diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index c06e5588..4109e8c7 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -40,13 +40,13 @@ if (process.env.NODE_ENV == 'development') {
// 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.116:6023/' // 邱平毅本地
+ axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地
// axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
// axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地
// axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
- // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
+ //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.231:6023/'; //杨思瑞本地
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/';
diff --git a/src/views/projectAdmin/fourEngin/command/leftThree/index.vue b/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
index ccd61a05..bc5853be 100644
--- a/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
@@ -40,21 +40,21 @@ export default {
this.getData();
},
methods: {
- getData() {
- listProgressOfTheTask({
- projectSn: this.$store.state.projectSn,
- isNoStart: false,
- }).then((res) => {
- // state 0未开始, 1进行中, 2已完成
- res.result.forEach((item) => {
- if (item.state == 2) {
- item.state = true;
- }
- });
- console.log("进度条的返回值", res);
- this.list = res.result;
- });
- },
+ // getData() {
+ // listProgressOfTheTask({
+ // projectSn: this.$store.state.projectSn,
+ // isNoStart: false,
+ // }).then((res) => {
+ // // state 0未开始, 1进行中, 2已完成
+ // res.result.forEach((item) => {
+ // if (item.state == 2) {
+ // item.state = true;
+ // }
+ // });
+ // console.log("进度条的返回值", res);
+ // this.list = res.result;
+ // });
+ // },
},
};
diff --git a/src/views/projectAdmin/jlw/safeManage/leftBottom.vue b/src/views/projectAdmin/jlw/safeManage/leftBottom.vue
index 34545918..c30c2216 100644
--- a/src/views/projectAdmin/jlw/safeManage/leftBottom.vue
+++ b/src/views/projectAdmin/jlw/safeManage/leftBottom.vue
@@ -1,9 +1,9 @@
-
-
+
+
diff --git a/src/views/projectAdmin/jlw/safeManage/leftCenter.vue b/src/views/projectAdmin/jlw/safeManage/leftCenter.vue
index 3c8d7750..699a667b 100644
--- a/src/views/projectAdmin/jlw/safeManage/leftCenter.vue
+++ b/src/views/projectAdmin/jlw/safeManage/leftCenter.vue
@@ -34,15 +34,20 @@ export default {
}
},
mounted() {
- selectSecurityManageStatisticsApi({ projectSn: this.projectSn }).then(res => {
- const totals = res.result.total
- this.series[1].data = [
- { value: totals.weekInspectNum, name: '周检' },
- { value: totals.monthInspectNum, name: '月检' },
- { value: totals.otherInspectNum, name: '其他' }
+ this.series[1].data = [
+ { value: 3, name: '周检' },
+ { value: 7, name: '月检' },
+ { value: 1, name: '其他' }
]
- this.totalNum = totals.totalNum
- })
+ // selectSecurityManageStatisticsApi({ projectSn: this.projectSn }).then(res => {
+ // const totals = res.result.total
+ // this.series[1].data = [
+ // { value: totals.weekInspectNum, name: '周检' },
+ // { value: totals.monthInspectNum, name: '月检' },
+ // { value: totals.otherInspectNum, name: '其他' }
+ // ]
+ // this.totalNum = totals.totalNum
+ // })
},
data() {
return {
diff --git a/src/views/projectAdmin/jlw/safeManage/leftTop.vue b/src/views/projectAdmin/jlw/safeManage/leftTop.vue
index b3924e7e..0d0cbb56 100644
--- a/src/views/projectAdmin/jlw/safeManage/leftTop.vue
+++ b/src/views/projectAdmin/jlw/safeManage/leftTop.vue
@@ -56,7 +56,11 @@ export default {
data() {
return {
projectSn: this.$store.state.projectSn,
- alarmList: []
+ alarmList: [
+ {checkPoints:'施工方案',checkContent:'施工方案整改',checkTime:'2022-12-07',rectifyPeopleAme:'张平江'},
+ {checkPoints:'洞口防护',checkContent:'洞口需要防护',checkTime:'2022-12-09',rectifyPeopleAme:'马杰'}
+ ],
+
// yData: [
// '未分类',
// '临边防护',
@@ -72,10 +76,10 @@ export default {
}
},
mounted() {
- getNewestSecurityManageDataList2Api({ projectSn: this.projectSn }).then(res => {
- console.log('待整改问题: ', res);
- this.alarmList = res.result || []
- })
+ // getNewestSecurityManageDataList2Api({ projectSn: this.projectSn }).then(res => {
+ // console.log('待整改问题: ', res);
+ // this.alarmList = res.result || []
+ // })
},
}
diff --git a/src/views/projectAdmin/jlw/safeManage/rightTop.vue b/src/views/projectAdmin/jlw/safeManage/rightTop.vue
index b5ef222c..a20c3b74 100644
--- a/src/views/projectAdmin/jlw/safeManage/rightTop.vue
+++ b/src/views/projectAdmin/jlw/safeManage/rightTop.vue
@@ -69,12 +69,13 @@ export default {
},
methods: {
getCounts() {
- selectSecurityManageStatisticsApi({ projectSn: this.projectSn }).then(res => {
- const totals = res.result.total
- const { totalNum, reviewedNum, rectificationNum, closeNum } = totals
- const ratioNum = totals.totalNum ? ((totals.closeNum / totals.totalNum) * 100).toFixed(2) : 0
- this.totals = { totalNum, reviewedNum, rectificationNum, closeNum, ratioNum }
- })
+ // selectSecurityManageStatisticsApi({ projectSn: this.projectSn }).then(res => {
+ // const totals = res.result.total
+ // const { totalNum, reviewedNum, rectificationNum, closeNum } = totals
+ // const ratioNum = totals.totalNum ? ((totals.closeNum / totals.totalNum) * 100).toFixed(2) : 0
+ // this.totals = { totalNum, reviewedNum, rectificationNum, closeNum, ratioNum }
+ // })
+ this.totals = { totalNum:'6', reviewedNum:'1', rectificationNum:'1', closeNum:'1', ratioNum:'84' }
}
}
}
diff --git a/src/views/projectAdmin/zjsj/command/index.vue b/src/views/projectAdmin/zjsj/command/index.vue
index 39d0da8d..095bed8f 100644
--- a/src/views/projectAdmin/zjsj/command/index.vue
+++ b/src/views/projectAdmin/zjsj/command/index.vue
@@ -39,7 +39,7 @@