设备台账调整

src/config/axios/service.ts

@@ -183,9 +183,7 @@ service.interceptors.response.use(
       if (requestUrl.includes('rq/')||requestUrl.includes('system/dict')) {
         const localeStore = useLocaleStore()
         const lang = localeStore.getCurrentLocale.lang
-        console.log('检测到rq/:', requestUrl)
         // const lang = 'en'
-        debugger
         if (data&& data.data) {
           if (data.data.list) {
             if (Array.isArray(data.data.list)) {

src/router/modules/remaining.ts

@@ -145,7 +145,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
     },
     children: [
       {
-        path: 'device/detail/add',
+        path: 'device/detail/add/:type/:deptId',
         component: () => import('@/views/pms/device/IotDeviceForm.vue'),
         name: 'DeviceDetailAdd',
         meta: {
@@ -158,7 +158,20 @@ const remainingRouter: AppRouteRecordRaw[] = [
         }
       },
       {
-        path: 'device/detail/edit/:id(\\d+)',
+        path: 'device/detail/add',
+        component: () => import('@/views/pms/device/IotDeviceForm.vue'),
+        name: 'DeviceDetailAddd',
+        meta: {
+          noCache: false,
+          hidden: true,
+          canTo: true,
+          icon: 'ep:add',
+          title: '设备台账添加',
+          activeMenu: '/device/base'
+        }
+      },
+      {
+        path: 'device/detail/edit/:type/:id(\\d+)',
         component: () => import('@/views/pms/device/IotDeviceForm.vue'),
         name: 'DeviceDetailEdit',
         meta: {

src/store/modules/dict.ts

@@ -71,7 +71,6 @@ export const useDictStore = defineStore('dict', {
       if (!this.isSetDict) {
         this.setDictMap()
       }
-      debugger
       return this.dictMap[type]
     },
     async resetDict() {

src/views/pms/device/IotDeviceForm.vue

@@ -39,15 +39,21 @@
           <el-col :span="8">
             <el-form-item label="所在部门" prop="deptId">
               <el-tree-select
-                clearable
                 v-model="formData.deptId"
                 :data="deptList"
                 :props="defaultProps"
                 check-strictly
                 node-key="id"
-                filterable
                 placeholder="请选择所在部门"
               />
+<!--              <el-tree-select-->
+<!--                v-model="formData.deptId"-->
+<!--                :data="deptList"-->
+<!--                :props="defaultProps"-->
+<!--                check-strictly-->
+<!--                node-key="id"-->
+<!--                placeholder="请选择归属部门"-->
+<!--              />-->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -366,6 +372,8 @@ const { params, name } = useRoute() // 查询参数
 const { currentRoute, push } = useRouter()
 
 const id = params.id
+const type = params.type
+const deptId = params.deptId
 const isDetail = params.isDetail
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -575,12 +583,7 @@ const submitForm = async () => {
     dialogVisible.value = false
     // 发送操作成功的事件
     //emit('success')
-    delView(unref(currentRoute))
-    await push({
-      name: 'IotDevicePms', query: {
-        date: new Date().getTime(),
-      }
-    })
+    close()
   } finally {
     formLoading.value = false
   }
@@ -610,6 +613,7 @@ onMounted(async () => {
       formLoading.value = false
     }
   } else {
+    formData.value.deptId = Number(deptId)
     formType.value = 'create';
   }
 })

src/views/pms/device/index.vue

@@ -295,14 +295,18 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
+const openForm = (type: string, id?: number,deptId?:number) => {
   //修改
   if (typeof id === 'number') {
-    push({ name: 'DeviceDetailEdit', params: { id } })
+    push({ name: 'DeviceDetailEdit', params: { type,id } })
     return
   }
   // 新增
-  push({ name: 'DeviceDetailAdd', params: {} })
+  if (deptId) {
+    push({ name: 'DeviceDetailAdd', params: {type,deptId} })
+  }else {
+    push({ name: 'DeviceDetailAddd', params: {} })
+  }
 }
 
 /** 删除按钮操作 */