From b55c1fddfe88a4b68f20cf1650e5d79aee388c3a Mon Sep 17 00:00:00 2001 From: yjl <1490736767@qq.com> Date: Fri, 24 Mar 2023 17:33:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E6=9E=97=E6=B9=BE=E4=B8=8B=E9=9D=A2-?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/config.js | 2 +- src/assets/js/api/dataBoard.js | 4 + src/assets/js/http.js | 8 +- .../projectAdmin/jlw/components/progress.vue | 6 +- .../projectAdmin/jlw/digitalSite/rightTop.vue | 136 +++++++++++------- .../jlw/jChart/bar/JProgressChart.vue | 1 + .../jlw/jChart/pie/JNestedRingChart.vue | 32 ++--- .../jlw/projectHuli/qualityProblem.vue | 52 ++++--- .../jlw/qualityManage/leftTop.vue | 4 +- .../jlw/qualityManage/rightBottom.vue | 2 +- .../jlw/safeManage/leftCenter.vue | 108 +++++++------- .../projectAdmin/jlw/safeManage/leftTop.vue | 9 +- .../jlw/safeManage/rightBottom.vue | 55 ++++++- 13 files changed, 255 insertions(+), 164 deletions(-) diff --git a/public/js/config.js b/public/js/config.js index 2bd01352..39d018ae 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -21,7 +21,7 @@ var PROJECT = { } -var PROJECT_TYPE = PROJECT.online_zjsj +var PROJECT_TYPE = PROJECT.local_test var headerShow = true; // 是否显示头部 var tabsShow = true; // 是否显示tabs diff --git a/src/assets/js/api/dataBoard.js b/src/assets/js/api/dataBoard.js index f4b66fb2..d705ef06 100644 --- a/src/assets/js/api/dataBoard.js +++ b/src/assets/js/api/dataBoard.js @@ -31,6 +31,8 @@ export const selectUfaceDevStatisticsList = data => post('xmgl/ufaceDev/selectUf export const selectEnvironmentDevAlaramCountList = data => post('xmgl/environmentDev/selectEnvironmentDevAlaramCountList', data); export const selectProjectGetProjectInfoBySn = data => post('xmgl/project/getProjectInfoBySn', data);//获取项目平面图 +export const getSelectuFaceDevList = data => get('/xmgl/ufaceDev/count/onoffline', data);//获取项目平面图 + @@ -67,6 +69,8 @@ export const selectHiddenDangerSecurityManageStatisticsApi = data => post('xmgl // old安全管理 export const selectRectifiedSecurityManageList2Api = data => post('xmgl/securityManage/selectRectifiedSecurityManageList', data); export const getNewestSecurityManageDataList2Api = data => post('xmgl/securityManage/getNewestSecurityManageDataList', data); +export const getHiddenDangerInspectManageDataListApi = data => post('/xmgl/hiddenDangerInspectRecord/selectHiddenDangerTypeRatio', data); +export const getHiddenDangerStateTrendListApi = data => post('/xmgl/hiddenDangerInspectRecord/selectHiddenDangerStateTrend', data); diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 1a1d6b26..d60ae467 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -44,7 +44,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ // 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/'; @@ -75,10 +75,10 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上 // axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上 // axios.defaults.baseURL = 'http://192.168.34.221:8088' //郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:8210' //郭圣雄本地 - // axios.defaults.baseURL = 'http://192.168.34.221:8199' //郭圣雄本地 - // axios.defaults.baseURL = 'http://192.169.34.133:8070' //彭洁本地 + // axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地 } else if (process.env.NODE_ENV == 'debug') { axios.defaults.baseURL = 'https://www.ceshi.com' diff --git a/src/views/projectAdmin/jlw/components/progress.vue b/src/views/projectAdmin/jlw/components/progress.vue index d7362fff..33da6df6 100644 --- a/src/views/projectAdmin/jlw/components/progress.vue +++ b/src/views/projectAdmin/jlw/components/progress.vue @@ -140,10 +140,10 @@ export default { margin-left: -47%; } .line { - top: 60%; + top: 50%; position: absolute; - margin-left: 200px; - color: gray; + margin-left: 145px; + color: #465161; } } } diff --git a/src/views/projectAdmin/jlw/digitalSite/rightTop.vue b/src/views/projectAdmin/jlw/digitalSite/rightTop.vue index f74ffc66..20881636 100644 --- a/src/views/projectAdmin/jlw/digitalSite/rightTop.vue +++ b/src/views/projectAdmin/jlw/digitalSite/rightTop.vue @@ -1,8 +1,8 @@ @@ -73,49 +102,56 @@ export default { text-align: right; } } - .listBox{ + .listBox { height: calc(100% - 15px); - overflow:auto; - .list-item { - margin-bottom: 6px; - padding: 0 16px; - height: 22px; - display: flex; - align-items: center; - &.online { - background-image: linear-gradient(90deg, rgba(23, 54, 74, 1), rgba(23, 54, 74, 0.2)); + overflow: auto; + .list-item { + margin-bottom: 6px; + padding: 0 16px; + height: 22px; + display: flex; + align-items: center; + &.online { + background-image: linear-gradient( + 90deg, + rgba(23, 54, 74, 1), + rgba(23, 54, 74, 0.2) + ); + .status { + background-color: #3cabfd; + } + } + &.offline { + background-image: linear-gradient( + 90deg, + rgba(67, 42, 63, 1), + rgba(67, 42, 63, 0.2) + ); + .status { + background-color: #ff6c7f; + } + } .status { - background-color: #3cabfd; + margin-right: 20px; + width: 36px; + height: 16px; + line-height: 16px; + text-align: center; + font-size: 12px; + border-radius: 9px; + } + .label { + margin-right: auto; + font-size: 14px; + } + .enter { + width: 70px; + } + .outer { + width: 70px; + text-align: right; } } - &.offline { - background-image: linear-gradient(90deg, rgba(67, 42, 63, 1), rgba(67, 42, 63, 0.2)); - .status { - background-color: #ff6c7f; - } - } - .status { - margin-right: 20px; - width: 36px; - height: 16px; - line-height: 16px; - text-align: center; - font-size: 12px; - border-radius: 9px; - } - .label { - margin-right: auto; - font-size: 14px; - } - .enter { - width: 70px; - } - .outer { - width: 70px; - text-align: right; - } } - } - } diff --git a/src/views/projectAdmin/jlw/jChart/bar/JProgressChart.vue b/src/views/projectAdmin/jlw/jChart/bar/JProgressChart.vue index a8b1cea0..75573233 100644 --- a/src/views/projectAdmin/jlw/jChart/bar/JProgressChart.vue +++ b/src/views/projectAdmin/jlw/jChart/bar/JProgressChart.vue @@ -41,6 +41,7 @@ export default { }, methods: { createChart() { + this.JProgressChart = echarts.init(this.$refs.JProgressChart) const { grid, seriesData, yData } = this const max = Math.max(...seriesData) const maxData = seriesData.map((item) => max) diff --git a/src/views/projectAdmin/jlw/jChart/pie/JNestedRingChart.vue b/src/views/projectAdmin/jlw/jChart/pie/JNestedRingChart.vue index c3406e18..45d96663 100644 --- a/src/views/projectAdmin/jlw/jChart/pie/JNestedRingChart.vue +++ b/src/views/projectAdmin/jlw/jChart/pie/JNestedRingChart.vue @@ -31,15 +31,13 @@ export default { }, mounted() { this.jNestedRingChart = echarts.init(this.$refs.jNestedRingChart) + this.drawChart() this.createChart() - this.$nextTick(() => { - this.drawChart(); - this.timer = setInterval(() => { - this.doing(); - }, 200); - }); + this.timer = setInterval(() => { + this.doing() + }, 200) }, - destroyed(){ + destroyed() { clearInterval(this.timer) this.timer = '' }, @@ -51,8 +49,8 @@ export default { methods: { createChart() { const { title, legend, series, showLegend } = this - const setSeries = (series => { - return series.map(item => ({ + const setSeries = ((series) => { + return series.map((item) => ({ type: 'pie', label: false, center: item.center || ['30%', '50%'], @@ -62,6 +60,7 @@ export default { data: item.data })) })(series) + this.jNestedRingChart = echarts.init(this.$refs.jNestedRingChart) const option = { title: { @@ -104,20 +103,21 @@ export default { series: setSeries } if (!showLegend) { - delete option.legend; + delete option.legend } this.jNestedRingChart.setOption(option) }, drawChart() { - this.myChart = echarts.init(this.$refs.jNestedRingChart); + this.myChart = echarts.init(this.$refs.jNestedRingChart) this.option = { series: this.series - }; - }, - doing() {//转动饼图内圈 - this.series[0].startAngle = this.series[0].startAngle - 5; - this.myChart.setOption(this.option); + } }, + doing() { + //转动饼图内圈 + this.series[0].startAngle = this.series[0].startAngle - 5 + this.myChart.setOption(this.option) + } }, watch: { series() { diff --git a/src/views/projectAdmin/jlw/projectHuli/qualityProblem.vue b/src/views/projectAdmin/jlw/projectHuli/qualityProblem.vue index 8c72c4c3..6fda3068 100644 --- a/src/views/projectAdmin/jlw/projectHuli/qualityProblem.vue +++ b/src/views/projectAdmin/jlw/projectHuli/qualityProblem.vue @@ -9,22 +9,31 @@ :data="[{ value: total.jyUrgentLevelNum }, { value: total.ybUrgentLevelNum }]" :radius="['55%', '80%']" />--> - + ]" + />
已整改质量问题
-
{{( total.totalNum-total.rectificationNum)}}
+
{{ total.totalNum - total.rectificationNum }}
未整改质量问题
-
{{ total.rectificationNum}}
+
{{ total.rectificationNum }}
@@ -54,47 +63,48 @@ export default { ratioNum: 0 }, series: [ - { + { roseType: 'area', - startAngle:90, + startAngle: 90, center: ['50%', '50%'], radius: ['58%', '54%'], color: ['#0B1B35', '#244D8F'], data: [30, 40, 30, 40], - hoverAnimation:false, + hoverAnimation: false }, { color: ['#3aaaff', '#ff6982'], center: ['50%', '50%'], - startAngle:90, + startAngle: 90, data: [ { value: 0, name: '已整改质量问题' }, { value: 0, name: '未整改质量问题' } ], - hoverAnimation:false, + hoverAnimation: false } ] } }, - created(){ + created() { this.getData() }, - methods:{ - //获取数据 - getData() { + methods: { + //获取数据 + getData() { let data = { projectSn: this.$store.state.projectSn } - selectQualityStatisticsApi(data).then(res => { + selectQualityStatisticsApi(data).then((res) => { this.total = res.result.total this.total.totalNum = Number(res.result.total.totalNum) - this.series[1].data[0].value = this.total.totalNum-this.total.rectificationNum + this.series[1].data[0].value = + this.total.totalNum - this.total.rectificationNum this.series[1].data[1].value = this.total.rectificationNum - console.log(this.total,'质量问题'); + console.log(this.total, '质量问题') }) } - }, + } } diff --git a/src/views/projectAdmin/jlw/qualityManage/leftTop.vue b/src/views/projectAdmin/jlw/qualityManage/leftTop.vue index cd906bad..4b2eed8e 100644 --- a/src/views/projectAdmin/jlw/qualityManage/leftTop.vue +++ b/src/views/projectAdmin/jlw/qualityManage/leftTop.vue @@ -3,9 +3,9 @@
@@ -60,6 +60,8 @@ export default { }) this.yData = xdata this.seriesData = ydata + console.log('this.yData', this.yData) + console.log('this.seriesData', this.seriesData) }) }, handleSwitch(val) { diff --git a/src/views/projectAdmin/jlw/qualityManage/rightBottom.vue b/src/views/projectAdmin/jlw/qualityManage/rightBottom.vue index 44a0525b..aef59063 100644 --- a/src/views/projectAdmin/jlw/qualityManage/rightBottom.vue +++ b/src/views/projectAdmin/jlw/qualityManage/rightBottom.vue @@ -78,7 +78,7 @@ export default { ydata.push(item.num) }) this.xData = xdata - this.series.data = ydata + this.series[0].data = ydata } }) } diff --git a/src/views/projectAdmin/jlw/safeManage/leftCenter.vue b/src/views/projectAdmin/jlw/safeManage/leftCenter.vue index 699a667b..15383c67 100644 --- a/src/views/projectAdmin/jlw/safeManage/leftCenter.vue +++ b/src/views/projectAdmin/jlw/safeManage/leftCenter.vue @@ -1,29 +1,18 @@ @@ -115,7 +103,7 @@ export default { margin-right: 10px; color: #6ee4f0; cursor: pointer; - color: #3DACFE; + color: #3dacfe; } } } diff --git a/src/views/projectAdmin/jlw/safeManage/leftTop.vue b/src/views/projectAdmin/jlw/safeManage/leftTop.vue index 5875e559..4735d8e5 100644 --- a/src/views/projectAdmin/jlw/safeManage/leftTop.vue +++ b/src/views/projectAdmin/jlw/safeManage/leftTop.vue @@ -37,6 +37,7 @@ label="检查项" > .cell { + font-size: 14px !important; +} diff --git a/src/views/projectAdmin/jlw/safeManage/rightBottom.vue b/src/views/projectAdmin/jlw/safeManage/rightBottom.vue index a731401a..e2aeca00 100644 --- a/src/views/projectAdmin/jlw/safeManage/rightBottom.vue +++ b/src/views/projectAdmin/jlw/safeManage/rightBottom.vue @@ -1,5 +1,5 @@ - +