diff --git a/.env.development b/.env.development
index bbdad11..5e8cb1d 100644
--- a/.env.development
+++ b/.env.development
@@ -7,10 +7,13 @@ VUE_APP_GATEWAY_URL="/dev-api"
# 服务地址
VUE_APP_BASE_API_URL="http://192.168.2.187:8081"
# 服务前-- 请严格遵守格式 不允许换行
-VUE_APP_SERVICE_PREFIX= '{"system":"/system","file":"/file-zy","prevention":"/prevention-zsz","bpm":"/bpm-zsz"}'
+VUE_APP_SERVICE_PREFIX= '{"system":"/system","file":"/file","prevention":"/prevention-yx","bpm":"/bpm"}'
# 是否显示全部菜单
VUE_APP_ALL_MENU = false
-# 微前端地址
-VUE_APP_REMOTES_URL="http://192.168.1.20:8090"
+# # 微前端地址
+# 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_dev/"
# 当前应用部署地址
-VUE_APP_EXPOSES_URL="http://192.168.1.20:8090"
\ No newline at end of file
+VUE_APP_EXPOSES_URL=""
\ No newline at end of file
diff --git a/src/bootstrap.ts b/src/bootstrap.ts
index 8aa8fc0..ecbbb08 100644
--- a/src/bootstrap.ts
+++ b/src/bootstrap.ts
@@ -12,9 +12,10 @@ import Mock from "mockjs"
// import { MockData } from './mock';
Vue.config.productionTip = false;
-Vue.config.warnHandler = ()=>{
+// Vue.config.silent = true;
+// Vue.config.warnHandler = ()=>{
-}
+// }
document.title = process.env.VUE_APP_TITLE || '汉邦唐全真数字服务平台';
// if(process.env.NODE_ENV==="development"){
diff --git a/src/components/measure.component.vue b/src/components/measure.component.vue
index 411ab95..3bb6910 100644
--- a/src/components/measure.component.vue
+++ b/src/components/measure.component.vue
@@ -43,19 +43,13 @@
diff --git a/src/views/risk/duty/dutyRecords.component.vue b/src/views/risk/duty/dutyRecords.component.vue
index 89f80f4..53f93e7 100644
--- a/src/views/risk/duty/dutyRecords.component.vue
+++ b/src/views/risk/duty/dutyRecords.component.vue
@@ -128,7 +128,7 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent {
- if (data.status == 0) {
+ if (data.result == 2) {
return "异常"
- } else if (data.status == 1) {
+ } else if (data.result == 1) {
return "正常"
}
}
@@ -223,10 +223,20 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent是"
} else if (data.dangerFlag == 0) {
return "否"
+ } else {
+ return '--'
+ }
+ }
+ });
+ this.tableColumn.push({
+ name: '隐患归属人', key: "ownerName", render: (data) => {
+ if (data.ownerName) {
+ return data.ownerName
+ } else {
+ return '--'
}
}
});
- this.tableColumn.push({ name: '隐患归属人', key: "ownerName" });
}
@@ -360,7 +370,7 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent {
}
public buildTable() {
- this.tableColumn.push({ name: '管控对象', key: "controlName"});
- this.tableColumn.push({ name: '分析对象', key: "analName"});
- this.tableColumn.push({ name: '风险源', key: "riskSource"});
+ this.tableColumn.push({ name: '管控对象', key: "controlName" });
+ this.tableColumn.push({ name: '分析对象', key: "analName" });
+ this.tableColumn.push({ name: '风险源', key: "riskSource" });
this.tableColumn.push({
- name: '事故后果', key: "seriousResult", render: (data) => {
+ name: '事故后果', key: "seriousResult", render: (data) => {
if (data.seriousResult) {
return data.seriousResult.split(",").map(item => this.$store.getters.prevention_serious_result_map[item]).join(",")
}
}
});
this.tableColumn.push({
- name: '风险等级', key: "riskLevel", render: (data) => {
+ name: '风险等级', key: "riskLevel", render: (data) => {
return "" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '') + ""
},
filters: this.$store.state.prevention_risk_level.map(item => {
@@ -125,15 +125,15 @@ export default class MeasuresManagerComponent extends BaseRecordComponent {
}
});
this.tableColumn.push({
- name: '措施详情', key: "measureNum", render: (data) => {
- return "" + (data.details ? data.details.length : 0) + ""
+ name: '措施详情', key: "detailNum", render: (data) => {
+ return "" + (data.detailNum ? data.detailNum : 0) + ""
}
});
this.tableColumn.push({ name: '涉及岗位', key: "postName" });
//管控措施详情
- this.proTableColumn.push({ name: '序号', key: "index",});
+ this.proTableColumn.push({ name: '序号', key: "index", });
this.proTableColumn.push({
name: '措施类型一', key: "firstTypeName", render: (data) => {
if (data.firstType) {
@@ -151,7 +151,7 @@ export default class MeasuresManagerComponent extends BaseRecordComponent {
}
});
this.proTableColumn.push({ name: '措施类型三', key: "thirdType" });
- this.proTableColumn.push({ name: '管控措施', key: "description",});
+ this.proTableColumn.push({ name: '管控措施', key: "description", });
}
public callback(data, type) {
@@ -200,8 +200,8 @@ export default class MeasuresManagerComponent extends BaseRecordComponent {
public toggleAll() {
-
- this.tableData.datas.forEach((item,index)=>{
+
+ this.tableData.datas.forEach((item, index) => {
(this.$refs.multipleTable as any).toggleRowSelection(item);
})
}
@@ -226,11 +226,17 @@ export default class MeasuresManagerComponent extends BaseRecordComponent {
public showPros(el, data) {
const isTarget = el.target.classList.contains("link");
if (isTarget) {
- this.showProtable = true;
- this.currentProTableData.datas = data.details.map((item, index) => {
- item.index = index + 1;
- return item
+ this.tableService.selectDetailById({ measureInventoryId: data.id }).then((res: any) => {
+ if (res.code === 200) {
+ this.currentProTableData.datas = res.data.datas.map((item, index) => {
+ item.index = index + 1;
+ return item
+ })
+ this.showProtable = true;
+ }
})
+
+
}
}
diff --git a/src/views/risk/measuresReport/measuresReport.component.vue b/src/views/risk/measuresReport/measuresReport.component.vue
index cc2c11d..8730509 100644
--- a/src/views/risk/measuresReport/measuresReport.component.vue
+++ b/src/views/risk/measuresReport/measuresReport.component.vue
@@ -51,6 +51,9 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
public filterStatusData: any;
+ //来源类型
+ public sourceType = ["","JHA","SCL","线下评估","巡检"]
+
public subActions = [{
name: "取消",
value: "cancel"
@@ -154,6 +157,11 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
return row.status === data;
}
});
+ this.tableColumn.push({
+ name: '来源', key: "type", render:(data)=>{
+ return this.sourceType[data.type]
+ }
+ });
this.tableColumn.push({
name: '区域名称', key: "areaName", width: "130px",
});
@@ -252,6 +260,10 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
return this.$store.getters.prevention_cycle_unit_map[data.taskReviewCycleUnit]
}
});
+ this.tableColumn.push({ name: '开始执行时间', key: "executeStartTime", width: "150px" });
+ this.tableColumn.push({ name: '开始时间', key: "startTime", width: "100px" });
+ this.tableColumn.push({ name: '结束时间', key: "endTime", width: "100px" });
+
//查看执行记录
this.proTableColumn.push({ name: '序号', key: "index", width: "80px" });
@@ -279,7 +291,7 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
return "是"
} else if (data.dangerFlag == 0) {
return "否"
- }else{
+ } else {
return '--'
}
}