Merge branch 'qll'

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/authorizationmanage/user_management.vue

@@ -437,19 +437,19 @@ export default {
             operationMsg.apply(this,[res.data.code,'用户信息修改'])
             res.data.code === 0 ? this.dialogFormVisible = false : true
             this.$refs.tree.setCheckedKeys([]);
-            if(tempData.password&&tempData.userId==this.userId){
+            if(tempData.password&&tempData.userId==this.userId){//修改了登录者本人的密码时
               this.$store.dispatch("FedLogOut").then(res => {
                 if (res) {
                   location.reload();
                 }
               });
             }
-            if(tempData.userId==this.userId){
+            if(tempData.userId==this.userId){//修改了本人的信息，重新更新cookies
               Cookies.set('img',tempData.img);
               Cookies.set('email',tempData.email);
               Cookies.set('username',tempData.userName);
               Cookies.set('name',tempData.name);
-              this.$store.dispatch("ChangeNavImg").then(res => {
+              this.$store.dispatch("ChangeNavImg").then(res => {//这里其实不需要异步
                 if (res) {
                   //location.reload();
                 }

src/views/dataManagement/chart.vue

@@ -139,10 +139,10 @@ var surveyOption = {
             0
         ],
         bottom: 30,
-        "start": 10,
-        "end": 80,
+        "start": 0,
+        "end": 100,
         handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
-        handleSize: '110%',
+        handleSize: '120%',
         handleStyle:{
             color:"#d3dee5",  
         },
@@ -503,19 +503,19 @@ var mapOption = {
              }
          }
       },
-      visualMap: {
-          min: 0,
-          max: 11,
-          left: 'left',
-          top: 'bottom',
-          text: ['高', '低'],
-          calculable: true,
-          seriesIndex:'0',
-          show:false,
-          inRange: {
-            color:["#01689C",'#01689C']
-          }
-      },
+    //   visualMap: {
+    //       min: 0,
+    //       max: 11,
+    //       left: 'left',
+    //       top: 'bottom',
+    //       text: ['高', '低'],
+    //       calculable: true,
+    //       seriesIndex:'0',
+    //       show:false,
+    //       inRange: {
+    //         color:["#01689C",'#01689C']
+    //       }
+    //   },
       series: [{
             name: '散点',
             type: 'scatter',
@@ -526,10 +526,8 @@ var mapOption = {
             },
             label: {
                 normal: {
-                    //color: 'yellow',
                     formatter: '{b}',
-                    position: 'center',
-                    align:"center",
+                    position: 'right',
                     show: true
                 },
                 emphasis: {
@@ -584,7 +582,7 @@ export default {
       statusChart:null,
       typeChart:null,
       mapOption:null,
-      province:'北京市',
+      province:'广东省',
       cityOptions:[],
       //proName:'北京',
     };
@@ -681,7 +679,7 @@ export default {
             }
         })
     },
-    getMap(proName='北京市'){
+    getMap(proName='广东省'){
        mapOption.geo.map=proName;
        echarts.registerMap(proName, cityMap[proName]);
        mapOption.title.text= proName+"资源分布情况";

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;
@@ -220,7 +220,7 @@
 .dataChart_wrap{
     .metaDataTop {
         width:100%;
-        border-bottom:1px solid #EBEEF1;
+        // border-bottom:1px solid #EBEEF1;
         padding-bottom:23px;
         em {
             color:#3F4560;

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;