feat:更新到线上环境，依据测试进行优化

2023-07-26 17:29:47 +08:00 · 2023-07-26 17:29:47 +08:00 · 405c549834
parent 64b7afc5a1
commit 405c549834
19 changed files with 448 additions and 372 deletions
--- a/.env.production
+++ b/.env.production
@ -1,4 +1,4 @@
-#生产环境
+#开发环境
 NODE_ENV:"production"
 # 页面标题
 VUE_APP_TITLE = 汉邦唐全真数字服务平台
@ -7,10 +7,13 @@ VUE_APP_GATEWAY_URL="/prod-api"
 # 服务地址
 VUE_APP_BASE_API_URL=""
 # 服务前-- 请严格遵守格式  不允许换行
-VUE_APP_SERVICE_PREFIX= '{"knowledge":"/knowledge","system":"/system"}'
+VUE_APP_SERVICE_PREFIX= '{"system":"/system","file":"/file","prevention":"/prevention","bpm":"/bpm"}'
 # 是否显示全部菜单
 VUE_APP_ALL_MENU = false
-# 微前端地址
+# # 微前端地址
+# VUE_APP_REMOTES_URL="http://192.168.1.20:8090"
+# # 当前应用部署地址
+# VUE_APP_EXPOSES_URL="http://192.168.1.20:8090"
 VUE_APP_REMOTES_URL="http://119.45.158.12/common/"
 # 当前应用部署地址
-VUE_APP_EXPOSES_URL=""
+VUE_APP_EXPOSES_URL="/prevention"
--- a/src/components/analEvaluation.component.vue
+++ b/src/components/analEvaluation.component.vue
@ -278,7 +278,7 @@ export default class AnalEvaluationComponent extends Vue {
            {
                name: "危害分析",
                key: "hazardAnalysis",
-                type: "text",
+                type: "textarea",
                require: true,
                width: "calc(100% - 20px)"
            },
--- a/src/components/measure.component.vue
+++ b/src/components/measure.component.vue
@ -31,8 +31,8 @@
            </TableComponent>
        </FormComponent>

-        <el-dialog :close-on-click-modal="false" :title="taskIsReadonly?'详情':taskUpdataParams.index?'编辑':'新增'" :visible.sync="showSubUpdate" width="952px"
-            :before-close="handleCloseTask">
+        <el-dialog :close-on-click-modal="false" :title="taskIsReadonly ? '详情' : taskUpdataParams.index ? '编辑' : '新增'"
+            :visible.sync="showSubUpdate" width="952px" :before-close="handleCloseTask">
            <FormComponent :options="taskUpdateOptions" :isReadonly="taskIsReadonly" labelWidth="110px" labelAlign="right"
                :data.sync="taskUpdataParams" :actions="subActions" :full-btn="true" btnPosition="center"
                @actionCallback="taskCallback" @change="taskSelectChange">
@ -127,15 +127,17 @@ export default class MeasureComponent extends Vue {
            width: "25%",
            datas: this.secondTypeItem
        }, {
+            name:"",
            key: "thirdType",
            type: "text",
            require: true,
            width: "25%",
+            showError: false,
        }, {

            name: "措施描述",
            key: "description",
-            type: "text",
+            type: "textarea",
            require: true,
            width: "100%"
        }];
@ -202,7 +204,7 @@ export default class MeasureComponent extends Vue {
        }, {
            name: "隐患排查任务",
            key: "name",
-            type: "text",
+            type: "textarea",
            width: "100%",
            require: true,
        }, {
--- a/src/service/jobHazard.service.ts
+++ b/src/service/jobHazard.service.ts
@ -44,4 +44,9 @@ export default class JobHazardService extends BaseService<any>{
            const url = this.prefix.prevention+'/job/inventory/filter/list';
            return this.post(url,params,{},true)
        }
+    //过滤区域单元
+    public getDistinctList(params: any):Promise<AxiosResponse<ActionResult<any>>>{
+        const url = this.prefix.prevention+'/job/inventory/getDistinctList';
+        return this.post(url,params)
+    }
 }
--- a/src/views/hiddenDanger/safe/plan.component.vue
+++ b/src/views/hiddenDanger/safe/plan.component.vue
@ -197,24 +197,31 @@ export default class PlanComponent extends BaseRecordComponent<any> {
            showError: false,
            datas: this.$store.state.prevention_danger_check_type
        }, {
-            name: "巡检周期",
+            name: "巡检周期 每隔",
            key: "inspectCycleValue",
            type: "number",
            hide: this.updateParams.planType === 1,
-            controls: false,
-            width: "calc(50% - 20px)",
+            controls: true,
+            width: "calc(35% - 20px)",
            require: true,
            showError: false,
        }, {
-            name: "巡检周期单位",
+            // name: "巡检周期单位",
            key: "inspectCycleUnit",
            format: "inspectCycleUnitName",
            type: "select",
            hide: this.updateParams.planType === 1,
-            width: "calc(50% - 20px)",
+            width: "calc(15% - 20px)",
            require: true,
            showError: false,
            datas: this.$store.state.prevention_cycle_unit
+        }, {
+            name: "1次",
+            key: "times",
+            type: 'null',
+            labelWidth:"0px",
+            // width: "30px",
+            hide: this.updateParams.planType === 1,
        },{
            name: "检查区域",
            key: "areaIds",
@ -345,9 +352,9 @@ export default class PlanComponent extends BaseRecordComponent<any> {


    public buildTable() {
-        this.tableColumn.push({ name: '检查标题', key: "name", width: "100px" });
+        this.tableColumn.push({ name: '检查标题', key: "name", width: "250px" });
        this.tableColumn.push({
-            name: '检查类型', width: "100px", render: (data) => {
+            name: '检查类型', render: (data) => {
                return this.$store.getters.prevention_danger_check_type_map[data.inspectType]
            }
        });
@ -356,9 +363,9 @@ export default class PlanComponent extends BaseRecordComponent<any> {
                return data.startTime + (data.endTime ? '~' + data.endTime : "")
            }
        });
-        this.tableColumn.push({ name: '检查负责人', key: "chargeUserName", width: "100px" });
-        this.tableColumn.push({ name: '检查范围', width: "270px", key: "scope" });
-        this.tableColumn.push({ name: '发现隐患数量', key: "dangerCount", width: "120px" });
+        this.tableColumn.push({ name: '检查负责人', key: "chargeUserName",});
+        this.tableColumn.push({ name: '检查范围', key: "scope" });
+        this.tableColumn.push({ name: '发现隐患数量', key: "dangerCount",});
        this.tableColumn.push({
            name: '检查类型', render: (data) => {
                return this.planTypeMap[data.planType]
--- a/src/views/reward/rewardsRecord/rewardsRecord.component.vue
+++ b/src/views/reward/rewardsRecord/rewardsRecord.component.vue
@ -156,7 +156,7 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
            name: "岗位:",
            type: "text",
            key: "postName",
-            require: true,
+            // require: true,
            width: "calc(50% - 20px)",
            showError: false,
            disable: true,
@ -188,7 +188,7 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
            showError: false,
            datas: this.rewardsType
        }, {
-            name: "发生金额/¥",
+            name: "发生金额/元",
            type: "number",
            key: "money",
            require: true,
@ -244,12 +244,16 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
        if (item && item.key === 'userId') {
            this.userService.getDetailsByIds({ userId: data }).then((res: any) => {
                if (res.code === 200) {
-                    const postName = res.posts.map((item) => item.postName).join(",")
+                    const postName = res.postIds.map((item) => {
+                        if (item) {
+                            return this.$store.getters.post_map[item]
+                        }
+                    }
+                    ).join(",")
                    this.updateParams.userName = res.data.nickName
                    this.updateParams.postName = postName
                    this.buildUpdateForm()
                }
-
            })
        }
    }
@ -282,7 +286,7 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
            }
        });
        this.subTableColumn.push({ name: '事由', key: "reason", });
-        this.subTableColumn.push({ name: '发生金额/¥', key: "money" });
+        this.subTableColumn.push({ name: '发生金额/元', key: "money" });
        this.subTableColumn.push({ name: '实施人', key: "operatorName", });
        this.subTableColumn.push({ name: '实施部门', key: "operateDeptName", });
    }
--- a/src/views/reward/selfAssessment/selfAssessment.component.html
+++ b/src/views/reward/selfAssessment/selfAssessment.component.html
@ -107,7 +107,7 @@
                                    v-if="scope.row.recordFlag" @blur="inputClick(scope.row)" v-focus></el-input>
                                <span
                                    style="font-size: 14px;font-weight: 400;color: rgba(0,0,0,0.3) ;line-height: 20px;"
-                                    v-if="!scope.row.recordFlag && !scope.row.record">{{'点击输入评估记录'}}</span>
+                                    v-if="!scope.row.recordFlag && !scope.row.record">{{isReadonly?'--': '点击输入评估记录'}}</span>
                                <span v-if="!scope.row.recordFlag &&scope.row.record ">
                                    {{scope.row.record}}
                                </span>
--- a/src/views/reward/selfAssessment/selfAssessment.component.vue
+++ b/src/views/reward/selfAssessment/selfAssessment.component.vue
@ -188,10 +188,6 @@ export default class SelfAssessment extends BaseRecordComponent<any> {
    public updateActions = [{
        name: "取消",
        value: "cancel"
-    }, {
-        name: "保存并继续添加",
-        value: "saveAndContinue",
-        type: "primary"
    },{
        name: "保存",
        value: "save",
--- a/src/views/risk/area/area.component.vue
+++ b/src/views/risk/area/area.component.vue
@ -170,6 +170,7 @@ export default class AreaManagerComponent extends BaseRecordComponent<any> {
        }, {
            name: "重大危险源等级",
            key: "majorHazardLevel",
+            format: "majorHazardLevelName",
            type: "select",
            hide: !this.updateParams.majorHazardFlag,
            width: "calc(50% - 20px)",
@ -275,10 +276,13 @@ export default class AreaManagerComponent extends BaseRecordComponent<any> {
        this.tableColumn.push({ name: '区域名称', key: "name" });
        this.tableColumn.push({ name: '责任部门', key: "chargeDeptName" });
        this.tableColumn.push({ name: '责任人', key: "chargeUserName" });
-        this.tableColumn.push({name:'是否属于重大危险源',key:"majorHazardFlag",render:(data)=>{
+        this.tableColumn.push({
+            name: '是否属于重大危险源', key: "majorHazardFlag", render: (data) => {
                return this.$store.getters.common_yes_no_map[data.majorHazardFlag]
-        }});
-        this.tableColumn.push({name:'绘制情况',filters:this.filters,filterMethod:(data,row)=>{
+            }
+        });
+        this.tableColumn.push({
+            name: '绘制情况', filters: this.filters, filterMethod: (data, row) => {
                if (data) {
                    return row.geoJson && row.geoJson !== "[]"
                } else {
@ -288,9 +292,10 @@ export default class AreaManagerComponent extends BaseRecordComponent<any> {
                if (data.geoJson === '[]' || !data.geoJson) {
                    return "<span class='noDraw'>未绘制</span>"
                } else {
-                return "<span>已绘制</span>"
+                    return "<span class='color_1'>已绘制</span>"
                }
-        }});
+            }
+        });
    }

    public doDraw() {
@ -393,7 +398,7 @@ export default class AreaManagerComponent extends BaseRecordComponent<any> {
            this.getCreateNumber();
        } else {
            this.currentId = data.id;
-            this.updateParams = Object.assign({bottomHeight:0,topHeight:0,geoJson:"[]",majorHazardFlagName:this.$store.getters.common_yes_no_map[data.majorHazardFlag]},data);
+            this.updateParams = Object.assign({ bottomHeight: 0, topHeight: 0, geoJson: "[]", majorHazardFlagName: this.$store.getters.common_yes_no_map[data.majorHazardFlag], majorHazardLevelName: this.levelName(data.majorHazardLevel) }, data);

            this.isReadonly = !!isRead;
            this.buildFormOptions();
@ -401,6 +406,20 @@ export default class AreaManagerComponent extends BaseRecordComponent<any> {
        }
    }

+    public levelName(type) {
+        if (type === 1) {
+            return "一级"
+        } else if (type === 2) {
+            return "二级"
+        } else if (type === 3) {
+            return "三级"
+        } else if (type === 4) {
+            return "四级"
+        } else if (type === 5) {
+            return "不涉及级"
+        }
+    }
+
    public handleClose() {
        this.showUpdate = false;
        this.currentId = -1;
--- a/src/views/risk/assessment/device/device.component.html
+++ b/src/views/risk/assessment/device/device.component.html
@ -22,11 +22,11 @@
                        </template>
                    </el-table-column>
                    <template v-for="item in tableColumn">
-                        <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key">
+                        <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key"  :show-overflow-tooltip="item.showTip">
                            <div slot-scope="scope" v-html="item.render(scope.row)" @click="showPros($event,scope.row)">
                            </div>
                        </el-table-column>
-                        <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key">
+                        <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key"  :show-overflow-tooltip="item.showTip">
                        </el-table-column>
                    </template>
                    <el-table-column label="操作" fixed="right" width="150">
--- a/src/views/risk/assessment/device/device.component.vue
+++ b/src/views/risk/assessment/device/device.component.vue
@ -291,7 +291,7 @@ export default class DeviceManagerComponent extends BaseRecordComponent<any> {
    public buildTable() {
        this.tableColumn.push({ name: '区域名称', key: "areaName", width: "200px" });
        this.tableColumn.push({ name: '风险分析单元', key: "unitName", width: "200px" });
-        this.tableColumn.push({ name: '设备名称', key: "name" });
+        this.tableColumn.push({ name: '设备名称', key: "name",width:"250px",showTip: true, });
        this.tableColumn.push({
            name: '设备类别', key: "type", render: (data) => {
                if (data.type) {
--- a/src/views/risk/assessment/device/deviceAnal.component.html
+++ b/src/views/risk/assessment/device/deviceAnal.component.html
@ -46,7 +46,7 @@
    </div>

    <el-dialog :close-on-click-modal="false" :title="!updateParams.id?'新增':isReadonly?'详情':'编辑'"
-        :visible.sync="showUpdate" width="952px" :before-close="handleClose"  destroy-on-close>
+        :visible.sync="showUpdate" width="1080px" :before-close="handleClose"  destroy-on-close>
        <FormComponent :options="updateOptions" labelWidth="110px" labelAlign="right" :labelWidth="labelWidth" :data.sync="updateParams"
            :isReadonly="isReadonly" @actionCallback="callback" @change="changes">
            <div class="sub-title">安全检查表分析法</div>
--- a/src/views/risk/assessment/device/deviceAnal.component.vue
+++ b/src/views/risk/assessment/device/deviceAnal.component.vue
@ -748,11 +748,9 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
            if (!data) {
                data = []
            }
-            if (data.length > 0 && data.includes(0)) {
-                data = []
-                this.updateParams.majorSign = []
-                data.push(0)
-                this.updateParams.majorSign.push(0)
+            if (this.updateParams.majorSign.includes(0)) {
+                this.updateParams.majorSign = this.updateParams.majorSign.filter(item => item === 0)
+                data = this.updateParams.majorSign.filter(item => item === 0)
            }
        }
        this.buildUpdateForm()
@ -812,10 +810,14 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
            this.tableService.selectById(this.currentId).then((res: any) => {
                if (isReadonly) {
                    const areaAnalRiskLevel = this.areaList.filter((item) => item.value === res.data.areaId)[0]['analRiskLevel']
+                    const majorHazard = res.data.majorHazard ? parseInt(res.data.majorHazard) : null
+                    const regulatoryProcess = res.data.regulatoryProcess ? parseInt(res.data.regulatoryProcess) : null
+                    const regulatoryChemical = res.data.regulatoryChemical ? parseInt(res.data.regulatoryChemical) : null
+
                    this.updateParams = Object.assign({
-                        majorHazardName: !res.data.majorHazard ? null : res.data.majorHazard.split(",").map(item => this.sourceMap[item]).join(","),
-                        regulatoryProcessName: !res.data.regulatoryProcess ? null : res.data.regulatoryProcess.split(",").map(item => this.craftMap[item]).join(","),
-                        regulatoryChemicalName: !res.data.regulatoryChemical ? null : res.data.regulatoryChemical.split(",").map(item => this.chemicaltMap[item]).join(","),
+                        majorHazardName: majorHazard || majorHazard === 0 ? this.sourceMap[majorHazard] : null,
+                        regulatoryProcessName: regulatoryProcess || regulatoryProcess === 0 ? this.craftMap[regulatoryProcess] : null,
+                        regulatoryChemicalName: regulatoryChemical || regulatoryChemical === 0 ? this.chemicaltMap[regulatoryChemical] : null,
                        majorSignName: !res.data.majorSign ? null : res.data.majorSign.split(",").map(item => this.$store.getters.prevention_majorsign_map[item]).join(","),
                        riskLevelName: this.$store.getters.prevention_risk_level_map[res.data.riskLevel],
                        remainRiskLevelName: this.$store.getters.prevention_risk_level_map[res.data.remainRiskLevel],
@ -836,9 +838,9 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
                    this.isModifyonly = true
                    this.updateParams = res.data;
                    this.updateParams.majorSign = res.data.majorSign ? this.stringChangeArray(res.data.majorSign) : []
-                    this.updateParams.majorHazard = this.stringChangeArray(res.data.majorHazard)
-                    this.updateParams.regulatoryProcess = this.stringChangeArray(res.data.regulatoryProcess)
-                    this.updateParams.regulatoryChemical = this.stringChangeArray(res.data.regulatoryChemical)
+                    this.updateParams.majorHazard = res.data.majorHazard ? parseInt(res.data.majorHazard) : null
+                    this.updateParams.regulatoryProcess = res.data.regulatoryProcess ? parseInt(res.data.regulatoryProcess) : null
+                    this.updateParams.regulatoryChemical = res.data.regulatoryChemical ? parseInt(res.data.regulatoryChemical) : null
                    const areaAnalRiskLevel = this.areaList.filter((item) => item.value === res.data.areaId)[0]['analRiskLevel']
                    this.updateParams.analRiskLevel = areaAnalRiskLevel
                    this.loadUnitData(res.data.areaId)
@ -863,9 +865,9 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
    public doSave(goOn?) {
        // 如果是新增工作危害分析清单
        this.updateParams.majorSign = this.arrayChangeString(this.updateParams.majorSign)
-        this.updateParams.regulatoryProcess = this.arrayChangeString(this.updateParams.regulatoryProcess)
-        this.updateParams.regulatoryChemical = this.arrayChangeString(this.updateParams.regulatoryChemical)
-        this.updateParams.majorHazard = this.arrayChangeString(this.updateParams.majorHazard)
+        this.updateParams.regulatoryProcess = this.numberChangeString(this.updateParams.regulatoryProcess)
+        this.updateParams.regulatoryChemical = this.numberChangeString(this.updateParams.regulatoryChemical)
+        this.updateParams.majorHazard = this.numberChangeString(this.updateParams.majorHazard)
        this.updateParams.safetyFactor = this.arrayChangeString(this.updateParams.safetyFactor)
        if (!this.updateParams.id) {
            if (this.updateParams.steps && this.updateParams.steps.length > 0) {
@ -885,9 +887,9 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
    public doSaveDraft() {
        // 如果是新增工作危害分析清单
        this.updateParams.majorSign = this.arrayChangeString(this.updateParams.majorSign)
-        this.updateParams.regulatoryProcess = this.arrayChangeString(this.updateParams.regulatoryProcess)
-        this.updateParams.regulatoryChemical = this.arrayChangeString(this.updateParams.regulatoryChemical)
-        this.updateParams.majorHazard = this.arrayChangeString(this.updateParams.majorHazard)
+        this.updateParams.regulatoryProcess = this.numberChangeString(this.updateParams.regulatoryProcess)
+        this.updateParams.regulatoryChemical = this.numberChangeString(this.updateParams.regulatoryChemical)
+        this.updateParams.majorHazard = this.numberChangeString(this.updateParams.majorHazard)
        this.updateParams.safetyFactor = this.arrayChangeString(this.updateParams.safetyFactor)
        if (this.updateParams.steps && this.updateParams.steps.length > 0) {
            this.updateParams.items = this.updateParams.steps
@ -994,6 +996,16 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
            return data.split(",").map((item) => parseInt(item))
        }
    }
+
+    //数字转字符串
+    public numberChangeString(data) {
+        if (data || data === 0) {
+            return data.toString()
+        } else {
+            return null
+        }
+    }
+
 }
 </script>
 <style lang="scss" scoped src="../../../common.component.scss"></style>
--- a/src/views/risk/assessment/work/work.component.vue
+++ b/src/views/risk/assessment/work/work.component.vue
@ -97,6 +97,7 @@ export default class WorkManagerComponent extends BaseRecordComponent<any> {
    public updateParams = {
        identifyTime: moment().format('YYYY-MM-DD'),
        identifyUserId: this.account.userId,
+        steps: [],
    } as any;

    public selectData = [];
@ -482,7 +483,10 @@ export default class WorkManagerComponent extends BaseRecordComponent<any> {
            this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功！");
            this.updateParams = {
                postCode: [],
-                safetyFactor: []
+                safetyFactor: [],
+                identifyTime: moment().format('YYYY-MM-DD'),
+                identifyUserId: this.account.userId,
+                steps: []
            } as any
            this.showUpdate = !!goOn;
            this.getTableData();
--- a/src/views/risk/assessment/work/workAnal.component.html
+++ b/src/views/risk/assessment/work/workAnal.component.html
@ -46,7 +46,7 @@
    </div>

    <el-dialog :close-on-click-modal="false" :title="!updateParams.id?'新增':isReadonly?'详情':'编辑'"
-        :visible.sync="showUpdate" width="952px" :before-close="handleClose"  destroy-on-close>
+        :visible.sync="showUpdate" width="1080px" :before-close="handleClose"  destroy-on-close>
        <FormComponent :options="updateOptions" labelWidth="110px" labelAlign="right" :labelWidth="labelWidth" :data.sync="updateParams"
            :isReadonly="isReadonly" @actionCallback="callback" @change="changes">
            <div class="sub-title">工作危害分析法</div>
@ -97,7 +97,7 @@
    </el-dialog>
    <!-- 检查项目 -->
    <el-dialog :close-on-click-modal="false" title="作业步骤" :show-close="false" :visible.sync="showProtable"
-        width="940px"  destroy-on-close>
+        width="940px">
        <FormComponent labelWidth="110px" labelAlign="right" :actions="proActions" @actionCallback="proCallback"
            :full-btn="true" btnPosition="center">
            <TableComponent :tableData="currentProTableData" :tableColumn="proTableColumn" :showFooter="false"
--- a/src/views/risk/assessment/work/workAnal.component.vue
+++ b/src/views/risk/assessment/work/workAnal.component.vue
@ -266,54 +266,57 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
            labelWidth: "140px",
            width: "calc(100% - 20px)",
            require: true,
+            showError: false,
            datas: [{
                name: "不涉及",
-                disable: false,
                value: 0
            }, {
                name: "重大危险源",
-                disable: this.updateParams.majorSign.includes(0),
+                disable: this.updateParams.majorSign && this.updateParams.majorSign.includes(0),
                value: 1
            }, {
                name: "重大监管化工工艺",
-                disable: this.updateParams.majorSign.includes(0),
+                disable: this.updateParams.majorSign && this.updateParams.majorSign.includes(0),
                value: 2
            }, {
                name: "重点监管危化品",
-                disable: this.updateParams.majorSign.includes(0),
+                disable: this.updateParams.majorSign && this.updateParams.majorSign.includes(0),
                value: 3
            }],
        }, {
            name: "重大危险源",
            key: "majorHazard",
-            hide: !this.updateParams.majorSign || this.updateParams.majorSign.length === 0 || (!this.updateParams.majorSign.includes(1) || this.updateParams.majorSign.includes(0)),
+            hide: (!this.updateParams.majorSign) || (this.updateParams.majorSign && (this.updateParams.majorSign.length === 0 || !this.updateParams.majorSign.includes(1) || this.updateParams.majorSign.includes(0))),
            type: "select",
            format: "majorHazardName",
            width: "calc(50% - 20px)",
            require: true,
            // multiple: true,
-            datas: this.dictData.source
+            datas: this.dictData.source,
+            showError: false,

        }, {
            name: "重点监管工艺",
            key: "regulatoryProcess",
            format: "regulatoryProcessName",
-            hide: !this.updateParams.majorSign || this.updateParams.majorSign.length === 0 || !this.updateParams.majorSign.includes(2) || this.updateParams.majorSign.includes(0),
+            hide: (!this.updateParams.majorSign) || (this.updateParams.majorSign && (this.updateParams.majorSign.length === 0 || !this.updateParams.majorSign.includes(2) || this.updateParams.majorSign.includes(0))),
            type: "select",
            width: "calc(50% - 20px)",
            require: true,
            // multiple: true,
            datas: this.dictData.craft,
+            showError: false,
        }, {
            name: "重点监管化学品",
            key: "regulatoryChemical",
            format: "regulatoryChemicalName",
-            hide: !this.updateParams.majorSign || this.updateParams.majorSign.length === 0 || !this.updateParams.majorSign.includes(3) || this.updateParams.majorSign.includes(0),
+            hide: (!this.updateParams.majorSign) || (this.updateParams.majorSign && (this.updateParams.majorSign.length === 0 || !this.updateParams.majorSign.includes(3) || this.updateParams.majorSign.includes(0))),
            type: "select",
            width: "calc(50% - 20px)",
            require: true,
            // multiple: true,
            datas: this.dictData.chemical,
+            showError: false,
        }];

        this.subTableActions = [{
@ -335,6 +338,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
            require: true,
            width: "calc(50% - 20px)",
            disable: true,
+            showError: false,
            datas: this.$store.state.prevention_risk_level
        }, {
            name: "残余风险等级",
@ -344,6 +348,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
            require: true,
            width: "calc(50% - 20px)",
            disable: true,
+            showError: false,
            datas: this.$store.state.prevention_risk_level
        }]
    }
@ -417,11 +422,11 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
    public loadAreaData() {
        this.unitList = [];
        this.jobList = [];
-        this.areaService.selectByPage({ pageSize: 1000 }).then((res: any) => {
-            this.areaList = res.data.datas.map(item => {
+        this.tableService.getDistinctList({}).then((res: any) => {
+            this.areaList = res.data.map(item => {
                return {
-                    name: item.name,
-                    value: item.id,
+                    name: item.areaName,
+                    value: item.areaId,
                    analRiskLevel: item.analRiskLevel ? item.analRiskLevel : null,
                }
            });
@ -430,14 +435,14 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
    }
    // 加载单元列表
    public loadUnitData(id?) {
-        this.unitService.selectByPage({ pageSize: 1000, areaId: id }, false).then((res: any) => {
-            this.unitList = res.data.datas.map(item => {
+        this.tableService.getDistinctList({ areaId: id }).then((res: any) => {
+            this.unitList = res.data.map(item => {
                return {
-                    name: item.name,
-                    value: item.id,
+                    name: item.unitName,
+                    value: item.unitId,
                    deptId: item.chargeDeptId,
-                    userId: item.chargeUserId,
                    deptName: item.chargeDeptName,
+                    userId: item.chargeUserId,
                    userName: item.chargeUserName,
                }
            });
@ -742,11 +747,9 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
            if (!data) {
                data = []
            }
-            if (data.includes(0)) {
-                data = []
-                this.updateParams.majorSign = []
-                data.push(0)
-                this.updateParams.majorSign.push(0)
+            if (this.updateParams.majorSign.includes(0)) {
+                this.updateParams.majorSign = this.updateParams.majorSign.filter(item => item === 0)
+                data = this.updateParams.majorSign.filter(item => item === 0)
            }

        }
@ -796,10 +799,13 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
            this.tableService.selectById(this.currentId).then((res: any) => {
                if (isReadonly) {
                    const areaAnalRiskLevel = this.areaList.filter((item) => item.value === res.data.areaId)[0]['analRiskLevel']
+                    const majorHazard = res.data.majorHazard ? parseInt(res.data.majorHazard) : null
+                    const regulatoryProcess = res.data.regulatoryProcess ? parseInt(res.data.regulatoryProcess) : null
+                    const regulatoryChemical = res.data.regulatoryChemical ? parseInt(res.data.regulatoryChemical) : null
                    this.updateParams = Object.assign({
-                        majorHazardName: !res.data.majorHazard ? null : res.data.majorHazard.split(",").map(item => this.sourceMap[item]).join(","),
-                        regulatoryProcessName: !res.data.regulatoryProcess ? null : res.data.regulatoryProcess.split(",").map(item => this.craftMap[item]).join(","),
-                        regulatoryChemicalName: !res.data.regulatoryChemical ? null : res.data.regulatoryChemical.split(",").map(item => this.chemicaltMap[item]).join(","),
+                        majorHazardName: majorHazard || majorHazard === 0 ? this.sourceMap[majorHazard] : null,
+                        regulatoryProcessName: regulatoryProcess || regulatoryProcess === 0 ? this.craftMap[regulatoryProcess] : null,
+                        regulatoryChemicalName: regulatoryChemical || regulatoryChemical === 0 ? this.chemicaltMap[regulatoryChemical] : null,
                        majorSignName: !res.data.majorSign ? null : res.data.majorSign.split(",").map(item => this.$store.getters.prevention_majorsign_map[item]).join(","),
                        riskLevelName: this.$store.getters.prevention_risk_level_map[res.data.riskLevel],
                        remainRiskLevelName: this.$store.getters.prevention_risk_level_map[res.data.remainRiskLevel],
@ -821,9 +827,9 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
                    this.isModifyonly = true
                    this.updateParams = res.data;
                    this.updateParams.majorSign = res.data.majorSign ? this.stringChangeArray(res.data.majorSign) : []
-                    this.updateParams.majorHazard = this.stringChangeArray(res.data.majorHazard)
-                    this.updateParams.regulatoryProcess = this.stringChangeArray(res.data.regulatoryProcess)
-                    this.updateParams.regulatoryChemical = this.stringChangeArray(res.data.regulatoryChemical)
+                    this.updateParams.majorHazard = res.data.majorHazard ? parseInt(res.data.majorHazard) : null
+                    this.updateParams.regulatoryProcess = res.data.regulatoryProcess ? parseInt(res.data.regulatoryProcess) : null
+                    this.updateParams.regulatoryChemical = res.data.regulatoryChemical ? parseInt(res.data.regulatoryChemical) : null
                    const areaAnalRiskLevel = this.areaList.filter((item) => item.value === res.data.areaId)[0]['analRiskLevel']
                    this.updateParams.analRiskLevel = areaAnalRiskLevel
                    this.loadUnitData(res.data.areaId)
@ -852,9 +858,9 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
    public doSave(goOn?) {
        // 如果是新增工作危害分析清单
        this.updateParams.majorSign = this.arrayChangeString(this.updateParams.majorSign)
-        this.updateParams.regulatoryProcess = this.arrayChangeString(this.updateParams.regulatoryProcess)
-        this.updateParams.regulatoryChemical = this.arrayChangeString(this.updateParams.regulatoryChemical)
-        this.updateParams.majorHazard = this.arrayChangeString(this.updateParams.majorHazard)
+        this.updateParams.regulatoryProcess = this.numberChangeString(this.updateParams.regulatoryProcess)
+        this.updateParams.regulatoryChemical = this.numberChangeString(this.updateParams.regulatoryChemical)
+        this.updateParams.majorHazard = this.numberChangeString(this.updateParams.majorHazard)
        this.updateParams.safetyFactor = this.arrayChangeString(this.updateParams.safetyFactor)
        this.tableService.addOrUpdate(this.updateParams, !this.updateParams.id || this.updateParams.status === 1 ? true : false).then((res) => {
            this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功！");
@ -866,9 +872,9 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
    public doSaveDraft() {
        // 如果是新增工作危害分析清单
        this.updateParams.majorSign = this.arrayChangeString(this.updateParams.majorSign)
-        this.updateParams.regulatoryProcess = this.arrayChangeString(this.updateParams.regulatoryProcess)
-        this.updateParams.regulatoryChemical = this.arrayChangeString(this.updateParams.regulatoryChemical)
-        this.updateParams.majorHazard = this.arrayChangeString(this.updateParams.majorHazard)
+        this.updateParams.regulatoryProcess = this.numberChangeString(this.updateParams.regulatoryProcess)
+        this.updateParams.regulatoryChemical = this.numberChangeString(this.updateParams.regulatoryChemical)
+        this.updateParams.majorHazard = this.numberChangeString(this.updateParams.majorHazard)
        this.updateParams.safetyFactor = this.arrayChangeString(this.updateParams.safetyFactor)
        this.tableService.addOrDraft(this.updateParams, !this.updateParams.id).then((res) => {
            this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功！");
@ -969,6 +975,16 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
            return data.split(",").map((item) => parseInt(item))
        }
    }
+
+    //数字转字符串
+    public numberChangeString(data) {
+        if (data || data === 0) {
+            return data.toString()
+        } else {
+            return null
+        }
+    }
+
 }
 </script>
 <style lang="scss" scoped src="../../../common.component.scss"></style>
--- a/src/views/risk/duty/dutyRecords.component.vue
+++ b/src/views/risk/duty/dutyRecords.component.vue
@ -219,9 +219,9 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent<any
        this.tableColumn.push({ name: '排查时间', key: "checkTime" });
        this.tableColumn.push({
            name: '是否为隐患', key: "dangerFlag", render: (data) => {
-                if (data.status == 1) {
+                if (data.dangerFlag == 1) {
                    return "<span class='noDraw'>是</span>"
-                } else if (data.status == 0) {
+                } else if (data.dangerFlag == 0) {
                    return "<span>否</span>"
                }
            }
@ -361,7 +361,7 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent<any
        this.updateParams = Object.assign({
            insuranceDutyFlagName: row.insuranceDutyFlag === 0 ? '否' : '是',
            resultName: row.result === 1 ? '正常' : '异常',
-            dangerFlagName: row.dangerFlag === 0 ? '否' : '是',
+            dangerFlagName: row.dangerFlag === 0 ? '否' : row.dangerFlag === 1 ? '是' : null,
            taskTypeName: this.$store.getters.prevention_hazard_category_map[row.dangerType],
            checkUserName: this.$store.getters.user_map[row.checkUserId]
        }, row)
--- a/src/views/threecards/emergencyCard.component.vue
+++ b/src/views/threecards/emergencyCard.component.vue
@ -248,9 +248,9 @@ export default class EmergencyCard extends BaseRecordComponent<any> {
            require: true,
            width: "calc(50% - 20px)",
            showError: false,
-            rules: [
-                { pattern: /^1[3|5|7|8|9]\d{9}$/, message: '请输入正确的号码格式', }
-            ]
+            // rules: [
+            //     { pattern: /^1[3|5|7|8|9]\d{9}$/, message: '请输入正确的号码格式', }
+            // ]
        },
        {
            name: "应急联络方式",
@ -259,9 +259,9 @@ export default class EmergencyCard extends BaseRecordComponent<any> {
            require: true,
            width: "calc(50% - 20px)",
            showError: false,
-            rules: [
-                { pattern: /^1[3|5|7|8|9]\d{9}$/, message: '请输入正确的号码格式', }
-            ]
+            // rules: [
+            //     { pattern: /^1[3|5|7|8|9]\d{9}$/, message: '请输入正确的号码格式', }
+            // ]
        },
        {
            name: "附件",
--- a/src/views/workprogress/trainRecords.component.vue
+++ b/src/views/workprogress/trainRecords.component.vue
@ -276,6 +276,7 @@ export default class TrainRecords extends BaseRecordComponent<any> {
            require: true,
            width: "calc(50% - 20px)",
            showError: false,
+            hide: !(this.subUpdateParams.examStatus === 1)
        },]
    }

@ -345,6 +346,13 @@ export default class TrainRecords extends BaseRecordComponent<any> {
                this.updateParams.endTime = null
            }
        }
+
+        if (item && item.key === "examStatus") {
+            if (data === 0) {
+                this.subUpdateParams.score = null
+            }
+            this.buildSubForm()
+        }
    }

    public callback(data, type) {