diff --git a/dist.zip b/dist.zip index 3b4791a7..0a5c2155 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/public/js/config.js b/public/js/config.js index 89de7e21..7f7c6f90 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -18,7 +18,7 @@ var PROJECT = { } -var PROJECT_TYPE = PROJECT.local_test +var PROJECT_TYPE = PROJECT.online_zjsj var headerShow = true; // 是否显示头部 var tabsShow = true; // 是否显示tabs diff --git a/src/assets/js/api/zhongjianFourth.js b/src/assets/js/api/zhongjianFourth.js index 0a2a5cde..55d9c289 100644 --- a/src/assets/js/api/zhongjianFourth.js +++ b/src/assets/js/api/zhongjianFourth.js @@ -37,4 +37,9 @@ export const getWorkerNumApi = data => get('xmgl/workerInfo/getPersonnelNum',dat // 人员增长趋势 export const getWorkerGrowthApi = data => get('xmgl/workerInfo/getPersonnelGrowth',data) // 员工申报年龄段 -export const getDeclareAgeApi = data => get('/xmgl/workerInfo/getDeclareAge',data) \ No newline at end of file +export const getDeclareAgeApi = data => get('/xmgl/workerInfo/getDeclareAge',data) + + +/* --------------质量管理------------ */ +// 质量巡检 +export const getQualityAcceptanceApi = data => get('/xmgl/qualityInspectionRecord/getQualityAcceptanceAndRectificationNum',data) \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index ec69a772..f03d839a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -45,8 +45,8 @@ export default new Vuex.Store({ // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', // - // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // - // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 + UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // + FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 /* 2022-05-16 */ // tag: 部署河南项目时,需要打开这两行代码 // UPLOADURL: 'http://124.71.178.44:100/upload/image', @@ -56,8 +56,8 @@ export default new Vuex.Store({ // UPLOADURL: 'http://182.90.224.237:7000/upload/image', // FILEURL: 'http://182.90.224.237:7000/image/', // 邱平毅的 - UPLOADURL: 'http://192.168.34.216:6023/upload/image', - FILEURL: 'http://192.168.34.216:6023/image/', + // UPLOADURL: 'http://192.168.34.216:6023/upload/image', + // FILEURL: 'http://192.168.34.216:6023/image/', // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 diff --git a/src/views/home/login_v1.vue b/src/views/home/login_v1.vue index 0cd9f959..330a9646 100644 --- a/src/views/home/login_v1.vue +++ b/src/views/home/login_v1.vue @@ -162,7 +162,8 @@
- + {{ $t("message.login.login") }}
diff --git a/src/views/projectAdmin/zjsj/quality/leftTop.vue b/src/views/projectAdmin/zjsj/quality/leftTop.vue index b6ecf34c..b5716d27 100644 --- a/src/views/projectAdmin/zjsj/quality/leftTop.vue +++ b/src/views/projectAdmin/zjsj/quality/leftTop.vue @@ -4,9 +4,9 @@
@@ -17,8 +17,8 @@ 占比
- 123456 - 20% + {{list.disposeNum}} + {{list.disposeNumRatio}}%
@@ -27,17 +27,17 @@ 占比
- 123456 - 20% + {{list.noDisposeNum}} + {{list.noDisposeNumRatio}}%
@@ -48,8 +48,8 @@ 占比
- 123456 - 20% + {{list.pollingNum}} + {{list.pollingNumRatio}}%
@@ -58,8 +58,8 @@ 占比
- 123456 - 20% + {{list.noPollingNum}} + {{list.noPollingNumRatio}}%
@@ -70,8 +70,36 @@ diff --git a/src/views/projectAdmin/zjsj/security/leftTop.vue b/src/views/projectAdmin/zjsj/security/leftTop.vue index 05507833..52172201 100644 --- a/src/views/projectAdmin/zjsj/security/leftTop.vue +++ b/src/views/projectAdmin/zjsj/security/leftTop.vue @@ -97,19 +97,19 @@ export default { return { // 安全隐患 safetyPeril: { - rectificationNum: undefined, - rectificationRatio: undefined, - noRectificationNum: undefined, - noRectificationRatio: undefined, - totalNum: undefined, + rectificationNum: 0, + rectificationRatio: 0, + noRectificationNum: 0, + noRectificationRatio: 0, + totalNum: 0, }, // 今日巡检 todayInspection: { - rectificationNum: undefined, - rectificationRatio: undefined, - noRectificationNum: undefined, - noRectificationRatio: undefined, - totalNum: undefined, + rectificationNum: 0, + rectificationRatio: 0, + noRectificationNum: 0, + noRectificationRatio: 0, + totalNum: 0, }, // 事件列表 list: [