diff --git a/src/api/iot/staistics.js b/src/api/iot/staistics.js new file mode 100644 index 00000000..75222dae --- /dev/null +++ b/src/api/iot/staistics.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function projectEnergy(query) { + return request({ + url: '/iot/stat/projectEnergy', + method: 'get', + params: query + }) +} diff --git a/src/components/EDialogTableInput/src/main.vue b/src/components/EDialogTableInput/src/main.vue index b6f5b677..2aaa10de 100644 --- a/src/components/EDialogTableInput/src/main.vue +++ b/src/components/EDialogTableInput/src/main.vue @@ -2,13 +2,16 @@
+ {{ '点击选择' + title }}
\ No newline at end of file diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue index 9a8f4abc..e082293e 100644 --- a/src/views/iot/device/index.vue +++ b/src/views/iot/device/index.vue @@ -14,17 +14,6 @@ v-show="showSearch" label-width="68px" > - - - @@ -291,10 +285,15 @@ prop="parentId" v-if="form.deviceType === 'MINIATURE_BREAKER'" > - @@ -330,7 +329,14 @@ /> - + 取 消
- - - - -
- 确 定 - 取 消 -
- -
{ - this.queryModelOpt = response.rows; - }); - }, - modelChildList(data) { - listModel(Object.assign(data.page, data.param, { selected: 1 })).then( - (response) => { - this.tableSelectOption.tableList = response.rows; - this.tableSelectOption.queryOpt.page.total = Number(response.total); - } - ); - }, - 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); - } - ); - }, // 根据 型号id 获取 型号详情 getModelInfoById(modelId) { getModel(modelId).then((res) => { this.$refs.paramWrap.setList(res.data.paramList || []); }); }, - // 点击或者双击数据回调 - returnEvent(data) { - if (data.type === "dblclick") { - if (data.otherOption.tableType === "device") { - this.form.parentId = data.value.deviceId; - this.form.parentName = data.value.deviceName; - } else if (data.otherOption.tableType === "model") { - this.getModelInfoById(data.value.modelId); - this.form.modelId = data.value.modelId; - this.form.modelName = data.value.modelName; - this.form.deviceType = data.value.deviceType; - this.form.prodKey = data.value.prodKey; - this.deviceTypeChange(this.form.deviceType); - } - this.selectTableShow = false; - } else if (data.type === "click") { - this.selectResult = {}; - if (data.otherOption.tableType === "device") { - this.selectResult.parentId = data.value.deviceId; - this.selectResult.parentName = data.value.deviceName; - } else if (data.otherOption.tableType === "model") { - this.selectResult.modelId = data.value.modelId; - this.selectResult.modelName = data.value.modelName; - this.selectResult.deviceType = data.value.deviceType; - // this.selectResult.paramList = data.value.paramList; - this.selectResult.prodKey = data.value.prodKey; - } - this.selectResult.tableType = data.otherOption.tableType; - } - }, - // 点击确定按钮 - resuleClick() { - if (this.selectResult.tableType === "device") { - this.form.parentId = this.selectResult.parentId; - this.form.parentName = this.selectResult.parentName; - } else if (this.selectResult.tableType === "model") { - this.form.modelId = this.selectResult.modelId; - this.form.prodKey = this.selectResult.prodKey; - this.form.modelName = this.selectResult.modelName; - this.form.deviceType = this.selectResult.deviceType; - this.deviceTypeChange(this.form.deviceType); - this.getModelInfoById(this.selectResult.modelId); - // this.$refs.paramWrap.setList(this.selectResult.paramList || []); - } - this.selectTableShow = false; - }, deviceTypeChange(val) { if (val !== "MINIATURE_BREAKER") { this.form.parentId = 0; @@ -916,7 +795,7 @@ export default { paramList: [], deviceKey: "", lineType: undefined, - deviceTag: '', + deviceTag: "", }; this.resetForm("form"); }, diff --git a/src/views/iot/project/index.vue b/src/views/iot/project/index.vue index e31f0b9d..a9bd1841 100644 --- a/src/views/iot/project/index.vue +++ b/src/views/iot/project/index.vue @@ -1,6 +1,10 @@