fix:重点工程隐患考评相关bug修复

src/components/KeyProjectHidden/index.vue

@@ -72,6 +72,58 @@
           <td colspan="3">{{ pd.ISPUNISH === '1' ? '是' : '否' }}</td>
         </tr>
       </table>
+      <div v-if="projectEntity && projectEntity.KEYPROJECTPUNISH_ID">
+        <div style="font-weight: bold;margin-top: 20px">
+          罚款详情
+        </div>
+        <div>
+          <table class="table-ui mt-20">
+            <tr>
+              <td class="tbg">处罚原因</td>
+              <td>{{ projectEntity.REASON }}</td>
+            </tr>
+            <tr>
+              <td class="tbg">处罚金额</td>
+              <td>{{ projectEntity.AMOUT }}元</td>
+            </tr>
+            <tr>
+              <td class="tbg">被处罚单位</td>
+              <td>{{ projectEntity.UNITS_NAME }}</td>
+            </tr>
+            <tr>
+              <td class="tbg">被处罚人</td>
+              <td>{{ projectEntity.PERSON_NAME }}</td>
+            </tr>
+            <tr>
+              <td class="tbg">下发人</td>
+              <td>{{ projectEntity.CREATOR_NAME }}</td>
+            </tr>
+            <tr>
+              <td class="tbg">下发处罚时间</td>
+              <td>{{ projectEntity.DATE }}</td>
+            </tr>
+            <tr v-if="projectEntity.HANDLED === '1'">
+              <td class="tbg">罚款缴纳单</td>
+              <td v-viewer>
+                <img :src="config.fileUrl + projectEntity.HANDLE_IMG" alt="" style="width: 100px;height: 100px;">
+              </td>
+            </tr>
+            <tr>
+              <td class="tbg">处罚处理人</td>
+              <td>{{ projectEntity.PERSON_NAME }}</td>
+            </tr>
+            <tr v-if="projectEntity.HANDLED === '1'">
+              <td class="tbg">处罚处理时间</td>
+              <td colspan="3">{{ projectEntity.HANLDE_TIME }}</td>
+            </tr>
+            <div class="ui-height" />
+            <div class="ui-foot">
+              <el-button icon="el-icon-arrow-left" @click="goBack">返 回</el-button>
+            </div>
+          </table>
+        </div>
+      </div>
+
     </div>
     <el-dialog :visible.sync="dialogViewVideo" title="视频" width="800px" @close="closePlay">
       <div>
@@ -105,6 +157,7 @@ export default {
     return {
       config,
       pd: {},
+      projectEntity: {},
       dialogViewVideo: false,
       playerOptions: {
         playbackRates: [0.5, 1.0, 1.5, 2.0], // 可选的播放速度
@@ -142,6 +195,7 @@ export default {
         }
       ).then((data) => {
         this.pd = data.pd
+        this.projectEntity = data.pd.punishForm
       })
     },
     goViewVideo(FILEPATH) {

src/components/OutSourced/index.vue

@@ -42,10 +42,22 @@
       <el-table-column prop="CORP_NAME" label="公司名称" show-overflow-tooltip />
       <el-table-column prop="STARTTIME" label="属地" show-overflow-tooltip>
         <template slot-scope="{row}">
-          {{ row.prvinceName }} -- {{ row.cityName }} -- {{ row.countryName }}
+          <span v-if="row.CORPINFO_ID != '1'">
+            {{ row.prvinceName }} -- {{ row.cityName }} -- {{ row.countryName }}
+          </span>
+          <span v-else>
+            河北省-秦皇岛市-海港区
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="INDUSTRY_NAME" label="所属行业" show-overflow-tooltip >
+        <template slot-scope="{row}">
+          <span v-if="row.CORPINFO_ID != '1'">
+            {{ row.INDUSTRY_NAME }}
+          </span>
+          <span v-else>交通运输、仓储和邮政业</span>
         </template>
       </el-table-column>
-      <el-table-column prop="INDUSTRY_NAME" label="所属行业" show-overflow-tooltip />
       <el-table-column prop="OUTSOURCED_COUNT" label="包含重点工程数" />
       <el-table-column label="操作" align="center" width="100">
         <template slot-scope="{row}">

src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue

@@ -5,12 +5,10 @@
         <el-col :span="8">
           <el-form-item label="隐患来源">
             <el-select v-model="searchForm.SOURCE" style="width: 100%;">
-              <el-option value="1" label="隐患快报"/>
+              <el-option value="1" label="Ai报警"/>
-              <el-option value="2" label="清单排查"/>
               <!--              <el-option value="3" label="清单排查"/>-->
               <el-option value="4" label="安全环保检查(监管端)"/>
               <el-option value="5" label="安全环保检查(企业端)"/>
-              <el-option value="6" label="消防点检"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -80,13 +78,7 @@
       <el-table-column label="隐患来源">
         <template slot-scope="{row}">
           <span v-if="row.SOURCE=='1'">
-            隐患快报
+            Ai报警
-          </span>
-          <span v-else-if="row.SOURCE=='2'">
-            清单排查
-          </span>
-          <span v-else-if="row.SOURCE=='3'">
-            清单排查
           </span>
           <span v-else-if="row.SOURCE=='4'">
             安全环保检查(监管端)
@@ -94,9 +86,6 @@
           <span v-else-if="row.SOURCE=='5'">
             安全环保检查(企业端)
           </span>
-          <span v-else-if="row.SOURCE=='6'">
-            消防点检
-          </span>
         </template>
       </el-table-column>
       <el-table-column prop="HIDDENDESCR" label="隐患描述"/>
@@ -254,7 +243,12 @@ export default {
         }
       ).then((data) => {
         this.listLoading = false
-        this.varList = data.varList
+        console.log(data.varList)
+        if (data.varList) {
+          this.varList = data.varList
+        }else {
+          this.varList = []
+        }
         this.total = data.page.totalResult
       }).catch((e) => {
         this.listLoading = false