合并冲突

web/src/components/EditCom.vue

@@ -27,31 +27,28 @@
         </template>
         <template #treetable="item">
           <TreeTable
+            class="treeTable"
             :columns="item.columns"
             :table-data="item.tableData"
             ref="treeTable"
             :transfer-dialog="transferDialog"
-            @handleDetailPagesizeChange="handleDetailPagesizeChange"
             :table-option="{
               checkStrictly: false,
               selectTableData: item.selectTableData,
               scroll: { y: 500 }
             }"
           >
-            <template #isQuery="record">
-              <a-tag :color="record.isQuery ? 'green' : 'red'">{{
-                record.isQuery ? '启用' : '禁用'
-              }}</a-tag>
+            <template #is_add="recordList">
+              <a-checkbox v-model:checked="recordList.is_add"></a-checkbox>
             </template>
-            <template #isEdit="record">
-              <a-tag :color="record.isEdit ? 'green' : 'red'">{{
-                record.isEdit ? '启用' : '禁用'
-              }}</a-tag>
+            <template #is_del="recordList">
+              <a-checkbox v-model:checked="recordList.is_del"></a-checkbox>
             </template>
-            <template #isControl="record">
-              <a-tag :color="record.isControl ? 'green' : 'red'">{{
-                record.isControl ? '启用' : '禁用'
-              }}</a-tag>
+            <template #is_edit="recordList">
+              <a-checkbox v-model:checked="recordList.is_edit"></a-checkbox>
+            </template>
+            <template #isQuery="recordList">
+              <a-checkbox v-model:checked="recordList.isQuery"></a-checkbox>
             </template>
           </TreeTable>
         </template>
@@ -75,7 +72,9 @@ import {
   stationFormRules,
   deviceOptions,
   deviceFormRules,
-  alarmlogOptions
+  alarmlogOptions,
+  serviceApiOptions,
+  serviceApiFormRules
 } from '../../public/config/columnList'
 import DetailInfo from './DetailInfo.vue'
 import { postReq, getReq } from '@/request/api'
@@ -117,10 +116,12 @@ export default {
       formRules: {},
       apiMethods: {
         // menu: 'menuConfirm',
-        // permission: 'permissionConfirm',
         user: 'userConfirm',
         role: 'roleConfirm',
-        device: 'deviceConfirm'
+        device: 'deviceConfirm',
+        station: 'stationConfirm',
+        serviceApi: 'serviceApiConfirm',
+        // permission: 'permissionConfirm',
       },
       form: {},
       ObjInfo: {},
@@ -173,6 +174,9 @@ export default {
         case 'alarmLog':
           this.detailInfos = alarmlogOptions
           this.formRules = {}
+        case 'serviceApi':
+          this.detailInfos = serviceApiOptions
+          this.formRules = serviceApiFormRules
 
           break
 
@@ -302,21 +306,24 @@ export default {
           add: '/insertRole',
           edit: '/deleteRole'
         }
+        const { selectedRowKeys } = this.$refs.treeTable[0]
+        console.log(selectedRowKeys, 'selectedRowKeys')
         const paramsDate = {
           ...this.form
         }
-        if (this.action == 'edit') {
-          paramsDate.role_id = this.record.role_id
-        }
 
-        const res = await postReq(menuApi[this.action], paramsDate)
-        if (res.errcode === 0) {
-          setTimeout(() => {
-            this.handleback()
-          }, 1000)
-        } else {
-          throw res
-        }
+        // if (this.action == 'edit') {
+        //   paramsDate.role_id = this.record.role_id
+        // }
+
+        // const res = await postReq(menuApi[this.action], paramsDate)
+        // if (res.errcode === 0) {
+        //   setTimeout(() => {
+        //     this.handleback()
+        //   }, 1000)
+        // } else {
+        //   throw res
+        // }
       } catch (error) {
         console.log(error, 'roleConfirm')
       }
@@ -377,6 +384,31 @@ export default {
         this.$message.error('添加失败')
       }
     },
+    async serviceApiConfirm() {
+      try {
+        const menuApi = {
+          add: '/insertServiceApi',
+          edit: '/updateServiceApi'
+        }
+        const paramsDate = {
+          ...this.form
+        }
+        if (this.action == 'edit') {
+          paramsDate.api_id = this.record.api_id
+        }
+
+        const res = await postReq(menuApi[this.action], paramsDate)
+        if (res.errcode === 0) {
+          setTimeout(() => {
+            this.handleback()
+          }, 1000)
+        } else {
+          throw res
+        }
+      } catch (error) {
+        console.log(error, 'stationConfirm')
+      }
+    },
     handleback() {
       this.$emit('operateForm', 'back')
     },
@@ -417,4 +449,8 @@ export default {
 :deep(.ant-picker) {
   color: var(--theme-text-default) !important;
 }
+
+:deep(.treeTable) {
+  width: 550px !important;
+}
 </style>