Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-vue

shanXiPlatform/src/api/facilitiesEquipment/facilitiesManagement.js

@@ -2,12 +2,14 @@ import request from '@/utils/request'
 
 // 设施设备 -设施管理
 // 获取最新设施种类
-export function getFacility() {
+export function getFacility(parentId) {
   return request({
-    url: `/csc-szls-system-manage/basicsEnum/authority/getEnumAll`,
+    // url: `/csc-szls-system-manage/basicsEnum/authority/getEnumAll`,
+    url: `/csc-szls-system-manage/basicsEnum/authority/getOnlyChildData/${parentId}`,
     method: 'get',
   })
 }
+// /basicsEnum/authority/getOnlyChildData/{parentId}
 
 // 最新设施检查记录
 export function getNewFacilityCheckRecord(params) {
@@ -41,6 +43,14 @@ export function getAllFacilitiyCheckRecord(params) {
     params
   })
 }
+// 修改
+export function editFacilitiy(data) {
+  return request({
+    url: `/csc-szls-business/equipFacilities/facilities/update`,
+    method: 'post',
+    data
+  })
+}
 // 查看
 export function checkFacilitiyInfo(id) {
   return request({

shanXiPlatform/src/api/safeProduction/index.js

@@ -53,7 +53,7 @@ export function haveDone(userId,type,depotId,auditState) {
   
 export function getDateTimeNow(){
   var time = new Date();
-  time.setTime(time.setHours(time.getHours() - 8))
+  time.setTime(time.setHours(time.getHours()))
   var day = ("0" + time.getDate()).slice(-2)
   var month = ("0" + (time.getMonth()+1)).slice(-2)
 

shanXiPlatform/src/api/supervisionInspection/entrustedRepository/index.js

@@ -32,7 +32,7 @@ export function deleteFun(id) {
   
 export function getDateTimeNow(){
   var time = new Date();
-  time.setTime(time.setHours(time.getHours() - 8))
+  time.setTime(time.setHours(time.getHours()))
   var day = ("0" + time.getDate()).slice(-2)
   var month = ("0" + (time.getMonth()+1)).slice(-2)
 

shanXiPlatform/src/api/supervisionInspection/library/index.js

@@ -39,7 +39,7 @@ export function deleteFun(id) {
   
 export function getDateTimeNow(){
   var time = new Date();
-  time.setTime(time.setHours(time.getHours() - 8))
+  time.setTime(time.setHours(time.getHours()))
   var day = ("0" + time.getDate()).slice(-2)
   var month = ("0" + (time.getMonth()+1)).slice(-2)
 

shanXiPlatform/src/api/supervisionInspection/subTreasury/index.js

@@ -32,7 +32,7 @@ export function deleteFun(id) {
   
 export function getDateTimeNow(){
   var time = new Date();
-  time.setTime(time.setHours(time.getHours() - 8))
+  time.setTime(time.setHours(time.getHours()))
   var day = ("0" + time.getDate()).slice(-2)
   var month = ("0" + (time.getMonth()+1)).slice(-2)
 

shanXiPlatform/src/router/index.js

@@ -843,7 +843,7 @@ export const constantRoutes = [
           redirect: 'facilitiesManagement/newFacilities',
           component: facilitiesTabs,
           name: 'FacilitiesManagemen',
-          meta: { title: '设施管理', icon: 'dashboard', affix: false},
+          meta: { title: '设施管理', icon: 'dashboard', affix: false,istable: true},
           resourceCode: 243,
 
 
@@ -855,7 +855,7 @@ export const constantRoutes = [
               name: 'NewFacilities',
 
               hidden: true,
-              meta: { title: '最新设施检查记录', icon: 'dashboard', affix: false}
+              meta: { title: '最新设施检查记录', icon: 'dashboard', affix: false,relation: 'house', istable: true}
             },
 
 
@@ -866,7 +866,7 @@ export const constantRoutes = [
               name: 'AllFacilities',
 
               hidden: true,
-              meta: { title: '全部设施检查记录', icon: 'dashboard', affix: false}
+              meta: { title: '全部设施检查记录', icon: 'dashboard', affix: false ,relation: 'house', istable: true}
             },
 
 
@@ -892,7 +892,7 @@ export const constantRoutes = [
           component: () => import('@/views/facilitiesEquipment/facilitiesManagement/newFacilities/addType'),
           name: 'AddType',
           hidden: true,
-          meta: { title: '新增', icon: 'dashboard', affix: false, noCache: true }
+          meta: { title: '新增', icon: 'dashboard', affix: false, noCache: true ,relation: 'house'}
         },
 
 

shanXiPlatform/src/views/basicInformation/personnelStructure.vue

@@ -7,7 +7,9 @@
           <el-col :span="12" style="overflow-y: scroll;">
             <!-- 内容主体 -->
             <el-header style=" padding-left: 0;" height="40px">
-              <div class="header-text"><span class="myspan">人员结构</span> </div>
+              <div class="header-text">
+                <span class="myspan">人员结构</span>
+              </div>
             </el-header>
             <div class="content">
               <!-- 选择筛选项 -->
@@ -25,7 +27,7 @@
                   class="tableItem"
                   :data="tableData"
                   v-loading="loading"
-                  :header-cell-style="{background:'#f8f8f8'}"
+                  :header-cell-style="{ background: '#f8f8f8' }"
                   style="width: 100%"
                   border
                 >
@@ -85,8 +87,9 @@
           <el-col :span="12" style="overflow-y: scroll;">
             <!-- 侧边栏 -->
             <el-aside style="width:100%;">
-              <el-header height="40px" >
-                <div class="header-text"><span class="myspan"> 粮库科室结构图</span>
+              <el-header height="40px">
+                <div class="header-text">
+                  <span class="myspan"> 粮库科室结构图</span>
                 </div>
               </el-header>
               <div class="imgDepartment">
@@ -103,8 +106,10 @@
                   </div>
                 </div>
                 <div>
-                  <el-header height="40px" >
-                    <div class="header-text"><span class="myspan">仓储、检验人员职业资格情况</span></div>
+                  <el-header height="40px">
+                    <div class="header-text">
+                      <span class="myspan">仓储、检验人员职业资格情况</span>
+                    </div>
                   </el-header>
                   <div id="chartProfession"></div>
                 </div>
@@ -263,77 +268,8 @@ 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"
-        },
-        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]
-              }
-            }
-          }
-        ]
-      }
     }
   },
 
@@ -513,8 +449,93 @@ export default {
         document.getElementById("chartProfession")
       )
       // 使用刚指定的配置项和数据显示图标
-
-      myChart.setOption(this.option)
+      
+      if (this.seriesdata.length == 0) {
+        option = {
+          title: {
+            text: "暂无数据",
+            x: "center",
+            y: "center",
+            textStyle: {
+              color: "#65ABE7",
+              fontWeight: "normal",
+              fontSize: 16
+            }
+          }
+        }
+      } 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)
     },
     // 筛选科室
     handleClick(tab, event) {
@@ -585,7 +606,7 @@ export default {
 
 <style lang="scss" scoped>
 .main {
-  padding: 10px 0 30px 10px ;
+  padding: 10px 0 30px 10px;
   height: calc(100vh - 150px);
   .el-main {
     padding-top: 0;
@@ -609,7 +630,7 @@ export default {
     color: #037d41;
     font-weight: 500;
     font-family: Source Han Sans CN;
-    .myspan{
+    .myspan {
       margin-left: 10px;
     }
   }

shanXiPlatform/src/views/basicInformation/policySystem/detail.vue

@@ -6,8 +6,7 @@
         {{formData.title}}
       </div>
       <div style="text-align:right;margin-top:20px">
-        <span v-if="formData.publishTime">{{formData.publishTime.slice(0,10)}}</span>
-        <span v-if="!formData.publishTime">{{formData.publishTime}}</span>
+        <span>{{dateFormatValue(formData.publishTime)}}</span>
       </div>
       <div style="margin-top:20px">
         <quill-editor
@@ -206,6 +205,16 @@ export default {
       console.log('editor change!', editor, html, text)
       // this.content = html
     },
+    dateFormatValue(timedate) {
+      if (timedate === null || timedate === undefined) {
+        return ""
+      } else {
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        return (year + '-' + month + '-' + day)
+      }
+    },
     dateFormat(timedate) {
       if (timedate === null || timedate === undefined) {
         return ""

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

@@ -3,7 +3,7 @@
     <div class="header">
       <el-form :inline="true" :model="query" class="demo-form-inline">
         <el-form-item label="检测时间:">
-          <el-date-picker
+          <!-- <el-date-picker
             v-model="value2"
             type="datetimerange"
             start-placeholder="开始日期"
@@ -11,7 +11,16 @@
             :default-time="['09:00:00', '18:00:00']"
             value-format="yyyy-MM-dd HH:mm:ss"
           >
-          </el-date-picker>
+          </el-date-picker> -->
+          <el-date-picker
+                v-model="value2"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm"
+              >
+              </el-date-picker>
         </el-form-item>
         <!--  <el-form-item label="-">
           <el-date-picker
@@ -327,13 +336,13 @@ export default {
 
     //设施种类
     getFacilityList() {
-      getFacility()
+      getFacility(40)
         .then(res => {
           if (res.code == 200) {
             console.log(res, "设施种类")
             // console.log(res.data[2].children,'设备设施种类')
             // 设施种类保存本地，并且tavle中，遍历的时候与其对应一下，显示种类名称
-            this.facilityKind = res.data[2].children
+            this.facilityKind = res.data
             console.log(this.facilityKind, "设施种类")
           }
         })

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

@@ -23,15 +23,11 @@
             label="序号"
             width="50px"
           />
-          <el-table-column
-            label="记录时间"
-            prop="createDate"
-            align="center"
-          />
+          <el-table-column label="记录时间" prop="createDate" align="center" />
 
           <el-table-column label="检查项" prop="enumId" align="center">
             <template slot-scope="scope">
-              <p v-for="item in facility" :key="item.enumId">
+              <p v-for="item in facilityList" :key="item.enumId">
                 <span v-if="scope.row.enumId == item.enumId">{{
                   item.enumName
                 }}</span>
@@ -68,7 +64,7 @@
 
           <el-table-column label="检查项" prop="enumId" align="center">
             <template slot-scope="scope">
-              <p v-for="item in facility" :key="item.enumId">
+              <p v-for="item in facilityList" :key="item.enumId">
                 <span v-if="scope.row.enumId == item.enumId">{{
                   item.enumName
                 }}</span>
@@ -119,6 +115,7 @@ import {
   getFacility,
   getFacilitiyById,
   addFacilitiy,
+  editFacilitiy,
   checkFacilitiyInfo
 } from "@/api/facilitiesEquipment/facilitiesManagement"
 export default {
@@ -134,18 +131,20 @@ export default {
       facilityId: "", //设施种类id
       id: "", // 列表每行id
       kind: "",
+      checkResult:'',
       // 头部下拉选的值
       // type: "cfss",
       type: "", // 1：新增 2：查看 3：修改
       checkItems: [],
       flag: false, // 管理暂存保存切换
       disabled: false, //查看时单选框不能被点击
-      loading:false,
+      loading: false,
       //仓房字典数据
       hourseDic: {},
       // 新增modal
       data1: {
         equipFacilities: {
+          id:'',
           checkResult: "", //检查结果(0:绿,1:黄) 1:全部都是是,0:存在否，也就是检查项存在不完好
           checkState: "", //1:已完成,0:进行中
           checkTime: "",
@@ -470,7 +469,7 @@ export default {
     this.data1.equipFacilities.depotName = userInfo.depotName
 
     let routeParams = this.$route.query
-    // console.log(routeParams, "routeParams")
+    console.log(routeParams, "routeParams")
     this.type = routeParams.type
     this.id = routeParams.pid
     // this.id = routeParams.data.id
@@ -508,27 +507,12 @@ export default {
   methods: {
     // 获取设施类型
     getFacilityList() {
-      getFacility()
+      getFacilitiyById(this.kind)
         .then(res => {
-          // console.log(res, "设施字典表")
-          this.facilityList = res.data[2].children
-
-          if (this.kind == 41) {
-            this.facility = this.facilityList[0].children
-            // console.log(this.facility, "仓房设施")
-          } else if (this.kind == 42) {
-            this.facility = this.facilityList[1].children
-            // console.log(this.facility, "消防设施")
-          } else if (this.kind == 43) {
-            this.facility = this.facilityList[2].children
-            // console.log(this.facility, "计量设施")
-          } else if (this.kind == 44) {
-            this.facility = this.facilityList[3].children
-            // console.log(this.facility, "药品库设施")
-          } else if (this.kind == 45) {
-            this.facility = this.facilityList[4].children
-            // console.log(this.facility, "配电室设施")
-          }
+          console.log(res, "设施字典表")
+          this.facilityList = res.data
+          console.log(this.facilityList, "this.facilityList.....")
+
           // console.log(this.facilityList, "this.facilityList.....")
         })
         .catch(err => {
@@ -615,32 +599,41 @@ export default {
 
     //改变选项的值时
     radioChange(index, row) {
-      // console.log(row, "row00000000", index, "index")
+      console.log(row, "row111", index, "index")
       if (this.type == 1) {
         //新增时
         row.createDate = getNowFormatDateone()
         // console.log(row.createDate, "createDate")
         // console.log(this.checkItems, "是否被选中")
         var num = 0
-        this.checkItems.map((item, index) => {
+
+        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 === 0) {
-            // 有一项点击否，结果就是1（黄）
-            this.data1.equipFacilities.checkResult = 1
-          } else {
-            // 有一项点击否，结果就是0（绿）
-            this.data1.equipFacilities.checkResult = 0
-          }
 
-          if (item.isCheck === 1 || item.isCheck === 0) {
+
+          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
@@ -685,21 +678,24 @@ export default {
         row.operationTime = getNowFormatDateone()
         // row.operationTime = getNowFormatDateone()
         var num = 0
-        this.checkItems.map((item, index) => {
-          Object.assign(item, { checkEnumId: item.enumId })
-          if (item.isCheck === 0) {
+
+        if (row.isCheck == 0) {
             // 有一项点击否，结果就是1（黄）
             this.data1.equipFacilities.checkResult = 1
-          } else {
-            // 有一项点击否，结果就是0（绿）
+            this.checkResult = 1
+          } else{
+            // 有一项点击是，结果就是0（绿）
             this.data1.equipFacilities.checkResult = 0
+            this.checkResult = 0
           }
-
-          if (item.isCheck === 1 || item.isCheck === 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
@@ -743,7 +739,7 @@ export default {
     },
     // 保存
     btnSave() {
-      this.loading =true
+      this.loading = true
       this.data1.equipFacilities.hname = this.houseDic[
         this.data1.equipFacilities.hid
       ]
@@ -757,26 +753,48 @@ export default {
         this.data1.equipFacilitiesChildren,
         "this.data1.equipFacilitiesChildren111"
       )
-      // console.log(this.data1, "data1...........")
-      addFacilitiy(this.data1)
-
-        .then(res => {
-          console.log(res, "新增成功")
-          if (res.code == 200) {
+      if (this.type == 1) {
+        console.log("这是新增")
+        addFacilitiy(this.data1)
+          .then(res => {
+            console.log(res, "新增成功")
+            if (res.code == 200) {
+              this.loading = false
+              this.$message({
+                message: "新增成功！",
+                type: "success"
+              })
+              this.$router.push({
+                path: "/facilitiesEquipment/facilitiesManagement/newFacilities"
+              })
+            }
+          })
+          .catch(err => {
+            this.loading = false
+            console.log(err, "新增失败")
+          })
+      } else if (this.type == 3) {
+        console.log("这是修改")
+        this.data1.equipFacilities.id = this.id
+        console.log(this.data1,'this.data1')
+        editFacilitiy(this.data1).then(res =>{
+          console.log(res,'res....')
+          if(res.code == 200){
             this.loading = false
-            this.$message({
-              message: "新增成功！",
-              type: "success"
-            })
-            this.$router.push({
-              path: "/facilitiesEquipment/facilitiesManagement/newFacilities"
-            })
+              this.$message({
+                message: "修改成功！",
+                type: "success"
+              })
+              this.$router.push({
+                path: "/facilitiesEquipment/facilitiesManagement/allFacilities"
+              })
           }
-        })
-        .catch(err => {
+        }).catch(err =>{
           this.loading = false
-          console.log(err, "新增失败")
+          console.log(err)
         })
+      }
+      // console.log(this.data1, "data1...........")
     },
     // 返回按钮
     goBack() {

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

@@ -44,14 +44,15 @@
         align="center"
       >
         <template slot-scope="scope">
+
           <p
-            v-if="scope.row.checkResult == 1"
+            v-if="scope.row.checkResult == 0"
             style="height:45px;line-height:45px;margin:0;padding-top:7px;"
           >
             <span class="colorspano"></span>
           </p>
-          <p
-            v-if="scope.row.checkResult == 0"
+           <p
+            v-if="scope.row.checkResult == 1"
             style="height:45px;line-height:45px;margin:0;padding-top:7px;"
           >
             <span class="colorspant"></span>
@@ -73,7 +74,7 @@
               (scope.row.kind == 42 && $tools.IsPermission(319)) ||
               (scope.row.kind == 43 && $tools.IsPermission(321)) ||
               (scope.row.kind == 44 && $tools.IsPermission(322)) ||
-              (scope.row.kind == 45&& $tools.IsPermission(324))
+              (scope.row.kind == 45 && $tools.IsPermission(324))
 
             "
             >新增</el-button
@@ -142,14 +143,14 @@ export default {
   methods: {
     //设施种类
     getFacilityList() {
-      getFacility()
+      getFacility(40)
         .then(res => {
           if (res.code == 200) {
             console.log(res, "设施种类")
             // console.log(res.data[2].children,'设备设施种类')
             // 设施种类保存本地，并且tavle中，遍历的时候与其对应一下，显示种类名称
-            this.facilityKind = res.data[2].children
-            // console.log(this.facilityKind,'设施种类')
+            this.facilityKind = res.data
+            // console.log(this.facilityKind,'设施种类00000000')
           }
         })
         .catch(err => {

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

@@ -10,7 +10,7 @@
                 >起始日期时刻为 12:00:00，结束日期时刻为 08:00:00</span
               > -->
               <span class="demonstration">检测时间：</span>
-              <el-date-picker
+              <!-- <el-date-picker
                 v-model="value2"
                 type="datetimerange"
                 align="right"
@@ -19,6 +19,15 @@
                 :default-time="['00:00:00', '12:00:00']"
                 value-format="yyyy-MM-dd HH:mm"
               >
+              </el-date-picker> -->
+              <el-date-picker
+                v-model="value2"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm"
+              >
               </el-date-picker>
             </div>
           </div>
@@ -42,9 +51,21 @@
         <el-col :span="5"
           ><div class="grid-content bg-purple">
             <div class="btns">
-              <el-button type="info" plain @click="clear" class="iconfont iconclear"> 清空 </el-button>
-              <el-button icon="el-icon-search" plain type="success" @click="handleQuery">查询</el-button>
-
+              <el-button
+                type="info"
+                plain
+                @click="clear"
+                class="iconfont iconclear"
+              >
+                清空
+              </el-button>
+              <el-button
+                icon="el-icon-search"
+                plain
+                type="success"
+                @click="handleQuery"
+                >查询</el-button
+              >
             </div>
           </div>
         </el-col>
@@ -52,14 +73,18 @@
     </div>
     <!-- 表格区域 -->
     <div class="table">
-      <el-table border :header-cell-style="{background:'#f8f8f8'}" :data="data2" highlight-current-row>
+      <el-table
+        border
+        :header-cell-style="{ background: '#f8f8f8' }"
+        :data="data2"
+        highlight-current-row
+      >
         <el-table-column
           type="index"
           align="center"
           label="序号"
           width="50px"
           :index="indexMethod"
-
         >
         </el-table-column>
         <el-table-column prop="checkTime" label="记录时间" align="center" />
@@ -71,24 +96,33 @@
           width="100px"
         >
           <template slot-scope="scope">
-            <div class="yellow" v-if='scope.row.anomalousStatus == "1"'>有异常</div>
-            <div class="green" v-if='scope.row.anomalousStatus !== "1"'></div>
+            <div class="yellow" v-if="scope.row.anomalousStatus == '1'"></div>
+            <div class="green" v-if="scope.row.anomalousStatus !== '1'"></div>
           </template>
         </el-table-column>
         <el-table-column prop="recordStatus" label="状态" align="center">
           <template slot-scope="scope">
-            <div>
-              {{
-                scope.row.recordStatus == "0" ||
-                scope.row.recordStatus == null ||
-                scope.row.recordStatus == ""
-                  ? "进行中"
-                  : "已完成"
-              }}
-            </div>
+            <div
+              disable-transitions
+              v-if="
+                scope.row.recordStatus == '' || scope.row.recordStatus == null
+              "
+            ></div>
+            <p
+              v-if="scope.row.recordStatus == 1"
+              style="height:45px;line-height:45px;margin:0 ; padding-top:7px;"
+            >
+              <span>已完成</span>
+            </p>
+            <p
+              v-if="scope.row.recordStatus == 0"
+              style="height:45px;line-height:45px;margin:0 ; padding-top:7px;"
+            >
+              <span>进行中</span>
+            </p>
           </template>
         </el-table-column>
-<!--         <el-table-column prop="checkList" label="异常项" align="center">
+        <!--         <el-table-column prop="checkList" label="异常项" align="center">
           <template slot-scope="scope">
             <div>
               {{ scope.row.waterAbnormal == "1" ? "水分检测异常" : "" }}
@@ -109,7 +143,10 @@
             <el-button
               size="mini"
               @click="handleCheck(1, scope.$index, scope.row)"
-              v-if="(scope.row.checkPerson == '保管员每周检查粮情' && $tools.IsPermission(134))"
+              v-if="
+                scope.row.checkPerson == '保管员每周检查粮情' &&
+                  $tools.IsPermission(134)
+              "
               type="detailbtn"
               >查看</el-button
             >
@@ -117,15 +154,28 @@
                  v-if="scope.row.uid <= 2" -->
             <el-button
               size="mini"
-               type="editbtn"
+              type="editbtn"
               @click="handleEdit(3, scope.$index, scope.row)"
-              v-if="(scope.row.checkPerson == '保管员每周检查粮情' && $tools.IsPermission(135))"
+              v-if="
+                scope.row.checkPerson == '保管员每周检查粮情' &&
+                  scope.row.recordStatus == 0 &&
+                  $tools.IsPermission(135)
+              "
               >修改</el-button
             >
             <el-button
               size="mini"
-               type="dangerbtn"
-               v-if="$tools.IsPermission(136)"
+              type="dangerbtn"
+              v-if="
+                (scope.row.checkPerson == '保管员每周检查粮情' &&
+                  $tools.IsPermission(332)) ||
+                  (scope.row.checkPerson == '主管科长每2周检查粮情' &&
+                    $tools.IsPermission(333)) ||
+                  (scope.row.checkPerson == '分管副总每月检查粮情' &&
+                    $tools.IsPermission(334)) ||
+                  (scope.row.checkPerson == '总经理每季检查粮情' &&
+                    $tools.IsPermission(335))
+              "
               @click="handleDelete(scope.$index, scope.row)"
               >删除</el-button
             >
@@ -166,7 +216,7 @@ export default {
       activeName: "AllGrain",
       // 全部粮情检查记录数据
       data2: [],
-      depotId:this.$store.state.depotId,
+      depotId: this.$store.state.depotId,
       houseId: this.$store.state.houseId,
       // select 选项数据
       options: [
@@ -186,11 +236,10 @@ export default {
           value: "选项4",
           label: "总经理每季检查粮情"
         }
-
       ],
       check_person: "",
       value2: "",
-      type:'',//判断是否从更多纪录跳转过来
+      type: "", //判断是否从更多纪录跳转过来
       // 分页
       total: 10,
       listLoading: true,
@@ -201,25 +250,23 @@ export default {
       allGrainData: {}
     }
   },
-  created() {
-
-  },
+  created() {},
   mounted() {
     this.activeName = this.$route.name
     let routeParams = this.$route.query
     // console.log(routeParams,'routerouteParams')
-    console.log(routeParams.type,'type')
+    console.log(routeParams.type, "type")
+    console.log(this.data2, "this.data2")
     this.type = routeParams.type
-    if(this.type == ''|| this.type ==null || this.type ==undefined ){
+    if (this.type == "" || this.type == null || this.type == undefined) {
       this.getList()
-    }else if(this.type ==5){
-      console.log(routeParams.data.checkPerson,'routeParams.data.checkPerson')
+    } else if (this.type == 5) {
+      console.log(routeParams.data.checkPerson, "routeParams.data.checkPerson")
       this.check_person = routeParams.data.checkPerson
       this.handleQuery()
     }
-
   },
-   computed: {
+  computed: {
     HouseId() {
       return this.$store.state.houseId
     }
@@ -266,8 +313,8 @@ export default {
         // check_person: "科长每两周检查粮情",
         check_start_time: this.value2[0],
         check_end_time: this.value2[1],
-        houseId:this.houseId,
-        depotId:this.depotId
+        houseId: this.houseId,
+        depotId: this.depotId
       }
       // let conditions = JSON.stringify(condition)
 
@@ -297,7 +344,7 @@ export default {
       console.log(this.listQuery, "分页")
       this.getList()
     },
-     //切换分页序号递增
+    //切换分页序号递增
     indexMethod(index) {
       let curpage = this.listQuery.page //单前页码
       let limitpage = this.listQuery.limit //每页条数
@@ -309,7 +356,7 @@ export default {
       // this.allGrainData.splice(a, 1)
 
       this.$confirm("确定删除该项记录?", "提示", {
-        confirmButtonClass:'el-button--success is-plain',
+        confirmButtonClass: "el-button--success is-plain",
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -367,7 +414,7 @@ export default {
           break
       }
     },
-  /*   handletree(){
+    /*   handletree(){
       this.$router.push("/grainCheck/treeStructure")
     }, */
 
@@ -399,14 +446,12 @@ export default {
 }
 .el-table {
   margin-top: 15px;
-
-
 }
 .el-pagination {
-      text-align: right;
-      margin-top: 20px;
-      margin-right: 15px;
-    }
+  text-align: right;
+  margin-top: 20px;
+  margin-right: 15px;
+}
 .demonstration {
   font-size: 15px;
   font-family: "Gill Sans", "Gill Sans MT", Calibri, "Trebuchet MS", sans-serif;
@@ -414,21 +459,20 @@ export default {
 .yellow {
   // width: 100px;
   display: block;
-  height:25px;
-  background-color:#E3A512;
+  height: 25px;
+  background-color: #e3a512;
   color: azure;
   border-radius: 5px;
   // text-align: center;
-  font-size:13px;
+  font-size: 13px;
 }
-.green{
+.green {
   display: block;
   // width: 80%;
   height: 25px;
-  background-color: #037D41;
+  background-color: #037d41;
   color: #fff;
-  border-radius:5px;
-  font-size:13px;
-
+  border-radius: 5px;
+  font-size: 13px;
 }
 </style>

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

@@ -466,7 +466,8 @@ export default {
     handleCurrentChange() {},
     // 通过判断单选按钮的选择，弹出异常表单
     showClick(index, val) {
-      // console.log(index,'-index',val,'--val....')
+      console.log(this.tbdata,'this.tbdata')
+      console.log(index,'-index',val,'--val....')
       let time = getDateTimeNow()
       this.tbdata[index].createTime = time
       // 动态的把当前检查项作为对象名称保存到checkDescribe
@@ -474,6 +475,23 @@ export default {
         choose: this.tbdata[index].whether.radio,
         time: this.tbdata[index].createTime
       }
+     if (
+          this.tbdata[6].fieldValue == "pest_abnormal"  && this.tbdata[6].whether.radio == 1 ||
+          this.tbdata[7].fieldValue == "water_abnormal" && this.tbdata[7].whether.radio == 1 ||
+          this.tbdata[8].fieldValue == "grain_abnormal" && this.tbdata[8].whether.radio == 1
+        ) {
+          this.data3.anomalousStatus = 1
+          console.log(this.data3.anomalousStatus,'异常触发')
+        }else if(
+          (this.tbdata[6].fieldValue == "pest_abnormal"  && this.tbdata[6].whether.radio == 0) &&
+          (this.tbdata[7].fieldValue == "water_abnormal" && this.tbdata[7].whether.radio == 0) &&
+          (this.tbdata[8].fieldValue == "grain_abnormal" && this.tbdata[8].whether.radio == 0)
+        ){
+          this.data3.anomalousStatus = 0
+          console.log(this.data3.anomalousStatus,'this.data3.anomalousStatus')
+
+        }
+
       // console.log(this.data3.checkDescribe,'this.data3.checkDescribe....')
       let len = Object.getOwnPropertyNames(this.data3.checkDescribe).length - 1
       // console.log(len,'len............')
@@ -498,14 +516,7 @@ export default {
           // console.log("进了粮情异常表单")
           this.dialogFormVisible2 = true
         }
-        if (
-          val.fieldValue == "pest_abnormal" ||
-          val.fieldValue == "water_abnormal" ||
-          val.fieldValue == "grain_abnormal"
-        ) {
-          this.data3.anomalousStatus = "1"
-          // console.log(this.data3.anomalousStatus,'异常触发')
-        }
+
       }
       //判断异常项是否被选中是，选中则改变异常状态
     },

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

@@ -46,13 +46,13 @@
               v-if="scope.row.recordStatus == '1'"
               style="height:45px;line-height:45px;margin:0 ; padding-top:7px;"
             >
-              <span class="colorspano">已完成</span>
+              <span>已完成</span>
             </p>
             <p
               v-if="scope.row.recordStatus == '0'"
               style="height:45px;line-height:45px;margin:0 ; padding-top:7px;"
             >
-              <span class="colorspant">进行中</span>
+              <span>进行中</span>
             </p>
           </template>
         </el-table-column>

shanXiPlatform/src/views/safeProduction/allSafe/index.vue

@@ -262,6 +262,19 @@ export default {
           })
         })
     },
+    dateFormatValue(timedate) {
+      if (timedate === null || timedate === undefined) {
+        return ""
+      } else {
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
+      }
+    },
     dateFormat(timedate) {
       if (timedate === null || timedate === undefined) {
         return ""

shanXiPlatform/src/views/safeProduction/newSafe/detail.vue

@@ -9,9 +9,9 @@
       </div>
       <el-table border stripe :data="formData.detailsList" highlight-current-row>
         <el-table-column  type="index"  align="center"  label="序号"  width="50px"/>
-        <el-table-column prop="detailTime" label="记录时间" align="center"  width='200px'>
+        <el-table-column prop="detailTime" label="记录时间" align="center"  width='250px'>
           <template slot-scope="scope">
-            <span>{{dateFormat(scope.row.detailTime)}}</span>
+            <span>{{scope.row.detailTime}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="title" label="标题" align="center" />
@@ -285,64 +285,13 @@ export default {
       if (timedate === null || timedate === undefined) {
         return ""
       } else {
-        let arr
-        // 首先对日期进行拆解，获得日期字符串
-        if (timedate.indexOf("T") > -1) {
-          arr = timedate.split("T")
-        } else {
-          arr = timedate.split(" ")
-        }
-        var d = arr[0]
-        var darr = d.split("-")
-        var t = arr[1]
-        var tarr = t.split(".000")
-        var marr = tarr[0].split(":")
-        var dd =
-          parseInt(darr[0]) +
-          "/" +
-          parseInt(darr[1]) +
-          "/" +
-          parseInt(darr[2]) +
-          " " +
-          parseInt(marr[0]) +
-          ":" +
-          parseInt(marr[1]) +
-          ":" +
-          parseInt(marr[2])
-
-        const date = new Date(Date.parse(dd))
-        date.setTime(date.setHours(date.getHours() + 8))
-
-        var year = date.getFullYear()
-        /* 在日期格式中，月份是从0开始的，因此要加0
-         * 使用三元表达式在小于10的前面加0，以达到格式统一  如 09:11:05
-         * */
-        var month =
-          date.getMonth() + 1 < 10
-            ? "0" + (date.getMonth() + 1)
-            : date.getMonth() + 1
-        var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate()
-        var hours =
-          date.getHours() < 10 ? "0" + date.getHours() : date.getHours()
-        var minutes =
-          date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()
-        var seconds =
-          date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds()
-        // 拼接
-        return (
-          year +
-          "-" +
-          month +
-          "-" +
-          day +
-          " " +
-          hours +
-          ":" +
-          minutes +
-          ":" +
-          seconds
-        )
-        // return (year + '-' + month + '-' + day)
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
       }
     },
   }

shanXiPlatform/src/views/safeProduction/newSafe/index.vue

@@ -15,7 +15,6 @@
             <span>{{scope.row.inspecTime}}</span>
           </template>
         </el-table-column>
-        
         <el-table-column prop="status" label="状态" align="center" width='100px'>
           <template slot-scope="scope">
             <div  disable-transitions  v-if="scope.row.status == '' || scope.row.status == null"></div>
@@ -165,6 +164,19 @@ export default {
         query: { inspecType: row.inspecType }
       })
     },
+    dateFormatValue(timedate) {
+      if (timedate === null || timedate === undefined) {
+        return ""
+      } else {
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
+      }
+    },
     dateFormat(timedate) {
       if (timedate === null || timedate === undefined) {
         return ""

shanXiPlatform/src/views/supervisionInspection/entrustedRepository/newEntrustedRepository/detail.vue

@@ -6,9 +6,9 @@
       </div>
       <el-table border stripe :data="formData.detailsList" highlight-current-row>
         <el-table-column  type="index"  align="center"  label="序号"  width="50px"/>
-        <el-table-column prop="detailTime" label="记录时间" align="center"  width='200px'>
+        <el-table-column prop="detailTime" label="记录时间" align="center"  width='250px'>
           <template slot-scope="scope">
-            <span>{{dateFormat(scope.row.detailTime)}}</span>
+            <span>{{scope.row.detailTime}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="title" label="标题" align="center" />
@@ -249,64 +249,13 @@ export default {
       if (timedate === null || timedate === undefined) {
         return ""
       } else {
-        let arr
-        // 首先对日期进行拆解，获得日期字符串
-        if (timedate.indexOf("T") > -1) {
-          arr = timedate.split("T")
-        } else {
-          arr = timedate.split(" ")
-        }
-        var d = arr[0]
-        var darr = d.split("-")
-        var t = arr[1]
-        var tarr = t.split(".000")
-        var marr = tarr[0].split(":")
-        var dd =
-          parseInt(darr[0]) +
-          "/" +
-          parseInt(darr[1]) +
-          "/" +
-          parseInt(darr[2]) +
-          " " +
-          parseInt(marr[0]) +
-          ":" +
-          parseInt(marr[1]) +
-          ":" +
-          parseInt(marr[2])
-
-        const date = new Date(Date.parse(dd))
-        date.setTime(date.setHours(date.getHours() + 8))
-
-        var year = date.getFullYear()
-        /* 在日期格式中，月份是从0开始的，因此要加0
-         * 使用三元表达式在小于10的前面加0，以达到格式统一  如 09:11:05
-         * */
-        var month =
-          date.getMonth() + 1 < 10
-            ? "0" + (date.getMonth() + 1)
-            : date.getMonth() + 1
-        var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate()
-        var hours =
-          date.getHours() < 10 ? "0" + date.getHours() : date.getHours()
-        var minutes =
-          date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()
-        var seconds =
-          date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds()
-        // 拼接
-        return (
-          year +
-          "-" +
-          month +
-          "-" +
-          day +
-          " " +
-          hours +
-          ":" +
-          minutes +
-          ":" +
-          seconds
-        )
-        // return (year + '-' + month + '-' + day)
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
       }
     },
   }

shanXiPlatform/src/views/supervisionInspection/entrustedRepository/newEntrustedRepository/index.vue

@@ -202,6 +202,19 @@ export default {
           })
         })
     },
+    dateFormatValue(timedate) {
+      if (timedate === null || timedate === undefined) {
+        return ""
+      } else {
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
+      }
+    },
     dateFormat(timedate) {
       if (timedate === null || timedate === undefined) {
         return ""

shanXiPlatform/src/views/supervisionInspection/library/allLibrary/index.vue

@@ -44,11 +44,6 @@
             <span v-if="scope.row.inspecType == 2">分管副总每月本库检查</span>
           </template>
         </el-table-column>
-        <el-table-column prop="inspecTime" label="记录内容" align="center">
-          <template slot-scope="scope">
-            <span>{{scope.row.inspecTime}}</span>
-          </template>
-        </el-table-column>
         <el-table-column prop="status" label="状态" align="center" width='100px'>
           <template slot-scope="scope">
             <div  disable-transitions  v-if="scope.row.status == '' || scope.row.status == null"></div>
@@ -260,6 +255,19 @@ export default {
           })
         })
     },
+    dateFormatValue(timedate) {
+      if (timedate === null || timedate === undefined) {
+        return ""
+      } else {
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
+      }
+    },
     dateFormat(timedate) {
       if (timedate === null || timedate === undefined) {
         return ""

shanXiPlatform/src/views/supervisionInspection/library/newLibrary/detail.vue

@@ -8,9 +8,9 @@
       </div>
       <el-table border stripe :data="formData.detailsList" highlight-current-row>
         <el-table-column  type="index"  align="center"  label="序号"  width="50px"/>
-        <el-table-column prop="detailTime" label="记录时间" align="center"  width='200px'>
+        <el-table-column prop="detailTime" label="记录时间" align="center"  width='250px'>
           <template slot-scope="scope">
-            <span>{{dateFormat(scope.row.detailTime)}}</span>
+            <span>{{scope.row.detailTime}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="title" label="标题" align="center" />
@@ -278,64 +278,13 @@ export default {
       if (timedate === null || timedate === undefined) {
         return ""
       } else {
-        let arr
-        // 首先对日期进行拆解，获得日期字符串
-        if (timedate.indexOf("T") > -1) {
-          arr = timedate.split("T")
-        } else {
-          arr = timedate.split(" ")
-        }
-        var d = arr[0]
-        var darr = d.split("-")
-        var t = arr[1]
-        var tarr = t.split(".000")
-        var marr = tarr[0].split(":")
-        var dd =
-          parseInt(darr[0]) +
-          "/" +
-          parseInt(darr[1]) +
-          "/" +
-          parseInt(darr[2]) +
-          " " +
-          parseInt(marr[0]) +
-          ":" +
-          parseInt(marr[1]) +
-          ":" +
-          parseInt(marr[2])
-
-        const date = new Date(Date.parse(dd))
-        date.setTime(date.setHours(date.getHours() + 8))
-
-        var year = date.getFullYear()
-        /* 在日期格式中，月份是从0开始的，因此要加0
-         * 使用三元表达式在小于10的前面加0，以达到格式统一  如 09:11:05
-         * */
-        var month =
-          date.getMonth() + 1 < 10
-            ? "0" + (date.getMonth() + 1)
-            : date.getMonth() + 1
-        var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate()
-        var hours =
-          date.getHours() < 10 ? "0" + date.getHours() : date.getHours()
-        var minutes =
-          date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()
-        var seconds =
-          date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds()
-        // 拼接
-        return (
-          year +
-          "-" +
-          month +
-          "-" +
-          day +
-          " " +
-          hours +
-          ":" +
-          minutes +
-          ":" +
-          seconds
-        )
-        // return (year + '-' + month + '-' + day)
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
       }
     },
   }

shanXiPlatform/src/views/supervisionInspection/library/newLibrary/index.vue

@@ -163,6 +163,19 @@ export default {
         query: { inspecType: row.inspecType }
       })
     },
+    dateFormatValue(timedate) {
+      if (timedate === null || timedate === undefined) {
+        return ""
+      } else {
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
+      }
+    },
     dateFormat(timedate) {
       if (timedate === null || timedate === undefined) {
         return ""

shanXiPlatform/src/views/supervisionInspection/subTreasury/newSubTreasury/detail.vue

@@ -3,9 +3,9 @@
     <div class="contentContainer">
       <el-table border stripe :data="formData.detailsList" highlight-current-row>
         <el-table-column  type="index"  align="center"  label="序号"  width="50px"/>
-        <el-table-column prop="detailTime" label="记录时间" align="center"  width='200px'>
+        <el-table-column prop="detailTime" label="记录时间" align="center"  width='250px'>
           <template slot-scope="scope">
-            <span>{{dateFormat(scope.row.detailTime)}}</span>
+            <span>{{scope.row.detailTime}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="title" label="标题" align="center" />
@@ -245,64 +245,13 @@ export default {
       if (timedate === null || timedate === undefined) {
         return ""
       } else {
-        let arr
-        // 首先对日期进行拆解，获得日期字符串
-        if (timedate.indexOf("T") > -1) {
-          arr = timedate.split("T")
-        } else {
-          arr = timedate.split(" ")
-        }
-        var d = arr[0]
-        var darr = d.split("-")
-        var t = arr[1]
-        var tarr = t.split(".000")
-        var marr = tarr[0].split(":")
-        var dd =
-          parseInt(darr[0]) +
-          "/" +
-          parseInt(darr[1]) +
-          "/" +
-          parseInt(darr[2]) +
-          " " +
-          parseInt(marr[0]) +
-          ":" +
-          parseInt(marr[1]) +
-          ":" +
-          parseInt(marr[2])
-
-        const date = new Date(Date.parse(dd))
-        date.setTime(date.setHours(date.getHours() + 8))
-
-        var year = date.getFullYear()
-        /* 在日期格式中，月份是从0开始的，因此要加0
-         * 使用三元表达式在小于10的前面加0，以达到格式统一  如 09:11:05
-         * */
-        var month =
-          date.getMonth() + 1 < 10
-            ? "0" + (date.getMonth() + 1)
-            : date.getMonth() + 1
-        var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate()
-        var hours =
-          date.getHours() < 10 ? "0" + date.getHours() : date.getHours()
-        var minutes =
-          date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()
-        var seconds =
-          date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds()
-        // 拼接
-        return (
-          year +
-          "-" +
-          month +
-          "-" +
-          day +
-          " " +
-          hours +
-          ":" +
-          minutes +
-          ":" +
-          seconds
-        )
-        // return (year + '-' + month + '-' + day)
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
       }
     },
   }

shanXiPlatform/src/views/supervisionInspection/subTreasury/newSubTreasury/index.vue

@@ -202,6 +202,19 @@ export default {
           })
         })
     },
+    dateFormatValue(timedate) {
+      if (timedate === null || timedate === undefined) {
+        return ""
+      } else {
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
+      }
+    },
     dateFormat(timedate) {
       if (timedate === null || timedate === undefined) {
         return ""

shanXiPlatform/src/views/systemManagement/notice/allNotice/index.vue

@@ -4,7 +4,11 @@
       <el-table border stripe :data="tableList" highlight-current-row :header-cell-style="{background:'#f8f8f8'}">
         <el-table-column type="index" align="center" label="序号" width="50px" />
         <el-table-column prop="title" label="标题" align="center" />
-        <el-table-column prop="publishTime" label="发布时间" align="center" />
+        <el-table-column prop="publishTime" label="发布时间" align="center">
+          <template slot-scope="scope">
+            <span>{{dateFormatValue(scope.row.publishTime)}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="publishUserName" label="发布人" align="center" />
         <el-table-column prop="publishOrgName" label="发布人所属单位" align="center" />
         <el-table-column prop="recvDetailsInfo" label="接收人" align="center" />
@@ -146,6 +150,19 @@ export default {
           })
         })
     },
+    dateFormatValue(timedate) {
+      if (timedate === null || timedate === undefined) {
+        return ""
+      } else {
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
+      }
+    },
   }
 }
 </script>

shanXiPlatform/src/views/systemManagement/notice/newNotice/index.vue

@@ -4,7 +4,7 @@
       <el-form :inline="true">
         
             <el-form-item label="发布时间" label-width="80px">
-              <el-date-picker   v-model="query.publishTime"  type="daterange"  range-separator="至"  start-placeholder="开始日期"  end-placeholder="结束日期" value-format="yyyy-MM-dd"  unlink-panels></el-date-picker>
+              <el-date-picker   v-model="query.publishTime"  type="daterange" range-separator="至"  start-placeholder="开始日期"  end-placeholder="结束日期" value-format="yyyy-MM-dd"  unlink-panels></el-date-picker>
             </el-form-item>
          
             <el-form-item label="标题" label-width="50px">
@@ -24,7 +24,11 @@
       <el-table border stripe :data="tableList" highlight-current-row  :header-cell-style="{background:'#f8f8f8'}">
         <el-table-column type="index" align="center" label="序号" width="50px" />
         <el-table-column prop="title" label="标题" align="center" />
-        <el-table-column prop="publishTime" label="发布时间" align="center" />
+        <el-table-column prop="publishTime" label="发布时间" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.publishTime}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="publishUserName" label="发布人" align="center" />
         <el-table-column prop="publishOrgName" label="发布人所属单位" align="center" />
         <el-table-column prop="recvDetailsInfo" label="接收人" align="center" />
@@ -206,6 +210,19 @@ export default {
           })
         })
     },
+    dateFormatValue(timedate) {
+      if (timedate === null || timedate === undefined) {
+        return ""
+      } else {
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
+      }
+    },
   }
 }
 </script>

shanXiPlatform/src/views/systemManagement/policySystem/index.vue

@@ -32,7 +32,7 @@
             <el-table-column prop="title" label="标题" align="center" />
             <el-table-column prop="publishTime" label="发布时间" align="center">
               <template slot-scope="scope">
-                <span>{{scope.row.publishTime.slice(0,10)}}</span>
+                <span>{{scope.row.publishTime}}</span>
               </template>
             </el-table-column>
             <el-table-column prop="publishUserName" label="发布人" align="center" />
@@ -172,6 +172,19 @@ export default {
           })
         })
     },
+    dateFormatValue(timedate) {
+      if (timedate === null || timedate === undefined) {
+        return ""
+      } else {
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
+      }
+    },
   }
 }
 </script>

shanXiPlatform/src/views/systemManagement/userManagement/departmentManagement/index.vue

@@ -152,7 +152,20 @@ export default {
         return (year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds)
         // return (year + '-' + month + '-' + day)
       }
-    }
+    },
+    dateFormatValue(timedate) {
+      if (timedate === null || timedate === undefined) {
+        return ""
+      } else {
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
+      }
+    },
 
   }
 }

shanXiPlatform/src/views/systemManagement/userManagement/roleManagement/index.vue

@@ -14,7 +14,11 @@
     >
       <el-table-column type="index" align="center" label="序号" width="50px" />
       <el-table-column prop="rname" label="角色名称" align="center" />
-      <el-table-column prop="rCreateTime" label="创建时间" align="center" />
+      <el-table-column prop="rCreateTime" label="创建时间" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.rCreateTime}}</span>
+          </template>
+        </el-table-column>
       <el-table-column prop="rremark" label="备注" align="center" />
       <el-table-column
         prop="operation"
@@ -188,7 +192,20 @@ export default {
     handleDelete(index, row) {
       this.id = row.rid
       this.deleteList()
-    }
+    },
+    dateFormatValue(timedate) {
+      if (timedate === null || timedate === undefined) {
+        return ""
+      } else {
+        let year = timedate.slice(0,4)
+        let month = timedate.slice(5,7)
+        let day = timedate.slice(8,10)
+        let hours = timedate.slice(11,13)
+        let minutes = timedate.slice(14,16)
+        let seconds = timedate.slice(17,19)
+        return (year + '年' + month + '月' + day + '日' + hours + '时' + minutes + '分' + seconds + '秒')
+      }
+    },
 
     /* ----- 格式化表格序号 -----*/
     // indexMethod(index) {