diff --git a/dist.zip b/dist.zip index da07d2ea..0e875437 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/public/js/config.js b/public/js/config.js index 5128235d..e72a412c 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,7 +1,7 @@ -var COMPANY = ''; //通用 +// var COMPANY = ''; //通用 // var COMPANY='zhongjian'; //中建,和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 -// var COMPANY='nanchang'; //南昌地铁、衢州 +var COMPANY='nanchang'; //南昌地铁、衢州 // var COMPANY='longguang'; //龙光地产 // var COMPANY='zhengwu' // var COMPANY='shenbai'; //沈白高铁 diff --git a/src/assets/images/dataBoard/55.jpg b/src/assets/images/dataBoard/55.jpg new file mode 100644 index 00000000..43fdc6c4 Binary files /dev/null and b/src/assets/images/dataBoard/55.jpg differ diff --git a/src/assets/images/dataBoard/555.png b/src/assets/images/dataBoard/555.png new file mode 100644 index 00000000..c1c1a403 Binary files /dev/null and b/src/assets/images/dataBoard/555.png differ diff --git a/src/assets/images/dataBoard/menuBG-active2.png b/src/assets/images/dataBoard/menuBG-active2.png new file mode 100644 index 00000000..2e6ad466 Binary files /dev/null and b/src/assets/images/dataBoard/menuBG-active2.png differ diff --git a/src/assets/images/dataBoard/menuBG2.png b/src/assets/images/dataBoard/menuBG2.png new file mode 100644 index 00000000..9a2b06ab Binary files /dev/null and b/src/assets/images/dataBoard/menuBG2.png differ diff --git a/src/assets/images/dataBoard/tabBG-active2.png b/src/assets/images/dataBoard/tabBG-active2.png new file mode 100644 index 00000000..63cf0afd Binary files /dev/null and b/src/assets/images/dataBoard/tabBG-active2.png differ diff --git a/src/assets/images/dataBoard/tabBG2.png b/src/assets/images/dataBoard/tabBG2.png new file mode 100644 index 00000000..ca0dc6b7 Binary files /dev/null and b/src/assets/images/dataBoard/tabBG2.png differ diff --git a/src/assets/images/dataBoard/title_line3.png b/src/assets/images/dataBoard/title_line3.png new file mode 100644 index 00000000..f98a832e Binary files /dev/null and b/src/assets/images/dataBoard/title_line3.png differ diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 3d3b3bd8..b84c5450 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -37,13 +37,13 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光 // axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/' - // axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789 + axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // 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.125:6023/'; //杨意本地 http/1.1 // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇 // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index 8ec9acb9..00bd13f9 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -2555,7 +2555,7 @@ export default { personSerial: "", }; this.getUfaceDevList(); - this.goTwo(); + // this.goTwo(); this.addPersonDialog = true; this.personForm = JSON.parse(JSON.stringify(value)); this.personForm.sex = Number(value.sex);