Merge pull request 'master' (#41) from master into lukeyan

Reviewed-on: #41

src/views/archives/fangke.vue

@@ -99,8 +99,8 @@ export default {
         }
     },
     created() {
-        this.formInline.startTime = this.timeDefault + ' 00:00:00';
-        this.formInline.endTime = this.timeDefault + ' 23:59:59';
+        // this.formInline.startTime = this.timeDefault + ' 00:00:00';
+        // this.formInline.endTime = this.timeDefault + ' 23:59:59';
         this.getList()
     },
     mounted() {

src/views/enterpriseArchives/result.vue

@@ -391,7 +391,7 @@ export default {
             }
 
             .resultItem {
-                height: 135px;
+                height: 175px;
                 width: 95%;
                 border-bottom: 1px solid #6C8097;
                 padding: 20px 0;

src/views/head.vue

@@ -42,9 +42,12 @@ export default {
       activeIndex2: "1",
     };
   },
+  created() {
+    this.activeIndex = sessionStorage.getItem('activeIndex') ? sessionStorage.getItem('activeIndex') : '1'
+  },
   methods: {
-    handleSelect(key, keyPath) {
-      console.log(key, keyPath);
+    handleSelect(key) {
+      sessionStorage.setItem('activeIndex', key)
     },
   },
 };

src/views/safetyIndex/shuju.vue

@@ -3,7 +3,7 @@
         <div class="title"><img src="../../assets/safetyIndex/装饰009991.png" alt="">数据接入</div>
         <div class="qyclBody">
             <div class="zonglei">
-                <div class="zongleiTitle">接入总类</div>
+                <div class="zongleiTitle">接入总量</div>
                 <div class="zongleiNum"><span>1234124</span> 条</div>
             </div>
             <div class="leixingBox">

src/views/safetyIndex/yuangong.vue

@@ -341,9 +341,9 @@ export default {
     }
 
     .zongshu {
-        width: 400px;
-        height: 33px;
-        margin: 10px 20px;
+        width: 350px;
+        height: 26px;
+        margin: 5px auto;
         background: url('~@/assets/safetyIndex/7691.png') no-repeat;
         background-size: 100% 100%;
         display: flex;
@@ -384,12 +384,13 @@ export default {
     }
 
     .bottomBtns {
-        height: 37px;
+        height: 47px;
         width: 400px;
         margin: 0 auto;
         display: flex;
         justify-content: space-between;
-        background: url('~@/assets/safetyIndex/7691备份.png') no-repeat;
+        align-items: center;
+        background: url('~@/assets/safetyIndex/99108881.png') no-repeat;
         background-size: 100% 100%;
         padding: 4px;
         box-sizing: border-box;
@@ -399,6 +400,7 @@ export default {
             height: 100%;
             display: flex;
             justify-content: center;
+            align-items: center;
             cursor: pointer;
 
             .iconBox {

src/views/safetyIndex/yujing.vue

@@ -58,7 +58,6 @@
                 </div>
             </div>
         </div>
-
     </div>
 </template>
 <script>