diff --git a/src/layouts/admin/components/navBar/tabs.vue b/src/layouts/admin/components/navBar/tabs.vue index 2512f2b8..6be20afb 100644 --- a/src/layouts/admin/components/navBar/tabs.vue +++ b/src/layouts/admin/components/navBar/tabs.vue @@ -181,10 +181,7 @@ const updateTab = function (newRoute: RouteLocationNormalized) { } onBeforeRouteUpdate(async to => { - - - updateTab(to) - + updateTab(to) }) onMounted(() => { @@ -215,6 +212,9 @@ onMounted(() => { &::-webkit-scrollbar { height: 5px; } + &:hover { + scrollbar-width: auto; + } // //&::-webkit-scrollbar-thumb { diff --git a/src/views/pqs/business/terminal/FrontManagement/index.vue b/src/views/pqs/business/terminal/FrontManagement/index.vue index 1e493329..90afc746 100644 --- a/src/views/pqs/business/terminal/FrontManagement/index.vue +++ b/src/views/pqs/business/terminal/FrontManagement/index.vue @@ -23,7 +23,7 @@ :title="dialogTitle" v-model="dialogFormVisible" :close-on-click-modal="false" - class="cn-operate-dialog" + width="700px" :before-close="resetForm" > @@ -51,6 +51,22 @@ placeholder="请输入最大终端数" > + + + + @@ -91,6 +107,7 @@ const statusoption: any = ref([ { id: 1, name: '启用' } ]) + const ruleFormRef = ref() const formData: any = ref({ @@ -99,13 +116,15 @@ const formData: any = ref({ nodeGrade: '', nodeDevNum: '', sort: '', - remark: '' + remark: '', + maxProcessNum: '' }) const rules = reactive({ name: [{ required: true, message: '名称不可为空', trigger: 'blur' }], ip: [{ required: true, message: 'ip不可为空', trigger: 'blur' }], nodeGrade: [{ required: true, message: '等级不可为空', trigger: 'blur' }], nodeDevNum: [{ required: true, message: '最大终端数不可为空', trigger: 'blur' }], + maxProcessNum: [{ required: true, message: '最大进程数不可为空', trigger: 'blur' }], sort: [{ required: true, message: '排序不可为空', trigger: 'blur' }], remark: [{ required: true, message: '描述不可为空', trigger: 'blur' }] }) @@ -138,6 +157,10 @@ const tableStore = new TableStore({ title: '最大监测点数量', field: 'nodeDevNum' }, + { + title: '最大进程数', + field: 'maxProcessNum' + }, { title: '排序', field: 'sort' diff --git a/src/views/pqs/business/terminal/deviceter/index.vue b/src/views/pqs/business/terminal/deviceter/index.vue index 4859130b..e22edd50 100644 --- a/src/views/pqs/business/terminal/deviceter/index.vue +++ b/src/views/pqs/business/terminal/deviceter/index.vue @@ -542,6 +542,7 @@ ? pageStatus == 3 || pageStatus == 2 : pageStatus == 1 " + @change="item.processNum = ''" > + + + + + { return } - if (nodeData.value.level>= 400) { + if (nodeData.value.level >= 400) { setDown() } let data = { @@ -2974,11 +3005,10 @@ onMounted(() => { size.value = Math.round((180 / dom.offsetHeight) * 100) } if (VITE_FLAG) { - getYwZtSubstation({ orgId: '' }).then(res => { powerStationList.value = res.data }) - }else{ + } else { getDevTypeList().then(res => { typeArr.value = res.data }) diff --git a/src/views/pqs/panorama/components/map.vue b/src/views/pqs/panorama/components/map.vue index 371a7cd9..33dab2e9 100644 --- a/src/views/pqs/panorama/components/map.vue +++ b/src/views/pqs/panorama/components/map.vue @@ -1,11 +1,14 @@
-
+ v-for="k in item.psrList" + @click="flyTo(k)" + >

{{ k.psrName }}

{{ k.vlevelName }}|{{ k.maintOrgName }}

@@ -37,112 +43,169 @@ -
+
展开搜索结果
-
关闭
+
关闭
- + -
- - +
+
- - -./cds.js./boundary \ No newline at end of file +./cds.js./boundary diff --git a/src/views/pqs/panorama/components/mapR.vue b/src/views/pqs/panorama/components/mapR.vue index e5040f45..3eb8ed7d 100644 --- a/src/views/pqs/panorama/components/mapR.vue +++ b/src/views/pqs/panorama/components/mapR.vue @@ -267,7 +267,7 @@ const dictData = useDictData() const show = ref(false) const height = mainHeight(30) const boxHeight: any = mainHeight(420, 2) -const EchHeight: any = mainHeight(490, 2) +const EchHeight: any = mainHeight(510, 2) const evaluateRef = ref() const steadyStateRef = ref() const formRow: any = ref({}) @@ -491,7 +491,8 @@ defineExpose({ info, show }) } } .evaluate { - margin: 10px 0; + white-space: nowrap; + margin: 0px 0; display: flex; justify-content: space-around; text-align: center;