guoyuepeng
/
qa-regulatory-gwj-vue
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: guoyuepeng:800f101df842624f6a21d036d0dd835ae22aaf95
Branches Tags
guoyuepeng:2023年12月27日V01.00.50
guoyuepeng:2024-07-22新BI页面
guoyuepeng:20240528Test
guoyuepeng:2024年1月19日V01.00.51
guoyuepeng:2024年1月24日测试
guoyuepeng:2024年2月1日V1.0.53
guoyuepeng:2024年2月1日测试
guoyuepeng:2024年2月22日v1.0.55
guoyuepeng:2024年3月12日AIBOX&ALARM
guoyuepeng:2024年9月9日shanao
guoyuepeng:5_7_地图同步
guoyuepeng:cmt
guoyuepeng:cmt地图合并
guoyuepeng:czks-cmt-gwj地图合并
guoyuepeng:czks-地图合并
guoyuepeng:czks1.0
guoyuepeng:dev
guoyuepeng:dev-2024年1月8日
guoyuepeng:hyx_2024-9-29_tongbu
guoyuepeng:hyx_allXgfPerson
guoyuepeng:hyx_humanResource
guoyuepeng:hyx_temporaryAccess
guoyuepeng:hyx_门口门禁
guoyuepeng:liujun-2024-06-06-相关方新需求
guoyuepeng:liujun-2024-06-13-一公司人员定位新需求
guoyuepeng:liujun-2024-06-18-文本库新需求
guoyuepeng:liujun-2024-09-04-九公司人员定位
guoyuepeng:liujun-25-相关方企业新增属性
guoyuepeng:liujun-267公司人员定位新增
guoyuepeng:main
guoyuepeng:pet
guoyuepeng:pet-XFBJ
guoyuepeng:pet-人员中台对接-xuyifeng-7.24
guoyuepeng:pet_li_6.6
guoyuepeng:pet_门口门禁
guoyuepeng:xuyifeng-0724-人员中台对接-dev
guoyuepeng:zhy_new_1203
guoyuepeng:安全环保检查发起优化
guoyuepeng:2024-05-09版本
guoyuepeng:2024-04-24版本
guoyuepeng:2024-04-19升级
..
compare: guoyuepeng:9bf0fbcbcc13a85f90693250d7bc93f522b9b7eb
Branches Tags
guoyuepeng:2023年12月27日V01.00.50
guoyuepeng:2024-07-22新BI页面
guoyuepeng:20240528Test
guoyuepeng:2024年1月19日V01.00.51
guoyuepeng:2024年1月24日测试
guoyuepeng:2024年2月1日V1.0.53
guoyuepeng:2024年2月1日测试
guoyuepeng:2024年2月22日v1.0.55
guoyuepeng:2024年3月12日AIBOX&ALARM
guoyuepeng:2024年9月9日shanao
guoyuepeng:5_7_地图同步
guoyuepeng:cmt
guoyuepeng:cmt地图合并
guoyuepeng:czks-cmt-gwj地图合并
guoyuepeng:czks-地图合并
guoyuepeng:czks1.0
guoyuepeng:dev
guoyuepeng:dev-2024年1月8日
guoyuepeng:hyx_2024-9-29_tongbu
guoyuepeng:hyx_allXgfPerson
guoyuepeng:hyx_humanResource
guoyuepeng:hyx_temporaryAccess
guoyuepeng:hyx_门口门禁
guoyuepeng:liujun-2024-06-06-相关方新需求
guoyuepeng:liujun-2024-06-13-一公司人员定位新需求
guoyuepeng:liujun-2024-06-18-文本库新需求
guoyuepeng:liujun-2024-09-04-九公司人员定位
guoyuepeng:liujun-25-相关方企业新增属性
guoyuepeng:liujun-267公司人员定位新增
guoyuepeng:main
guoyuepeng:pet
guoyuepeng:pet-XFBJ
guoyuepeng:pet-人员中台对接-xuyifeng-7.24
guoyuepeng:pet_li_6.6
guoyuepeng:pet_门口门禁
guoyuepeng:xuyifeng-0724-人员中台对接-dev
guoyuepeng:zhy_new_1203
guoyuepeng:安全环保检查发起优化
guoyuepeng:2024-05-09版本
guoyuepeng:2024-04-24版本
guoyuepeng:2024-04-19升级

No commits in common. "800f101df842624f6a21d036d0dd835ae22aaf95" and "9bf0fbcbcc13a85f90693250d7bc93f522b9b7eb" have entirely different histories.
800f101df8 ... 9bf0fbcbcc

33 changed files with 5 additions and 98 deletions
Show Stats Expand all files Collapse all files

4
src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
View File

@ -16,7 +16,6 @@
<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>
@ -135,9 +134,6 @@
<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="隐患描述"/>

3
src/views/evaluation/branch_hazard_assessment/components/hidden_info.vue
View File

@ -23,9 +23,6 @@
<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>

3
src/views/evaluation/personnel_evaluation_status/components/hidden_info.vue
View File

@ -22,9 +22,6 @@
<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>

4
src/views/evaluation/personnel_evaluation_status/components/hidden_list.vue
View File

@ -11,7 +11,6 @@
<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>
@ -98,9 +97,6 @@
<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="隐患描述"/>

2
src/views/hidden/commonly/commonly/components/Print.vue
View File

@ -18,7 +18,6 @@
<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="隐患描述"/>
@ -73,7 +72,6 @@
<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>

2
src/views/hidden/commonly/commonly/components/companiesList.vue
View File

@ -11,7 +11,6 @@
<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>
@ -159,7 +158,6 @@
<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="隐患描述"/>

3
src/views/hidden/commonly/commonly/components/info.vue
View File

@ -25,9 +25,6 @@
<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>

2
src/views/hidden/commonly/ignore/components/companiesList.vue
View File

@ -9,7 +9,6 @@
<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>
@ -118,7 +117,6 @@
<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>

3
src/views/hidden/commonly/ignore/components/info.vue
View File

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

2
src/views/hidden/commonly/special/components/companiesList.vue
View File

@ -9,7 +9,6 @@
<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>
@ -83,7 +82,6 @@
<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>

3
src/views/hidden/commonly/special/components/info.vue
View File

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

3
src/views/hidden/major/checkandaccept/components/detail.vue
View File

@ -20,9 +20,6 @@
<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>

4
src/views/hidden/major/checkandaccept/components/list.vue
View File

@ -107,7 +107,6 @@
<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" >
@ -182,8 +181,7 @@ export default {
varList: [],
hiddenSourceList: [ // 隐患来源 1-隐患快报 2-清单排查
{ value: '1', label: '隐患快报' },
{ value: '2', label: '清单排查' },
{ value: '8', label: '点检隐患' }
{ value: '2', label: '清单排查' }
],
statusList: [
{ ID: '14', NAME: '待验收' },

2
src/views/hidden/major/components/companiesList.vue
View File

@ -7,7 +7,6 @@
<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>
@ -140,7 +139,6 @@
<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>

3
src/views/hidden/major/components/info.vue
View File

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

2
src/views/hidden/major/corpmajornum/components/companiesList.vue
View File

@ -9,7 +9,6 @@
<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>
@ -67,7 +66,6 @@
<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="隐患发现人"/>

3
src/views/hidden/major/corpmajornum/components/info.vue
View File

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

3
src/views/hidden/major/corpverify/components/detail.vue
View File

@ -20,9 +20,6 @@
<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>

4
src/views/hidden/major/corpverify/components/list.vue
View File

@ -107,7 +107,6 @@
<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" >
@ -179,8 +178,7 @@ export default {
varList: [],
hiddenSourceList: [ // 隐患来源 1-隐患快报 2-清单排查
{ value: '1', label: '隐患快报' },
{ value: '2', label: '清单排查' },
{ value: '8', label: '点检隐患' }
{ value: '2', label: '清单排查' }
],
statusList: [
{ ID: '-2', NAME: '待确认' },

3
src/views/hidden/major/majormanagement/components/detail.vue
View File

@ -17,9 +17,6 @@
<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>

4
src/views/hidden/major/majormanagement/components/list.vue
View File

@ -106,7 +106,6 @@
<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" >
@ -182,8 +181,7 @@ export default {
varList: [],
hiddenSourceList: [ // 隐患来源 1-隐患快报 2-清单排查
{ value: '1', label: '隐患快报' },
{ value: '2', label: '清单排查' },
{ value: '8', label: '点检隐患' }
{ value: '2', label: '清单排查' }
],
statusList: [
{ ID: '13', NAME: '待整改' },

3
src/views/hidden/normal/components/info.vue
View File

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

3
src/views/hidden/normal/components/list.vue
View File

@ -72,9 +72,6 @@
<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="企业类型" />-->

3
src/views/hidden/zczb/components/hidden.vue
View File

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

3
src/views/hiddenUtil/information.vue
View File

@ -28,9 +28,6 @@
<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>

4
src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue
View File

@ -14,7 +14,6 @@
<!-- <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>
@ -112,9 +111,6 @@
<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="隐患描述"/>

4
src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue
View File

@ -9,7 +9,6 @@
<!-- <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>
@ -88,9 +87,6 @@
<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="隐患描述"/>

6
src/views/keyprojects/hidden/components/list.vue
View File

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

3
src/views/keyprojects/relevantunits/components/edit.vue
View File

@ -27,9 +27,6 @@
<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>

3
src/views/safetyenvironmental/archive/components/accept.vue
View File

@ -23,9 +23,6 @@
<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>

3
src/views/safetyenvironmental/assess/components/info.vue
View File

@ -14,9 +14,6 @@
<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>

3
static/qrcode/views/bsbw/part-detail.html
View File

@ -29,9 +29,6 @@
<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">

3
static/qrcode/views/fxfb/part-detail.html
View File

@ -29,9 +29,6 @@
<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">