临时提交

web_src/src/components/common/GroupTree.vue

@@ -15,7 +15,7 @@
       <vue-easy-tree
         class="flow-tree"
         ref="veTree"
-        node-key="id"
+        node-key="deviceId"
         height="78vh"
         lazy
         style="padding: 2rem 0 2rem 0.5rem"
@@ -55,7 +55,6 @@ export default {
   data() {
     return {
       props: {
-        id: "treeId",
         label: "name",
       },
       showCode: false,
@@ -74,7 +73,7 @@ export default {
     loadNode: function (node, resolve) {
       if (node.level === 0) {
         resolve([{
-          id: "",
+          deviceId: "",
           name: "根资源组",
           isLeaf: false,
           type: 0
@@ -255,7 +254,7 @@ export default {
           method: 'post',
           url: `/api/common/channel/group/device/add`,
           data: {
-            parentId: node.data.id,
+            parentId: node.data.deviceId,
             businessGroup: node.data.businessGroup,
             deviceIds: deviceIds,
           }
@@ -322,8 +321,9 @@ export default {
         id: 0,
         name: "",
         deviceId: "",
-        parentDeviceId: node.level > 2 ? node.data.id:"",
-        businessGroup: node.level > 2 ? node.data.businessGroup: node.data.id,
+        parentDeviceId: node.level > 2 ? node.data.deviceId:"",
+        parentId: node.data.id,
+        businessGroup: node.level > 2 ? node.data.businessGroup: node.data.deviceId,
       },form => {
         node.loaded = false
         node.expand();
@@ -331,13 +331,7 @@ export default {
     },
     editGroup: function (id, node) {
       console.log(node)
-      this.$refs.groupEdit.openDialog({
-        id: node.data.dbId,
-        name: node.data.label,
-        deviceId: node.data.id,
-        parentDeviceId: node.data.parentDeviceId,
-        businessGroup: node.data.businessGroup,
-      },form => {
+      this.$refs.groupEdit.openDialog(node.data,form => {
         node.parent.loaded = false
         node.parent.expand();
       }, id);

web_src/src/components/group.vue

@@ -50,9 +50,9 @@
           <el-table-column label="类型" min-width="100">
             <template slot-scope="scope">
               <div slot="reference" class="name-wrapper">
-                <el-tag size="medium" v-if="scope.row.gbDeviceDbId">国标设备</el-tag>
-                <el-tag size="medium" v-if="scope.row.streamPushId">推流设备</el-tag>
-                <el-tag size="medium" v-if="scope.row.streamProxyId">拉流代理</el-tag>
+                <el-tag size="medium" effect="plain" v-if="scope.row.gbDeviceDbId">国标设备</el-tag>
+                <el-tag size="medium" effect="plain" type="success" v-if="scope.row.streamPushId">推流设备</el-tag>
+                <el-tag size="medium" effect="plain" type="warning" v-if="scope.row.streamProxyId">拉流代理</el-tag>
               </div>
             </template>
           </el-table-column>

web_src/src/components/region.vue

@@ -50,9 +50,9 @@
           <el-table-column label="类型" min-width="100">
             <template slot-scope="scope">
               <div slot="reference" class="name-wrapper">
-                <el-tag size="medium" v-if="scope.row.gbDeviceDbId">国标设备</el-tag>
-                <el-tag size="medium" v-if="scope.row.streamPushId">推流设备</el-tag>
-                <el-tag size="medium" v-if="scope.row.streamProxyId">拉流代理</el-tag>
+                <el-tag size="medium" effect="plain" v-if="scope.row.gbDeviceDbId">国标设备</el-tag>
+                <el-tag size="medium" effect="plain" type="success" v-if="scope.row.streamPushId">推流设备</el-tag>
+                <el-tag size="medium" effect="plain" type="warning" v-if="scope.row.streamProxyId">拉流代理</el-tag>
               </div>
             </template>
           </el-table-column>