From d9d52747b98933053e1311d4adc13709c0a905b1 Mon Sep 17 00:00:00 2001 From: 23688nl <329261568@qq.com> Date: Wed, 12 Jan 2022 15:31:33 +0800 Subject: [PATCH] tijioa --- public/index.html | 2 +- src/api/tenant/project.js | 4 +- .../Amap/components/bigscLocation/index.vue | 2 +- .../components/bigscLocation/indexV_2.vue | 7 +- .../personalBigscLocation/index.vue | 2 +- src/components/EasyCron/tabs/week.vue | 2 +- src/components/ThemePicker/index.vue | 2 +- src/components/Upload/Image.vue | 2 +- src/config/env.js | 5 +- src/layout/index.vue | 5 +- src/router/index.js | 3 + src/utils/request.js | 2 +- src/views/bashboardcom/pancake_echarts.vue | 2 +- .../bigScreen/v1/profile/echartsRadar.vue | 2 +- .../bigScreen/v1/profile/typeDistribution.vue | 4 +- src/views/bigScreen/v2/index.vue | 10 +- .../bigScreen/v2/profile/echartsRadar.vue | 2 +- .../bigScreen/v2/profile/typeDistribution.vue | 2 +- src/views/iot/device/profile/details.vue | 3 + src/views/iot/model/index.vue | 11 +- .../trigger/profile/insertTriggerDialog.vue | 2 - src/views/personal/device/index.vue | 2 +- src/views/personal/device/profile/details.vue | 3 + src/views/power/mywork/details.vue | 2 +- .../DeviceDetailsView/deviceSelectNav.vue | 202 +++++++++++------- src/views/profile/DeviceDetailsView/index.vue | 11 +- .../DeviceDetailsView/signalIntensity.vue | 75 +++++++ .../DeviceDetailsView/stateManagement.vue | 10 + src/views/profile/DeviceRunStarts/index.vue | 12 +- .../autocontrol/job/profile/deviceParam.vue | 2 +- src/views/system/tenant/index.vue | 4 +- src/views/tenant/device/profile/details.vue | 5 +- .../tenant/project/profile/deviceList.vue | 2 +- 33 files changed, 290 insertions(+), 116 deletions(-) create mode 100644 src/views/profile/DeviceDetailsView/signalIntensity.vue diff --git a/public/index.html b/public/index.html index 35983fc1..587ad560 100644 --- a/public/index.html +++ b/public/index.html @@ -8,7 +8,7 @@ - + diff --git a/src/api/tenant/project.js b/src/api/tenant/project.js index aa86fe51..f85fd3a5 100644 --- a/src/api/tenant/project.js +++ b/src/api/tenant/project.js @@ -12,7 +12,7 @@ export function listProject(query) { // 查询项目详细 export function getProject(projectId) { return request({ - url: "/tenant/project/" + projectId, + url: "/iot/project/" + projectId, method: "get" }); } @@ -20,7 +20,7 @@ export function getProject(projectId) { // 导出项目 export function exportProject(query) { return request({ - url: "/tenant/project/export", + url: "/iot/project/export", method: "get", params: query }); diff --git a/src/components/Amap/components/bigscLocation/index.vue b/src/components/Amap/components/bigscLocation/index.vue index 0c662748..5ee53921 100644 --- a/src/components/Amap/components/bigscLocation/index.vue +++ b/src/components/Amap/components/bigscLocation/index.vue @@ -85,7 +85,7 @@ export default { }, // 地图标点 点击事件 markerClick(e) { - console.log('地图点击标注点！！') + // console.log('地图点击标注点！！') if (!this.infoWindow) { this.createInfoWindowO(); } diff --git a/src/components/Amap/components/bigscLocation/indexV_2.vue b/src/components/Amap/components/bigscLocation/indexV_2.vue index 22928b8c..03ff43b8 100644 --- a/src/components/Amap/components/bigscLocation/indexV_2.vue +++ b/src/components/Amap/components/bigscLocation/indexV_2.vue @@ -59,7 +59,7 @@ export default { this.aMap.clearMap(); } this.createMarker(); - console.log("map_projectList: ", list); + // console.log("map_projectList: ", list); // this.textFu(); }, deep: true @@ -94,7 +94,7 @@ export default { }, // 地图标点 点击事件 markerClick(e) { - console.log("地图点击标注点！！"); + // console.log("地图点击标注点！！"); if (!this.infoWindow) { this.createInfoWindowO(); } @@ -212,9 +212,6 @@ export default { } return resultStr; }, - st(v) { - console.log('srccc:', v) - }, // 实例化信息窗体 createInfoWindow(content) { var info = document.createElement("div"); diff --git a/src/components/Amap/components/personalBigscLocation/index.vue b/src/components/Amap/components/personalBigscLocation/index.vue index 7e15bdb0..0490004a 100644 --- a/src/components/Amap/components/personalBigscLocation/index.vue +++ b/src/components/Amap/components/personalBigscLocation/index.vue @@ -85,7 +85,7 @@ export default { }, // 地图标点 点击事件 markerClick(e) { - console.log('地图点击标注点！！') + // console.log('地图点击标注点！！') if (!this.infoWindow) { this.createInfoWindowO(); } diff --git a/src/components/EasyCron/tabs/week.vue b/src/components/EasyCron/tabs/week.vue index b5ddf6a0..c45b23a6 100644 --- a/src/components/EasyCron/tabs/week.vue +++ b/src/components/EasyCron/tabs/week.vue @@ -97,7 +97,7 @@ export default { this.valueLoop.start = 2 this.valueLoop.interval = 1 this.parseProp(this.prop) - console.log(this.valueList) + // console.log(this.valueList) } } diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue index 3879c5ad..74c8ef27 100644 --- a/src/components/ThemePicker/index.vue +++ b/src/components/ThemePicker/index.vue @@ -35,7 +35,7 @@ export default { if (typeof val !== 'string') return const themeCluster = this.getThemeCluster(val.replace('#', '')) const originalCluster = this.getThemeCluster(oldVal.replace('#', '')) - console.log(themeCluster, originalCluster) + // console.log(themeCluster, originalCluster) const $message = this.$message({ message: ' Compiling the theme', diff --git a/src/components/Upload/Image.vue b/src/components/Upload/Image.vue index 97bf201c..8ee29bbe 100644 --- a/src/components/Upload/Image.vue +++ b/src/components/Upload/Image.vue @@ -71,7 +71,7 @@ export default { this.dialogVisible = true; }, beforeAvatarUpload(file) { - console.log(file.type) + // console.log(file.type) const isJPG = this.fileType.indexOf(file.type) >= 0; const isLt2M = file.size < this.fileSize; diff --git a/src/config/env.js b/src/config/env.js index fa7f9916..58e6bcb6 100644 --- a/src/config/env.js +++ b/src/config/env.js @@ -5,6 +5,7 @@ var iotHost="192.168.18.139"; // 海创iot 平台 host // iot.gkiiot.com 192.168.18.139 var flowIotUrl = ''; let iotWebSocketBaseUrl = '' +let devLiveWebSocketBaseUrl = '' let sysWebSocket = 'ws://' let prodApi = '/prod-api'; var hrefHost = window.location.host; @@ -24,11 +25,13 @@ if (env.NODE_ENV == 'development') { iotWebSocketAlarmBaseUrl = sysWebSocket + hrefHost + ':8899/ws/alarm/live' sysWebSocket = sysWebSocket + hrefHost + prodApi; iotWebSocketBaseUrl = sysWebSocket + '/ws/dev/up/' +devLiveWebSocketBaseUrl = sysWebSocket + '/ws/dev/live/' iotPlatformUrl = 'http://' + iotHost + '/prod-api' export { iotPlatformUrl, sysWebSocket, iotWebSocketBaseUrl, - iotWebSocketAlarmBaseUrl + iotWebSocketAlarmBaseUrl, + devLiveWebSocketBaseUrl } diff --git a/src/layout/index.vue b/src/layout/index.vue index d4907719..6d9e73f9 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -3,7 +3,7 @@
-
+ @@ -56,6 +56,9 @@ export default { } }, methods: { + navbarShow() { + return this.$route.path === '/index' + }, handleClickOutside() { this.$store.dispatch('app/closeSideBar', { withoutAnimation: false }) } diff --git a/src/router/index.js b/src/router/index.js index 4d91a85d..eb563d28 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -64,6 +64,9 @@ export const constantRoutes = [ name: 'BigScreen', meta: { title: '数据总览', icon: 'dashboard', noCache: true, affix: true + }, + params: { + showNav: false } }, ] diff --git a/src/utils/request.js b/src/utils/request.js index 0e46a283..cc851434 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -88,7 +88,7 @@ service.interceptors.response.use(res => { } }, error => { - console.log('err' + error) + // console.log('err' + error) let { message } = error; if (message == "Network Error") { message = "后端接口连接异常"; diff --git a/src/views/bashboardcom/pancake_echarts.vue b/src/views/bashboardcom/pancake_echarts.vue index ab2f55f8..ca0e9f70 100644 --- a/src/views/bashboardcom/pancake_echarts.vue +++ b/src/views/bashboardcom/pancake_echarts.vue @@ -85,7 +85,7 @@ export default { watch: { option(val, oldVal) { this.chart = null - console.log(val) + // console.log(val) this.drawLine() } } diff --git a/src/views/bigScreen/v1/profile/echartsRadar.vue b/src/views/bigScreen/v1/profile/echartsRadar.vue index 387f978c..8c190867 100644 --- a/src/views/bigScreen/v1/profile/echartsRadar.vue +++ b/src/views/bigScreen/v1/profile/echartsRadar.vue @@ -105,7 +105,7 @@ export default { } ] }; - console.log('radar',this.option, this.chart) + // console.log('radar',this.option, this.chart) this.chart.setOption(option); } }, diff --git a/src/views/bigScreen/v1/profile/typeDistribution.vue b/src/views/bigScreen/v1/profile/typeDistribution.vue index 9d5d1dab..af5908d2 100644 --- a/src/views/bigScreen/v1/profile/typeDistribution.vue +++ b/src/views/bigScreen/v1/profile/typeDistribution.vue @@ -59,7 +59,7 @@ export default { } if (list) { for(var i = 0; i < list.length; i++) { - console.log(list[i]['typeCode'].indexOf('a')) + // console.log(list[i]['typeCode'].indexOf('a')) if (list[i]['typeCode'].indexOf('a') === 0) { this.templist['alarm'].push({ value: list[i].alarmTotal, name: list[i].typeName }) } else if (list[i]['typeCode'].indexOf('w') === 0) { @@ -67,7 +67,7 @@ export default { } } } - console.log(this.templist) + // console.log(this.templist) this.updateEcharts() }, deep: true diff --git a/src/views/bigScreen/v2/index.vue b/src/views/bigScreen/v2/index.vue index 9086d0ee..80ae691a 100644 --- a/src/views/bigScreen/v2/index.vue +++ b/src/views/bigScreen/v2/index.vue @@ -107,7 +107,9 @@ export default { this.thisScrollTopY = document.getElementById("con_lf_top_div").scrollTop; document.getElementById("con_lf_top_div").style.background = "#010a31"; document.getElementById("con_lf_top_div").style.height = - "calc(100vh - 84px)"; + "calc(100vh - 0px)"; + document.getElementById("con_lf_top_div").style.minHeight = + "calc(100vh - 0px)"; document.getElementById("con_lf_top_div").style.overflow = "hidden"; document.getElementById("con_lf_top_div").scrollTop = 0; window.addEventListener("resize", () => { @@ -181,7 +183,7 @@ export default { if (this.fullscreen) { w_height = Number(document.documentElement.clientHeight / 1080); } else { - w_height = Number(document.documentElement.clientHeight / 1186); + w_height = Number(document.documentElement.clientHeight / 1080); } this.scalseNum = w_height; }, @@ -224,7 +226,7 @@ export default { diff --git a/src/views/profile/DeviceDetailsView/stateManagement.vue b/src/views/profile/DeviceDetailsView/stateManagement.vue index c92aff7d..10c0655c 100644 --- a/src/views/profile/DeviceDetailsView/stateManagement.vue +++ b/src/views/profile/DeviceDetailsView/stateManagement.vue @@ -5,12 +5,15 @@ :sourceId="deviceInfo.deviceId" :deviceInfo="deviceInfo" :prodId="deviceInfo.prodKey" + :wsUrl="iotWebSocketBaseUrl" + :realTimeData="realTimeData" >
- diff --git a/src/views/profile/autocontrol/job/profile/deviceParam.vue b/src/views/profile/autocontrol/job/profile/deviceParam.vue index b2fc09d7..321a1150 100644 --- a/src/views/profile/autocontrol/job/profile/deviceParam.vue +++ b/src/views/profile/autocontrol/job/profile/deviceParam.vue @@ -203,7 +203,7 @@ export default { reultEventFu() { this.form.guid = this.tempIndex; this.returnIsSumbit(); - console.log(this.form); + // console.log(this.form); this.$emit("resultEvent", { result: this.form, index: this.tempIndex }); }, returnIsSumbit() { diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index 05985145..c7e89d3a 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -619,7 +619,7 @@ export default { // 勾选数据保存操作 submitFileForm() { // 目前从选择到逻辑都是没有问题的，数据都到位了，就差接口 - console.log(this.otherOption["inputType"], ":", this.childIds); + // console.log(this.otherOption["inputType"], ":", this.childIds); } /** 修改按钮操作 */, handleUpdate(row) { this.reset(); @@ -661,7 +661,7 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - console.log(row); + // console.log(row); const tenantIds = row.tenantId || this.ids; this.$confirm( // '是否确认删除序号为"' + tenantIds + '"的数据项?', diff --git a/src/views/tenant/device/profile/details.vue b/src/views/tenant/device/profile/details.vue index 2d153a62..268a9264 100644 --- a/src/views/tenant/device/profile/details.vue +++ b/src/views/tenant/device/profile/details.vue @@ -20,6 +20,7 @@ :sourceId="deviceId" :deviceInfo="infoData" :prodId="infoData.prodKey" + :wsUrl="iotWebSocketBaseUrl" >
@@ -54,6 +55,7 @@ import { getDevice } from "@/api/tenant/device"; import InfoWrap from "./info"; import ChildDevice from "./childDevice"; import DeviceRunStartsWrap from "@/views/profile/DeviceRunStarts/index"; +import { iotWebSocketBaseUrl } from "@/config/env"; import TriggerWrap from "@/views/profile/DeviceTrigger/index"; export default { name: "DetailsWrap", @@ -71,7 +73,8 @@ export default { breadcrumbList: [], tempType: "bs", deviceId: "", - devudeRunState: false + devudeRunState: false, + iotWebSocketBaseUrl }; }, created() { diff --git a/src/views/tenant/project/profile/deviceList.vue b/src/views/tenant/project/profile/deviceList.vue index 16240aa6..44da8a8c 100644 --- a/src/views/tenant/project/profile/deviceList.vue +++ b/src/views/tenant/project/profile/deviceList.vue @@ -40,7 +40,7 @@ export default { }, /** 查询空间设备列表 */ getList() { - console.log(this.sourceId) + // console.log(this.sourceId) this.loading = true; listDeviceByProjectId(this.sourceId).then(response => { this.list = response.data;