Merge remote-tracking branch 'origin/zhy_new_1203' into pet

src/views/evaluation/branch_hazard_assessment/components/evaluation.vue

@@ -16,6 +16,7 @@
               <el-option value="4" label="安全环保检查(监管端)"/>
               <el-option value="5" label="安全环保检查(企业端)"/>
               <el-option value="6" label="消防点检"/>
+              <el-option value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -134,6 +135,9 @@
           <span v-else-if="row.SOURCE=='6'">
             消防点检
           </span>
+          <span v-else-if="row.SOURCE=='8'">
+            点检隐患
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="HIDDENDESCR" label="隐患描述"/>

src/views/evaluation/branch_hazard_assessment/components/hidden_info.vue

@@ -23,6 +23,9 @@
             <template v-else-if="pd.SOURCE=='5'">
               <td colspan="3">安全环保检查(企业端)</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td colspan="3">点检隐患</td>
+            </template>
           </tr>
           <!--<tr>
             <td class="tbg">检查内容</td>

src/views/evaluation/personnel_evaluation_status/components/hidden_info.vue

@@ -22,6 +22,9 @@
           <template v-else-if="pd.SOURCE=='5'">
             <td colspan="3">安全环保检查(企业端)</td>
           </template>
+          <template v-else-if="pd.SOURCE=='8'">
+            <td colspan="3">点检隐患</td>
+          </template>
         </tr>
         <!--<tr>
           <td class="tbg">检查内容</td>

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

@@ -11,6 +11,7 @@
               <el-option value="4" label="安全环保检查(监管端)"/>
               <el-option value="5" label="安全环保检查(企业端)"/>
               <el-option value="6" label="消防点检"/>
+              <el-option value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -97,6 +98,9 @@
           <span v-else-if="row.SOURCE=='6'">
             消防点检
           </span>
+          <span v-else-if="row.SOURCE=='8'">
+            点检隐患
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="HIDDENDESCR" label="隐患描述"/>

src/views/hidden/commonly/commonly/components/Print.vue

@@ -18,6 +18,7 @@
             <span v-else-if="row.SOURCE == 2">清单排查</span>
             <span v-else-if="row.SOURCE == 4">安全环保检查(监管端)</span>
             <span v-else-if="row.SOURCE == 5">安全环保检查(企业端)</span>
+            <span v-else-if="row.SOURCE == 8">点检隐患</span>
           </template>
         </el-table-column>
         <el-table-column prop="HIDDENDESCR" label="隐患描述"/>
@@ -72,6 +73,7 @@
               <template v-if="item.SOURCE == 2">清单排查</template>
               <template v-if="item.SOURCE == 4">安全环保检查(监管端) </template>
               <template v-if="item.SOURCE == 5">安全环保检查(企业端) </template>
+              <template v-if="item.SOURCE == 8">点检隐患</template>
             </td>
             <td>{{ item.HIDDENDESCR }}</td>
             <td>{{ item.FINDUSER }}</td>

src/views/hidden/commonly/commonly/components/companiesList.vue

@@ -11,6 +11,7 @@
                 <el-option :value="4" label="安全环保检查(监管端)"/>
                 <el-option :value="5" label="安全环保检查(企业端)"/>
                 <el-option :value="6" label="消防检查"/>
+                <el-option :value="8" label="点检隐患"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -158,6 +159,7 @@
           <template v-else-if="row.SOURCE=='4'">安全环保检查(监管端) </template>
           <template v-else-if="row.SOURCE=='5'">安全环保检查(企业端) </template>
           <template v-else-if="row.SOURCE=='6'">消防检查 </template>
+          <template v-else-if="row.SOURCE=='8'">点检隐患 </template>
         </template>
       </el-table-column>
       <el-table-column prop="HIDDENDESCR" label="隐患描述"/>

src/views/hidden/commonly/commonly/components/info.vue

@@ -25,6 +25,9 @@
           <template v-else-if="pd.SOURCE=='6'">
             <td colspan="3">消防检查</td>
           </template>
+          <template v-else-if="pd.SOURCE=='8'">
+            <td colspan="3">点检隐患</td>
+          </template>
         </tr>
         <!--<tr>
           <td class="tbg">检查内容</td>

src/views/hidden/commonly/ignore/components/companiesList.vue

@@ -9,6 +9,7 @@
               <el-option :value="2" label="清单排查"/>
               <el-option :value="4" label="安全环保检查(监管端)"/>
               <el-option :value="5" label="安全环保检查(企业端)"/>
+              <el-option :value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -117,6 +118,7 @@
           <span v-if="row.SOURCE == 1">隐患快报</span>
           <span v-else-if="row.SOURCE == 4">安全环保检查(监管端)</span>
           <span v-else-if="row.SOURCE == 5">安全环保检查(企业端)</span>
+          <span v-else-if="row.SOURCE == 8">点检隐患</span>
           <span v-else>清单排查</span>
         </template>
       </el-table-column>

src/views/hidden/commonly/ignore/components/info.vue

@@ -23,6 +23,9 @@
             <template v-else-if="pd.SOURCE=='5'">
               安全环保检查(企业端)
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              点检隐患
+            </template>
           </td>
         </tr>
         <tr>

src/views/hidden/commonly/special/components/companiesList.vue

@@ -9,6 +9,7 @@
               <el-option :value="2" label="清单排查"/>
               <el-option :value="4" label="安全环保检查(监管端)"/>
               <el-option :value="5" label="安全环保检查(企业端)"/>
+              <el-option :value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -82,6 +83,7 @@
           <span v-if="row.SOURCE == 1">隐患快报</span>
           <span v-else-if="row.SOURCE == 4">安全环保检查(监管端)</span>
           <span v-else-if="row.SOURCE == 5">安全环保检查(企业端)</span>
+          <span v-else-if="row.SOURCE == 8">点检隐患</span>
           <span v-else>清单排查</span>
         </template>
       </el-table-column>

src/views/hidden/commonly/special/components/info.vue

@@ -23,6 +23,9 @@
             <template v-else-if="pd.SOURCE=='5'">
               安全环保检查(企业端)
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              点检隐患
+            </template>
           </td>
         </tr>
         <tr>

src/views/hidden/major/checkandaccept/components/detail.vue

@@ -20,6 +20,9 @@
             <template v-else-if="pd.SOURCE=='6'">
               <td>消防检查</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td>点检隐患</td>
+            </template>
           </tr>
           <tr>
             <td class="tbg">隐患描述</td>

src/views/hidden/major/checkandaccept/components/list.vue

@@ -107,6 +107,7 @@
           <template v-if="row.SOURCE =='2'">清单排查</template>
           <template v-if="row.SOURCE =='3'">清单排查</template>
           <template v-if="row.SOURCE =='6'">消防检查</template>
+          <template v-if="row.SOURCE =='8'">点检隐患</template>
         </template>
       </el-table-column>
       <el-table-column label="隐患描述" prop="HIDDENDESCR" >
@@ -181,7 +182,8 @@ export default {
       varList: [],
       hiddenSourceList: [ // 隐患来源  1-隐患快报  2-清单排查
         { value: '1', label: '隐患快报' },
-        { value: '2', label: '清单排查' }
+        { value: '2', label: '清单排查' },
+        { value: '8', label: '点检隐患' }
       ],
       statusList: [
         { ID: '14', NAME: '待验收' },

src/views/hidden/major/components/companiesList.vue

@@ -7,6 +7,7 @@
             <el-select v-model="form.SOURCE" placeholder="隐患来源" clearable style="width: 100%" class="filter-item">
               <el-option :value="1" label="隐患快报"/>
               <el-option :value="2" label="清单排查"/>
+              <el-option :value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -139,6 +140,7 @@
       <el-table-column prop="SOURCE" label="隐患来源">
         <template slot-scope="{row}">
           <span v-if="row.SOURCE == 1">隐患快报</span>
+          <span v-else-if="row.SOURCE == 8">点检隐患</span>
           <span v-else>清单排查</span>
         </template>
       </el-table-column>

src/views/hidden/major/components/info.vue

@@ -17,6 +17,9 @@
             <template v-else-if="pd.SOURCE=='3'">
               清单排查
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              点检隐患
+            </template>
           </td>
         </tr>
         <tr v-if="pd.SOURCE=='2'">

src/views/hidden/major/corpmajornum/components/companiesList.vue

@@ -9,6 +9,7 @@
               <el-option :value="2" label="清单排查"/>
               <el-option :value="2" label="清单排查"/>
               <el-option :value="6" label="消防检查"/>
+              <el-option :value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -66,6 +67,7 @@
           <span v-if="row.SOURCE == 2">清单排查</span>
           <span v-if="row.SOURCE == 3">清单排查</span>
           <span v-if="row.SOURCE == 6">消防检查</span>
+          <span v-if="row.SOURCE == 8">点检隐患</span>
         </template>
       </el-table-column>
       <el-table-column prop="CREATORNAME" label="隐患发现人"/>

src/views/hidden/major/corpmajornum/components/info.vue

@@ -20,6 +20,9 @@
             <template v-else-if="pd.SOURCE=='6'">
               消防检查
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              点检隐患
+            </template>
           </td>
         </tr>
         <tr>

src/views/hidden/major/corpverify/components/detail.vue

@@ -20,6 +20,9 @@
             <template v-else-if="pd.SOURCE=='6'">
               <td>消防检查</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td>点检隐患</td>
+            </template>
           </tr>
           <tr>
             <td class="tbg">隐患描述</td>

src/views/hidden/major/corpverify/components/list.vue

@@ -107,6 +107,7 @@
           <template v-if="row.SOURCE =='2'">清单排查</template>
           <template v-if="row.SOURCE =='3'">清单排查</template>
           <template v-if="row.SOURCE =='6'">消防检查</template>
+          <template v-if="row.SOURCE =='8'">点检隐患</template>
         </template>
       </el-table-column>
       <el-table-column label="隐患描述" prop="HIDDENDESCR" >
@@ -178,7 +179,8 @@ export default {
       varList: [],
       hiddenSourceList: [ // 隐患来源  1-隐患快报  2-清单排查
         { value: '1', label: '隐患快报' },
-        { value: '2', label: '清单排查' }
+        { value: '2', label: '清单排查' },
+        { value: '8', label: '点检隐患' }
       ],
       statusList: [
         { ID: '-2', NAME: '待确认' },

src/views/hidden/major/majormanagement/components/detail.vue

@@ -17,6 +17,9 @@
             <template v-else-if="pd.SOURCE=='3'">
               <td>清单排查</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td>点检隐患</td>
+            </template>
           </tr>
           <tr>
             <td class="tbg">隐患描述</td>

src/views/hidden/major/majormanagement/components/list.vue

@@ -106,6 +106,7 @@
           <template v-if="row.SOURCE =='1'">隐患快报</template>
           <template v-if="row.SOURCE =='2'">清单排查</template>
           <template v-if="row.SOURCE =='3'">清单排查</template>
+          <template v-if="row.SOURCE =='8'">点检隐患</template>
         </template>
       </el-table-column>
       <el-table-column label="隐患描述" prop="HIDDENDESCR" >
@@ -181,7 +182,8 @@ export default {
       varList: [],
       hiddenSourceList: [ // 隐患来源  1-隐患快报  2-清单排查
         { value: '1', label: '隐患快报' },
-        { value: '2', label: '清单排查' }
+        { value: '2', label: '清单排查' },
+        { value: '8', label: '点检隐患' }
       ],
       statusList: [
         { ID: '13', NAME: '待整改' },

src/views/hidden/normal/components/info.vue

@@ -19,6 +19,9 @@
                 <template v-else-if="pd.SOURCE=='3'">
                   清单排查
                 </template>
+                <template v-else-if="pd.SOURCE=='8'">
+                  点检隐患
+                </template>
               </td>
             </tr>
             <tr v-if="pd.SOURCE=='2'">

src/views/hidden/normal/components/list.vue

@@ -72,6 +72,9 @@
           <template v-else-if="row.SOURCE=='3'">
             <span class="label label-info">清单排查</span>
           </template>
+          <template v-else-if="row.SOURCE=='8'">
+            <span class="label label-info">点检隐患</span>
+          </template>
         </template>
       </el-table-column>
       <!--      <el-table-column prop="TYPE_NAME" label="企业类型" />-->

src/views/hidden/zczb/components/hidden.vue

@@ -19,6 +19,9 @@
                 <template v-else-if="pd.SOURCE=='3'">
                   清单排查
                 </template>
+                <template v-else-if="pd.SOURCE=='8'">
+                  点检隐患
+                </template>
               </td>
             </tr>
             <tr>

src/views/hiddenUtil/information.vue

@@ -28,6 +28,9 @@
               <template v-else-if="pd.SOURCE=='5'">
                 <td>安全环保检查(企业端)</td>
               </template>
+              <template v-else-if="pd.SOURCE=='8'">
+                <td>点检隐患</td>
+              </template>
             </tr>
             <tr>
               <td class="tbg">隐患描述</td>

src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue

@@ -14,6 +14,7 @@
               <!--              <el-option value="3" label="清单排查"/>-->
               <el-option value="4" label="安全环保检查(监管端)"/>
               <el-option value="5" label="安全环保检查(企业端)"/>
+              <el-option value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -111,6 +112,9 @@
           <span v-else-if="row.SOURCE=='5'">
             安全环保检查(企业端)
           </span>
+          <span v-else-if="row.SOURCE=='8'">
+            点检隐患
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="HIDDENDESCR" label="隐患描述"/>

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

@@ -9,6 +9,7 @@
               <!--              <el-option value="3" label="清单排查"/>-->
               <el-option value="4" label="安全环保检查(监管端)"/>
               <el-option value="5" label="安全环保检查(企业端)"/>
+              <el-option value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -87,6 +88,9 @@
           <span v-else-if="row.SOURCE=='5'">
             安全环保检查(企业端)
           </span>
+          <span v-else-if="row.SOURCE=='8'">
+            点检隐患
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="HIDDENDESCR" label="隐患描述"/>

src/views/keyprojects/hidden/components/list.vue

@@ -151,7 +151,8 @@ export default {
       sourceState: {
         1: 'AI报警',
         4: '安全环保检查(监管端)',
-        5: '安全环保检查(企业端)'
+        5: '安全环保检查(企业端)',
+        8: '点检隐患'
       },
       state: {
         1: '未整改',
@@ -161,7 +162,8 @@ export default {
       SOURCEList: [
         { ID: '1', NAME: 'AI报警' },
         { ID: '4', NAME: '安全环保检查(监管端)' },
-        { ID: '5', NAME: '安全环保检查(企业端)' }
+        { ID: '5', NAME: '安全环保检查(企业端)' },
+        { ID: '8', NAME: '点检隐患' }
       ],
       zList: [
         { ID: '1', NAME: '未整改' },

src/views/keyprojects/relevantunits/components/edit.vue

@@ -27,6 +27,9 @@
             <template v-else-if="pd.SOURCE=='6'">
               <td>消防检查</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td>点检隐患</td>
+            </template>
           </tr>
           <tr>
             <td class="tbg">隐患描述</td>

src/views/safetyenvironmental/archive/components/accept.vue

@@ -23,6 +23,9 @@
             <template v-else-if="pd.SOURCE=='5'">
               <td>安全环保检查（企业端）</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td>点检隐患</td>
+            </template>
           </tr>
           <tr>
             <td class="tbg">隐患描述</td>

src/views/safetyenvironmental/assess/components/info.vue

@@ -14,6 +14,9 @@
             <template v-else-if="pd.SOURCE=='5'">
               <td>安全环保检查(企业端)</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td>点检隐患</td>
+            </template>
           </tr>
           <tr>
             <td class="tbg">位置</td>

static/qrcode/views/bsbw/part-detail.html

@@ -29,6 +29,9 @@
 						<template v-else-if="pd.SOURCE=='3'">
               清单排查
 						</template>
+						<template v-else-if="pd.SOURCE=='8'">
+							点检隐患
+						</template>
 			        </div>
 			    </div>
 				<div  v-if="pd.SOURCE=='2'" class="base-cell">

static/qrcode/views/fxfb/part-detail.html

@@ -29,6 +29,9 @@
 						<template v-else-if="pd.SOURCE=='3'">
               清单排查
 						</template>
+						<template v-else-if="pd.SOURCE=='8'">
+							点检隐患
+						</template>
 			        </div>
 			    </div>
 				<div  v-if="pd.SOURCE=='2'" class="base-cell">