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

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

@@ -35,7 +35,8 @@
         <el-table-column  type="index"  align="center"  label="序号"  width="50px"/>
         <el-table-column prop="inspecTime" label="记录时间" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.inspecTime}}</span>
+            <span v-if="scope.row.inspecTime">{{scope.row.inspecTime.slice(0,16)}}</span>
+            <span v-if="!scope.row.inspecTime">{{scope.row.inspecTime}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="inspecType" label="类型" align="center">

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

@@ -12,7 +12,8 @@
         </el-table-column>
         <el-table-column prop="inspecTime" label="最后记录时间" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.inspecTime}}</span>
+            <span v-if="scope.row.inspecTime">{{scope.row.inspecTime.slice(0,16)}}</span>
+            <span v-if="!scope.row.inspecTime">{{scope.row.inspecTime}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="status" label="状态" align="center" width='100px'>

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

@@ -33,7 +33,8 @@
             </el-table-column>
             <el-table-column prop="inspecTime" label="时间" align="center">
               <template slot-scope="scope">
-                <span>{{scope.row.inspecTime}}</span>
+                <span v-if="scope.row.inspecTime">{{scope.row.inspecTime.slice(0,16)}}</span>
+                <span v-if="!scope.row.inspecTime">{{scope.row.inspecTime}}</span>
               </template>
             </el-table-column>
             <el-table-column prop="status" label="状态" align="center" width='100px'>

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

@@ -35,7 +35,8 @@
         <el-table-column  type="index"  align="center"  label="序号"  width="50px"/>
         <el-table-column prop="inspecTime" label="检查时间" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.inspecTime}}</span>
+            <span v-if="scope.row.inspecTime">{{scope.row.inspecTime.slice(0,16)}}</span>
+            <span v-if="!scope.row.inspecTime">{{scope.row.inspecTime}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="inspecType" label="检查类型" align="center">

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

@@ -11,7 +11,8 @@
         </el-table-column>
         <el-table-column prop="inspecTime" label="最后记录时间" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.inspecTime}}</span>
+            <span v-if="scope.row.inspecTime">{{scope.row.inspecTime.slice(0,16)}}</span>
+            <span v-if="!scope.row.inspecTime">{{scope.row.inspecTime}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="status" label="状态" align="center" width='100px'>

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

@@ -33,7 +33,8 @@
             </el-table-column>
             <el-table-column prop="inspecTime" label="时间" align="center">
               <template slot-scope="scope">
-                <span>{{scope.row.inspecTime}}</span>
+                <span v-if="scope.row.inspecTime">{{scope.row.inspecTime.slice(0,16)}}</span>
+                <span v-if="!scope.row.inspecTime">{{scope.row.inspecTime}}</span>
               </template>
             </el-table-column>
             <el-table-column prop="status" label="状态" align="center" width='100px'>

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

@@ -6,7 +6,8 @@
         <el-table-column prop="title" label="标题" align="center" />
         <el-table-column prop="publishTime" label="发布时间" align="center">
           <template slot-scope="scope">
-            <span>{{dateFormatValue(scope.row.publishTime)}}</span>
+            <span v-if="scope.row.publishTime">{{scope.row.publishTime.slice(0,16)}}</span>
+            <span v-if="!scope.row.publishTime">{{scope.row.publishTime}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="publishUserName" label="发布人" align="center" />

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

@@ -26,7 +26,8 @@
         <el-table-column prop="title" label="标题" align="center" />
         <el-table-column prop="publishTime" label="发布时间" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.publishTime}}</span>
+            <span v-if="scope.row.publishTime">{{scope.row.publishTime.slice(0,16)}}</span>
+            <span v-if="!scope.row.publishTime">{{scope.row.publishTime}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="publishUserName" label="发布人" align="center" />

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

@@ -149,7 +149,7 @@ export default {
         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 + ' ' + hours + ':' + minutes)
         // return (year + '-' + month + '-' + day)
       }
     },

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

@@ -16,7 +16,8 @@
       <el-table-column prop="rname" label="角色名称" align="center" />
       <el-table-column prop="rCreateTime" label="创建时间" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.rCreateTime}}</span>
+            <span v-if="scope.row.rCreateTime">{{scope.row.rCreateTime.slice(0,16)}}</span>
+            <span v-if="!scope.row.rCreateTime">{{scope.row.rCreateTime}}</span>
           </template>
         </el-table-column>
       <el-table-column prop="rremark" label="备注" align="center" />