From 6e774dfc5d95ad1d6c68ab32891807a5bc7bd3fb Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Tue, 18 Feb 2025 08:44:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=B5=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 2 +- src/utils/dict.js | 1 + src/views/devConfig/energy/energyLimit/index.vue | 7 +++++-- .../components/energyPlcParamAdd.vue | 1 + .../devConfig/energy/energyPlcConnect/index.vue | 8 +++++--- .../components/energyStatisticsAdd.vue | 3 ++- .../energy/energyType/components/InnerTable.vue | 2 +- .../energy/energyType/components/energyTypeAdd.vue | 9 ++++++++- src/views/devConfig/energy/energyType/index.vue | 8 ++++++-- .../contrastAnalysis/components/searchArea.vue | 1 + .../analysis/trendAnalysis/components/searchArea.vue | 1 + src/views/system/dept/index.vue | 10 ++-------- src/views/system/dict/data.vue | 12 +++--------- src/views/system/dict/index.vue | 12 +++--------- src/views/system/menu/index.vue | 10 ++-------- src/views/system/post/index.vue | 12 +++--------- src/views/system/role/index.vue | 1 - src/views/system/user/index.vue | 8 ++++++-- 18 files changed, 51 insertions(+), 57 deletions(-) diff --git a/.env.dev b/.env.dev index 6fd1b3f3..08872ac3 100644 --- a/.env.dev +++ b/.env.dev @@ -18,7 +18,7 @@ VUE_APP_BASE_API = 'http://mes2.kszny.picaiba.com' # 积木报表指向地址 -VUE_APP_JIMU_API = 'http://192.168.0.33:48082' +VUE_APP_JIMU_API = 'http://mes2.kszny.picaiba.com' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/utils/dict.js b/src/utils/dict.js index ecaafb16..500956fd 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -89,6 +89,7 @@ export const DICT_TYPE = { // ============== ENERGY - 能源模块 ============= ENERGY_UNIT: 'energy_unit', + ENERGY_TYPE: 'energy_type', EQU_ALARM_LEVEL: 'equ_alarm_level', MONITOR_INDEX_TYPE: 'monitor_index_type', OBJECT_TYPE: 'object_type', diff --git a/src/views/devConfig/energy/energyLimit/index.vue b/src/views/devConfig/energy/energyLimit/index.vue index 841ae375..43666a47 100644 --- a/src/views/devConfig/energy/energyLimit/index.vue +++ b/src/views/devConfig/energy/energyLimit/index.vue @@ -92,7 +92,8 @@ export default { type: 'select', label: '能源类型', selectOptions: [], - param: 'energyTypeId' + param: 'energyTypeId', + clearable: false }, { type: 'select', @@ -162,7 +163,6 @@ export default { window.addEventListener('resize', () => { this.tableH = this.tableHeight(260) }) - this.getList(); this.getTypeList() // 获取对象树形结构 this.getObjTree() @@ -171,7 +171,10 @@ export default { getTypeList() { getEnergyTypeListAll().then((res) => { this.formConfig[0].selectOptions = res.data || [] + this.formConfig[0].defaultSelect = res.data[0].id + this.queryParams.energyTypeId = res.data[0].id this.energyTypeList = res.data || [] + this.getList(); }) }, buttonClick(val) { diff --git a/src/views/devConfig/energy/energyPlcConnect/components/energyPlcParamAdd.vue b/src/views/devConfig/energy/energyPlcConnect/components/energyPlcParamAdd.vue index 6eed9ca8..ee725f0c 100644 --- a/src/views/devConfig/energy/energyPlcConnect/components/energyPlcParamAdd.vue +++ b/src/views/devConfig/energy/energyPlcConnect/components/energyPlcParamAdd.vue @@ -82,6 +82,7 @@ export default { init(param) { this.form.connectId = param.connectId getEnergyTypeListAll().then((res) => { + console.log(res) this.energyListType = res.data || [] }) if (param.id) { diff --git a/src/views/devConfig/energy/energyPlcConnect/index.vue b/src/views/devConfig/energy/energyPlcConnect/index.vue index 672ce11b..a58c2e6f 100644 --- a/src/views/devConfig/energy/energyPlcConnect/index.vue +++ b/src/views/devConfig/energy/energyPlcConnect/index.vue @@ -37,7 +37,7 @@ @cancel="handleCancel" @confirm="handleConfirm" :before-close="handleCancel" - width='30%' + width='50%' > @@ -60,7 +60,8 @@ const tableProps = [ }, { prop: 'objCode', - label: '对象编码' + label: '对象编码', + minWidth: 160, }, { prop: 'plcTableName', @@ -69,7 +70,8 @@ const tableProps = [ { prop: 'plcTableCode', label: '关联表编码', - showOverflowtooltip: true + showOverflowtooltip: true, + minWidth: 160, }, { prop: 'cnName', diff --git a/src/views/devConfig/energy/energyStatistics/components/energyStatisticsAdd.vue b/src/views/devConfig/energy/energyStatistics/components/energyStatisticsAdd.vue index 2d9c8440..8554b290 100644 --- a/src/views/devConfig/energy/energyStatistics/components/energyStatisticsAdd.vue +++ b/src/views/devConfig/energy/energyStatistics/components/energyStatisticsAdd.vue @@ -60,7 +60,8 @@ export default { name: '', code: '', type: '', - energyTypeId: '' + energyTypeId: '', + remark: '' }, plcList: [], objList: [], diff --git a/src/views/devConfig/energy/energyType/components/InnerTable.vue b/src/views/devConfig/energy/energyType/components/InnerTable.vue index 4dba190d..333b5ea2 100644 --- a/src/views/devConfig/energy/energyType/components/InnerTable.vue +++ b/src/views/devConfig/energy/energyType/components/InnerTable.vue @@ -16,7 +16,7 @@ type="text" class="tableInnerButton" @click="showInnerTable(injectData)" - >详情价格详情 diff --git a/src/views/devConfig/energy/energyType/components/energyTypeAdd.vue b/src/views/devConfig/energy/energyType/components/energyTypeAdd.vue index 78142f38..2371203e 100644 --- a/src/views/devConfig/energy/energyType/components/energyTypeAdd.vue +++ b/src/views/devConfig/energy/energyType/components/energyTypeAdd.vue @@ -3,7 +3,14 @@ - + + + + diff --git a/src/views/devConfig/energy/energyType/index.vue b/src/views/devConfig/energy/energyType/index.vue index 8a064199..e97a9d93 100644 --- a/src/views/devConfig/energy/energyType/index.vue +++ b/src/views/devConfig/energy/energyType/index.vue @@ -80,10 +80,14 @@ export default { return { formConfig: [ { - type: 'input', + type: 'select', label: '能源类型', + selectOptions: this.getDictDatas(this.DICT_TYPE.ENERGY_TYPE), placeholder: '能源类型', - param: 'name' + labelField: 'label', + valueField: 'label', + param: 'name', + flilterable: true }, { type: 'button', diff --git a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue index eb531e7c..52658bc4 100644 --- a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue +++ b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue @@ -219,6 +219,7 @@ export default { getTypeList() { getEnergyTypeListAll().then((res) => { this.energyTypeList = res.data || [] + this.queryParams.energyTypeId = res.data[0].id }) }, // 范围选择器 diff --git a/src/views/energy/analysis/trendAnalysis/components/searchArea.vue b/src/views/energy/analysis/trendAnalysis/components/searchArea.vue index b639b608..125d12fb 100644 --- a/src/views/energy/analysis/trendAnalysis/components/searchArea.vue +++ b/src/views/energy/analysis/trendAnalysis/components/searchArea.vue @@ -205,6 +205,7 @@ export default { getTypeList() { getEnergyTypeListAll().then((res) => { this.energyTypeList = res.data || []; + this.queryParams.energyTypeId = res.data[0].id }); }, getObjTree() { diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index fa0a83c4..f3f9b37d 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -83,13 +83,7 @@ - - - + @@ -163,7 +157,7 @@ 取 消 确 定 - + diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue index 1a7b0392..7b852b5c 100644 --- a/src/views/system/dict/data.vue +++ b/src/views/system/dict/data.vue @@ -57,13 +57,7 @@ @pagination="getList"/> - - - + @@ -98,7 +92,7 @@ 取 消 确 定 - + @@ -132,7 +126,7 @@ export default { // 查询参数 queryParams: { pageNo: 1, - pageSize: 10, + pageSize: 20, dictName: undefined, dictType: undefined, status: undefined diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 9673f94c..6fdd02f6 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -60,13 +60,7 @@ @pagination="getList"/> - - - + @@ -87,7 +81,7 @@ 取 消 确 定 - + @@ -118,7 +112,7 @@ export default { // 查询参数 queryParams: { pageNo: 1, - pageSize: 10, + pageSize: 20, name: undefined, type: undefined, status: undefined, diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 2a52bcf5..da8abc8b 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -88,13 +88,7 @@ - - - + @@ -276,7 +270,7 @@ 取 消 确 定 - + diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index 76ca6f13..71dd479d 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -54,13 +54,7 @@ @pagination="getList"/> - - - + @@ -85,7 +79,7 @@ 取 消 确 定 - + @@ -116,7 +110,7 @@ export default { // 查询参数 queryParams: { pageNo: 1, - pageSize: 10, + pageSize: 20, code: undefined, name: undefined, status: undefined diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 15fbfa6c..994bea0f 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -151,7 +151,6 @@ export default { ? { type: 'dataAuth', btnName: '数据权限', - // showTip: "新增工单", } : undefined, this.$auth.hasPermi('system:role:update') diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 8f8ff096..fea9aeb0 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -68,7 +68,7 @@ - + @@ -180,6 +180,7 @@ - + @@ -628,6 +629,9 @@ export default { this.open = false; this.reset(); }, + cancelImport() { + this.upload.open = false; + }, // 取消按钮（角色权限） cancelRole() { this.openRole = false;