diff --git a/public/js/config.js b/public/js/config.js index a1d887b1..e82ee993 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,4 +1,4 @@ -// var COMPANY = ''; //通用 +var COMPANY = ''; //通用 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 // var COMPANY='nanchang'; //南昌地铁、衢州 @@ -11,7 +11,7 @@ // COMPANY = 'yunlian'//云联万物 // COMPANY = 'neimenggu'//内蒙古项目 // COMPANY = 'zjsj'//中建四局 -COMPANY = 'zjwj'//中建五局 +// COMPANY = 'zjwj'//中建五局 diff --git a/src/assets/images/menu/xmgk_cggl.png b/src/assets/images/menu/xmgk_cggl.png index aa5fe177..9f6b986f 100644 Binary files a/src/assets/images/menu/xmgk_cggl.png and b/src/assets/images/menu/xmgk_cggl.png differ diff --git a/src/assets/images/menu/xmgk_htgl.png b/src/assets/images/menu/xmgk_htgl.png index d8c7d579..f7165111 100644 Binary files a/src/assets/images/menu/xmgk_htgl.png and b/src/assets/images/menu/xmgk_htgl.png differ diff --git a/src/assets/images/menu/xmgk_sbgl.png b/src/assets/images/menu/xmgk_sbgl.png index 24dc6875..fda5cb04 100644 Binary files a/src/assets/images/menu/xmgk_sbgl.png and b/src/assets/images/menu/xmgk_sbgl.png differ diff --git a/src/assets/images/menu/xmgk_zcgl.png b/src/assets/images/menu/xmgk_zcgl.png index 817fb111..30e80a40 100644 Binary files a/src/assets/images/menu/xmgk_zcgl.png and b/src/assets/images/menu/xmgk_zcgl.png differ diff --git a/src/assets/images/menu/xmgk_zclgl.png b/src/assets/images/menu/xmgk_zclgl.png index e3a948c7..c03de797 100644 Binary files a/src/assets/images/menu/xmgk_zclgl.png and b/src/assets/images/menu/xmgk_zclgl.png differ diff --git a/src/assets/js/api/materialManagement.js b/src/assets/js/api/materialManagement.js index 90c017d6..e904979a 100644 --- a/src/assets/js/api/materialManagement.js +++ b/src/assets/js/api/materialManagement.js @@ -68,7 +68,7 @@ export const gettGMaterialSupplierEvaluationRecordPageApi = data => get('/xmgl/g //出入库管理 export const addGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/addWithMaterial', data); export const deletGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/delete', data); -export const editGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/edit', data); +export const editGtMaterialInOutWarehouseApi = data => post('xmgl/gt/gtMaterialInOutWarehouse/editWithMaterial', data); export const gettGMaterialInOutWarehousePageApi = data => get('/xmgl/gt/gtMaterialInOutWarehouse/page', data);//查询表单数据 export const gettGMaterialInOutWarehouseListApi = data => get('/xmgl/gt/gtMaterialPointCheckIntoWarehouseDetail/list', data);//根据id查物料 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 01f52648..537341c8 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -80,12 +80,13 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地 // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地 - // axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地 + axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地 // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上 // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上 // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址 + // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上 } else if (process.env.NODE_ENV == 'debug') { axios.defaults.baseURL = 'https://www.ceshi.com' diff --git a/src/views/companyAdmin/basicSetup/checkItem.vue b/src/views/companyAdmin/basicSetup/checkItem.vue index 829a806b..837fa64d 100644 --- a/src/views/companyAdmin/basicSetup/checkItem.vue +++ b/src/views/companyAdmin/basicSetup/checkItem.vue @@ -55,7 +55,7 @@ @mouseleave="name.visible = false" >{{ name.dangerName.length > 9 - ? name.dangerName.substring(0, 8) + "..." + ? name.dangerName.substring(0, 8) + '...' : name.dangerName }} @@ -93,9 +93,9 @@ @@ -132,7 +132,7 @@ > {{ item.dangerName.length > 10 - ? item.dangerName.substring(0, 9) + "..." + ? item.dangerName.substring(0, 9) + '...' : item.dangerName }} @@ -166,9 +166,9 @@ @@ -187,10 +187,7 @@
  • 暂无数据 @@ -259,13 +256,13 @@ 编辑 - 删除 + 删除 @@ -281,9 +278,13 @@ width="30%" >

    你确定要删除该项吗

    -
    - 取 消 - 确 定 +
    + 取 消 + 确 定
    - + - +
    - + - +
    @@ -395,14 +408,23 @@ - + - + - +
    @@ -630,42 +652,42 @@ export default { this.dialogdata = data; }, delSave1() { - if(this.type == 3){ + if (this.type == 3) { delDangerItemRecordApi({ id: this.editId }).then((res) => { - if (res.code == 200) { - this.$message({ - message: '删除成功', - type: 'success', - }); - this.loadList(); - this.loadRigthtList() - } else { - this.$message({ - message: '删除失败', - type: "error", - }); - } - this.dialogVisible1 = false; - }); - }else{ + if (res.code == 200) { + this.$message({ + message: '删除成功', + type: 'success', + }); + this.loadList(); + this.loadRigthtList() + } else { + this.$message({ + message: '删除失败', + type: "error", + }); + } + this.dialogVisible1 = false; + }); + } else { delDangerTypeRecordApi({ id: this.editId }).then((res) => { - if (res.code == 200) { - this.$message({ - message: '删除成功', - type: 'success', - }); - this.loadList(); - this.loadRigthtList() - } else { - this.$message({ - message: '删除失败', - type: "error", - }); - } - this.dialogVisible1 = false; - }); + if (res.code == 200) { + this.$message({ + message: '删除成功', + type: 'success', + }); + this.loadList(); + this.loadRigthtList() + } else { + this.$message({ + message: '删除失败', + type: "error", + }); + } + this.dialogVisible1 = false; + }); } - + // this.dialogVisible1 = false; // this.$message({ // message: "删除成功", @@ -692,7 +714,7 @@ export default { // }); }, del1(id, type) { - console.log('当前点击的id',id,'类型',type) + console.log('当前点击的id', id, '类型', type) this.type = type; this.title = "删除"; this.editId = id; diff --git a/src/views/projectFront/configManage/roleManage.vue b/src/views/projectFront/configManage/roleManage.vue index 986bfbaa..d9bb6324 100644 --- a/src/views/projectFront/configManage/roleManage.vue +++ b/src/views/projectFront/configManage/roleManage.vue @@ -39,18 +39,18 @@ - + - + - +