From de0a763ca27d3f56581f461d66bac1c44c820d27 Mon Sep 17 00:00:00 2001 From: wangxingyuan <2944009893@qq.com> Date: Mon, 24 Feb 2025 09:29:26 +0800 Subject: [PATCH] 11 --- .env.development | 2 +- .env.production | 2 +- .env.staging | 2 +- src/api/administration.js | 50 +- src/api/equipment/entry.js | 25 + src/views/administration/administration.vue | 635 +++++++++++++------- src/views/equipment/entry.vue | 132 ++-- 7 files changed, 584 insertions(+), 264 deletions(-) create mode 100644 src/api/equipment/entry.js diff --git a/.env.development b/.env.development index 302ecd1..2f7e897 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 智能巡视 # 开发环境配置 ENV = 'development' diff --git a/.env.production b/.env.production index b4893b0..8188545 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 智能巡视 # 生产环境配置 ENV = 'production' diff --git a/.env.staging b/.env.staging index 209b64e..2d51ff0 100644 --- a/.env.staging +++ b/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 智能巡视 BABEL_ENV = production diff --git a/src/api/administration.js b/src/api/administration.js index 9fb5f48..9d39b45 100644 --- a/src/api/administration.js +++ b/src/api/administration.js @@ -1,10 +1,56 @@ import request from '@/utils/request' export function getList(query) { - console.log(query,111111111) return request({ url: '/patrol/task/list', method: 'get', params: query }) -} \ No newline at end of file +} +export function getChangeStatus(query) { + return request({ + url: '/patrol/task/changeStatus', + method: 'get', + params: query + }) +} + +export function postRemove(query) { + return request({ + url: `/patrol/task/remove/${query}`, + method: 'post', + }) +} + +export function getPatroltypeList(query) { + return request({ + url: `/basedata/patrolpointmnt/patroltype/list`, + method: 'get', + }) +} + +export function getAreaList(query,type=0) { + if(type==0){ + return request({ + url: `/basedata/area/list`, + method: 'get', + }) + }else{ + return request({ + url: `/basedata/area/list?areaIdS=${query}`, + method: 'get', + }) + } +} +export function getProDeviceTreeSelect(query) { + return request({ + url: `/basedata/prodevmnt/device/getProDeviceTreeSelect?areaIdS=${query}`, + method: 'get', + }) +} +export function getTreeProMainDevicePatrolEquSelect(query) { + return request({ + url: `/basedata/prodevmnt/device/treeProMainDevicePatrolEquSelect?deviceIdAll=${query}`, + method: 'get', + }) +} diff --git a/src/api/equipment/entry.js b/src/api/equipment/entry.js new file mode 100644 index 0000000..96ef779 --- /dev/null +++ b/src/api/equipment/entry.js @@ -0,0 +1,25 @@ +import request from '@/utils/request'; +export function treeAreaDeviceSelect(query) { + return request({ + url: '/basedata/prodevmnt/device/treeAreaDeviceSelect', + method: 'get', + // params: query + }) +} +export function devicetypeList(query) { + return request({ + url: '/basedata/devicetype/list', + method: 'get', + params: { + powerMainEquFlag:'Yes' + } + }) + } + + export function deviceQuery(id) { + return request({ + url:`/basedata/prodevmnt/device/${id}?id=${id}`, + method: 'get', + // params: query + }) + } \ No newline at end of file diff --git a/src/views/administration/administration.vue b/src/views/administration/administration.vue index 7a93dfe..e660add 100644 --- a/src/views/administration/administration.vue +++ b/src/views/administration/administration.vue @@ -99,7 +99,7 @@ plain icon="el-icon-delete" size="mini" - @click="handleDelete" + @click="handleDeleteAll" >删除 @@ -128,7 +128,7 @@ diff --git a/src/views/equipment/entry.vue b/src/views/equipment/entry.vue index 2500d42..591341f 100644 --- a/src/views/equipment/entry.vue +++ b/src/views/equipment/entry.vue @@ -4,32 +4,43 @@
- - - - + + + + + + + + + + + + +
- + - + @@ -38,20 +49,21 @@
+
{{ titleName }}
- + - - - + + + - + 设备编号用于生产复核，需与SCADA系统中的设备编号一致 @@ -60,7 +72,7 @@ - + @@ -90,13 +102,14 @@
+ @@ -169,6 +212,9 @@ export default { color: #4a9de7 !important; // color: #fff !important; } +::v-deep .el-tree-node__content { + height: 34px !important; +} /*节点失焦时的背景颜色*/ // .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content{ // background-color: #4a9de7 !important; @@ -181,13 +227,17 @@ export default { font-size: 26px; padding: 10px; } -.number-title{ - margin-left: 10px; +.number-title { + margin-left: 10px; +} +.serial-number { + color: #999; + font-size: 12px; + margin-bottom: 30px; + margin-top: 20px; } -.serial-number{ - color: #999; - font-size: 12px; - margin-bottom: 30px; - margin-top: 20px; +.deleteIcon,.addIcon { + color: #dddddd; + cursor: not-allowed; }