diff --git a/dist.zip b/dist.zip index c458d728..93fb482e 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/assets/js/api/quality.js b/src/assets/js/api/quality.js index 277239b7..511de0a8 100644 --- a/src/assets/js/api/quality.js +++ b/src/assets/js/api/quality.js @@ -13,6 +13,7 @@ export const addDangerItemRecordApi = data => post('xmgl/dangerItemRecord/add', export const editDangerItemRecordApi = data => post('xmgl/dangerItemRecord/edit', data); export const getDangerItemRecordApi = data => post('xmgl/dangerItemRecord/list', data); //质量问题库信息 列表信息---右边 export const getCompanyDangerItemRecordApi = data => post('xmgl/dangerItemRecord/selectCompanyDangerItemRecordList', data); //企业质量问题库信息 列表信息---右边 +export const delDangerItemRecordApi = data => post('xmgl/dangerItemRecord/delete', data); // 删除质量问题库—子项信息 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 94fad474..e39128ae 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -41,10 +41,10 @@ if (process.env.NODE_ENV == 'development') { // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 - // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 + axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 - axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 + // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 // axios.defaults.baseURL = 'http://192.168.34.216:18070/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; diff --git a/src/views/companyAdmin/basicSetup/checkItem.vue b/src/views/companyAdmin/basicSetup/checkItem.vue index 17f63f34..3fb68cca 100644 --- a/src/views/companyAdmin/basicSetup/checkItem.vue +++ b/src/views/companyAdmin/basicSetup/checkItem.vue @@ -258,7 +258,7 @@ > 编辑 - + @@ -281,9 +281,9 @@ width="30%" >

你确定要删除该项吗

-
- 取 消 - 确 定 +
+ 取 消 + 确 定
{ - if (res.data.result) { - this.dialogVisible1 = false; + delDangerItemRecordApi({ id: this.editId }).then((res) => { + console.log('========',res) + if (res.code == 200) { this.$message({ - message: res.data.message, - type: "error", + message: '删除成功', + type: 'success', }); this.loadList(); + this.loadRigthtList() } else { this.$message({ - message: res.data.message, + message: '删除失败', type: "error", }); } - }); + this.dialogVisible1 = false; + }); + // this.dialogVisible1 = false; + // this.$message({ + // message: "删除成功", + // type: "success", + // }); + // return; + + // let url = "http://47.104.132.250:9000/itbgpv2/inspect/option/delete"; + + // this.$http.get(url, { params: { id: this.editId } }).then((res) => { + // if (res.data.result) { + // this.dialogVisible1 = false; + // this.$message({ + // message: res.data.message, + // type: "error", + // }); + // this.loadList(); + // } else { + // this.$message({ + // message: res.data.message, + // type: "error", + // }); + // } + // }); }, del1(id, type) { console.log(id); @@ -785,7 +803,7 @@ export default { letter-spacing: 1px; font-weight: bold; .clickName { - width: calc(100% - 145px); + // width: calc(100% - 145px); .imgbox { display: inline-block; margin: 0 6px 0 13px; @@ -813,6 +831,7 @@ export default { // } // } } + .system-right { float: right; // margin-right: 1.5%; diff --git a/src/views/projectFront/configManage/personnelAccess.vue b/src/views/projectFront/configManage/personnelAccess.vue index 615891b6..8971cfaa 100644 --- a/src/views/projectFront/configManage/personnelAccess.vue +++ b/src/views/projectFront/configManage/personnelAccess.vue @@ -440,6 +440,13 @@ export default { trigger: "blur", }, ], + workerId:[ + { + required: true, + message: this.$t("message.personnelPosition.required"), + trigger: "blur", + }, + ] }, List: [], Popup: { diff --git a/src/views/projectFront/materialManage/projectSiteManage.vue b/src/views/projectFront/materialManage/projectSiteManage.vue index e47514ff..f2a7711a 100644 --- a/src/views/projectFront/materialManage/projectSiteManage.vue +++ b/src/views/projectFront/materialManage/projectSiteManage.vue @@ -462,7 +462,7 @@
- + { // console.log(res); if (res.code == 200) { + console.log('------整改人',res) this.notifierOrPeopleList = res.result; } });