bug

shanXiPlatform/src/api/facilitiesEquipment/facilitiesManagement.js

@@ -66,3 +66,59 @@ export function deleteFacilitiyInfo(id) {
     method: 'delete',
   })
 }
+//获取当前时间
+export function getDateTimeNow(){
+  var time = new Date();
+  var day = ("0" + time.getDate()).slice(-2)
+  var month = ("0" + (time.getMonth()+1)).slice(-2)
+
+  var hour = ("0" + time.getHours()).slice(-2)
+  var minute = ("0" + time.getMinutes()).slice(-2)
+  var second = ("0" + time.getSeconds()).slice(-2)
+
+  var today = time.getFullYear() + "-" + (month) + "-" + (day) + " " + (hour) + ":" + (minute) + ":" + (second)
+  return today
+}
+
+//时间格式化
+export function getNowFormatDateone() {
+  var date = new Date()
+  var seperator1 = "-"
+
+  var year = date.getFullYear()
+  var month = date.getMonth() + 1
+  var hour = date.getHours()
+  var minutes = date.getMinutes()
+  var seconds = date.getSeconds();
+  var strDate = date.getDate()
+
+  if (month >= 1 && month <= 9) {
+    month = "0" + month
+  }
+  if (strDate >= 0 && strDate <= 9) {
+    strDate = "0" + strDate
+  }
+  if (minutes >= 0 && minutes <= 9) {
+    minutes = "0" + minutes
+  }
+  if (seconds >= 0 && seconds <= 9) {
+    seconds = "0" + seconds
+  }
+  // var currentdate = year + seperator1 + month + seperator1 + strDate+"  "+hour+":" +minutes+":" +seconds;
+
+  var currentdate =
+    year +
+    seperator1 +
+    month+
+    seperator1 +
+    strDate
+    +
+    "  " +
+    hour +
+    ":" +
+    minutes
+    ":" +
+    seconds
+
+  return currentdate
+}

shanXiPlatform/src/views/basicInformation/personnelStructure.vue

@@ -268,8 +268,78 @@ export default {
         limit: 10
       },
       xAxisdata: [],
-      seriesdata: []
+      seriesdata: [],
       // chart 数据设置
+      option : {
+          title: {
+            // text: "仓储、质检人员职业资格情况",
+            textStyle: {
+              color: "#7d7d7d",
+              fontStyle: "normal",
+              fontWeight: "900",
+              fontSize: "14"
+            },
+            left: "center"
+          },
+          tooltip: {
+            trigger: "axis",
+            axisPointer: {
+              // 坐标轴指示器，坐标轴触发有效
+              type: "shadow" // 默认设置为直线，可选为 'line' | 'shadow'
+            }
+          },
+          grid: {
+            y2: 60
+          },
+          /* legend:{
+          data:['初级','中级','高级','技师','高级技师']
+        }, */
+          /*         grid:{
+          left:'3%',
+          right:'4%',
+          bottom:'3%',
+          containLabel:true
+        }, */
+          xAxis: {
+            type: "category",
+            data: this.xAxisdata,
+            // data: ["初级", "中级", "高级", "技师", "高级技师"],
+            // data: this.xAxisdata,
+            axisTick: {
+              alignWithLabel: true
+            },
+            axisLabel: {
+              rotate: 60
+            }
+          },
+          yAxis: {
+            type: "value",
+            min: 3
+          },
+          series: [
+            {
+              name: "人数",
+              barWidth: "40%",
+              data: this.seriesdata,
+              // data: [1, 2, 1, 1, 1, 1, null, null],
+              type: "bar",
+              //修改第一组柱子的颜色
+              itemStyle: {
+                // barBorderRadius:20,
+                color: function(p) {
+                  var color = [
+                    "#F1DE34",
+                    "#58CEFF",
+                    "#8CCF23",
+                    "#FEBB46",
+                    "#4FC5BB"
+                  ]
+                  return color[p.dataIndex]
+                }
+              }
+            }
+          ]
+        }
     }
   },
 
@@ -449,8 +519,8 @@ export default {
         document.getElementById("chartProfession")
       )
       // 使用刚指定的配置项和数据显示图标
-      
-      if (this.seriesdata.length == 0) {
+
+      /* if (this.seriesdata.length == 0) {
         option = {
           title: {
             text: "暂无数据",
@@ -464,78 +534,9 @@ export default {
           }
         }
       } else {
-        option = {
-          title: {
-            // text: "仓储、质检人员职业资格情况",
-            textStyle: {
-              color: "#7d7d7d",
-              fontStyle: "normal",
-              fontWeight: "900",
-              fontSize: "14"
-            },
-            left: "center"
-          },
-          tooltip: {
-            trigger: "axis",
-            axisPointer: {
-              // 坐标轴指示器，坐标轴触发有效
-              type: "shadow" // 默认设置为直线，可选为 'line' | 'shadow'
-            }
-          },
-          grid: {
-            y2: 60
-          },
-          /* legend:{
-          data:['初级','中级','高级','技师','高级技师']
-        }, */
-          /*         grid:{
-          left:'3%',
-          right:'4%',
-          bottom:'3%',
-          containLabel:true
-        }, */
-          xAxis: {
-            type: "category",
-            data: this.xAxisdata,
-            // data: ["初级", "中级", "高级", "技师", "高级技师"],
-            // data: this.xAxisdata,
-            axisTick: {
-              alignWithLabel: true
-            },
-            axisLabel: {
-              rotate: 60
-            }
-          },
-          yAxis: {
-            type: "value",
-            min: 3
-          },
-          series: [
-            {
-              name: "人数",
-              barWidth: "40%",
-              data: this.seriesdata,
-              // data: [1, 2, 1, 1, 1, 1, null, null],
-              type: "bar",
-              //修改第一组柱子的颜色
-              itemStyle: {
-                // barBorderRadius:20,
-                color: function(p) {
-                  var color = [
-                    "#F1DE34",
-                    "#58CEFF",
-                    "#8CCF23",
-                    "#FEBB46",
-                    "#4FC5BB"
-                  ]
-                  return color[p.dataIndex]
-                }
-              }
-            }
-          ]
-        }
-      }
-      myChart.setOption(option)
+
+      } */
+      myChart.setOption(this.option)
     },
     // 筛选科室
     handleClick(tab, event) {

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

@@ -18,22 +18,11 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                value-format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd"
               >
               </el-date-picker>
         </el-form-item>
-        <!--  <el-form-item label="-">
-          <el-date-picker
-            v-model="query.end"
-            type="date"
-            placeholder="选择日期"
-
-            :default-time="['00:00:00']"
-            value-format="yyyy-MM-dd HH:mm:ss"
-          >
-          </el-date-picker>
 
-        </el-form-item> -->
 
         <el-form-item label="设施种类:">
           <el-select v-model="kind" placeholder="请选择设施种类">
@@ -80,6 +69,9 @@
       <el-table-column type="index" align="center" label="序号" width="50px">
       </el-table-column>
       <el-table-column prop="checkTime" label="检查时间" align="center">
+          <template slot-scope="scope">
+         <span>{{ scope.row.checkTime.slice(0,16) }}</span>
+        </template>
       </el-table-column>
       <el-table-column prop="kind" label="设施种类" align="center">
         <template slot-scope="scope">
@@ -179,7 +171,8 @@ import {
   getFacility,
   getAllFacilitiyCheckRecord,
   checkFacilitiyInfo,
-  deleteFacilitiyInfo
+  deleteFacilitiyInfo,
+  getNowFormatDateone
 } from "@/api/facilitiesEquipment/facilitiesManagement"
 export default {
   // components: { Pagination },
@@ -206,7 +199,8 @@ export default {
         type: undefined,
         sort: "+id" */
       },
-      allData: []
+      allData: [],
+      time:''
     }
   },
   mounted() {
@@ -242,11 +236,15 @@ export default {
         pageSize: this.listQuery.limit,
         condition: JSON.stringify(condition)
       }
-      console.log(data, "查询数据")
+      console.log(this.value2, "查询数据value2")
       getAllFacilitiyCheckRecord(data)
         .then(res => {
-          console.log(res, "1111")
+          // console.log(res, "1111")
           this.allData = res.data.records
+          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
@@ -274,13 +272,16 @@ export default {
           if (res.code == 200) {
             console.log(res, "全部列表返回数据..........")
             this.allData = res.data.records
-
+            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
           }
 
-          console.log(this.allData, "arrdata全部检查记录")
+          // console.log(this.allData, "arrdata全部检查记录")
         })
         .catch(err => {
           console.log(err, "获取全部记录失败信息")

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

@@ -24,6 +24,7 @@
             width="50px"
           />
           <el-table-column label="记录时间" prop="createDate" align="center" />
+          <!-- <el-table-column label="记录时间" prop="time" align="center" /> -->
 
           <el-table-column label="检查项" prop="enumId" align="center">
             <template slot-scope="scope">
@@ -110,13 +111,14 @@
 </template>
 <script>
 //时间格式的转化
-import { getNowFormatDateone, formatTime } from "@/utils"
 import {
   getFacility,
   getFacilitiyById,
   addFacilitiy,
   editFacilitiy,
-  checkFacilitiyInfo
+  checkFacilitiyInfo,
+  getNowFormatDateone,
+  getDateTimeNow
 } from "@/api/facilitiesEquipment/facilitiesManagement"
 export default {
   name: "AddType",
@@ -528,7 +530,7 @@ export default {
             if (res.code == 200) {
               // console.log(res, "检查项数据")
               this.checkItems = res.data
-              // console.log(this.checkItems, "this.checkItems")
+              console.log(this.checkItems, "this.checkItems")
               for (let i = 0; i < this.checkItems.length; i++) {
                 this.checkItems[i].isCheck = ""
                 this.checkItems[i].checkEnumId = ""
@@ -548,7 +550,12 @@ export default {
           .then(res => {
             console.log(res, "查看数据222")
             this.checkItems = res
-            // console.log(this.checkItems, "this.checkItems222")
+            /* this.checkItems.forEach(element => {
+              element.createDate = element.createDate.substring(0,element.createDate.length-3)
+              // console.log( element.time,' element.time')
+              console.log( element.createDate,' element.time')
+          }); */
+            console.log(this.checkItems, "this.checkItems222")
             for (let i = 0; i < this.checkItems.length; i++) {
               this.checkItems[i].createDate = res[i].operationTime
               this.checkItems[i].enumId = res[i].checkEnumId
@@ -562,7 +569,7 @@ export default {
         checkFacilitiyInfo(this.id).then(res => {
           // console.log(res, "修改数据333")
           this.checkItems = res
-          // console.log(this.checkItems, "this.checkItems333")
+          console.log(this.checkItems, "this.checkItems333")
           /* for (let i = 0; i < this.checkItems.length; i++) {
             this.checkItems[i].createDate = res[i].operationTime
             this.checkItems[i].enumId = res[i].checkEnumId
@@ -602,8 +609,8 @@ export default {
       console.log(row, "row111", index, "index")
       if (this.type == 1) {
         //新增时
-        row.createDate = getNowFormatDateone()
-        // console.log(row.createDate, "createDate")
+        row.createDate = getDateTimeNow()
+        console.log(row.createDate, "createDate")
         // console.log(this.checkItems, "是否被选中")
         var num = 0
 
@@ -611,11 +618,11 @@ export default {
             // 有一项点击否，结果就是1（黄）
             this.data1.equipFacilities.checkResult = 1
             this.checkResult = 1
-          } else{
+          } /* else{
             // 有一项点击是，结果就是0（绿）
             this.data1.equipFacilities.checkResult = 0
             this.checkResult = 0
-          }
+          } */
         this.checkItems.forEach((item, index) => {
           Object.assign(
             item,
@@ -675,7 +682,8 @@ export default {
       } */
       } else if (this.type == 3) {
         //修改时
-        row.operationTime = getNowFormatDateone()
+        // row.operationTime = getNowFormatDateone()
+        row.operationTime = getDateTimeNow()
         // row.operationTime = getNowFormatDateone()
         var num = 0
 
@@ -743,7 +751,7 @@ export default {
       this.data1.equipFacilities.hname = this.houseDic[
         this.data1.equipFacilities.hid
       ]
-      this.data1.equipFacilities.checkTime = getNowFormatDateone()
+      this.data1.equipFacilities.checkTime = getDateTimeNow()
       console.log(
         this.data1.equipFacilities.checkTime,
         "this.data1.equipFacilities.ccheckTime"

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="checkTime" label="最近记录时间" align="center">
+      <el-table-column prop="time" label="最近记录时间" align="center">
       </el-table-column>
       <el-table-column prop="checkState" label="状态" align="center">
         <template slot-scope="scope">
@@ -100,10 +100,12 @@
 <script>
 // 引入接口
 //时间格式的转化
-import { getNowFormatDateone, formatTime } from "@/utils"
+
 import {
   getFacility,
-  getNewFacilityCheckRecord
+  getNewFacilityCheckRecord,
+  getNowFormatDateone,
+  getDateTimeNow
 } from "@/api/facilitiesEquipment/facilitiesManagement"
 export default {
   data() {
@@ -131,7 +133,8 @@ export default {
       tableData: [],
       facilityKind: [],
       depotId: this.$store.state.depotId,
-      houseId: this.$store.state.houseId
+      houseId: this.$store.state.houseId,
+      datetime:''
     }
   },
   mounted() {
@@ -171,6 +174,11 @@ export default {
             console.log(res.data, "最新设施data") */
             // 把拿到的设施检查记录保存到data()中，并设为table数据源
             this.tableData = res.data
+            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') */
+          });
           }
         })
         .catch(err => {
@@ -181,8 +189,11 @@ export default {
     handleAdd(type, index, row) {
       console.log(index, "index", row, "row")
       console.log(row.checkTime, "改变时间...")
-      row.checkTime = getNowFormatDateone()
-      console.log(row.checkTime, "改变时间...")
+      row.checkTime = getDateTimeNow()
+      this.datetime = getDateTimeNow()
+
+      console.log(row.checkTime, "改变时间111...")
+      console.log( this.datetime, "改变时间...")
       if (row.depotId == null) {
         row.depotId = this.depotId
         console.log("库id为空时")

shanXiPlatform/src/views/home/branchOffice.vue

@@ -1418,7 +1418,7 @@ export default {
                 .myChartdcru {
                     width: 100%;
                     height: 10%;
-                    padding: 13px 3px 5px 0;
+                    padding: 13px 3px 5px 10px;
                     color: #333;
                     font-weight: 400;
                     font-family: Source Han Sans CN;
@@ -1489,7 +1489,7 @@ export default {
                 .myChartdcru {
                     width: 100%;
                     height: 10%;
-                    padding: 13px 3px 5px 0;
+                    padding: 13px 3px 5px 10px;
                     color: #333;
                     font-weight: 400;
                     font-family: Source Han Sans CN;

shanXiPlatform/src/views/reservesManagement/grainCheck/newGrain/addNewGrain.vue

@@ -83,7 +83,7 @@
           type="savebtn"
           :loading="loading"
           v-show="show"
-          v-else-if="flag"
+          v-if="flag"
           @click="saveInfo"
           >保存</el-button
         >
@@ -207,7 +207,7 @@ export default {
       loading: false,
       checkTime: "",
       //库id
-      depot_id: "",
+      depot_id: this.$store.state.depotId,
       //仓房id
       house_id: this.$store.state.houseId,
       houseId: "",
@@ -529,16 +529,24 @@ export default {
       if (this.type == "2") {
         this.data3.depotId = this.depot_id
         this.data3.houseId = this.house_id
-        // console.log(this.house_id, "house_id")
-        // console.log(this.data3.houseId, "this.data3.houseId...")
+        console.log(this.house_id, "house_id")
+        console.log(this.data3.houseId, "this.data3.houseId...")
         this.data3.checkDescribe = JSON.stringify(this.data3.checkDescribe)
 
         addInfo(this.data3)
           .then(res => {
-            // console.log(this.data3, "this.data3")
-            // console.log(res,'res222111...')
+            console.log(this.data3, "this.data3")
+            console.log(res,'res222111...')
             if (res.code == 200) {
+              console.log('新增成功........')
               this.loading = false
+              this.$message({
+              message: "新增成功！",
+              type: "success"
+            })
+            this.$router.push({
+              path: "/reservesManagement/grainCheck/newGrain"
+            })
               if (!(JSON.stringify(this.data2) == {})) {
                 if (
                   Object.getOwnPropertyNames(
@@ -548,10 +556,11 @@ export default {
                   //当选项全部被选中后调用接口
                   let auditState = 4 //4 是已完成
                   //判断是否切换仓房，或者仓房发生改变
+                  console.log(this.house_id,this.data2.houseId,'houseId')
                   if (this.house_id == this.data2.houseId) {
                     haveDone(this.data2.id, auditState)
                       .then(res => {
-                        // console.log(res, "res.......")
+                        console.log(res, "res.......")
                       })
                       .catch(err => {
                         console.log(err)
@@ -579,14 +588,9 @@ export default {
                   }
                 }
               }
+
             }
-            this.$message({
-              message: "新增成功！",
-              type: "success"
-            })
-            this.$router.push({
-              path: "/reservesManagement/grainCheck/newGrain"
-            })
+
           })
           .catch(err => {
             this.loading = false