项目管理-新增项目-工程项目下拉框树更改

src/api/cs-harmonic-boot/mxgraph.ts

@@ -3,41 +3,48 @@ import createAxios from '@/utils/request'
 //新增组态项目
 export function add(data: any) {
     return createAxios({
-      url: "/cs-harmonic-boot/csconfiguration/add",
+        url: '/cs-harmonic-boot/csconfiguration/add',
-      method: "post",
+        method: 'post',
-      data,
+        data
-    });
+    })
 }
 //组态项目分页查询
 export function coFqueryPage(data: any) {
     return createAxios({
-      url: "/cs-harmonic-boot/csconfiguration/queryPage",
+        url: '/cs-harmonic-boot/csconfiguration/queryPage',
-      method: "post",
+        method: 'post',
-      data,
+        data
-    });
+    })
 }
 //修改组态项目
 export function audit(data: any) {
     return createAxios({
-      url: "/cs-harmonic-boot/csconfiguration/audit",
+        url: '/cs-harmonic-boot/csconfiguration/audit',
-      method: "post",
+        method: 'post',
-      data,
+        data
-    });
+    })
 }
 //组态页面分页查询
 export function queryPageData(data: any) {
     return createAxios({
-      url: "/cs-harmonic-boot/cspage/queryPage",
+        url: '/cs-harmonic-boot/cspage/queryPage',
-      method: "post",
+        method: 'post',
-      data,
+        data
-    });
+    })
 }
 //查询工程列表
 export function deviceTree(data: any) {
     return createAxios({
-      url: "/cs-device-boot/csLedger/deviceTree",
+        url: '/cs-device-boot/csLedger/deviceTree',
-      method: "post",
+        method: 'post',
-      data,
+        data
-    });
+    })
 }
 
+//三层设备树(项目层根节点为治理设备和便携式设备组态)
+export function getztProjectTree() {
+    return createAxios({
+        url: '/cs-device-boot/csLedger/getztProjectTree',
+        method: 'post',
+    })
+}

src/views/govern/mxgraph/graphList/components/popup.vue

@@ -1,46 +1,51 @@
 <template>
-
+    <el-dialog
-
+        draggable
-    <el-dialog draggable :title="title" v-model="dialogVisible" width="500px" :before-close="handleClose"
+        :title="title"
-        :close-on-click-modal="false">
+        v-model="dialogVisible"
+        width="500px"
+        :before-close="handleClose"
+        :close-on-click-modal="false"
+    >
         <el-form ref="formRef" :rules="rules" :model="form" label-width="90px" class="form">
             <el-form-item label="项目名称:" prop="name">
                 <el-input v-model.trim="form.name" placeholder="请输入项目名称"></el-input>
             </el-form-item>
             <el-form-item label="工程项目:" class="top" prop="projectIds">
-
+                <el-tree-select
-                <el-tree-select v-model="form.projectIds" default-expand-all show-checkbox node-key="id"
+                    v-model="form.projectIds"
-                    :props="defaultProps" multiple :data="Engineering" collapse-tags style="width: 100%" />
+                    default-expand-all
+                    show-checkbox
+                    node-key="id"
+                    :props="defaultProps"
+                    multiple
+                    :data="Engineering"
+                    collapse-tags
+                    style="width: 100%"
+                />
                 <!-- <el-cascader v-model="form.projectIds" :options="Engineering" :props="defaultProps"
                     :show-all-levels="false" collapse-tags collapse-tags-tooltip clearable  style="width: 100%;"/> -->
-
             </el-form-item>
             <el-form-item label="项目排序:" prop="orderBy">
                 <el-input-number v-model="form.orderBy" :min="0" :step="1" step-strictly style="width: 100%" />
             </el-form-item>
 
-
             <el-form-item label="备注:" class="top">
-                <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model.trim="form.remark">
+                <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model.trim="form.remark"></el-input>
-                </el-input>
             </el-form-item>
         </el-form>
 
         <template #footer>
             <span class="dialog-footer">
-               
                 <el-button @click="dialogVisible = false">取 消</el-button>
                 <el-button type="primary" @click="addFn">确定</el-button>
             </span>
         </template>
     </el-dialog>
-
-
-
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
 import { ref, reactive } from 'vue'
-import { deviceTree, add, audit } from '@/api/cs-harmonic-boot/mxgraph';
+import { deviceTree, add, audit, getztProjectTree } from '@/api/cs-harmonic-boot/mxgraph'
 import { ElMessage, ElMessageBox } from 'element-plus'
 const title = ref('')
 const formRef = ref()
@@ -52,20 +57,18 @@ const defaultProps = {
     value: 'id',
     label: 'name',
     multiple: true,
-    expandTrigger: 'hover' as const,
+    expandTrigger: 'hover' as const
 }
 const form: any = reactive({
-    name: "",
+    name: '',
     projectIds: [],
     orderBy: '100',
-    remark: "",
+    remark: ''
 })
 const rules = {
-    name: [{ required: true, message: "请输入项目名称", trigger: "blur" }],
+    name: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
-    projectIds: [
+    projectIds: [{ required: true, message: '请选择工程项目', trigger: 'change' }],
-        { required: true, message: "请选择工程项目", trigger: "change" },
+    orderBy: [{ required: true, message: '请输入排序', trigger: 'blur' }]
-    ],
-    orderBy: [{ required: true, message: "请输入排序", trigger: "blur" }],
 }
 const addFn = () => {
     formRef.value.validate((valid: boolean) => {
@@ -76,30 +79,44 @@ const addFn = () => {
                     dialogVisible.value = false
                     emit('submit')
                 })
-
             } else {
                 audit(form).then((res: any) => {
                     ElMessage.success('修改项目成功!')
                     dialogVisible.value = false
                     emit('submit')
                 })
-
             }
         }
     })
-
-
-
-
 }
 const open = ref((row: any) => {
     formRef.value?.resetFields()
-    deviceTree({}).then((res: any) => {
+    // deviceTree({}).then((res: any) => {
-        res.data.forEach((item: any) => {
+    //     res.data.forEach((item: any) => {
-            item.children.forEach((child: any) => {
+    //         item.children.forEach((child: any) => {
-                child.children = []
+    //             child.children = []
+    //         })
+    //     })
+    //     Engineering.value = res.data
+    // })
+    getztProjectTree().then((res: any) => {
+        res.data.forEach((item: any, index: any) => {
+            if (!item.children || item.children.length == 0) {
+                res.data.splice(index, 1)
+                return
+            }
+            item.newList = []
+            item.children.forEach((vv: any, vvs: any) => {
+                vv.children.forEach((ss: any, ssIndex: any) => {
+                    if (ss.level == 1) {
+                        item.newList.push(ss)
+                    }
                 })
             })
+            if (item.name == '治理设备') {
+                item.children = item.newList
+            }
+        })
         Engineering.value = res.data
     })
     title.value = row.title