接口调试

src/api/basic/model.js

@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+// 获取模型列表
+export function getModelListApi(query) {
+    return request({
+        url: '/model/list',
+        method: 'get',
+        params: query,
+    })
+}
+// 新增模型数据
+export function addModelApi(data) {
+    return request({
+        url: '/model/add',
+        method: 'post',
+        data,
+    })
+}
+// 删除层级
+export function delModelApi(data) {
+    return request({
+        url: '/model/delete',
+        method: 'post',
+        data,
+    })
+}
+// // 修改层级
+// export function editLevelApi(data) {
+//     return request({
+//         url: '/level/edit',
+//         method: 'post',
+//         data,
+//     })
+// }

src/views/basic/model-manage/addOrEditForm.vue

@@ -5,8 +5,8 @@
             <el-form-item label="上级节点" prop="deviceName">
                 <el-input v-model="addOrEditForm.deviceName" placeholder="请输入设备名称" />
             </el-form-item>
-            <el-form-item label="分类名称" prop="deviceCode">
+            <el-form-item label="分类名称" prop="proName">
-                <el-input v-model="addOrEditForm.deviceCode" placeholder="请输入设备编码" />
+                <el-input v-model="addOrEditForm.proName" placeholder="请输入设备编码" />
             </el-form-item>
 
             <el-form-item>
@@ -18,6 +18,7 @@
 </template>
 
 <script>
+import { addModelApi } from '@/api/basic/model'
 export default {
     name: 'AddOrEditForm',
 
@@ -25,11 +26,16 @@ export default {
         return {
             addOrEditForm: {
                 deviceName: '',
-                deviceCode: '',
+                proName: '',
+                projectId: '',
+                level: '',
+                nodeCount: '',
+                proName: '',
+                parentId: '', //父级节点id
             },
             addOrEditFormRules: {
                 deviceName: [{ required: true, message: '请输入设备名称', trigger: 'blur' }],
-                deviceCode: [{ required: true, message: '请输入设备编码', trigger: 'blur' }],
+                proName: [{ required: true, message: '请输入设备编码', trigger: 'blur' }],
                 Keeper: [{ required: true, message: '请选择设备保管人', trigger: 'change' }],
             },
 
@@ -47,14 +53,21 @@ export default {
     },
     methods: {
         cancel() {
-            this.$emit('closeAddOrEditFormDialog')
+            this.$emit('closeAddOrEditFormDialog', false)
         },
         submitForm() {
-            // this.$emit('submitForm')
+            this.$refs.addOrEditFormRef.validate(async (valid) => {
-
-            this.$refs.addOrEditFormRef.validate((valid) => {
                 if (valid) {
-                    this.$emit('closeAddOrEditFormDialog')
+                    // 组装参数
+                    const params = JSON.parse(JSON.stringify(this.addOrEditForm))
+                    this.$delete(params, 'deviceName')
+                    const res = await addModelApi(params)
+                    if (res.code === 200) {
+                        this.$message.success('新增成功')
+                        this.$emit('closeAddOrEditFormDialog', true)
+                    } else {
+                        this.$message.error(res.msg)
+                    }
                 } else {
                     return false
                 }
@@ -65,9 +78,13 @@ export default {
         },
 
         setFormData(data) {
-            const { deviceName } = data
+            const { deviceName, id, level, nodeCount, projectId } = data
             this.addOrEditForm = {
                 deviceName,
+                projectId,
+                parentId: id,
+                level: parseInt(level) + 1,
+                nodeCount,
             }
         },
     },

src/views/basic/model-manage/index.vue

@@ -51,15 +51,15 @@
             border
             row-key="id"
             v-loading="loading"
-            :data="deviceList"
+            :data="modelList"
-            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+            :tree-props="{ children: 'nodes', hasChildren: 'hasChildren' }"
         >
             <el-table-column label="序号" align="center" type="index" />
 
-            <el-table-column prop="name" label="项目名称">
+            <el-table-column label="项目名称">
                 <template slot-scope="{ row }">
                     <span>
-                        {{ row.name }}
+                        {{ row.proName }}
                     </span>
                     <el-tag style="margin-left: 10px" size="mini" type="primary">节点{{ row.level }}</el-tag>
                 </template>
@@ -72,7 +72,7 @@
                         type="text"
                         icon="el-icon-plus"
                         @click="handleAddChild(row)"
-                        v-if="row.totalLevel !== row.level"
+                        v-if="row.nodeCount !== row.level"
                     >
                         新增
                     </el-button>
@@ -80,17 +80,27 @@
                         size="mini"
                         type="text"
                         icon="el-icon-upload"
-                        v-if="row.totalLevel === row.level"
+                        v-if="row.nodeCount === row.level"
                         @click="handleUploadModel(row)"
                     >
                         上传模型
                     </el-button>
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="handleEdit(row)"
+                        v-if="row.level != 1"
+                    >
+                        修改
+                    </el-button>
                     <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-delete"
                         style="color: #f56c6c"
                         @click="handleDelete(row)"
+                        v-if="row.level != 1"
                     >
                         删除
                     </el-button>
@@ -103,7 +113,7 @@
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
-            @pagination="getDeviceList"
+            @pagination="getModelList"
         />
 
         <!-- 添加或修改岗位对话框 -->
@@ -125,6 +135,8 @@
 import AddOrEditForm from './addOrEditForm.vue'
 import UseOrReturnForm from './useOrReturnForm.vue'
 import UseRecordTable from './useRecordTable.vue'
+
+import { getModelListApi, delModelApi } from '@/api/basic/model'
 export default {
     name: 'DeviceManage',
     components: {
@@ -142,144 +154,11 @@ export default {
             useOrReturnFormVisible: false, // 领用或归还对话框是否显示
             useRecordFormVisible: false, // 使用记录对话框是否显示
             // 设备列表
-            deviceList: [
+            modelList: [],
-                {
-                    id: 3,
-                    date: '2016-05-01',
-                    name: '*****项目1',
-                    level: 1,
-                    totalLevel: 2,
-                    children: [
-                        {
-                            id: 31,
-                            date: '2016-05-01',
-                            name: '椭圆',
-                            level: 2,
-                            totalLevel: 2,
-                        },
-                        {
-                            id: 32,
-                            date: '2016-05-01',
-                            name: '长方形',
-                            level: 2,
-                            totalLevel: 2,
-                        },
-                        {
-                            id: 33,
-                            date: '2016-05-01',
-                            name: '正方形',
-                            level: 2,
-                            totalLevel: 2,
-                        },
-                    ],
-                },
-                {
-                    id: 4,
-                    date: '2016-05-01',
-                    name: '*****项目2',
-                    level: 1,
-                    totalLevel: 2,
-                    children: [
-                        {
-                            id: 39,
-                            date: '2016-05-01',
-                            name: '椭圆',
-                            level: 2,
-                            totalLevel: 2,
-                        },
-                        {
-                            id: 40,
-                            date: '2016-05-01',
-                            name: '长方形',
-                            level: 2,
-                            totalLevel: 2,
-                        },
-                    ],
-                },
-                {
-                    id: 5,
-                    date: '2016-05-01',
-                    name: '*****项目3',
-                    level: 1,
-                    totalLevel: 3,
-                    children: [
-                        {
-                            id: 41,
-                            date: '2016-05-01',
-                            name: '*****工程1',
-                            level: 2,
-                            totalLevel: 3,
-                            children: [
-                                {
-                                    id: 58,
-                                    date: '2016-05-01',
-                                    name: '椭圆',
-                                    level: 3,
-                                    totalLevel: 3,
-                                },
-                                {
-                                    id: 59,
-                                    date: '2016-05-01',
-                                    name: '长方形',
-                                    level: 3,
-                                    totalLevel: 3,
-                                },
-                            ],
-                        },
-                        {
-                            id: 42,
-                            date: '2016-05-01',
-                            name: '*****工程2',
-                            level: 2,
-                            totalLevel: 3,
-                            children: [
-                                {
-                                    id: 60,
-                                    date: '2016-05-01',
-                                    name: '椭圆',
-                                    level: 3,
-                                    totalLevel: 3,
-                                },
-                                {
-                                    id: 61,
-                                    date: '2016-05-01',
-                                    name: '长方形',
-                                    level: 3,
-                                    totalLevel: 3,
-                                },
-                            ],
-                        },
-                        {
-                            id: 43,
-                            date: '2016-05-01',
-                            name: '*****工程3',
-                            level: 2,
-                            totalLevel: 3,
-                            children: [
-                                {
-                                    id: 62,
-                                    date: '2016-05-01',
-                                    name: '椭圆',
-                                    level: 3,
-                                    totalLevel: 3,
-                                },
-                                {
-                                    id: 63,
-                                    date: '2016-05-01',
-                                    name: '长方形',
-                                    level: 3,
-                                    totalLevel: 3,
-                                },
-                            ],
-                        },
-                    ],
-                },
-            ],
-
             // 查询参数
             queryParams: {
-                pageNum: 1,
+                // pageNum: 1,
-                pageSize: 10,
+                // pageSize: 10,
                 proName: undefined,
                 unit: undefined,
                 chargePerson: undefined,
@@ -288,12 +167,13 @@ export default {
     },
     created() {
         // this.getDeviceList()
+        this.getModelList()
     },
     methods: {
         // 查询按钮
         handleQuery() {
             this.queryParams.pageNum = 1
-            this.getDeviceList()
+            this.getModelList()
         },
 
         // 重置按钮
@@ -311,23 +191,22 @@ export default {
 
         // 新增子节点
         handleAddChild(row) {
-            console.log(row)
+            const { id, proName, level, nodeCount, projectId } = row
-            const { id, name } = row
             this.addOrEditFormTitle = '新增'
             this.editForm = null
             this.addOrEditFormVisible = true
 
-            const editForm = { deviceName: name }
+            const editForm = { deviceName: proName, id, level, nodeCount, projectId }
             this.$nextTick(() => {
                 this.$refs.addOrEditComponentRef.setFormData(editForm)
             })
         },
 
         //  获取设备列表
-        getDeviceList() {
+        getModelList() {
             this.loading = true
-            listProject(this.queryParams).then((response) => {
+            getModelListApi(this.queryParams).then((response) => {
-                this.proList = response.rows
+                this.modelList = response.rows
                 this.total = response.total
                 this.loading = false
             })
@@ -346,10 +225,12 @@ export default {
 
         // 编辑按钮
         handleEdit(row) {
+            const { id, proName, level, nodeCount } = row
             this.addOrEditFormTitle = '编辑'
+            this.editForm = null
             this.addOrEditFormVisible = true
-            const { deviceId, deviceName, deviceCode, remark, Keeper } = row
+
-            const editForm = { deviceId, deviceName, deviceCode, remark, Keeper }
+            const editForm = { deviceName: proName, id, level, nodeCount }
             this.$nextTick(() => {
                 this.$refs.addOrEditComponentRef.setFormData(editForm)
             })
@@ -362,12 +243,23 @@ export default {
         },
 
         // 删除按钮
-        handleDelete(row) {},
+        handleDelete(row) {
+            this.$modal.confirm('是否确认删除当前节点数据吗？').then(async () => {
+                const res = await delModelApi({ id: row.id })
+                if (res.code === 200) {
+                    this.$modal.msgSuccess('删除成功')
+                    this.getModelList()
+                }
+            })
+        },
 
         // 关闭新增或编辑对话框
-        closeAddOrEditFormDialog() {
+        closeAddOrEditFormDialog(isSuccess) {
             this.$refs.addOrEditComponentRef.resetForm()
             this.addOrEditFormVisible = false
+            if (isSuccess) {
+                this.getModelList()
+            }
         },
 
         // 关闭领用或归还对话框
@@ -375,6 +267,8 @@ export default {
             this.$refs.useOrReturnFormComponentRef.resetForm()
             this.useOrReturnFormVisible = false
         },
+
+        //
     },
 }
 </script>

src/views/basic/project/index.vue

@@ -65,10 +65,11 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="proList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="proList" @selection-change="handleSelectionChange" border>
             <el-table-column label="序号" align="center" type="index" />
             <el-table-column label="项目名称" align="center" prop="proName" />
             <el-table-column label="项目类型" align="center" prop="proType" />
+            <el-table-column label="层级配置" align="center" prop="level" />
             <el-table-column label="所属单位" align="center" prop="unit" />
             <el-table-column label="负责人" align="center" prop="chargePerson" />
             <el-table-column label="项目所在地" align="center" prop="location" width="180" />
@@ -112,6 +113,16 @@
                 <el-form-item label="项目类型" prop="proType">
                     <el-input v-model="form.proType" placeholder="请输入项目类型" />
                 </el-form-item>
+                <el-form-item label="层级配置" prop="level">
+                    <el-select v-model="form.level" placeholder="请选择层级配置" style="width: 100%">
+                        <el-option
+                            :key="item.configId"
+                            :value="item.configId"
+                            :label="item.configName"
+                            v-for="item in levelList"
+                        />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="建设单位" prop="unit">
                     <el-input v-model="form.unit" placeholder="请输入建设单位" />
                 </el-form-item>
@@ -134,9 +145,9 @@
         <!-- 地图选点对话框 -->
         <el-dialog
             title="地图选点"
-            :visible.sync="mapVisible"
-            :fullscreen="false"
             id="mapDialog"
+            :fullscreen="false"
+            :visible.sync="mapVisible"
             :close-on-click-modal="false"
             style="margin-top: 8.5vh"
         >
@@ -207,6 +218,7 @@
 
 <script>
 import { listProject, getProject, delProject, addProject, updateProject } from '@/api/basic/project'
+import { getLevelListApi } from '@/api/basic/level-manage.js'
 import { BaiduMap, BmNavigation, BmView, BmGeolocation, BmCityList, BmLocalSearch } from 'vue-baidu-map'
 
 export default {
@@ -251,17 +263,30 @@ export default {
                 longitude: '',
                 latitude: '',
                 location: '',
+                remark: '',
+                level: '',
             },
             // 表单校验
             rules: {
                 proName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
+                level: [{ required: true, message: '请选择层级配置', trigger: 'change' }],
             },
+
+            levelList: [],
         }
     },
     created() {
         this.getList()
+        this.getLevelList()
     },
     methods: {
+        async getLevelList() {
+            const res = await getLevelListApi({
+                pageNum: 1,
+                pageSize: 1000,
+            })
+            this.levelList = res.rows
+        },
         /** 查询岗位列表 */
         getList() {
             this.loading = true
@@ -286,6 +311,7 @@ export default {
                 chargePerson: undefined,
                 location: undefined,
                 remark: undefined,
+                level: undefined,
             }
             this.resetForm('form')
         },
@@ -317,6 +343,7 @@ export default {
                 this.form = response.data
                 this.open = true
                 this.title = '修改项目'
+                this.form.level = response.data.proId
             })
         },
         /** 提交按钮 */