Merge branch 'http_test' into insist

src/components/newLayout/Head.vue

@@ -245,7 +245,7 @@ export default {
   }
 }
 .nav-div1 {
-  width:25px;height:50px;border-radius: 0 50px 50px 0;line-height:50px;background: #6cb5ff; position: absolute; bottom: 172px; left: 0;border: 1px solid #333;animation:myfirsts 0.5s;
+  width:25px;height:50px;border-radius: 0 50px 50px 0;line-height:50px;background: #6cb5ff; position: absolute; bottom: 172px; left: 0;border: 1px solid #6cb5ff;animation:myfirsts 0.5s;
 }
 .nav-div2 {
   bottom: 137px; width:60px; height:120px; line-height:120px;border-radius: 0 80px 80px 0;;background: #6cb5ff; position: absolute; left: 0;animation:myfirst 1s;
@@ -268,7 +268,7 @@ export default {
   line-height:50px;
   background: #FFF;
   bottom: 172px;
-  border: 1px solid #eee;
+  border: 1px solid #FFF;
   opacity: 0.63;
 }
 .nav-div4 {
@@ -277,7 +277,7 @@ export default {
   line-height:45px;
   background: #FFF;
   bottom: 177px;
-  border: 1px solid #eee;
+  border: 1px solid #FFF;
 }
 .div-child {
   text-align: right;
@@ -292,6 +292,7 @@ export default {
 	from {opacity: 0}
   to {opacity: 1}
 }
+
 .nav-circular {
   position: absolute;
   left: 0;

src/views/monthly/index.vue

@@ -24,14 +24,14 @@
           </div>
         </div>
       </el-aside>
-      <el-main class="monthly-main">
+      <el-main v-loading="loading" class="monthly-main">
         <div class="monthly-main-title">
           <div>{{ monthly_main_image.title }}</div>
           <div class="monthly-main-date">{{ monthly_main_image.gmtCreate }}</div>
         </div>
         <div class="demo-image__placeholder" style="padding: 20px 0;">
           <div class="block" style="text-align: center;max-height: calc(100vh - 211px); overflow-y: auto;">
-            <el-image :src="monthly_main_image.content" />
+            <el-image :src="monthly_main_image.content" @load="loading = false" />
           </div>
         </div>
       </el-main>
@@ -62,6 +62,7 @@ export default {
     return {
       logo: logoUrl,
       title: '',
+      loading: true,
       show: false,
       monthly_show: false,
       monthly_nav_query: '',
@@ -89,6 +90,7 @@ export default {
       }
     },
     monthlyGetData(val) {
+      this.loading = true
       this.monthly_main_image = this.monthly_nav_list.filter(item => item.id === Number(val.id))[0]
     },
     async monthly_query(val) {

src/views/projectManage/requirement/list/index.vue

@@ -362,8 +362,8 @@ export default {
         this.searchForm.name = ''
       }
       if (this.searchForm.date) {
-        this.searchForm.createTimeBegin = this.searchForm.date[0]
-        this.searchForm.createTimeEnd = this.searchForm.date[1]
+        this.searchForm.createStartTime = this.searchForm.date[0]
+        this.searchForm.createEndTime = this.searchForm.date[1]
       }
       this.searchForm.bizId = this.bizId
       this.loading = true
@@ -448,7 +448,7 @@ export default {
     async toSave() {
       const saveObj = deepClone(this.searchForm)
       if (saveObj.createTimeBegin) {
-        saveObj.date = [saveObj.createTimeBegin, saveObj.createTimeEnd]
+        saveObj.date = [saveObj.createStartTime, saveObj.createEndTime]
       }
       delete saveObj.curIndex
       delete saveObj.pageSize

src/views/quality/components/requireDrawer.vue

@@ -26,7 +26,7 @@
     </el-table>
     <el-pagination
       style="text-align: center;"
-      :current-page="currentPage"
+      :current-page.sync="currentPage"
       :page-sizes="[10, 20, 30, 40]"
       :page-size="10"
       layout="total, sizes, prev, pager, next, jumper"
@@ -59,18 +59,13 @@ export default {
         curIndex: 1, // 分页
         pageSize: 10 // 分页
       },
-      tableData: [{
-        date: '2016-05-02',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }]
+      tableData: []
     }
   },
   computed: {
     drawer_: {
       get() { return this.drawer },
       set(v) {
-        console.log(v, 'co')
         this.$emit('clone', v)
       }
     }
@@ -79,6 +74,11 @@ export default {
     data: {
       handler(newV, oldV) {
         this.Statistics = newV
+        this.currentPage = 1
+        this.paging = {
+          curIndex: 1, // 分页
+          pageSize: 10 // 分页
+        }
         this.getTableData()
       },
       immediate: true
@@ -193,7 +193,7 @@ export default {
     left: 50%;
     overflow: hidden;
     margin: 0;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+    // box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
 }
 >>>.el-drawer__container {
     left: 0;