.

shanXiPlatform/src/views/basicInformation/personnelStructure.vue

@@ -38,8 +38,8 @@
                     :index="indexMethod"
                   >
                   </el-table-column>
-                  <!--  <el-table-column prop="uname" label="姓名" align="center">
-                  </el-table-column> -->
+                   <el-table-column prop="uname" label="姓名" align="center">
+                  </el-table-column>
                   <el-table-column
                     prop="usex"
                     label="性别"

shanXiPlatform/src/views/facilitiesEquipment/facilitiesManagement/allFacilities/index.vue

@@ -68,7 +68,7 @@
     >
       <el-table-column type="index" align="center" label="序号" width="50px">
       </el-table-column>
-      <el-table-column prop="time" label="检查时间" align="center">
+      <el-table-column prop="checkTime" label="检查时间" align="center">
       </el-table-column>
       <el-table-column prop="kind" label="设施种类" align="center">
         <template slot-scope="scope">
@@ -238,10 +238,10 @@ export default {
         .then(res => {
           // console.log(res, "1111")
           this.allData = res.data.records
-          this.allData.forEach(element => {
+          /* this.allData.forEach(element => {
             element.time = element.checkTime.substring(0,this.allData[1].checkTime.length-3)
             console.log( element.time,' element.time')
-          });
+          }); */
           this.listLoading = false
           this.listQuery.limit = res.data.size
           this.total = res.data.total
@@ -269,10 +269,10 @@ export default {
           if (res.code == 200) {
             console.log(res, "全部列表返回数据..........")
             this.allData = res.data.records
-            this.allData.forEach(element => {
+            /* this.allData.forEach(element => {
               element.time = element.checkTime.substring(0,this.allData[1].checkTime.length-3)
               // console.log( element.time,' element.time')
-          });
+          }); */
             this.listLoading = false
             this.listQuery.limit = res.data.size
             this.total = res.data.total

shanXiPlatform/src/views/facilitiesEquipment/facilitiesManagement/newFacilities/addType.vue

@@ -610,47 +610,10 @@ export default {
       if (this.type == 1) {
         //新增时
         row.createDate = getDateTimeNow()
-        console.log(row.createDate, "createDate")
+
         // console.log(this.checkItems, "是否被选中")
         var num = 0
-
-        if (row.isCheck == 0) {
-            // 有一项点击否，结果就是1（黄）
-            this.data1.equipFacilities.checkResult = 1
-            this.checkResult = 1
-          } /* else{
-            // 有一项点击是，结果就是0（绿）
-            this.data1.equipFacilities.checkResult = 0
-            this.checkResult = 0
-          } */
-        this.checkItems.forEach((item, index) => {
-          Object.assign(
-            item,
-            { operationTime: item.createDate },
-            { checkEnumId: item.enumId }
-          )
-
-
-          if (item.isCheck == 1 || item.isCheck == 0) {
-            num += 1
-            // console.log(this.checkItems[i], num, "该项被选中了")
-          }
-
-          console.log(this.checkItems, "this.checkItems111")
-          console.log(
-            this.data1.equipFacilities.checkResult,
-            "this.data1.equipFacilities.checkResult"
-          )
-          if (num == this.checkItems.length) {
-            this.data1.equipFacilities.checkState = 1
-            this.flag = true
-            // console.log("此时暂存变保存，切状态改为已完成")
-          } else {
-            this.data1.equipFacilities.checkState = 0
-            // console.log("此时暂存还是暂存，切状态改为 进行中")
-          }
-        })
-        /* for (let i = 0; i < this.checkItems.length; i++) {
+        for (let i = 0; i < this.checkItems.length; i++) {
         // console.log(this.checkItems[i].enumId, "this.checkItems[i].enumId")
         // var num =0;
         this.checkItems[i].checkEnumId = this.checkItems[i].enumId
@@ -679,51 +642,26 @@ export default {
           this.data1.equipFacilities.checkState = 0
           // console.log("此时暂存还是暂存，切状态改为 进行中")
         }
-      } */
+      }
+
       } else if (this.type == 3) {
         //修改时
-        // row.operationTime = getNowFormatDateone()
         row.operationTime = getDateTimeNow()
-        // row.operationTime = getNowFormatDateone()
         var num = 0
 
-        if (row.isCheck == 0) {
-            // 有一项点击否，结果就是1（黄）
-            this.data1.equipFacilities.checkResult = 1
-            this.checkResult = 1
-          } else{
-            // 有一项点击是，结果就是0（绿）
-            this.data1.equipFacilities.checkResult = 0
-            this.checkResult = 0
-          }
-        this.checkItems.forEach((item, index) => {
-          Object.assign(item, { checkEnumId: item.enumId })
-          if (item.isCheck == 1 || item.isCheck == 0) {
-            num += 1
-            // console.log(this.checkItems[i], num, "该项被选中了")
-          }
-          console.log(this.checkItems, "this.checkItems111")
-          console.log(this.checkItems.length, "this.checkItems222")
-          if (num == this.checkItems.length) {
-            this.data1.equipFacilities.checkState = 1
-            this.flag = true
-            // console.log("此时暂存变保存，切状态改为已完成")
-          } else {
-            this.data1.equipFacilities.checkState = 0
-            // console.log("此时暂存还是暂存，切状态改为 进行中")
-          }
-        })
-        /* for (let i = 0; i < this.checkItems.length; i++) {
+
+        for (var i = 0; i < this.checkItems.length; i++) {
         // console.log(this.checkItems[i].enumId, "this.checkItems[i].enumId")
         // var num =0;
-        this.checkItems[i].checkEnumId = this.checkItems[i].enumId
-        this.checkItems[i].operationTime = this.checkItems[i].createDate
+        Object.assign(this.checkItems[i], { checkEnumId: this.checkItems[i].enumId })
         if (this.checkItems[i].isCheck === 0) {
           // 有一项点击否，结果就是1（黄）
           this.data1.equipFacilities.checkResult = 1
+          console.log(this.data1.equipFacilities.checkResult,'this.data1.equipFacilities.checkResult')
         } else {
           // 有一项点击否，结果就是0（绿）
           this.data1.equipFacilities.checkResult = 0
+          console.log(this.data1.equipFacilities.checkResult,'this.data1.equipFacilities.checkResult')
         }
 
         if (
@@ -731,23 +669,34 @@ export default {
           this.checkItems[i].isCheck === 0
         ) {
           num += 1
-          // console.log(this.checkItems[i], num, "该项被选中了")
+          console.log(this.checkItems[i], num, "该项被选中了")
         }
 
         if (num == this.checkItems.length) {
           this.data1.equipFacilities.checkState = 1
           this.flag = true
-          // console.log("此时暂存变保存，切状态改为已完成")
+          console.log("此时暂存变保存，切状态改为已完成")
         } else {
           this.data1.equipFacilities.checkState = 0
-          // console.log("此时暂存还是暂存，切状态改为 进行中")
+          console.log("此时暂存还是暂存，切状态改为 进行中")
         }
-      } */
+      }
       }
     },
     // 保存
     btnSave() {
       this.loading = true
+      for(var i =0;i<this.checkItems.length;i++){
+        if (this.checkItems[i].isCheck === 0) {
+          // 有一项点击否，结果就是1（黄）
+          this.data1.equipFacilities.checkResult = 1
+          console.log(this.data1.equipFacilities.checkResult,'this.data1.equipFacilities.checkResult')
+        } /* else if(this.checkItems[i].isCheck === 1){
+          // 有一项点击否，结果就是0（绿）
+          this.data1.equipFacilities.checkResult = 0
+          console.log(this.data1.equipFacilities.checkResult,'this.data1.equipFacilities.checkResult')
+        } */
+      }
       this.data1.equipFacilities.hname = this.houseDic[
         this.data1.equipFacilities.hid
       ]

shanXiPlatform/src/views/facilitiesEquipment/facilitiesManagement/newFacilities/index.vue

@@ -15,7 +15,7 @@
           <span v-if='scope.row.kind==45'>45</span> -->
         </template>
       </el-table-column>
-      <el-table-column prop="time" label="最近记录时间" align="center">
+      <el-table-column prop="checkTime" label="最近记录时间" align="center">
       </el-table-column>
       <el-table-column prop="checkState" label="状态" align="center">
         <template slot-scope="scope">
@@ -174,11 +174,11 @@ export default {
             console.log(res.data, "最新设施data") */
             // 把拿到的设施检查记录保存到data()中，并设为table数据源
             this.tableData = res.data
-            this.tableData.forEach(element => {
+           /*  this.tableData.forEach(element => {
               element.time = element.checkTime.substring(0,element.checkTime.length-3)
-              /* console.log( element.time,' element.time')
-              console.log( element.checkTime,' element.time') */
-          });
+              console.log( element.time,' element.time')
+              console.log( element.checkTime,' element.time')
+          }); */
           }
         })
         .catch(err => {

shanXiPlatform/src/views/reservesManagement/grainCheck/allGrain/index.vue

@@ -17,7 +17,7 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 :default-time="['00:00:00', '12:00:00']"
-                value-format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker> -->
               <el-date-picker
@@ -26,7 +26,7 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                value-format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd hh:mm:ss"
               >
               </el-date-picker>
             </div>
@@ -324,6 +324,7 @@ export default {
 
         condition: JSON.stringify(condition)
       }
+      console.log(data3,'data3')
       queryGrainInfo(data3)
         .then(res => {
           this.data2 = res.data.records