Merge branch 'master' of http://192.168.2.120/quanlili/knowledgeServiceAdmin into wtf

index.html

@@ -8,7 +8,7 @@
     <meta name="description"  />
 <meta name="keywords"  />
     <link href="https://cdn.jsdelivr.net/npm/animate.css@3.5.1" rel="stylesheet" type="text/css">
-    <title>人大OAIS数字资源系统</title>
+    <title>广州记忆-数字资源库系统</title>
     <script>
       function ifUndefined(data){
         return Object.prototype.toString.call(data) !== '[object Undefined]'

src/styles/sidebar.scss

@@ -4,7 +4,6 @@
     transition: margin-left .28s;
     margin-left: 180px;
     padding-top:56px;
-    // padding-bottom: 60px;
     background-color: #F5F7FA;
   }
   // 侧边栏

src/views/dataManagement/index.scss

 .search_wrap{
     width:100%;
-    padding:37px 28px 0;
+    padding:37px 28px 20px;
     .metaDataTop {
         width:100%;
         border-bottom:1px solid #EBEEF1;

src/views/draw/metadata/index.scss

@@ -231,7 +231,7 @@
 }
 .matedata_wrap{
     width:100%;
-    padding:37px 28px 0;
+    padding:37px 28px 20px;
     .refBtn{
         font-size:14px;
         color:#868BA3;

src/views/index_show/index.scss

@@ -9,7 +9,7 @@
     top:0px;
     right: 0;
     left:0;
-    bottom: 60px;
+    bottom: 0px;
     padding: 20px 20px;
     overflow-y: scroll;
     background: #F5F7FA;

src/views/layout/components/AppMain.vue

@@ -15,9 +15,9 @@
         <router-view></router-view>
       </keep-alive>
     </transition>
-    <div class="footer">
+    <!-- <div class="footer">
       Copyright © 2018中国人民大学信息资源管理学院, All Rights Reserved.
-    </div>
+    </div> -->
   </section>
 </template>
 
@@ -99,7 +99,7 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .app-main{
   padding-top:56px;
-  padding-bottom:60px;
+  padding-bottom:0px;
   min-height: calc( 100vh - 56px);
   position: relative;
 }

src/views/storagemodule/namedentity/character.vue

@@ -856,7 +856,7 @@ export default {
 <style lang="less" scoped>
 .box {
 	width:100%;
-  padding:37px 40px 0;
+  padding:37px 40px 20px;
   display:flex;
   flex-direction:column;
 	height:100%;

src/views/storagemodule/namedentity/characterentry.vue

@@ -460,7 +460,7 @@ export default {
 <style lang="less" scoped>
 .box {
 	width:100%;
-  padding:37px 40px 0;
+  padding:37px 40px 20px;
   display:flex;
   flex-direction:column;
 	height:100%;

src/views/storagemodule/namedentity/localtion.vue

@@ -407,7 +407,7 @@ export default {
 <style lang="less" scoped>
 .box {
 	width:100%;
-  padding:37px 40px 0;
+  padding:37px 40px 20px;
   display:flex;
   flex-direction:column;
 	height:100%;

src/views/storagemodule/namedentity/organ.vue

@@ -427,7 +427,7 @@ export default {
 <style lang="less" scoped>
 .box {
 	width:100%;
-  padding:37px 40px 0;
+  padding:37px 40px 20px;
   display:flex;
   flex-direction:column;
 	height:100%;

src/views/storagemodule/namedentity/timer.vue

@@ -430,7 +430,7 @@ export default {
 <style lang="less" scoped>
 .box {
 	width:100%;
-  padding:37px 40px 0;
+  padding:37px 40px 20px;
   display:flex;
   flex-direction:column;
 	height:100%;

src/views/submission/entrypage/index.vue

@@ -91,7 +91,7 @@ export default {
 <style lang="less" scoped>
 .box {
 	width:100%;
-  padding:37px 40px 0;
+  padding:37px 40px 20px;
   display:flex;
   flex-direction:column;
   height:100%;

src/views/submission/infoview/allresource.vue

@@ -321,7 +321,7 @@ export default {
 <style lang="less" scoped>
 .matedata_wrap{
     width:100%;
-    padding:37px 28px 0;
+    padding:37px 28px 20;
     .metaDataTop {
 			width:100%;
 			border-bottom:1px solid #EBEEF1;

src/views/submission/infoview/mycommit.vue

@@ -323,7 +323,7 @@ export default {
 <style lang="less" scoped>
 .matedata_wrap{
 	width:100%;
-	padding:37px 28px 0;
+	padding:37px 28px 20;
 	.metaDataTop {
 		width:100%;
 		border-bottom:1px solid #EBEEF1;

src/views/submission/infoview/myedit.vue

@@ -323,7 +323,7 @@ export default {
 <style lang="less" scoped>
 .matedata_wrap{
     width:100%;
-    padding:37px 28px 0;
+    padding:37px 28px 20;
     .metaDataTop {
         width:100%;
         border-bottom:1px solid #EBEEF1;

src/views/submission/resourcecommit/index.vue

@@ -157,7 +157,7 @@
 			</div>
 			<div class="threeBtn">
 				<button @click="$router.back(-1)">取消</button>
-				<button v-if="isShowSavaBtn">提交并转录目录</button>
+				<!-- <button v-if="isShowSavaBtn">提交并转录目录</button> -->
 				<button @click="commitResource" v-if="isShowSavaBtn">提交入库</button>
 				<button @click="saveEdit" v-if="isShowSavaBtn1">保存变更</button>
 			</div>