提交更改

src/views/govern/device/planData/components/popup.vue

@@ -345,6 +345,7 @@
                         >
                             <vxe-column type="checkbox" width="60"></vxe-column>
                             <vxe-column type="seq" width="40"></vxe-column>
+                            <vxe-column field="itemName" title="名称"></vxe-column>
                             <vxe-column field="devName" title="设备名称"></vxe-column>
                             <vxe-column field="devMac" title="设备MAC"></vxe-column>
                             <vxe-column field="devNdId" title="网络识别码"></vxe-column>
@@ -472,7 +473,7 @@ const initForm = () => {
     //测试项数据
     form1.value = {
         itemName: '', //测试项名称
-        statisticalInterval: statisticalIntervalList[0].id, //测量间隔
+        statisticalInterval: statisticalIntervalList[1].id, //测量间隔
         voltageLevel: voltageLevelList[0].id, //电压等级
         volConType: volConTypeList[0].id, //接线方式
         capacitySscmin: 10, //最小短路容量
@@ -601,7 +602,6 @@ const details = (val: any) => {
     }
     //修改测试项回显
     if (activeFormIndex.value == 3) {
-        console.log(val, '66666666777777755555')
         form1.value = val.records[0]
     }
     if (activeFormIndex.value != 1 && activeFormIndex.value != 3) {
@@ -645,6 +645,9 @@ defineOptions({
 const treeIds: any = ref(['-1'])
 //树节点选择变化的时候处理树节点选中数据
 const checkChange = async (data: any) => {
+    if (defaultCheckedKeys.value.length == 0) {
+        treeIds.value[0] = '-1'
+    }
     if (data.checked) {
         defaultCheckedKeys.value.push(data.data.id)
         data.data.children?.map((item: any) => {
@@ -656,6 +659,8 @@ const checkChange = async (data: any) => {
             treeIds.value.splice(defaultCheckedKeys.value.indexOf(item.id), 1)
         })
     }
+    treeIds.value = [...new Set(treeIds.value)]
+    treeIds.value[0] = '-1'
     await tableStore.index()
 }
 const deviceInfoTreeRef = ref()
@@ -678,6 +683,7 @@ const tableStore = new TableStore({
     column: [
         { width: '40', type: 'checkbox', fixed: 'left' },
         { title: '序号', type: 'seq', width: 60 },
+        { field: 'itemName', title: '名称', minWidth: 170 },
         { field: 'devName', title: '设备名称', minWidth: 170 },
         { field: 'lineName', title: '线路号', minWidth: 170 },
         { field: 'startTime', title: '开始时间', minWidth: 170 },
@@ -890,6 +896,7 @@ defineExpose({ open, details })
     width: 100%;
     display: flex;
     justify-content: flex-end;
+    margin: 10px 0;
 }
 .add_device {
     // display: flex;