0616

app/src/mixin/unit.js

@@ -125,6 +125,10 @@ const punishmentMixin = {
 					value: "低风险",
 					label: "低风险",
 				},
+				{
+					value: "低风险（无色）",
+					label: "低风险（无色）",
+				},
 			],
 			//起火原因
 			qhyyList: [{

app/src/views/Detail/components/Risklevel.vue

@@ -161,7 +161,7 @@ export default {
       console.log(this.detail.fxdj);
       let color = '';
       if (this.detail.fxdj.indexOf('低风险') >= 0) {
-        color = '#35c2ff';
+        color = '#00D957';
       } else if (this.detail.fxjd.indexOf('一般风险') >= 0) {
         color = '#fbff3d';
       } else if (this.detail.fxjd.indexOf('较大风险') >= 0 || this.detail.fxjd.indexOf('较高风险') >= 0) {

app/src/views/Detail/components/YhModalContent.vue

@@ -96,6 +96,8 @@ export default {
       }
       if (this.params.yhxm) {
         params.yhxm = this.params.yhxm.join(",");
+      } else {
+        params.yhxm = null;
       }
       if (this.params.zgjd) {
         params.zgjd = this.params.zgjd.join(",");
@@ -119,6 +121,17 @@ export default {
 
         params.zgsx = "1970-01-01 00:00:00|" + endTime;
       }
+
+      if (params.yhxm === '') {
+        params.yhxm = null;
+      }
+      if (params.zdqx === '') {
+        params.zdqx = null;
+      }
+      if (params.zgjd === '') {
+        params.zgjd = null;
+      }
+      console.log(params);
       ylycyhzzqdTc(params).then((res) => {
         this.tableData = res.data.rows;
         this.total = res.data.total;
@@ -185,7 +198,12 @@ export default {
           </el-form-item>
           <!-- 重点情形 -->
           <el-form-item>
-            <el-select v-model="params.zdqx" placeholder="重点情形" multiple collapse-tags>
+            <el-select
+              v-model="params.zdqx"
+              placeholder="重点情形"
+              multiple
+              collapse-tags
+            >
               <el-option
                 :label="item"
                 :value="item"
@@ -196,7 +214,12 @@ export default {
           </el-form-item>
           <!-- 隐患项目 -->
           <el-form-item>
-            <el-select v-model="params.yhxm" placeholder="隐患项目" multiple collapse-tags>
+            <el-select
+              v-model="params.yhxm"
+              placeholder="隐患项目"
+              multiple
+              collapse-tags
+            >
               <el-option
                 :label="item"
                 :value="item"
@@ -218,7 +241,12 @@ export default {
           </el-form-item>
           <!-- 整改进度 -->
           <el-form-item>
-            <el-select v-model="params.zgjd" placeholder="整改进度" multiple collapse-tags>
+            <el-select
+              v-model="params.zgjd"
+              placeholder="整改进度"
+              multiple
+              collapse-tags
+            >
               <el-option
                 :label="item"
                 :value="item"
@@ -238,6 +266,18 @@ export default {
               ></el-option>
             </el-select>
           </el-form-item>
+          <!-- 风险等级 -->
+          <el-form-item>
+            <el-select v-model="params.fxdj" placeholder="风险等级">
+              <el-option
+                :value="item.value"
+                :label="item.lable"
+                v-for="(item, index) in fxdjLlst"
+                :key="index"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
           <!-- 建筑名称 -->
           <el-form-item>
             <div class="inp">
@@ -248,10 +288,10 @@ export default {
             </div>
           </el-form-item>
         </el-form>
-        <div class="btn-item">
-          <el-button @click="funList">搜索</el-button>
-          <el-button @click="resetForm">重置</el-button>
-        </div>
+      </div>
+      <div class="btn-item">
+        <el-button @click="funList">搜索</el-button>
+        <el-button @click="resetForm">重置</el-button>
       </div>
     </div>
 
@@ -275,27 +315,72 @@ export default {
       <el-table-column label="隐患数" show-overflow-tooltip>
         <template> 1 </template>
       </el-table-column>
-      <el-table-column prop="yhxm" label="隐患项目" show-overflow-tooltip min-width="150">
+      <el-table-column
+        prop="yhxm"
+        label="隐患项目"
+        show-overflow-tooltip
+        min-width="150"
+      >
       </el-table-column>
       <el-table-column prop="pcqk" label="排查情况" show-overflow-tooltip>
       </el-table-column>
       <el-table-column prop="yhjd" label="整改进度" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="jtqk" label="具体问题" show-overflow-tooltip min-width="150">
+      <el-table-column
+        prop="jtqk"
+        label="具体问题"
+        show-overflow-tooltip
+        min-width="150"
+      >
       </el-table-column>
-      <el-table-column prop="zgcs" label="整改措施" show-overflow-tooltip min-width="150">
+      <el-table-column
+        prop="zgcs"
+        label="整改措施"
+        show-overflow-tooltip
+        min-width="150"
+      >
       </el-table-column>
-      <el-table-column prop="zgzrdw" label="整改单位" show-overflow-tooltip min-width="150">
+      <el-table-column
+        prop="zgzrdw"
+        label="整改单位"
+        show-overflow-tooltip
+        min-width="150"
+      >
       </el-table-column>
-      <el-table-column prop="zgzrr" label="整改责任人" show-overflow-tooltip min-width="100">
+      <el-table-column
+        prop="zgzrr"
+        label="整改责任人"
+        show-overflow-tooltip
+        min-width="100"
+      >
       </el-table-column>
-      <el-table-column prop="zgsx" label="整改时限" show-overflow-tooltip min-width="120">
+      <el-table-column
+        prop="zgsx"
+        label="整改时限"
+        show-overflow-tooltip
+        min-width="120"
+      >
       </el-table-column>
-      <el-table-column prop="zgzjwy" label="整改资金" show-overflow-tooltip  min-width="100">
+      <el-table-column
+        prop="zgzjwy"
+        label="整改资金"
+        show-overflow-tooltip
+        min-width="100"
+      >
       </el-table-column>
-      <el-table-column prop="djsj" label="登记时间" show-overflow-tooltip min-width="120">
+      <el-table-column
+        prop="djsj"
+        label="登记时间"
+        show-overflow-tooltip
+        min-width="120"
+      >
       </el-table-column>
-      <el-table-column prop="sftxdw" label="是否提醒单位" show-overflow-tooltip min-width="120">
+      <el-table-column
+        prop="sftxdw"
+        label="是否提醒单位"
+        show-overflow-tooltip
+        min-width="120"
+      >
       </el-table-column>
       <el-table-column
         prop="sfts"
@@ -304,9 +389,20 @@ export default {
         min-width="200"
       >
       </el-table-column>
-      <el-table-column prop="yhfj" label="隐患附件" show-overflow-tooltip  min-width="100">
+      <el-table-column
+        prop="yhfj"
+        label="隐患附件"
+        show-overflow-tooltip
+        min-width="100"
+      >
         <template slot-scope="scope">
-          <a :href="scope.row.yhfj" target="_blank" style="color: #ffffff;" v-if="scope.row.yhfj">下载</a>
+          <a
+            :href="scope.row.yhfj"
+            target="_blank"
+            style="color: #ffffff"
+            v-if="scope.row.yhfj"
+            >下载</a
+          >
         </template>
       </el-table-column>
     </basic-table>
@@ -504,5 +600,4 @@ export default {
   background: rgba(0, 213, 255, 0.3);
   opacity: 0.7;
 }
-
 </style>