diff --git a/src/router/static.ts b/src/router/static.ts index 2baca73..58a40b9 100644 --- a/src/router/static.ts +++ b/src/router/static.ts @@ -27,7 +27,7 @@ export const adminBaseRoute = { }, { - // 设备补召 + // 在线补召 path: '/supplementaryRecruitment', name: 'supplementaryRecruitment', component: () => import('@/views/govern/device/control/supplementaryRecruitment.vue'), diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue index 7aa4924..0070668 100644 --- a/src/views/govern/alarm/Transient.vue +++ b/src/views/govern/alarm/Transient.vue @@ -29,7 +29,7 @@
- 值类型选择: + 值类型选择 - - + + diff --git a/src/views/govern/device/planData/components/popup.vue b/src/views/govern/device/planData/components/popup.vue index 23b53b5..721e731 100644 --- a/src/views/govern/device/planData/components/popup.vue +++ b/src/views/govern/device/planData/components/popup.vue @@ -345,8 +345,9 @@ const unBindList = ref([]) const bindList = ref([]) //0 新增方案 1 修改方案 2 新增测试项 3 修改测试项 4 设备信息 const open = async (val: any, id: any, name?: any) => { + console.log("🚀 ~ open ~ val:", val) popupType.value = val - title.value = val == 0 ? '新增方案' : val == 1 ? '修改方案' : val == 2 ? '新增测试项' : ('修改测试项' + '_' + name) + title.value = val == 0 ? '新增方案' : val == 1 ? '修改方案' : val == 2 ? '新增测试项' : val == 3 ? '修改测试项' : ('绑定测试项' + '_' + name) dialogVisible.value = true planId.value = id //新增方案或者测试项数据 @@ -477,7 +478,7 @@ const submit = () => { }) } //修改测试项 - if (popupType.value == 3) { + if (popupType.value == 3 || popupType.value == 4) { let subForm = JSON.parse(JSON.stringify(form1.value)) subForm.list = checkedIdList.value updateRecord(subForm).then((res: any) => { diff --git a/src/views/govern/device/planData/components/schemeTree.vue b/src/views/govern/device/planData/components/schemeTree.vue index 5588a4b..d4ff921 100644 --- a/src/views/govern/device/planData/components/schemeTree.vue +++ b/src/views/govern/device/planData/components/schemeTree.vue @@ -12,8 +12,16 @@ - + + + + + + + @@ -29,24 +37,52 @@ {{ node.label }}
+ + + + - + + + + + + + + - - - - - - + + + + + - + + + + + + + + + + + + +
@@ -65,7 +101,7 @@ import { getSchemeTree, getTestRecordInfo } from '@/api/cs-device-boot/planData' import { useConfig } from '@/stores/config' import useCurrentInstance from '@/utils/useCurrentInstance' import { ElTree } from 'element-plus' -import { Plus, Edit, Delete ,SetUp} from '@element-plus/icons-vue' +import { Plus, Edit, Delete, SetUp } from '@element-plus/icons-vue' import { delRecord } from '@/api/cs-device-boot/planData' import popup from './popup.vue' import { ElMessage, ElMessageBox } from 'element-plus' @@ -76,7 +112,10 @@ interface Props { width?: string canExpand?: boolean } - +const visible1 = ref(false) +const visible2 = ref(false) +const visible3 = ref(false) +const visible4 = ref(false) const { proxy } = useCurrentInstance() const menuCollapse = ref(false) const filterText = ref('') @@ -126,9 +165,9 @@ const onAdd = () => { } // 绑定数据 const bind = (node: any, data: any) => { - console.log("🚀 ~ bind ~ data:", data) - emit('bind',data) - + + emit('bind', data) + } /** 树形结构数据 */ const defaultProps = { @@ -147,7 +186,7 @@ const props = withDefaults( } ) -const emit = defineEmits(['init', 'checkChange', 'nodeChange', 'editNode', 'getChart','onAdd','bind']) +const emit = defineEmits(['init', 'checkChange', 'nodeChange', 'editNode', 'getChart', 'onAdd', 'bind']) const config = useConfig() const tree = ref() const treRef = ref() diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue index c1f2444..cb43e64 100644 --- a/src/views/govern/device/planData/index.vue +++ b/src/views/govern/device/planData/index.vue @@ -100,8 +100,9 @@
-

历史趋势

-
+ + +
@@ -154,6 +155,11 @@
+ + Config + + +
@@ -191,7 +197,7 @@ const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand') const volConTypeList = dictData.getBasicData('Dev_Connect') //值类型 const pageHeight = mainHeight(20) -const EcharHeight = ref(mainHeight(448)) +const EcharHeight = ref(mainHeight(483)) const loading = ref(false) const searchForm: any = ref({}) const typeOptions = [ @@ -314,7 +320,7 @@ const onAdd = () => { handleOpen(0) } const bind = (data: any) => { - handleOpen(3, data) + handleOpen(4, data) } const handleOpen = (val: any, data?: any) => { if (!deviceData.value) { @@ -333,6 +339,10 @@ const handleOpen = (val: any, data?: any) => { let name: any = '' //数据绑定 if (val == 3) { + ids = data?.id + // name = data?.name + dialogRef.value.detailsType('table') + } else if (val == 4) { ids = data?.id name = data?.name dialogRef.value.detailsType('table') @@ -477,15 +487,15 @@ const init = (flag: boolean) => { echartsData.value = { - title: { - text: chartTitle.value, - left: '0', + // title: { + // text: chartTitle.value, + // left: '0', - textStyle: { - color: '#000', - fontSize: '16' - }, - }, + // textStyle: { + // color: '#000', + // fontSize: '16' + // }, + // }, toolbox: { featureProps: { myTool1: { @@ -505,8 +515,8 @@ const init = (flag: boolean) => { itemStyle: { opacity: 0 },//去圆点 type: 'scroll', // 开启滚动分页 right: 70, - width: 550, - + // width: 550, + // height: 50 }, grid: { @@ -846,15 +856,15 @@ const selectChange = (e: boolean) => { if (activeColName.value == '0') { if (flag.value) { - EcharHeight.value = mainHeight(492) + EcharHeight.value = mainHeight(527) } else { - EcharHeight.value = mainHeight(448) + EcharHeight.value = mainHeight(483) } } else { if (flag.value) { - EcharHeight.value = mainHeight(322) + EcharHeight.value = mainHeight(357) } else { - EcharHeight.value = mainHeight(280) + EcharHeight.value = mainHeight(315) } } } @@ -862,15 +872,15 @@ const selectChange = (e: boolean) => { const handleChange = () => { if (activeColName.value == '0') { if (flag.value) { - EcharHeight.value = mainHeight(492) + EcharHeight.value = mainHeight(527) } else { - EcharHeight.value = mainHeight(448) + EcharHeight.value = mainHeight(483) } } else { if (flag.value) { - EcharHeight.value = mainHeight(322) + EcharHeight.value = mainHeight(357) } else { - EcharHeight.value = mainHeight(280) + EcharHeight.value = mainHeight(315) } } } diff --git a/src/views/govern/manage/basic/dictionary.vue b/src/views/govern/manage/basic/dictionary.vue index a6d7b08..13ebdf2 100644 --- a/src/views/govern/manage/basic/dictionary.vue +++ b/src/views/govern/manage/basic/dictionary.vue @@ -52,7 +52,9 @@ const tableStore = new TableStore({ url: '/system-boot/csDictData/list', method: 'POST', column: [ - { title: '序号', type: 'seq', width: 60 }, + { title: '序号', width: 80,formatter: (row: any) => { + return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 + } }, { title: '数据分类', field: 'dataTypeName', minWidth: 170 }, { title: '数据名称', field: 'name', minWidth: 220 }, { title: '别名', field: 'otherName', minWidth: 220 }, diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue index 777723f..1576707 100644 --- a/src/views/govern/manage/factory.vue +++ b/src/views/govern/manage/factory.vue @@ -187,7 +187,9 @@ const tableStore = new TableStore({ url: '/cs-device-boot/EquipmentDelivery/list', method: 'POST', column: [ - { title: '序号', type: 'seq', width: 60 }, + { title: '序号', width: 80,formatter: (row: any) => { + return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 + } }, { title: '设备名称', field: 'name' }, { title: '设备类型', diff --git a/src/views/govern/manage/gplot/index.vue b/src/views/govern/manage/gplot/index.vue index dfb759b..953fd13 100644 --- a/src/views/govern/manage/gplot/index.vue +++ b/src/views/govern/manage/gplot/index.vue @@ -37,7 +37,9 @@ const tableStore = new TableStore({ url: '/cs-device-boot/topologyTemplate/queryImage', method: 'POST', column: [ - { title: '序号', type: 'seq', width: 60 }, + { title: '序号', width: 80,formatter: (row: any) => { + return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 + } }, { title: '拓扑图模版名称', field: 'name', align: 'center' }, { title: '监测点数量', field: 'pointNum', align: 'center' }, { title: '拓扑图', field: 'filePath', align: 'center', render: 'image' }, diff --git a/src/views/govern/setting/statisticalType/add.vue b/src/views/govern/setting/statisticalType/add.vue index 6b69572..4bcaac4 100644 --- a/src/views/govern/setting/statisticalType/add.vue +++ b/src/views/govern/setting/statisticalType/add.vue @@ -8,12 +8,19 @@ + + + + + + +