fit:修复bug

src/components/analEvaluation.component.vue

@@ -1153,7 +1153,7 @@ export default class AnalEvaluationComponent extends Vue {
 
         }
     }
-    //整理数据
+
     public collationAnalysisDataMethod() {
         this.analysisUpdateParams.measuresNum = this.analysisUpdateParams.measures.length;
         this.analysisUpdateParams.seriousResult = this.analysisUpdateParams.seriousResult.join(",");

src/components/draw.component.vue

@@ -11,7 +11,7 @@
             <div class="update-box">
                 <div class="form-box">
                     <FormComponent v-if="viewModel!=='list'" labelWidth="56px" :isReadonly="isReadonly" :fullBtn="true" :btnPosition="'center'" @change="change" :data.sync="updateParams" @actionCallback="callback" :options="options" :actions="actions"></FormComponent>
-                    <FormComponent v-else labelWidth="56px" @change="change" :data.sync="listParams" :options="listForm" ></FormComponent>
+                    <FormComponent v-else labelWidth="56px" @input="change" :data.sync="listParams" :options="listForm" ></FormComponent>
                 </div>
                 <div class="tree-box" v-if="viewModel==='list'">
                     <el-tree :data="treeData" :props="{children:'children',label:'name'}" :expand-on-click-node="false" default-expand-all highlight-current 

src/components/map.component.vue

@@ -18,7 +18,7 @@ export default class MapComponent extends Vue {
     @PropSync("position",{
         required:false,
         default:()=>{
-            return [118.751353,31.969568]
+            return [119.592977,34.523847]
         }
     })
     center:number[]

src/global.d.ts

@@ -2,4 +2,5 @@
 declare module 'common/notFound';
 declare module 'common/index';
 declare module 'common/layout';
+declare module 'common/login';
 declare module 'file-saver'

src/router/index.ts

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import VueRouter, { RouteConfig } from 'vue-router'
 import pageNoFoundComponent from 'common/notFound'
 import indexComponent from 'common/index'
+import LoginComponent from 'common/login'
 import LayoutComponent from "common/layout"
 import HomeComponent from '@/views/home/home.component.vue'
 import BlankComponent from "@/views/blank.component.vue"
@@ -316,6 +317,11 @@ const routes: Array<RouteConfig> = [
     name: 'index',
     component:indexComponent
   },
+  {
+    path: '/login',
+    name: 'login',
+    component:LoginComponent
+  },
   {
     path: '*',
     name: '404',

src/service/unit.service.ts

@@ -36,6 +36,12 @@ export default class UnitService extends BaseService<any>{
         return this.post(url,params,{},showLoading)
     }
 
+    //获取单元详情
+    public getUnitDetail(params):Promise<AxiosResponse<ActionResult<any>>>{
+        const url = this.prefix.prevention+'/risk/unit/repairList';
+        return this.get(url,params)
+    }
+
 
     // 新增或更新
     public addOrUpdate(params: any, add: boolean,showLoading?:boolean): Promise<AxiosResponse<ActionResult<any>>>{

src/views/common.component.scss

@@ -195,7 +195,7 @@
     color: #F56C6C;
     margin-left: -43px;
     margin-bottom: 20px;
-    margin-top: -20px;
+    margin-top: -10px;
     font-size: 20px;
     scale:0.5;
 }

src/views/hiddenDanger/rules/rules.component.html

@@ -5,8 +5,8 @@
                 :full-btn="false" @change="change" btn-position="end"></FormComponent>
         </div>
         <div class="table-box flex-1">
-            <TableComponent :tableData="tableData" :tableColumn="tableColumn"
+            <TableComponent :tableData="tableData" :tableColumn="tableColumn" @actionCallback="callback($event)"
-                @actionCallback="callback($event)" @pageNumberChange="callback($event,'pageNum')" @pageSizeChange="callback($event,'pageSize')"
+                @pageNumberChange="callback($event,'pageNum')" @pageSizeChange="callback($event,'pageSize')"
                 :footerActions="footerActions" :actions="tableActions">
 
                 <el-table ref="multipleTable" :data="tableData.datas" tooltip-effect="dark" height="100%" border
@@ -19,12 +19,14 @@
                         </template>
                     </el-table-column>
                     <template v-for="item in tableColumn">
-                        <el-table-column v-if="item.render" :show-overflow-tooltip="item.showTip" :filters="item.filters"
+                        <el-table-column v-if="item.render" :show-overflow-tooltip="item.showTip"
-                        :filter-method="item.filterMethod"  :label="item.name" :width="item.width" :key="item.key">
+                            :filters="item.filters" :filter-method="item.filterMethod" :label="item.name"
+                            :width="item.width" :key="item.key">
                             <div slot-scope="scope" v-html="item.render(scope.row)"></div>
                         </el-table-column>
                         <el-table-column v-else :prop="item.key" :filters="item.filters"
-                        :filter-method="item.filterMethod"  :show-overflow-tooltip="item.showTip" :label="item.name" :width="item.width" :key="item.key">
+                            :filter-method="item.filterMethod" :show-overflow-tooltip="item.showTip" :label="item.name"
+                            :width="item.width" :key="item.key">
                         </el-table-column>
                     </template>
                     <el-table-column label="操作" fixed="right" width="200">
@@ -40,28 +42,28 @@
         </div>
     </div>
 
-    <el-dialog  :close-on-click-modal="false" :title="currentId===-1?'新增':isReadonly?'详情':'编辑'" :visible.sync="showUpdate" width="952px"
+    <el-dialog :close-on-click-modal="false" :title="currentId===-1?'新增':isReadonly?'详情':'编辑'"
-        :before-close="handleClose"  destroy-on-close>
+        :visible.sync="showUpdate" width="952px" :before-close="handleClose" destroy-on-close>
-        <FormComponent :options="updateOptions" :isReadonly="isReadonly" labelWidth="110px" labelAlign="right" :data.sync="updateParams"
+        <FormComponent :options="updateOptions" :isReadonly="isReadonly" labelWidth="110px" labelAlign="right"
-            @actionCallback="callback" :actions="updateActions" :full-btn="true" @change="change"
+            :data.sync="updateParams" @actionCallback="callback" :actions="updateActions" :full-btn="true"
-            btn-position="center">
+            @change="change" btn-position="center" ref="checkForm">
             <div class="sub-title" v-if="isManager">检查项目</div>
-
             <TableComponent v-if="isManager" :tableData="updateTableData" :tableColumn="updateTableColumn"
-                @actionCallback="subCallback($event)" actionPosition="flex-start" :actions="!isReadonly?updateTableActions:[]"
+                @actionCallback="subCallback($event)" actionPosition="flex-start"
-                :showFooter="false" style="margin-bottom: 20px;">
+                :actions="!isReadonly?updateTableActions:[]" :showFooter="false" style="margin-bottom: 20px;">
-    
                 <el-table ref="multipleTable" :data="updateParams.tableItems" tooltip-effect="dark" height="100%" border
                     @selection-change="handleSelectionChange" style="width: 100%;min-height: 200px;">
                     <el-table-column type="selection" fixed label="全选" width="40" v-if="!isReadonly">
                     </el-table-column>
                     <template v-for="item in updateTableColumn">
-                        <el-table-column v-if="item.render" :filters="item.filters"
+                        <el-table-column v-if="item.render" :filters="item.filters" :filter-method="item.filterMethod"
-                        :filter-method="item.filterMethod" :show-overflow-tooltip="item.showTip" :label="item.name" :width="item.width" :key="item.key">
+                            :show-overflow-tooltip="item.showTip" :label="item.name" :width="item.width"
+                            :key="item.key">
                             <div slot-scope="scope" v-html="item.render(scope.row)"></div>
                         </el-table-column>
                         <el-table-column v-else :prop="item.key" :filters="item.filters"
-                        :filter-method="item.filterMethod"  :show-overflow-tooltip="item.showTip" :label="item.name" :width="item.width" :key="item.key">
+                            :filter-method="item.filterMethod" :show-overflow-tooltip="item.showTip" :label="item.name"
+                            :width="item.width" :key="item.key">
                         </el-table-column>
                     </template>
                     <el-table-column label="操作" fixed="right" width="200" v-if="!isReadonly">
@@ -72,25 +74,24 @@
                         </template>
                     </el-table-column>
                 </el-table>
-    
             </TableComponent>
-
         </FormComponent>
     </el-dialog>
 
 
-    <el-dialog  v-if="isManager" :close-on-click-modal="false" :title="!subUpdateParams.id?'新增':subIsReadonly?'详情':'编辑'" :visible.sync="showSubUpdate"
+    <el-dialog v-if="isManager" :close-on-click-modal="false" :title="!subUpdateParams.id?'新增':subIsReadonly?'详情':'编辑'"
-        :before-close="handleClose">
+        :visible.sync="showSubUpdate" :before-close="handleClose">
-        <FormComponent :options="subUpdateOptions" :isReadonly="subIsReadonly" labelWidth="110px" labelAlign="right" :data.sync="subUpdateParams"
+        <FormComponent :options="subUpdateOptions" :isReadonly="subIsReadonly" labelWidth="110px" labelAlign="right"
-            @actionCallback="subCallback" :actions="updateActions" :full-btn="true" @change="subChange"
+            :data.sync="subUpdateParams" @actionCallback="subCallback" :actions="updateActions" :full-btn="true"
-            btn-position="center">
+            @change="subChange" btn-position="center">
         </FormComponent>
     </el-dialog>
 
     <el-dialog v-if="isManager" :close-on-click-modal="false" :title="'批量添加'" :visible.sync="showSubMutilUpdate"
         :before-close="handleClose" destroy-on-close>
         <FormComponent :options="mutilAddOptions" @change="loadRuleTable" :data.sync="ruleParams"></FormComponent>
-        <TableComponent :tableData="updateTableData" :tableColumn="updateTableColumn" @pageNumberChange="loadRuleTable($event,'pageNum')" @pageSizeChange="loadRuleTable($event,'pageSize')"
+        <TableComponent :tableData="updateTableData" :tableColumn="updateTableColumn"
+            @pageNumberChange="loadRuleTable($event,'pageNum')" @pageSizeChange="loadRuleTable($event,'pageSize')"
             :showFooter="true">
 
             <el-table ref="multipleTable" :data="updateTableData.datas" tooltip-effect="dark" height="100%" border
@@ -98,10 +99,12 @@
                 <el-table-column type="selection" fixed label="全选" width="40px">
                 </el-table-column>
                 <template v-for="item in updateTableColumn">
-                        <el-table-column v-if="item.render" :show-overflow-tooltip="item.showTip" :label="item.name" :width="item.width" :key="item.key">
+                    <el-table-column v-if="item.render" :show-overflow-tooltip="item.showTip" :label="item.name"
+                        :width="item.width" :key="item.key">
                         <div slot-scope="scope" v-html="item.render(scope.row)"></div>
                     </el-table-column>
-                        <el-table-column v-else :prop="item.key"  :show-overflow-tooltip="item.showTip" :label="item.name" :width="item.width" :key="item.key">
+                    <el-table-column v-else :prop="item.key" :show-overflow-tooltip="item.showTip" :label="item.name"
+                        :width="item.width" :key="item.key">
                     </el-table-column>
                 </template>
             </el-table>

src/views/hiddenDanger/rules/rules.component.vue

@@ -74,18 +74,7 @@ export default class RulesComponent extends BaseRecordComponent<any> {
     public drawModel = "list";
 
 
-    public updateActions = [{
+    public updateActions = [] as any;
-        name:"取消",
-        value:"cancel"
-    },{
-        name:"保存并继续添加",
-        value:"saveAndContinue",
-        type:"primary"
-    },{
-        name:"保存",
-        value:"save",
-        type:"primary"
-    }];
 
     public selectData = [];
 
@@ -131,17 +120,36 @@ export default class RulesComponent extends BaseRecordComponent<any> {
             type: "select",
             width: "100%",
             require: true,
+            multiple: true,
+            showError: false,
             datas: this.$store.state.prevention_dangrous_type
         }]
+        this.updateActions = [{
+            name: "取消",
+            value: "cancel"
+        }, {
+            name: "保存并继续添加",
+            value: "saveAndContinue",
+            type: "primary",
+            hide: this.updateParams.id
+        }, {
+            name: "保存",
+            value: "save",
+            type: "primary"
+        }]
     }
 
     public buildTable() {
         this.tableColumn.push({ name: '检查项目', key: "name" });
         this.tableColumn.push({ name: '检查内容', key: "content", showTip: true });
         this.tableColumn.push({ name: '检查依据', key: "reason", showTip: true });
-        this.tableColumn.push({name:'分类',key:"type",render:(data)=>{
+        this.tableColumn.push({
-            return this.$store.getters.prevention_dangrous_type_map[data.type]
+            name: '分类', key: "type", render: (data) => {
-        }});
+                return data.type.split(',').map(item => {
+                    return this.$store.getters.prevention_dangrous_type_map[item]
+                }).join(",")
+            }
+        });
 
     }
 
@@ -186,8 +194,12 @@ export default class RulesComponent extends BaseRecordComponent<any> {
             pageSize: 20,
         } as any;
     }
-
+    /**
+     * 数据保存
+     * @param goOn 
+     */
     public doSave(goOn?) {
+        this.updateParams.type = this.updateParams.type.join(',')
         this.tableService.addOrUpdate(this.updateParams, this.currentId === -1).then((res => {
             this.$message.success(this.currentId === -1 ? "新增成功！" : "编辑成功");
             this.showUpdate = !!goOn;
@@ -198,14 +210,12 @@ export default class RulesComponent extends BaseRecordComponent<any> {
                 })
             }
             this.getTableData();
-
         }))
     }
 
 
 
     public showUpdateModel(row?, isRead?) {
-
         this.updateParams = Object.assign({ number: null })
         this.isReadonly = !!isRead;
         if (!row) {
@@ -214,11 +224,18 @@ export default class RulesComponent extends BaseRecordComponent<any> {
                 this.updateParams.number = res.data
             })
         } else {
-        this.updateParams = Object.assign({number:null,typeName:this.$store.getters.prevention_dangrous_type_map[row.type]},row)
+            this.updateParams = Object.assign({
+                number: null,
+                typeName: row.type.split(',').map(item => {
+                    return this.$store.getters.prevention_dangrous_type_map[item]
+                }).join(",")
+            }, row)
+            this.updateParams.type = row.type.split(',').map((item: any) => parseInt(item))
             this.currentId = row.id;
         }
         this.clearSelect();
-        this.showUpdate = true
+        this.getTableCallback()
+        this.showUpdate = true;
     }
 
     public clearSelect() {

src/views/hiddenDanger/safe/action.component.vue

@@ -544,6 +544,7 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
             pageNum: 1,
             pageSize: 20,
         } as any;
+        this.getTableData()
     }
 
     public getMap(map) {

src/views/risk/area/area.component.vue

@@ -111,7 +111,7 @@ export default class AreaManagerComponent extends BaseRecordComponent<any> {
 
 
     created() {
-
+//
     }
 
     public buildFormOptions() {

src/views/risk/areaUnit.component.html

@@ -1,13 +1,13 @@
 <div class="common-box  dis-flex ">
     <div class="common-content-box dis-flex flex-col flex-1">
         <div class="search-box">
-            <FormComponent :inline="true" :options="formOptions" :data.sync="params" @actionCallback="callback" :actions="formActions"
+            <FormComponent :inline="true" :options="formOptions" :data.sync="params" @actionCallback="callback"
-                :full-btn="false" @change="change" btn-position="end"></FormComponent>
+                :actions="formActions" :full-btn="false" @change="change" btn-position="end"></FormComponent>
         </div>
         <div class="table-box flex-1">
-            <TableComponent :tableData="tableData" :tableColumn="tableColumn"
+            <TableComponent :tableData="tableData" :tableColumn="tableColumn" @actionCallback="callback($event)"
-                @actionCallback="callback($event)" @pageNumberChange="callback($event,'pageNum')"
+                @pageNumberChange="callback($event,'pageNum')" @pageSizeChange="callback($event,'pageSize')"
-                @pageSizeChange="callback($event,'pageSize')" :footerActions="footerActions" :actions="tableActions">
+                :footerActions="footerActions" :actions="tableActions">
 
                 <el-table ref="multipleTable" :data="tableData.datas" height="100%" border
                     @selection-change="handleSelectionChange" style="width: 100%">
@@ -54,12 +54,9 @@
             :data.sync="updateParams" @actionCallback="callback" :actions="updateActions" :full-btn="true"
             @change="change" btn-position="center">
             <span class="tips" v-if="isArea">*注：安全风险分析对象编码即危险化学品登记综合服务系统中的危险源编码</span>
-
-
             <div class="sub-title" v-if="!isArea && isReadonly">停用/检修记录</div>
-
             <TableComponent v-if="!isArea && isReadonly" :tableData="repairTableData" :tableColumn="repairTableColumn"
-                :showFooter="false" style="margin-bottom: 20px;">
+                :showFooter="false" style="margin-bottom: 20px;height: 200px;">
             </TableComponent>
         </FormComponent>
 

src/views/risk/assessment/areaAnal/areaAnal.component.html

@@ -91,11 +91,7 @@
                         <div slot-scope="scope" class="cursor td-content" :class="{active:scope.row.value===4}">
                             <el-radio v-model="scope.row.value" :label="4"">{{scope.row.type4}}</el-radio></div>
                     </el-table-column>
-
-
-
                 </el-table-column>
-
             </el-table-column>
             <el-table-column prop=" value" :label="popTitle==='L'?'Ln':'Sn'">
                                 <div slot-scope="scope">

src/views/risk/assessment/areaAnal/areaAnal.component.vue

@@ -144,11 +144,18 @@ export default class AreaAnalComponent extends BaseRecordComponent<any> {
         this.showUpdate = true
     }
 
-    // 新增 添加L/S值
+    /**
-    public addVal(el, row) {
+     * 新增 添加L/S值
+     * @param el 
+     * @param row 当前行数据
+     */
+    public addVal(el: any, row: any) {
+        this.riskLDatas = [];
+        this.riskSDatas = [];
         this.currentRow = row;
         this.cacheCurrentRow = JSON.parse(JSON.stringify(row));
-        this.riskLDatas = riskLData;
+        this.riskLDatas = JSON.parse(JSON.stringify(riskLData));
+        this.riskSDatas = JSON.parse(JSON.stringify(riskSData));
         this.popTitle = 'L';
         const lData = JSON.parse(row.analLikelihoodContent || "[]");
         const sData = JSON.parse(row.analSeverityContent || "[]");
@@ -222,7 +229,30 @@ export default class AreaAnalComponent extends BaseRecordComponent<any> {
         }
         if (row[column.property] !== '/') {
             row.value = column.index - 1
+            this.countEstimateValue()
         }
+
+    }
+
+    public countEstimateValue() {
+        let value: number = 0;
+        let len: number = 0;
+        let tmpRiskDatas = []
+        if (this.popTitle === 'L') {
+            tmpRiskDatas = this.riskLDatas
+        }
+        if (this.popTitle === 'S') {
+            tmpRiskDatas = this.riskSDatas
+        }
+        tmpRiskDatas.forEach((item: any) => {
+            if (item.value && typeof (item.value) === 'number') {
+                len = len + 1
+                value = value + item.value
+            }
+        })
+        tmpRiskDatas.forEach((item: any) => {
+            item.result = Math.round(value / len).toString()
+        })
     }
 
     public startEdit(row) {
@@ -274,7 +304,9 @@ export default class AreaAnalComponent extends BaseRecordComponent<any> {
                 this.popTitle = 'S';
                 this.stepsActive = 2;
                 this.riskLDatas[0].value = value;
+                if (this.riskSDatas.length === 0) {
                     this.riskSDatas = JSON.parse(JSON.stringify(riskSData));
+                }
                 this.updateBtn();
             } else {
                 this.currentRow.analSeverityContent = content;
@@ -304,7 +336,7 @@ export default class AreaAnalComponent extends BaseRecordComponent<any> {
 
     //单选
     public selectRadioData(data) {
-        console.log('data', data);
+       // console.log('data', data);
     }
 
     //点击L 步骤

src/views/risk/assessment/work/work.component.vue

@@ -470,6 +470,7 @@ export default class WorkManagerComponent extends BaseRecordComponent<any> {
         }
         this.showSubUpdate = true;
         this.subUpdateActionsForm();
+        this.buildUpdateForm();
     }
 
     public doSubDelete(indexs) {
@@ -486,6 +487,10 @@ export default class WorkManagerComponent extends BaseRecordComponent<any> {
 
 
     public doSave(goOn?) {
+        if (this.updateParams.steps.length === 0) {
+            this.$message.warning("请您至少添加一条作业步骤！");
+            return
+        }
         // 如果是新增步骤
         if (this.showSubUpdate) {
             // 新增
@@ -598,7 +603,7 @@ export default class WorkManagerComponent extends BaseRecordComponent<any> {
             this.toggleAll()
         } else {
             this.tableData.datas.forEach((item, index) => {
-                const find = this.selectData.find((data: any) => data.userId === item.userId);
+                const find = this.selectData.find((data: any) => data.id === item.id);
                 if (!find) {
                     (this.$refs.multipleTable as any).toggleRowSelection(item);
                 }