装置审计记录 - 审计结果显示优化（绿区/黄区/红区）

rc-buisness/src/main/resources/mapper/rc/TAuditMapper.xml

@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectHomeData2" resultType="java.math.BigDecimal">
-      select (select count(*) from t_audit where audit_result='绿区通过') / (select count(*) from t_audit) from dual;
+      select (select count(*) from t_audit where audit_result='绿区') / (select count(*) from t_audit) from dual;
     </select>
 
     <select id="selectHomeData3" parameterType="Long" resultType="int">

ruoyi-ui/.env.development

@@ -5,8 +5,8 @@ VUE_APP_TITLE = 扬子石化-巴斯夫RC审计管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-#VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://43.143.92.79:8094'
+VUE_APP_BASE_API = '/dev-api'
+#VUE_APP_BASE_API = 'http://43.143.92.79:8094'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

ruoyi-ui/src/assets/icons/svg/roundGreen.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1626846308849" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1310" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400"><defs><style type="text/css"></style></defs><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#02b151" p-id="1311"></path></svg>

ruoyi-ui/src/assets/icons/svg/roundGrey.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1668389542451" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2035" width="400" height="400" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 512m-512 0a100 100 0 1 0 1024 0 100 100 0 1 0-1024 0Z" p-id="2036" fill="#707070"></path></svg>

ruoyi-ui/src/assets/icons/svg/roundRed.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1626846308849" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1310" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400"><defs><style type="text/css"></style></defs><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#C1272D" p-id="1311"></path></svg>

ruoyi-ui/src/assets/icons/svg/roundYellow.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1668408676313" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3106" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400"><path d="M512 512m-512 0a100 100 0 1 0 1024 0 100 100 0 1 0-1024 0Z" p-id="3107" fill="#f9bb47" data-spm-anchor-id="a313x.7781069.0.i8" class="selected"></path></svg>

ruoyi-ui/src/views/rc/audit/index.vue

@@ -105,7 +105,22 @@
           <span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审计结果" align="center" prop="auditResult" width="120"/>
+      <el-table-column label="审计结果" align="center" prop="auditResult" width="120">
+        <template slot-scope="scope">
+          <span v-if="scope.row.auditResult == '绿区'">
+            <svg-icon icon-class="roundGreen" style="font-size: 10px;"></svg-icon>
+          </span>
+          <span v-if="scope.row.auditResult == '黄区'">
+            <svg-icon icon-class="roundYellow" style="font-size: 10px;"></svg-icon>
+          </span>
+          <span v-if="scope.row.auditResult == '红区'">
+            <svg-icon icon-class="roundRed" style="font-size: 10px;"></svg-icon>
+          </span>
+          <span>
+            {{ scope.row.auditResult }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks"/>
       <el-table-column label="审计结果报告" align="center" width="120" fixed="right">
         <template slot-scope="scope">
@@ -185,7 +200,11 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="审计结果" prop="auditResult">
-          <el-input v-model="form.auditResult" type="textarea" placeholder="请输入内容" />
+          <el-select v-model="form.auditResult" placeholder="请选择">
+            <el-option key="绿区" label="绿区" value="绿区"></el-option>
+            <el-option key="黄区" label="黄区" value="黄区"></el-option>
+            <el-option key="红区" label="红区" value="红区"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />