Merge remote-tracking branch 'origin/master'

ui/src/store/modules/user.js

@@ -66,7 +66,7 @@ const user = {
         })
       })
     },
-    
+
     // 退出系统
     LogOut({ commit, state }) {
       return new Promise((resolve, reject) => {
@@ -81,7 +81,6 @@ const user = {
         })
       })
     },
-
     // 前端 登出
     FedLogOut({ commit }) {
       return new Promise(resolve => {

ui/src/views/sems/specCc/index.vue

@@ -148,8 +148,6 @@
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('预警标识')" align="center" prop="warnFlag" width="100"></el-table-column>
-
       <el-table-column :label="$t('报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('资产归属形式')" align="center" prop="assetOwner" :show-overflow-tooltip="true"/>
 
@@ -905,14 +903,14 @@
     },
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex == 24 && row.warnFlag == 1){
-        return "background-color:rgba(255, 255,153, 1);"
+      if (columnIndex == 23 && row.warnFlag == 1){
+        return "background-color:rgba(255, 255,153, 0.5);"
       }
-      if (columnIndex == 24 && row.warnFlag == 2){
-        return "background-color:rgba(255, 180, 68, 1);"
+      if (columnIndex == 23 && row.warnFlag == 2){
+        return "background-color:rgba(255, 180, 68, 0.5);"
       }
-      if (columnIndex == 24 && row.warnFlag == 3){
-        return "background-color:rgba(255, 68,68, 1);"
+      if (columnIndex == 23 && row.warnFlag == 3){
+        return "background-color:rgba(255, 68,68, 0.5);"
       }
     }
   }

ui/src/views/sems/specDt/index.vue

@@ -144,7 +144,6 @@
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('预警标识')" align="center" prop="warnFlag" width="100"></el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -805,14 +804,14 @@
     },
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex == 18 && row.warnFlag == 1){
-        return "background-color:rgba(255, 255,153, 1);"
+      if (columnIndex == 17 && row.warnFlag == 1){
+        return "background-color:rgba(255, 255,153, 0.5);"
       }
-      if (columnIndex == 18 && row.warnFlag == 2){
-        return "background-color:rgba(255, 180, 68, 1);"
+      if (columnIndex == 17 && row.warnFlag == 2){
+        return "background-color:rgba(255, 180, 68, 0.5);"
       }
-      if (columnIndex == 18 && row.warnFlag == 3){
-        return "background-color:rgba(255, 68,68, 1);"
+      if (columnIndex == 17 && row.warnFlag == 3){
+        return "background-color:rgba(255, 68,68, 0.5);"
       }
     }
   }

ui/src/views/sems/specDzsb/index.vue

@@ -271,7 +271,6 @@
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('预警标识')" align="center" prop="warnFlag" width="100"></el-table-column>
       <el-table-column :label="$t('检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
 
@@ -988,14 +987,14 @@
     },
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex == 20 && row.warnFlag == 1){
-        return "background-color:rgba(255, 255,153, 1);"
+      if (columnIndex == 19 && row.warnFlag == 1){
+        return "background-color:rgba(255, 255,153, 0.5);"
       }
-      if (columnIndex == 20 && row.warnFlag == 2){
-        return "background-color:rgba(255, 180, 68, 1);"
+      if (columnIndex == 19 && row.warnFlag == 2){
+        return "background-color:rgba(255, 180, 68, 0.5);"
       }
-      if (columnIndex == 20 && row.warnFlag == 3){
-        return "background-color:rgba(255, 68,68, 1);"
+      if (columnIndex == 19 && row.warnFlag == 3){
+        return "background-color:rgba(255, 68,68, 0.5);"
       }
     }
   }

ui/src/views/sems/specGl/index.vue

@@ -163,7 +163,6 @@
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('预警标识')" align="center" prop="warnFlag" width="100"></el-table-column>
       <el-table-column :label="$t('本次外部检测日期')" align="center" prop="outWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outWarnDate, '{y}-{m}-{d}') }}</span>
@@ -969,14 +968,14 @@
     },
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex == 27 && row.warnFlag == 1){
-        return "background-color:rgba(255, 255,153, 1);"
+      if (columnIndex == 26 && row.warnFlag == 1){
+        return "background-color:rgba(255, 255,153, 0.5);"
       }
-      if (columnIndex == 27 && row.warnFlag == 2){
-        return "background-color:rgba(255, 180, 68, 1);"
+      if (columnIndex == 26 && row.warnFlag == 2){
+        return "background-color:rgba(255, 180, 68, 0.5);"
       }
-      if (columnIndex == 27 && row.warnFlag == 3){
-        return "background-color:rgba(255, 68,68, 1);"
+      if (columnIndex == 26 && row.warnFlag == 3){
+        return "background-color:rgba(255, 68,68, 0.5);"
       }
     }
   }

ui/src/views/sems/specYlgd/index.vue

@@ -229,8 +229,6 @@
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('预警标识')" align="center" prop="warnFlag" width="100">
-      </el-table-column>
       <el-table-column :label="$t('定期检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('年度检查日期')" align="center" prop="yearWarnDate" width="100">
         <template slot-scope="scope">
@@ -1125,14 +1123,14 @@ export default {
         return "color:rgba(255, 26, 26, 0.98);"
       }
 
-      if (columnIndex == 36 && row.warnFlag == 1){
-        return "background-color:rgba(255, 255,153, 1);"
+      if (columnIndex == 35 && row.warnFlag == 1){
+        return "background-color:rgba(255, 255,153, 0.5);"
       }
-      if (columnIndex == 36 && row.warnFlag == 2){
-        return "background-color:rgba(255, 180, 68, 1);"
+      if (columnIndex == 35 && row.warnFlag == 2){
+        return "background-color:rgba(255, 180, 68, 0.5);"
       }
-      if (columnIndex == 36 && row.warnFlag == 3){
-        return "background-color:rgba(255, 68,68, 1);"
+      if (columnIndex == 35 && row.warnFlag == 3){
+        return "background-color:rgba(255, 68,68, 0.5);"
       }
     }
   }

ui/src/views/sems/specYlrq/index.vue

@@ -169,7 +169,6 @@
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('预警标识')" align="center" prop="warnFlag" width="100"></el-table-column>
       <el-table-column :label="$t('定期检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('年度检查日期')" align="center" prop="yearWarnDate" width="100">
         <template slot-scope="scope">
@@ -1026,14 +1025,14 @@
       if (columnIndex == 7 && row.isRepeat == 1){
         return "color:rgba(255, 26, 26, 0.98);"
       }
-      if (columnIndex == 29 && row.warnFlag == 1){
-        return "background-color:rgba(255, 255,153, 1);"
+      if (columnIndex == 28 && row.warnFlag == 1){
+        return "background-color:rgba(255, 255,153, 0.5);"
       }
-      if (columnIndex == 29 && row.warnFlag == 2){
-        return "background-color:rgba(255, 180, 68, 1);"
+      if (columnIndex == 28 && row.warnFlag == 2){
+        return "background-color:rgba(255, 180, 68, 0.5);"
       }
-      if (columnIndex == 29 && row.warnFlag == 3){
-        return "background-color:rgba(255, 68,68, 1);"
+      if (columnIndex == 28 && row.warnFlag == 3){
+        return "background-color:rgba(255, 68,68, 0.5);"
       }
     }