diff --git a/public/js/config.js b/public/js/config.js index e9918cd1..bff9bf94 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'; //南昌地铁、衢州 @@ -14,7 +14,7 @@ // COMPANY = 'zjwj'//中建五局 // COMPANY = 'sccr'//四川成润 // COMPANY = 'pssh'//坪山沙湖项目 -COMPANY = 'jlw'//金林湾 +// COMPANY = 'jlw'//金林湾 // COMPANY = 'shzj'//上海张江 diff --git a/src/assets/js/api/jxjadmin.js b/src/assets/js/api/jxjadmin.js index ccde06d9..ada128a1 100644 --- a/src/assets/js/api/jxjadmin.js +++ b/src/assets/js/api/jxjadmin.js @@ -1,62 +1,95 @@ /** * api接口统一管理 */ -import {post,get} from '../http' +import { post, get } from '../http' -export const editCompanyConfigApi = data => post('xmgl/companyConfig/edit', data); //修改企业配置信息 -export const getRegisterAuditList = data => post('xmgl/company/selectCompanyPage', data); //获取企业注册审核列表 +export const editCompanyConfigApi = (data) => + post('xmgl/companyConfig/edit', data) //修改企业配置信息 +export const getRegisterAuditList = (data) => + post('xmgl/company/selectCompanyPage', data) //获取企业注册审核列表 -export const baseModuleList = data => post('xmgl/baseModule/list', data); //列表查询所有模块信息 -export const getCompanyModuleList = data => post('xmgl/baseModule/getCompanyModuleList', data); //查询总企业默认的模块列表 -export const baseModuleProjectEdit = data => post('xmgl/baseModuleProject/edit', data); //编辑模块-企业项目关联信息 -export const getProjectModuleList = data => post('xmgl/baseModule/getProjectModuleList', data); //查询企业下项目默认的模块列表 +export const baseModuleList = (data) => post('xmgl/baseModule/list', data) //列表查询所有模块信息 +export const getCompanyModuleList = (data) => + post('xmgl/baseModule/getCompanyModuleList', data) //查询总企业默认的模块列表 +export const baseModuleProjectEdit = (data) => + post('xmgl/baseModuleProject/edit', data) //编辑模块-企业项目关联信息 +export const getProjectModuleList = (data) => + post('xmgl/baseModule/getProjectModuleList', data) //查询企业下项目默认的模块列表 + +export const getUserModuleList = (data) => + post('xmgl/baseModule/getUserModuleList', data) //查询企业用户配置的模块列表 +export const baseModuleUserEdit = (data) => + post('xmgl/baseModuleUser/edit', data) //查询企业用户配置的模块列表 + +export const addHeadquarterCompanyApi = (data) => + post('/xmgl/company/headquarterCompany/add', data) +export const editHeadquarterCompanyApi = (data) => + post('/xmgl/company/headquarterCompany/update', data) +export const deleteHeadquarterCompanyApi = (data) => + post('/xmgl/company/delete', data) -export const getUserModuleList = data => post('xmgl/baseModule/getUserModuleList', data); //查询企业用户配置的模块列表 -export const baseModuleUserEdit = data => post('xmgl/baseModuleUser/edit', data); //查询企业用户配置的模块列表 /** * 模块管理 */ -export const addModuleApi = data => post('xmgl/baseModule/add', data); -export const deleteModuleApi = data => post('xmgl/baseModule/delete', data); -export const editModuleApi = data => post('xmgl/baseModule/edit', data); -export const getAllModuleApi = data => post('xmgl/baseModule/list', data); +export const addModuleApi = (data) => post('xmgl/baseModule/add', data) +export const deleteModuleApi = (data) => post('xmgl/baseModule/delete', data) +export const editModuleApi = (data) => post('xmgl/baseModule/edit', data) +export const getAllModuleApi = (data) => post('xmgl/baseModule/list', data) /** * 菜单管理 */ -export const addMenuApi = data => post('xmgl/baseMenu/add', data); -export const deleteMenuApi = data => post('xmgl/baseMenu/delete', data); -export const editMenuApi = data => post('xmgl/baseMenu/edit', data); -export const getAllMenuApi = data => post('xmgl/baseMenu/list', data); -export const getAllMenuByGroupApi = data => post('xmgl/baseMenu/selectGroupList', data); - +export const addMenuApi = (data) => post('xmgl/baseMenu/add', data) +export const deleteMenuApi = (data) => post('xmgl/baseMenu/delete', data) +export const editMenuApi = (data) => post('xmgl/baseMenu/edit', data) +export const getAllMenuApi = (data) => post('xmgl/baseMenu/list', data) +export const getAllMenuByGroupApi = (data) => + post('xmgl/baseMenu/selectGroupList', data) /** * 按钮管理 */ -export const addBtnApi = data => post('xmgl/action/add', data); -export const deleteBtnApi = data => post('xmgl/action/delete', data); -export const editBtnApi = data => post('xmgl/action/edit', data); -export const getAllBtnApi = data => post('xmgl/action/getActionList', data); +export const addBtnApi = (data) => post('xmgl/action/add', data) +export const deleteBtnApi = (data) => post('xmgl/action/delete', data) +export const editBtnApi = (data) => post('xmgl/action/edit', data) +export const getAllBtnApi = (data) => post('xmgl/action/getActionList', data) /** * 系统安全校验码 */ -export const addSystemVerificationApi = data => post('xmgl/systemVerification/add', data); -export const getSystemVerificationApi = data => post('xmgl/systemVerification/queryById', data); +export const addSystemVerificationApi = (data) => + post('xmgl/systemVerification/add', data) +export const getSystemVerificationApi = (data) => + post('xmgl/systemVerification/queryById', data) /** * app版本管理 */ -export const addappVersionApi = data => post('xmgl/appVersion/add', data); -export const deleteappVersionApi = data => post('xmgl/appVersion/delete', data); -export const editappVersionApi = data => post('xmgl/appVersion/edit', data); -export const getappVersionListApi = data => get('xmgl/appVersion/list', data); - +export const addappVersionApi = (data) => post('xmgl/appVersion/add', data) +export const deleteappVersionApi = (data) => + post('xmgl/appVersion/delete', data) +export const editappVersionApi = (data) => post('xmgl/appVersion/edit', data) +export const getappVersionListApi = (data) => get('xmgl/appVersion/list', data) /** * 系统设置 */ -export const selectSystemLogoConfigApi = data => get('xmgl/systemLogoConfig/selectSystemLogoConfig', data); //查询系统logo配置信息 -export const editSystemLogoConfigApi = data => post('xmgl/systemLogoConfig/editSystemLogoConfig', data); //编辑系统logo配置信息 +export const selectSystemLogoConfigApi = (data) => + get('xmgl/systemLogoConfig/selectSystemLogoConfig', data) //查询系统logo配置信息 +export const editSystemLogoConfigApi = (data) => + post('xmgl/systemLogoConfig/editSystemLogoConfig', data) //编辑系统logo配置信息 + +//字典管理 +export const addDictionaryApi = (data) => post('/xmgl/dictionary/add', data) +export const editDictionaryApi = (data) => post('/xmgl/dictionary/edit', data) +export const getDictionaryPageApi = (data) => get('/xmgl/dictionary/page', data) + +//字典管理-数据项 +export const addDictionaryItemApi = (data) => post('/xmgl/dictionaryItem/add', data) +export const deleteDictionaryItemApi = (data) => post('/xmgl/dictionaryItem/delete', data) +export const editDictionaryItemApi = (data) => post('/xmgl/dictionaryItem/edit', data) +export const getDictionaryItemPageApi = (data) => get('/xmgl/dictionaryItem/list', data) +export const getDictionaryItemBackApi = (data) => post('/xmgl/dictionary/back', data) +export const deleteDictionaryItemBackApi = (data) => post('/xmgl/dictionary/deletePhysic', data) +export const batchDeleteDictionaryItemBackApi = (data) => post('/xmgl/dictionary/batch/delete', data) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 7fb6d363..a5d502b9 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -69,7 +69,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上 // 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://121.196.214.246/api/'//金林湾线上新 // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址 // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上 // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1) @@ -82,8 +82,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://61.145.163.135:12345/' //坪山沙湖 // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上 // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 - // axios.defaults.baseURL ='http://101.43.164.214:45011' //上海优益 - // axios.defaults.baseURL ='http://192.168.34.221:30002' //郭圣雄本地 + // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益 + axios.defaults.baseURL ='http://192.168.34.221:30002/' //郭圣雄本地 } else if (process.env.NODE_ENV == 'debug') { axios.defaults.baseURL = 'https://www.ceshi.com' } else if (process.env.NODE_ENV == 'production') { diff --git a/src/pages/index/index.js b/src/pages/index/index.js index ab17847c..3419ee92 100644 --- a/src/pages/index/index.js +++ b/src/pages/index/index.js @@ -101,10 +101,15 @@ if (COMPANY == 'xingxuan') { path: '/operateManage', }, { - menuName: '塔吊模型管理', + menuName: '字典管理', id: 9298, - path: '/brand', + path: '/dictionaryManaged' }, + { + menuName: '塔吊模型管理', + id: 9299, + path: '/brand' + } ] switch (data.accountType) { case 1: diff --git a/src/router/index.js b/src/router/index.js index d8ce65f7..7b8a5f79 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -75,11 +75,18 @@ const routes2 = [ name: 'operateManage', component: () => import('../views/jxjadmin/operateManage.vue'), }, + //字典管理 + { + path: '/dictionaryManaged', + name: 'dictionaryManaged', + component: () => import('../views/jxjadmin/dictionaryManaged.vue'), + }, { path: '/brand', name: 'brand', component: () => import('../views/projectFront/towerCrane/brand.vue'), }, + // 企业版 人员管理 { path: '/firm/peopleManage', diff --git a/src/store/index.js b/src/store/index.js index a1e32524..0533f9d0 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -105,10 +105,12 @@ export default new Vuex.Store({ // FILEURL: 'http://182.90.224.147:15551/image/',//四川成润（内部线上） // UPLOADURL: 'http://118.121.198.147:23232/upload/image',//四川成润（正式） // FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式） - UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾 - FILEURL: 'http://121.196.214.246/api/image/',//金林湾 - // UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地 - // FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地 + // UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾 + // FILEURL: 'http://121.196.214.246/api/image/',//金林湾 + UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地 + FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地 + // UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益 + // FILEURL: 'http://101.43.164.214:45011/image/',//上海优益 ACCOUNTTYPE: [ "系统管理员", diff --git a/src/views/home/login_v1.vue b/src/views/home/login_v1.vue index 25fb103f..36ce9d59 100644 --- a/src/views/home/login_v1.vue +++ b/src/views/home/login_v1.vue @@ -604,10 +604,15 @@ export default { path: '/operateManage' }, { - menuName: '塔吊模型管理', + menuName: '字典管理', id: 9298, - path: '/brand' - } + path: '/dictionaryManaged' + }, + // { + // menuName: '塔吊模型管理', + // id: 9299, + // path: '/brand' + // } ] switch (data.accountType) { case 1: diff --git a/src/views/jxjadmin/dictionaryManaged.vue b/src/views/jxjadmin/dictionaryManaged.vue new file mode 100644 index 00000000..8f451fcb --- /dev/null +++ b/src/views/jxjadmin/dictionaryManaged.vue @@ -0,0 +1,956 @@ + + + \ No newline at end of file diff --git a/src/views/jxjadmin/registerAudit.vue b/src/views/jxjadmin/registerAudit.vue index bfa261b3..ba914f6b 100644 --- a/src/views/jxjadmin/registerAudit.vue +++ b/src/views/jxjadmin/registerAudit.vue @@ -7,7 +7,7 @@ :model="searchForm" ref="searchForm" > - + @@ -24,6 +24,9 @@ 查询 刷新 + 添加企业 @@ -41,6 +44,18 @@ align="center" width="180" > + + - + @@ -298,6 +331,69 @@ + + +
+ + + + + + + + + + + + + + +
+ 取消 + + 确定 + +
+ +
+ diff --git a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue index 69af1b21..ae03f47e 100644 --- a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue +++ b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue @@ -27,7 +27,7 @@ filterLeave(item.safetyLevel) }}

- +

{{ $t('message.deepFoundConfig.finishStatus') }}： - + {{ scope.row.deviceSn }} diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index c374cfa8..8ab80e1f 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -2028,7 +2028,7 @@ export default { exportM() { window.location.href = this.$http.defaults.baseURL + - '/xmgl/download/exporExcelWorkerTemplate?projectSn=' + + 'xmgl/download/exporExcelWorkerTemplate?projectSn=' + this.projectSn }, // 下发通行设备 diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index 19f340a8..336403e2 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue @@ -2301,7 +2301,7 @@ export default { exportM() { window.location.href = this.$http.defaults.baseURL + - '/xmgl/download/exporExcelWorkerTemplate?projectSn=' + + 'xmgl/download/exporExcelWorkerTemplate?projectSn=' + this.projectSn }, // 下发通行设备 diff --git a/src/views/projectFront/toxicGasDetection/gasMonitoringData.vue b/src/views/projectFront/toxicGasDetection/gasMonitoringData.vue index 77089b0a..a2000fa8 100644 --- a/src/views/projectFront/toxicGasDetection/gasMonitoringData.vue +++ b/src/views/projectFront/toxicGasDetection/gasMonitoringData.vue @@ -123,7 +123,7 @@ export default { //导出 exportBtn() { - fetch(this.$http.defaults.baseURL + '/xmgl/poisonousGasDevCurrentData/exportXls?&projectSn=' + this.projectSn + '&queryEndTime=' + this.time[1] + '&queryStartTime=' + this.time[0] + '&devName=' + this.devName, { + fetch(this.$http.defaults.baseURL + 'xmgl/poisonousGasDevCurrentData/exportXls?&projectSn=' + this.projectSn + '&queryEndTime=' + this.time[1] + '&queryStartTime=' + this.time[0] + '&devName=' + this.devName, { headers: { 'Authorization': this.$store.state.userInfo.token }