dedsudiyu 1 år sedan
förälder
incheckning
0dd8e4cadc
42 ändrade filer med 75 tillägg och 55 borttagningar
  1. 1 1
      src/views/chemicalManage/basicManagement/msdsSpecification/index.vue
  2. 1 1
      src/views/chemicalManage/earlyWarningEvent/index.vue
  3. 3 3
      src/views/chemicalManage/earlyWarningEvent/infoPage.vue
  4. 2 2
      src/views/chemicalManage/inventoryManagement/inventoryStatistics/infoPage.vue
  5. 1 1
      src/views/chemicalManage/inventoryManagement/savePending/index.vue
  6. 1 1
      src/views/chemicalManage/inventoryManagement/saveRecord/index.vue
  7. 1 1
      src/views/chemicalManage/inventoryManagement/takeRecord/index.vue
  8. 1 1
      src/views/chemicalManage/inventoryManagement/takeStockRecord/index.vue
  9. 3 3
      src/views/chemicalManage/purchaseManage/examineProcess/index.vue
  10. 2 2
      src/views/chemicalManage/purchaseManage/purchaseExamine/index.vue
  11. 24 4
      src/views/chemicalManage/purchaseManage/purchaseExamine/infoPage.vue
  12. 2 2
      src/views/chemicalManage/purchaseManage/purchaseRegister/index.vue
  13. 1 1
      src/views/chemicalManage/purchaseManage/purchaseRegister/infoPage.vue
  14. 2 2
      src/views/chemicalManage/useLedger/index.vue
  15. 1 1
      src/views/chemicalManage/useLedger/infoPage.vue
  16. 1 1
      src/views/integratedManagement/laboratoryManagement/classifiedGrading/subjectClass.vue
  17. 1 1
      src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/infoConfig.vue
  18. 1 1
      src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/safetyInfoCategory.vue
  19. 1 1
      src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/safetyInfoConfig.vue
  20. 1 1
      src/views/integratedManagement/messageNotice/warningNotice/forewarningConfig.vue
  21. 1 1
      src/views/integratedManagement/messageNotice/warningNotice/infoPage.vue
  22. 1 1
      src/views/integratedManagement/personnelManage/post/index.vue
  23. 1 1
      src/views/integratedManagement/personnelManage/teacherInfo/index.vue
  24. 1 1
      src/views/iotDevice/hardwareManagement/hardwareClassification/index.vue
  25. 1 1
      src/views/iotDevice/hardwareManagement/hardwareEquipment/index.vue
  26. 1 1
      src/views/iotDevice/intelligenceIot/classConfig/addPage.vue
  27. 1 1
      src/views/iotDevice/intelligenceIot/classConfig/index.vue
  28. 1 1
      src/views/iotDevice/intelligenceIot/iotClassification/index.vue
  29. 1 1
      src/views/iotDevice/intelligenceIot/iotHardware/index.vue
  30. 1 1
      src/views/iotDevice/monitoringWarning/messageTemplate/index.vue
  31. 1 1
      src/views/iotDevice/monitoringWarning/receiver/index.vue
  32. 1 1
      src/views/iotDevice/monitoringWarning/warningMode/index.vue
  33. 1 1
      src/views/iotDevice/operationManagement/networkComponent/index.vue
  34. 2 2
      src/views/securityCheck/photonote/processed.vue
  35. 2 2
      src/views/serviceCenter/certificationManagement/certificationAccredit/index.vue
  36. 1 1
      src/views/serviceCenter/certificationManagement/certificationInfo/index.vue
  37. 1 1
      src/views/serviceCenter/timingTask/index.vue
  38. 1 1
      src/views/systemManagement/filePreview/index.vue
  39. 1 1
      src/views/systemManagement/menu/index.vue
  40. 1 1
      src/views/systemManagement/parameterSetting/index.vue
  41. 1 1
      src/views/systemManagement/smallProgramConfig/smallProgramMenu/index.vue
  42. 1 1
      src/views/systemManagement/systemUser/index.vue

+ 1 - 1
src/views/chemicalManage/basicManagement/msdsSpecification/index.vue

@@ -27,7 +27,7 @@
           <el-table-column label="名称" align="center" prop="name" />
           <el-table-column label="编号" align="center" prop="code"/>
           <el-table-column label="创建时间" align="center" prop="createTime"/>
-          <el-table-column label="创建人" align="center" prop="createBy" width="200"/>
+          <el-table-column label="创建人" align="center" prop="createByName" width="200"/>
           <el-table-column label="查看次数" align="center" prop="scanCount" width="100"/>
           <el-table-column label="二维码" align="center" width="100">
             <template slot-scope="scope">

+ 1 - 1
src/views/chemicalManage/earlyWarningEvent/index.vue

@@ -52,7 +52,7 @@
         <el-table class="table-box" v-loading="loading" border :data="dataList">
           <el-table-column label="报警时间" prop="createTime" width="180" fixed show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.warnTime) }}</span>
+              <span>{{ parseTime(scope.row.warnTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="预警类型" prop="content" width="200" fixed show-overflow-tooltip>

+ 3 - 3
src/views/chemicalManage/earlyWarningEvent/infoPage.vue

@@ -86,7 +86,7 @@
             <el-table-column label="归属人" prop="belongName" width="220" fixed show-overflow-tooltip/>
             <el-table-column label="过期时间" prop="expireTime" width="220" fixed show-overflow-tooltip>
               <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.expireTime) }}</span>
+                <span>{{ parseTime(scope.row.expireTime,"{y}-{m}-{d} {h}:{i}") }}</span>
               </template>
             </el-table-column>
             <el-table-column label="存放位置" prop="position" width="220" show-overflow-tooltip/>
@@ -107,7 +107,7 @@
             <el-table-column label="类型" prop="source"  fixed show-overflow-tooltip/>
             <el-table-column label="创建时间" prop="createTime"  fixed show-overflow-tooltip>
               <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
+                <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -159,7 +159,7 @@
           <el-table class="table-box" v-loading="loading" border :data="infoData.warningNoticeLogVoList">
             <el-table-column label="通知时间" prop="createTime" width="200" fixed show-overflow-tooltip>
               <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.noticeTime) }}</span>
+                <span>{{ parseTime(scope.row.noticeTime,"{y}-{m}-{d} {h}:{i}") }}</span>
               </template>
             </el-table-column>
             <el-table-column label="通知方式" prop="noticeType" width="180" fixed show-overflow-tooltip/>

+ 2 - 2
src/views/chemicalManage/inventoryManagement/inventoryStatistics/infoPage.vue

@@ -40,8 +40,8 @@
             <!-- useStatus 0已归还,1使用中,2超时未归还,3用结出库,4作废出库,5整瓶领用-->
             <div class="record-li-b">
               <!--操作时间-->
-              <p v-if="item.useStatus==1 || item.useStatus==2 || item.useStatus==3 || item.useStatus==4 || item.useStatus==5">{{parseTime(item.collectTime)}}</p>
-              <p v-if="item.useStatus==0">{{parseTime(item.returnTime)}}</p>
+              <p v-if="item.useStatus==1 || item.useStatus==2 || item.useStatus==3 || item.useStatus==4 || item.useStatus==5">{{parseTime(item.collectTime,"{y}-{m}-{d} {h}:{i}")}}</p>
+              <p v-if="item.useStatus==0">{{parseTime(item.returnTime,"{y}-{m}-{d} {h}:{i}")}}</p>
               <!--领用量-->
               <p v-if="item.useStatus==1 || item.useStatus==2 || item.useStatus==3 || item.useStatus==4|| item.useStatus==5">{{item.collectNowNum}}</p>
               <!--使用量-->

+ 1 - 1
src/views/chemicalManage/inventoryManagement/savePending/index.vue

@@ -136,7 +136,7 @@
           </el-table-column>
           <el-table-column label="入库期限" prop="createTime" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.stockPeriod) }}</span ><span v-if="scope.row.isOverdue">逾期</span>
+              <span>{{ parseTime(scope.row.stockPeriod,"{y}-{m}-{d} {h}:{i}") }}</span ><span v-if="scope.row.isOverdue">逾期</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="200" show-overflow-tooltip v-if="tableButtonType">

+ 1 - 1
src/views/chemicalManage/inventoryManagement/saveRecord/index.vue

@@ -108,7 +108,7 @@
           </el-table-column>
           <el-table-column label="入库时间" prop="joinTime" width="150" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.joinTime) }}</span>
+              <span>{{ parseTime(scope.row.joinTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="归属人" prop="belongName" width="150" show-overflow-tooltip/>

+ 1 - 1
src/views/chemicalManage/inventoryManagement/takeRecord/index.vue

@@ -124,7 +124,7 @@
           </el-table-column>
           <el-table-column label="出库时间" prop="outTime" width="150" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.outTime) }}</span>
+              <span>{{ parseTime(scope.row.outTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作人" prop="createByName" width="100" show-overflow-tooltip/>

+ 1 - 1
src/views/chemicalManage/inventoryManagement/takeStockRecord/index.vue

@@ -67,7 +67,7 @@
           <el-table-column label="盘点人" prop="state" width="100" show-overflow-tooltip/>
           <el-table-column label="盘点时间" prop="createTime" sortable="custom" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
         </el-table>

+ 3 - 3
src/views/chemicalManage/purchaseManage/examineProcess/index.vue

@@ -7,9 +7,9 @@
         <p class="table-button" :class="leftTableType == 1 ? 'check-table' : ''" @click="leftTableButton(1)">
           申购审核流程
         </p>
-        <p class="table-button" :class="leftTableType == 2 ? 'check-table' : ''" @click="leftTableButton(2)">
-          申购审核流程
-        </p>
+        <!--<p class="table-button" :class="leftTableType == 2 ? 'check-table' : ''" @click="leftTableButton(2)">-->
+          <!--申领审核流程-->
+        <!--</p>-->
       </div>
       <div class="examineProcessPage-right">
         <div class="title-right-box">

+ 2 - 2
src/views/chemicalManage/purchaseManage/purchaseExamine/index.vue

@@ -58,7 +58,7 @@
         <el-table class="table-box" v-loading="loading" border :data="dataList">
           <el-table-column label="申请时间" prop="applyTime" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.applyTime) }}</span>
+              <span>{{ parseTime(scope.row.applyTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="申购人" prop="applyUserName" width="140" show-overflow-tooltip/>
@@ -72,7 +72,7 @@
           <el-table-column label="审核时间" prop="completeTime" width="180"
                            v-if="queryParams.auditStatus==2" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.completeTime) }}</span>
+              <span>{{ parseTime(scope.row.completeTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="申购状态" prop="auditNode" width="150" show-overflow-tooltip/>

+ 24 - 4
src/views/chemicalManage/purchaseManage/purchaseExamine/infoPage.vue

@@ -42,11 +42,11 @@
         </div>
       </div>
       <div class="flex-text-max-big-box">
-        <div>
+        <div class="flex-text-max-big-left-box">
           <p>用途:</p>
           <p>{{newData.applyReason}}</p>
         </div>
-        <div>
+        <div class="flex-text-max-big-right-box">
           <div>
             <p>非管控液体已存储量:</p>
             <p>{{newData.unReguLiquids}}</p>
@@ -86,7 +86,7 @@
         <p class="title-p">实验室现有库存</p>
       </div>
       <div class="for-table-box">
-        <el-table class="table-box" border :data="newData.chemicalStockList">
+        <el-table class="table-box table-null-img-40" border :data="newData.chemicalStockList">
           <el-table-column label="名称" prop="chemicalName" show-overflow-tooltip/>
           <el-table-column label="纯度" prop="chemicalPurity" width="200" show-overflow-tooltip/>
           <el-table-column label="数量" prop="chemicalNumber" width="200" show-overflow-tooltip/>
@@ -337,9 +337,29 @@
       }
       .flex-text-max-big-box{
         display: flex;
-        div{
+        .flex-text-max-big-left-box{
+          display: flex;
+          flex: 1;
+          p{
+            font-size:16px;
+            line-height:20px;
+            margin-bottom:30px;
+          }
+          p:nth-child(1){
+            width:144px;
+            text-align: right;
+          }
+          p:nth-child(2){
+            flex:1;
+          }
+        }
+        .flex-text-max-big-right-box{
           display: flex;
           flex: 1;
+          div{
+            display: flex;
+            flex: 1;
+          }
           p{
             font-size:16px;
             line-height:20px;

+ 2 - 2
src/views/chemicalManage/purchaseManage/purchaseRegister/index.vue

@@ -83,7 +83,7 @@
           <el-table-column type="selection" width="50" align="center"/>
           <el-table-column label="申请时间" align="left" prop="applyTime" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.applyTime) }}</span>
+              <span>{{ parseTime(scope.row.applyTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="申购人" width="100" align="left" prop="applyUserName" show-overflow-tooltip/>
@@ -96,7 +96,7 @@
           </el-table-column>
           <el-table-column label="完成时间" width="180" align="left" prop="createTime" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.completeTime) }}</span>
+              <span>{{ parseTime(scope.row.completeTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="状态" width="150" align="left" prop="auditNode" show-overflow-tooltip/>

+ 1 - 1
src/views/chemicalManage/purchaseManage/purchaseRegister/infoPage.vue

@@ -101,7 +101,7 @@
           <el-table-column label="状态" prop="applyStatusStr" width="150" show-overflow-tooltip/>
           <el-table-column label="时间" width="180" align="left" prop="updateTime" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.updateTime) }}</span>
+              <span>{{ parseTime(scope.row.updateTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="备注" prop="nodeContent" show-overflow-tooltip/>

+ 2 - 2
src/views/chemicalManage/useLedger/index.vue

@@ -130,7 +130,7 @@
           <el-table-column label="领用人" align="left" width="100" prop="useUserName" />
           <el-table-column label="领用时间" align="left" width="200" prop="createTime">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.collectTime) }}</span>
+              <span>{{ parseTime(scope.row.collectTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="领用量" align="left" width="100" prop="name">
@@ -140,7 +140,7 @@
           </el-table-column>
           <el-table-column label="归还时间" align="left" width="200" prop="name">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.returnTime) }}</span>
+              <span>{{ parseTime(scope.row.returnTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作人" align="left" width="100" prop="name" />

+ 1 - 1
src/views/chemicalManage/useLedger/infoPage.vue

@@ -43,7 +43,7 @@
                   </div>
                   <!-- tagCode 1领用,0是归还,3是空瓶出库-->
                   <div class="record-li-b">
-                      <p>{{parseTime(item.collectTime)}}</p>
+                      <p>{{parseTime(item.collectTime,"{y}-{m}-{d} {h}:{i}")}}</p>
                       <p v-if="item.tagCode==1 || item.tagCode==3">{{item.collectNowNum}}</p>
                       <p v-if="item.tagCode==0 || item.tagCode==3">{{item.useAmount}}</p>
                       <p v-if="item.tagCode==0">{{item.returnStockNum}}</p>

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/classifiedGrading/subjectClass.vue

@@ -21,7 +21,7 @@
           <el-table-column :label="versionField() == 'xiBeiNongLinDaXue'?'房间类型':'实验室类型'" align="left" prop="moldName" />
           <el-table-column label="创建人" align="left" prop="createName"/>
           <el-table-column label="创建时间" align="left" prop="createTime">
-            <template slot-scope="scope">{{ parseTime(scope.row.createTime) }}</template>
+            <template slot-scope="scope">{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</template>
           </el-table-column>
           <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
             <template slot-scope="scope">

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/infoConfig.vue

@@ -35,7 +35,7 @@
         <el-table-column label="创建人" align="left" prop="createName"/>
         <el-table-column label="创建时间" align="left" prop="createTime">
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
+            <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
           </template>
         </el-table-column>
         <el-table-column label="状态" align="left" class-name="small-padding fixed-width" width="120">

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/safetyInfoCategory.vue

@@ -69,7 +69,7 @@
         <el-table-column label="创建人" align="left" prop="createBy"/>
         <el-table-column label="创建时间" align="left" prop="createTime">
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
+            <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="120">

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/safetyInfoConfig.vue

@@ -64,7 +64,7 @@
           <el-table-column label="添加人" align="left" prop="createName"/>
           <el-table-column label="添加时间" align="left" prop="createTime">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="120">

+ 1 - 1
src/views/integratedManagement/messageNotice/warningNotice/forewarningConfig.vue

@@ -222,7 +222,7 @@
             </el-table-column>
             <el-table-column label="创建时间" prop="createTime" width="200" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
+                <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
               </template>
             </el-table-column>
             <el-table-column label="创建人" prop="createName" width="150" show-overflow-tooltip/>

+ 1 - 1
src/views/integratedManagement/messageNotice/warningNotice/infoPage.vue

@@ -107,7 +107,7 @@
             <el-table-column label="类型" prop="source"  fixed show-overflow-tooltip/>
             <el-table-column label="创建时间" prop="createTime"  fixed show-overflow-tooltip>
               <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
+                <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
               </template>
             </el-table-column>
           </el-table>

+ 1 - 1
src/views/integratedManagement/personnelManage/post/index.vue

@@ -28,7 +28,7 @@
           <el-table-column label="权限组" align="left" prop="roleNameStr" :show-overflow-tooltip="true"/>
           <el-table-column label="创建时间" align="left" prop="createTime" width="180">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="180" v-if="tableButtonType">

+ 1 - 1
src/views/integratedManagement/personnelManage/teacherInfo/index.vue

@@ -170,7 +170,7 @@
               <el-table-column label="身份" align="left" prop="positionName" width="110" show-overflow-tooltip/>
               <el-table-column label="创建时间" align="left" prop="createTime" width="160" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                  <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="在职状态" align="left" prop="userName" width="100">

+ 1 - 1
src/views/iotDevice/hardwareManagement/hardwareClassification/index.vue

@@ -55,7 +55,7 @@
           </el-table-column>
           <el-table-column label="创建时间" prop="createTime" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="200" show-overflow-tooltip v-if="tableButtonType">

+ 1 - 1
src/views/iotDevice/hardwareManagement/hardwareEquipment/index.vue

@@ -118,7 +118,7 @@
           </el-table-column>
           <el-table-column label="创建时间" prop="createTime" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="200" show-overflow-tooltip v-if="tableButtonType">

+ 1 - 1
src/views/iotDevice/intelligenceIot/classConfig/addPage.vue

@@ -47,7 +47,7 @@
         </el-table-column>
         <el-table-column label="创建时间" align="left" prop="createTime" width="180"  show-overflow-tooltip>
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
+            <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="260">

+ 1 - 1
src/views/iotDevice/intelligenceIot/classConfig/index.vue

@@ -48,7 +48,7 @@
           </el-table-column>
           <el-table-column label="创建时间" align="left" prop="createTime" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="left" width="260" v-if="tableButtonType">

+ 1 - 1
src/views/iotDevice/intelligenceIot/iotClassification/index.vue

@@ -45,7 +45,7 @@
           </el-table-column>
           <el-table-column label="创建时间" align="left" prop="createTime" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="left" class-name="small-padding fixed-width" v-if="tableButtonType">

+ 1 - 1
src/views/iotDevice/intelligenceIot/iotHardware/index.vue

@@ -98,7 +98,7 @@
           </el-table-column>
           <el-table-column label="创建时间" align="left" prop="createTime" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="left" width="200" show-overflow-tooltip v-if="tableButtonType">

+ 1 - 1
src/views/iotDevice/monitoringWarning/messageTemplate/index.vue

@@ -73,7 +73,7 @@
           </el-table-column>
           <el-table-column label="创建时间" align="left" prop="createTime" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="240" v-if="tableButtonType">

+ 1 - 1
src/views/iotDevice/monitoringWarning/receiver/index.vue

@@ -61,7 +61,7 @@
           </el-table-column>
           <el-table-column label="创建时间" prop="createTime" width="300" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="200" show-overflow-tooltip v-if="tableButtonType">

+ 1 - 1
src/views/iotDevice/monitoringWarning/warningMode/index.vue

@@ -71,7 +71,7 @@
           </el-table-column>
           <el-table-column label="创建时间" width="200" align="left" prop="createTime" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="200" v-if="tableButtonType">

+ 1 - 1
src/views/iotDevice/operationManagement/networkComponent/index.vue

@@ -57,7 +57,7 @@
           </el-table-column>
           <el-table-column label="创建时间" align="left" prop="createTime" width="180" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="200" v-if="tableButtonType">

+ 2 - 2
src/views/securityCheck/photonote/processed.vue

@@ -7,13 +7,13 @@
       <el-table-column label="反馈人" align="left" prop="applyName"  width="157" show-overflow-tooltip/>
       <el-table-column label="提交时间" align="left" prop="createTime" width="200" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="处理人" align="left" prop="handleName"  width="135" show-overflow-tooltip/>
       <el-table-column label="处理时间" align="left" prop="handleTime" width="200" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.handleTime) }}</span>
+          <span>{{ parseTime(scope.row.handleTime,"{y}-{m}-{d} {h}:{i}") }}</span>
         </template>
       </el-table-column>
     </el-table>

+ 2 - 2
src/views/serviceCenter/certificationManagement/certificationAccredit/index.vue

@@ -62,12 +62,12 @@
           </el-table-column>
           <el-table-column label="授权时间" align="center" prop="createTime" show-overflow-tooltip width="180">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="过期时间" align="center" prop="expireTime" show-overflow-tooltip width="180">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.expireTime) }}</span>
+              <span>{{ parseTime(scope.row.expireTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="状态" align="center" prop="state" show-overflow-tooltip width="80">

+ 1 - 1
src/views/serviceCenter/certificationManagement/certificationInfo/index.vue

@@ -56,7 +56,7 @@
           <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip width="240"/>
           <el-table-column label="创建时间" align="left" prop="createTime" show-overflow-tooltip width="180">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" prop="deptName" width="140"

+ 1 - 1
src/views/serviceCenter/timingTask/index.vue

@@ -53,7 +53,7 @@
           <el-table-column label="执行状态" align="left" prop="status" :formatter="statusFormat" />
           <el-table-column label="执行时间" align="left" prop="createTime" width="180">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="left" class-name="small-padding fixed-width">

+ 1 - 1
src/views/systemManagement/filePreview/index.vue

@@ -51,7 +51,7 @@
           </el-table-column>
           <el-table-column label="上传时间" align="center" prop="createTime" show-overflow-tooltip width="200">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="上传人" align="center" prop="userName" show-overflow-tooltip width="170"/>

+ 1 - 1
src/views/systemManagement/menu/index.vue

@@ -64,7 +64,7 @@
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" width="180">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180"

+ 1 - 1
src/views/systemManagement/parameterSetting/index.vue

@@ -43,7 +43,7 @@
           <el-table-column label="备注" align="left" prop="remark" :show-overflow-tooltip="true" />
           <el-table-column label="创建时间" align="left" prop="createTime" width="200">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">

+ 1 - 1
src/views/systemManagement/smallProgramConfig/smallProgramMenu/index.vue

@@ -37,7 +37,7 @@
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" width="300">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180"

+ 1 - 1
src/views/systemManagement/systemUser/index.vue

@@ -88,7 +88,7 @@
           </el-table-column>
           <el-table-column label="创建时间" align="left" prop="createTime" width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column