Merge branch 'develop' of https://gitlab.com/970104719/tijing into develop

src/components/maintain/Record.vue

@@ -3,7 +3,7 @@
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
  * @LastEditors: Tao
- * @LastEditTime: 2021-01-28 19:02:16
+ * @LastEditTime: 2021-01-29 19:34:04
  -->
 <template>
     <div class="public-table" @click="changeselect = false"       v-loading="this.$store.state.isShow"
@@ -103,7 +103,7 @@
                 <el-table-column prop="FinishTime" label="保养完成时间" width="200" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="MaintenancePerson" label="保养人" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="DeviceName" label="设备名称" :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column prop="Remarks" label="备注" :show-overflow-tooltip="true"></el-table-column>
+                <el-table-column prop="CloseRemarks" label="备注" :show-overflow-tooltip="true"></el-table-column>
             </el-table>
         </div>
         <div class="pages-container">
@@ -733,6 +733,7 @@ export default {
                     `/api/MaintenanceManage/MaintenanceManage_GstRecord?argDeviceType=&argStartTime=${this.value1}&argTaskStatus=${a}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
+                    console.log('请求全部数据==>',res)
                      if (res.data.code == 0) {
                           this.tableData1 = res.data.data.DataList;
                         this.PageData = res.data.data.ParameterList;

src/views/cpk/cpk.vue

@@ -3,7 +3,7 @@
  * @since: 2019-11-08 15:00:48
  * @Author: jawnwa22
  * @LastEditors: Tao
- * @LastEditTime: 2021-01-29 13:50:21
+ * @LastEditTime: 2021-01-29 19:46:17
  -->
 <template>
     <div class="tapwater"     v-loading="this.$store.state.isShow"
@@ -1820,7 +1820,7 @@ export default {
             this.$store.state.a.endtime = this.value2;
             this.$store.state.a.num = this.Number1;
                  this.$store.state.one  = 2;
-                                if (res.data.code == 1) {
+                                if (res.data.code !== 0) {
                                     this.tipchange1 = true;
                                     this.pdyd3 = true;
                                     this.w = '这段时间无样本数据';

vue.config.js

@@ -3,7 +3,7 @@
  * @Date: 2019-11-12 17:31:23
  * @Author: Tao
  * @LastEditors: Tao
- * @LastEditTime: 2021-01-27 11:25:32
+ * @LastEditTime: 2021-01-29 19:20:40
  */
 /**
  * @description: vue-cli配置文件