diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 4582d8cd..2655db01 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,7 +40,7 @@ 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/' // 邱平毅本地1 + // axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地1 // axios.defaults.baseURL = 'http://192.168.34.116:18070/' // 邱平毅本地2 // axios.defaults.baseURL = 'http://192.168.34.125:6023' // 邱平毅本地3 // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 @@ -55,7 +55,6 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲 // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西 // axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲 - // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; // // axios.defaults.baseURL = 'http://120.236.247.200:9000/'; //横琴线上 // axios.defaults.baseURL = 'http://223.82.100.80:9000/'; //南昌地铁 @@ -77,6 +76,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://218.92.215.138:9090/' //盐城 新佳城小区 123456 // axios.defaults.baseURL = 'http://36.137.53.203:9090/' //盐城 gdjt 123456789 // axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789 + //  axios.defaults.baseURL = 'http://139.9.66.234:7072/' //三江集团 + // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台 } 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/views/projectAdmin/dataBoard/index.vue b/src/views/projectAdmin/dataBoard/index.vue index ec634dcb..a590339b 100644 --- a/src/views/projectAdmin/dataBoard/index.vue +++ b/src/views/projectAdmin/dataBoard/index.vue @@ -12,12 +12,7 @@
-
+
@@ -30,8 +25,7 @@ @click="optionListIndex = item.index" :class="{ selectOptionList_item: item.index == optionListIndex, - selectOptionList_item2: - item.index == optionListIndex && enabledProjectV2 == 4 + selectOptionList_item2: item.index == optionListIndex && enabledProjectV2 == 4 }" v-for="(item, index) in $t('message.companyDiagram.optionList')" :key="index" @@ -47,26 +41,19 @@ controls loop > -
+
- {{ - $t('message.companyDiagram.changeImg') - }} + {{ $t('message.companyDiagram.changeImg') }} -->
-
+

{{ $t('message.videoManage.empty') }}, @@ -91,9 +75,9 @@ style="display: inline-block" class="upload-demo" :action="$store.state.UPLOADURL" - :on-success="(file) => handleSuccess(file, 1)" - :on-error="(file) => handleError(file, 1)" - :beforeUpload="(file) => handleBeforeUpload(file, 1)" + :on-success="file => handleSuccess(file, 1)" + :on-error="file => handleError(file, 1)" + :beforeUpload="file => handleBeforeUpload(file, 1)" name="files" :show-file-list="false" > @@ -106,29 +90,23 @@ v-if="projectData.videoUrl && optionListIndex == 1" class="changeVideoBox" :action="$store.state.UPLOADURL" - :on-success="(file) => handleSuccess(file, 1)" - :on-error="(file) => handleError(file, 1)" - :beforeUpload="(file) => handleBeforeUpload(file, 1)" + :on-success="file => handleSuccess(file, 1)" + :on-error="file => handleError(file, 1)" + :beforeUpload="file => handleBeforeUpload(file, 1)" name="files" :show-file-list="false" > - {{ - $t('message.companyDiagram.changeVideo') - }} + {{ $t('message.companyDiagram.changeVideo') }}

-
- {{ $t('message.companyDiagram.planStatus') }} -
+
{{ $t('message.companyDiagram.planStatus') }}
-
- {{ $t('message.companyDiagram.countDown') }} -
+
{{ $t('message.companyDiagram.countDown') }}
@@ -151,17 +129,11 @@
- +
-
- {{ $t('message.companyDiagram.milestone') }} -
+
{{ $t('message.companyDiagram.milestone') }}

{{ item.name }}

-
+
@@ -192,30 +157,15 @@
-
+
{{ $t('message.companyDiagram.environmentMonitor') }}
-
- +
+
-
+

{{ item.day }} @@ -260,16 +210,10 @@

-
+
{{ $t('message.companyDiagram.safeManage') }}
-
+
@@ -277,10 +221,7 @@
-
+
{{ $t('message.companyDiagram.qualityManage') }}
@@ -294,10 +235,7 @@ class="qulityChart" ref="qulityChart" >
--> -
+
@@ -305,10 +243,7 @@
- +

塔吊

@@ -319,10 +254,7 @@
- +

升降机

@@ -333,10 +265,7 @@
- +

环境监测

@@ -347,10 +276,7 @@
- +

AI视频监测

@@ -390,39 +316,24 @@
-
+
{{ $t('message.companyDiagram.environmentMonitor') }}
{{ $t('message.companyDiagram.alarmRecord') }}
-
+
-
+
- +
@@ -448,10 +359,7 @@
-
+

{{ $t('message.companyDiagram.noData') }}

@@ -486,10 +394,7 @@ import { getRealTimeDustNoiseDataApi, environmentDevList } from '@/assets/js/api/environmentManage' -import { - eidtProjectShowConfig, - queryBySnData -} from '@/assets/js/api/projectSummary.js' +import { eidtProjectShowConfig, queryBySnData } from '@/assets/js/api/projectSummary.js' import ProjectInfo from './homePage/projectInfo' import PersonOverview from './homePage/personOverview' @@ -710,7 +615,7 @@ export default { { itemStyle: { normal: { - color: function (params) { + color: function(params) { var colorList = ['#4378d8', '#a65d23', '#913211', '#199d83'] return colorList[params.dataIndex] } @@ -720,8 +625,7 @@ export default { data: [ this.statisticsCount.devcount.videoNum, this.statisticsCount.devcount.ufaceDevNum, - this.statisticsCount.devcount.lifterDevNum + - this.statisticsCount.devcount.towerDevNum, + this.statisticsCount.devcount.lifterDevNum + this.statisticsCount.devcount.towerDevNum, this.statisticsCount.devcount.environmentDevNum ], type: 'bar', @@ -744,7 +648,7 @@ export default { }, loadWeather() { var _this = this - getWeatherDataApi({ cityid: '' }).then((res) => { + getWeatherDataApi({ cityid: '' }).then(res => { console.log(res) var json = JSON.parse(res.result) var list = json.data @@ -753,9 +657,7 @@ export default { list.forEach((element, index) => { // element.week=getWeek(element.date) // element.date = element.date.substring(5,element.date.length) - element.url = require('@/assets/images/weather/' + - element.wea_img + - '.png') + element.url = require('@/assets/images/weather/' + element.wea_img + '.png') this.weatherList.push(element) }) }) @@ -763,16 +665,14 @@ export default { //获取环境设备列表--环境监测实时数据--下拉 getDevList() { console.log(22222222222222) - environmentDevList({ projectSn: this.$store.state.projectSn }).then( - (result) => { - // console.log('列表', result) - console.log(result) - if (result.result.length > 0) { - this.currentDevDetail = result.result[0] - this.getRealTimeDustNoiseData() - } + environmentDevList({ projectSn: this.$store.state.projectSn }).then(result => { + // console.log('列表', result) + console.log(result) + if (result.result.length > 0) { + this.currentDevDetail = result.result[0] + this.getRealTimeDustNoiseData() } - ) + }) }, // 获取环境监测空气质量 getRealTimeDustNoiseData() { @@ -781,7 +681,7 @@ export default { projectSn: this.$store.state.projectSn } console.log(data) - getRealTimeDustNoiseDataApi(data).then((res) => { + getRealTimeDustNoiseDataApi(data).then(res => { console.log(res) if (res.code == 200) { console.log(res.result) @@ -814,7 +714,7 @@ export default { sn: this.$store.state.projectSn } // 获取塔吊报警数据 - getAllTowerDangerInfo(data).then((res) => { + getAllTowerDangerInfo(data).then(res => { if (res.code === 200) { let { result } = res this.totalTowerDev = result.devCount.devNum @@ -823,7 +723,7 @@ export default { }) // getAiVideoInfo // 获取升降机报警数据 - getAllLifterDangerInfo(data).then((res) => { + getAllLifterDangerInfo(data).then(res => { if (res.code === 200) { let { result } = res this.totalLifterDev = result.devCount.devNum @@ -831,7 +731,7 @@ export default { } }) // 获取环境监测报警数据 - getEnvironmentInfo(data).then((res) => { + getEnvironmentInfo(data).then(res => { if (res.code === 200) { let { result } = res this.environmentDevNum = result.devTotal.devNum @@ -839,7 +739,7 @@ export default { } }) // 获取AI设备报警数据 - getAiVideoInfo(data).then((res) => { + getAiVideoInfo(data).then(res => { console.log(res) if (res.code === 200) { let { result } = res @@ -848,21 +748,11 @@ export default { } }) // 获取报警列表数据 - getAIDangerList(data).then((res) => { + getAIDangerList(data).then(res => { if (res.code === 200) { let { result } = res - let type = [ - '烟感', - '明火', - '人员倒地', - '未戴安全帽', - '区域入侵', - '越界入侵', - '人员聚集衣', - '反光衣', - '裸土覆盖' - ] - this.alarmList = result.slice(0, 3).map((x) => { + let type = ['烟感', '明火', '人员倒地', '未戴安全帽', '区域入侵', '越界入侵', '人员聚集衣', '反光衣', '裸土覆盖'] + this.alarmList = result.slice(0, 3).map(x => { return { createTime: x.createTime, hardwareName: x.hardwareName, @@ -873,7 +763,7 @@ export default { alarmType: type[x.alarmType - 1] } }) - result.slice(0, 3).forEach((x) => { + result.slice(0, 3).forEach(x => { this.srcList.push(`${this.$store.state.FILEURL}${x.imageUrl}`) }) console.log(this.alarmList) @@ -887,51 +777,46 @@ export default { projectSn: this.$store.state.projectSn } console.log('当前的参数', data) - getProjectDetail(data).then((res) => { + getProjectDetail(data).then(res => { if (res.code == 200) { this.projectData = res.result console.log('projectData', this.projectData) if (parseInt(this.projectData.constructionStage) > 4) { - this.$refs['stageScroll'].scrollTo( - { x: (this.projectData.constructionStage - 4) * 230 }, - 500 - ) + this.$refs['stageScroll'].scrollTo({ x: (this.projectData.constructionStage - 4) * 230 }, 500) } } }) }, //统计企业下项目各人员统计 getWorkerStatisticsCount(type) { - getWorkerStatisticsCountApi({ sn: this.$store.state.projectSn }).then( - (res) => { - console.log(res) - this.statisticsCount = res.result - console.log('----------------', this.statisticsCount) - this.totalDevNum = - this.statisticsCount.devcount.ufaceDevNum + - this.statisticsCount.devcount.videoNum + - this.statisticsCount.devcount.environmentDevNum + - this.statisticsCount.devcount.towerDevNum + - this.statisticsCount.devcount.lifterDevNum - const device = this.statisticsCount.devcount - this.deviceData = [ - { label: 'projectSummary.ufaceDevNum', value: device.ufaceDevNum }, - { - label: 'projectSummary.environmentDevNum', - value: device.environmentDevNum - }, - { label: 'companyDiagram.videoDevNum', value: device.videoNum }, - { label: 'companyDiagram.towerDevNum', value: device.towerDevNum } - ] - if (type == 1) { - this.createdEchart2() - } - clearInterval(this.interval1) - this.interval1 = setTimeout(() => { - this.getWorkerStatisticsCount() - }, 5000) + getWorkerStatisticsCountApi({ sn: this.$store.state.projectSn }).then(res => { + console.log(res) + this.statisticsCount = res.result + console.log('----------------', this.statisticsCount) + this.totalDevNum = + this.statisticsCount.devcount.ufaceDevNum + + this.statisticsCount.devcount.videoNum + + this.statisticsCount.devcount.environmentDevNum + + this.statisticsCount.devcount.towerDevNum + + this.statisticsCount.devcount.lifterDevNum + const device = this.statisticsCount.devcount + this.deviceData = [ + { label: 'projectSummary.ufaceDevNum', value: device.ufaceDevNum }, + { + label: 'projectSummary.environmentDevNum', + value: device.environmentDevNum + }, + { label: 'companyDiagram.videoDevNum', value: device.videoNum }, + { label: 'companyDiagram.towerDevNum', value: device.towerDevNum } + ] + if (type == 1) { + this.createdEchart2() } - ) + clearInterval(this.interval1) + this.interval1 = setTimeout(() => { + this.getWorkerStatisticsCount() + }, 5000) + }) }, // 文件上传 之前 handleBeforeUpload(file, type) { @@ -984,7 +869,7 @@ export default { showTitle: this.$t('message.companyDiagram.resultImg'), //'效果图' configValue: url } - eidtProjectShowConfig(data).then((res) => { + eidtProjectShowConfig(data).then(res => { if (res.code == 200) { this.getQueryBySnData() } @@ -994,7 +879,7 @@ export default { queryBySnData({ projectSn: this.$store.state.projectSn, showType: 3 - }).then((res) => { + }).then(res => { console.log(this.fileUrl + this.imgUrl) this.imgUrl = res.result.configValue }) @@ -1004,7 +889,7 @@ export default { editProjectInfo({ projectId: this.projectData.projectId, videoUrl: url - }).then((res) => { + }).then(res => { this.$message.success(this.$t('message.companyDiagram.uploadSuccess')) //"上传成功" this.projectData.videoUrl = url }) @@ -1032,16 +917,10 @@ export default { background: linear-gradient(rgba(5, 11, 59, 0.3), rgba(36, 100, 206, 0.3)); } &:nth-child(2n) { - background: linear-gradient( - rgba(6, 248, 179, 0.06), - rgba(21, 25, 33, 0.06) - ); + background: linear-gradient(rgba(6, 248, 179, 0.06), rgba(21, 25, 33, 0.06)); } &:first-child { - background: linear-gradient( - rgba(21, 25, 33, 0.12), - rgba(6, 248, 179, 0.12) - ); + background: linear-gradient(rgba(21, 25, 33, 0.12), rgba(6, 248, 179, 0.12)); } .imgBox { height: 36px; diff --git a/src/views/projectAdmin/zjsj/command/index.vue b/src/views/projectAdmin/zjsj/command/index.vue index f41379f4..3f49b3f8 100644 --- a/src/views/projectAdmin/zjsj/command/index.vue +++ b/src/views/projectAdmin/zjsj/command/index.vue @@ -39,7 +39,7 @@