diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index a7b70377..734c907e 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -10,16 +10,16 @@ diff --git a/src/views/bigScreen/v3/index.vue b/src/views/bigScreen/v3/index.vue index e614545f..e1c79500 100644 --- a/src/views/bigScreen/v3/index.vue +++ b/src/views/bigScreen/v3/index.vue @@ -133,9 +133,15 @@ export default { watch: { $route(to, from) { if (from.fullPath === "/index") { + debugger document.getElementById("con_lf_top_div").style.background = "#fff"; + document.getElementById("con_lf_top_div").style.height = "calc(100vh - 84px)"; + document.getElementById("con_lf_top_div").style.minHeight = "calc(100vh - 84px)"; } else if (to.fullPath === "/index") { + debugger document.getElementById("con_lf_top_div").style.background = "#010e45"; + document.getElementById("con_lf_top_div").style.height = "calc(100vh - 84px)"; + document.getElementById("con_lf_top_div").style.minHeight = "calc(100vh - 84px)"; } }, }, @@ -249,6 +255,8 @@ export default { document.getElementById("app").style.background = "#fff"; document.getElementById("con_lf_top_div").style.background = "#fff"; document.getElementById("con_lf_top_div").style.overflow = "auto"; + document.getElementById("con_lf_top_div").style.height = "calc(100vh - 84px)"; + document.getElementById("con_lf_top_div").style.minHeight = "calc(100vh - 84px)"; document.getElementById("con_lf_top_div").scrollTop = this.thisScrollTopY; if (this.setIntervalGetCountOpt) { clearInterval(this.setIntervalGetCountOpt); diff --git a/src/views/bigScreen/v3/profile/censusTempA.vue b/src/views/bigScreen/v3/profile/censusTempA.vue index b9da0a2b..2f9b678e 100644 --- a/src/views/bigScreen/v3/profile/censusTempA.vue +++ b/src/views/bigScreen/v3/profile/censusTempA.vue @@ -21,7 +21,7 @@ export default { type: String, }, value: { - type: String, + type: [String, Number], }, }, }; diff --git a/src/views/iot/project/index.vue b/src/views/iot/project/index.vue index 9c12301f..6be81224 100644 --- a/src/views/iot/project/index.vue +++ b/src/views/iot/project/index.vue @@ -238,6 +238,10 @@ + + + +
确 定 @@ -265,7 +269,7 @@ />
- 确 定 + 确 定 取 消
@@ -285,6 +289,9 @@ import { updateProject, exportProject } from "@/api/iot/project"; +import { + listDevice +} from "@/api/iot/device"; import { listContract } from "@/api/iot/contract"; @@ -350,16 +357,16 @@ export default { { required: true, message: "项目类型不能为空", trigger: "blur" } ], regionalismId: [ - { required: true, message: "行政区划不能为空", trigger: "blur" } + { required: true, message: "行政区划不能为空", trigger: "change" } ], projectAddress: [ - { required: true, message: "项目地址不能为空", trigger: "blur" } + { required: true, message: "项目地址不能为空", trigger: "change" } ], projectLng: [ - { required: true, message: "经度不能为空", trigger: "blur" } + { required: true, message: "经度不能为空", trigger: "change" } ], projectLat: [ - { required: true, message: "纬度不能为空", trigger: "blur" } + { required: true, message: "纬度不能为空", trigger: "change" } ] }, projectTypeOptions: [], @@ -390,6 +397,96 @@ export default { this.getTreeselect(); }, methods: { + // 打开设备选择窗口 ——表格 + openTableSelectDialog() { + this.selectResult = {}; + this.tableSelectOption = { + otherOption: { + tableType: "device" + }, + queryOpt: { + disable: false, + labelWidth: "68px", + params: { + deviceName: "", + modelId: "", + parentId: 0, + deviceType: "MINIATURE_BREAKER" + }, + page: { + pageSize: 10, + pageNum: 1, + total: 0 + }, + inline: true, + queryChilds: [ + { + style: "", + placeholder: "设备名称", + clearable: true, + label: "设备名称", + type: "input", + key: "deviceName", + size: "small", + value: "" + } + ] + }, + tableOpt: { + loading: false, + rowKey: "deviceId", + selection: false, + maxHeight: "45vh", + childs: [ + { + style: "", + label: "所属型号", + type: "", + prop: "modelName", + align: "left", + width: "", + "show-overflow-tooltip": false, + tempType: "span" + }, + { + style: "", + label: "设备名称", + type: "", + prop: "deviceName", + align: "left", + width: "", + "show-overflow-tooltip": false, + tempType: "span" + }, + { + style: "", + label: "设备Key", + type: "", + prop: "deviceKey", + align: "left", + width: "", + "show-overflow-tooltip": false, + tempType: "span" + }, + { + style: "", + label: "创建时间", + type: "time", + prop: "createTime", + align: "center", + width: "160", + "show-overflow-tooltip": false, + tempType: "span" + } + ], + tableList: { + type: Array + } + }, + tableList: [] + }; + this.selectTableShow = true; + }, // 开启 电价合同选择的 弹窗 inputFocusContract() { this.selectResult = {}; @@ -474,6 +571,14 @@ export default { }, // 查询回调 childGetList(data) { + if (data.otherOption.tableType === "device") { + this.deviceChildList(data); + } else if (data.otherOption.tableType === "model") { + this.getListContract(data); + } + }, + // 电价合同查询 + getListContract(data) { listContract(Object.assign(data.page, data.param, { selected: 1 })).then( response => { this.tableSelectOption.tableList = response.rows; @@ -481,22 +586,46 @@ export default { } ); }, + deviceChildList(data) { + listDevice(Object.assign(data.page, data.param, { selected: 1 })).then( + response => { + this.tableSelectOption.tableList = response.rows; + this.tableSelectOption.queryOpt.page.total = Number(response.total); + } + ); + }, // 点击或者双击数据回调 returnEvent(data) { if (data.type === "dblclick") { + if (data.otherOption.tableType === "device") { + this.form.projectDevice = data.value.deviceId; + this.form.projectDeviceName = data.value.deviceName; + } else if (data.otherOption.tableType === "model") { this.form.contractId = data.value.contractId; this.form.contractName = data.value.contractName; - this.selectTableShow = false; + } + this.selectTableShow = false; } else if (data.type === "click") { this.selectResult = {}; - this.selectResult.contractId = data.value.contractId; - this.selectResult.contractName = data.value.contractName; + if (data.otherOption.tableType === "device") { + this.selectResult.projectDevice = data.value.deviceId; + this.selectResult.projectDeviceName = data.value.deviceName; + } else if (data.otherOption.tableType === "model") { + this.selectResult.contractId = data.value.contractId; + this.selectResult.contractName = data.value.contractName; + } + this.selectResult.tableType = data.otherOption.tableType; } }, // 点击确定按钮 - resuleClick() { - this.form.contractId = this.selectResult.contractId; - this.form.contractName = this.selectResult.contractName; + resultClick() { + if (this.selectResult.tableType === "device") { + this.form.projectDevice = this.selectResult.projectDevice; + this.form.projectDeviceName = this.selectResult.projectDeviceName; + } else if (this.selectResult.tableType === "model") { + this.form.contractId = this.selectResult.contractId; + this.form.contractName = this.selectResult.contractName; + } this.selectTableShow = false; }, sortChange(column) { @@ -638,7 +767,8 @@ export default { regionalismId: null, projectAddress: null, projectLng: null, - projectLat: null + projectLat: null, + projectDevice: '', }; this.resetForm("form"); }, diff --git a/src/views/iot/project/profile/info.vue b/src/views/iot/project/profile/info.vue index c09f9a62..59cfbf16 100644 --- a/src/views/iot/project/profile/info.vue +++ b/src/views/iot/project/profile/info.vue @@ -51,6 +51,11 @@
+
总路设备
+
{{infoData.projectDeviceName || '--' }}
+
+ +
项目地址
{{infoData.projectAddress}}