临时提交

web_src/src/components/PlatformEdit.vue

@@ -125,6 +125,8 @@
                 <el-checkbox label="消息通道" v-model="value.asMessageChannel"></el-checkbox>
                 <el-checkbox label="主动推送通道" v-model="value.autoPushChannel"></el-checkbox>
                 <el-checkbox label="推送平台信息" v-model="value.catalogWithPlatform"></el-checkbox>
+                <el-checkbox label="推送分组信息" v-model="value.catalogWithGroup"></el-checkbox>
+                <el-checkbox label="推送行政区划" v-model="value.catalogWithRegion"></el-checkbox>
               </div>
 
 

web_src/src/components/common/GroupTree.vue

@@ -21,18 +21,19 @@
         style="padding: 2rem 0 2rem 0.5rem"
         :load="loadNode"
         :data="treeData"
+        :props="props"
         :default-expanded-keys="['']"
         @node-contextmenu="contextmenuEventHandler"
         @node-click="nodeClickHandler"
       >
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <span @click.stop >
-            <el-radio v-if="node.data.type === 0 && node.level > 2 " style="margin-right: 0" v-model="chooseId" @input="chooseIdChange(node.data.id, node.data.businessGroup)" :label="node.data.id">{{''}}</el-radio>
+            <el-radio v-if="node.data.type === 0 && node.level > 2 " style="margin-right: 0" v-model="chooseId" @input="chooseIdChange(node.data.deviceId, node.data.businessGroup)" :label="node.data.deviceId">{{''}}</el-radio>
           </span>
           <span v-if="node.data.type === 0" style="color: #409EFF" class="iconfont icon-bianzubeifen3"></span>
           <span v-if="node.data.type === 1" style="color: #409EFF" class="iconfont icon-shexiangtou2"></span>
-          <span style=" padding-left: 1px" v-if="node.data.id !=='' && showCode" :title="node.data.id">{{ node.label }}（编号：{{ node.data.id }}）</span>
-          <span style=" padding-left: 1px" v-if="node.data.id ==='' || !showCode" :title="node.data.id">{{ node.label }}</span>
+          <span style=" padding-left: 1px" v-if="node.data.deviceId !=='' && showCode" :title="node.data.deviceId">{{ node.label }}（编号：{{ node.data.deviceId }}）</span>
+          <span style=" padding-left: 1px" v-if="node.data.deviceId ==='' || !showCode" :title="node.data.deviceId">{{ node.label }}</span>
         </span>
       </vue-easy-tree>
     </div>
@@ -53,6 +54,10 @@ export default {
   },
   data() {
     return {
+      props: {
+        id: "treeId",
+        label: "name",
+      },
       showCode: false,
       searchSrt: "",
       chooseId: "",
@@ -70,7 +75,7 @@ export default {
       if (node.level === 0) {
         resolve([{
           id: "",
-          label: "根资源组",
+          name: "根资源组",
           isLeaf: false,
           type: 0
         }]);
@@ -112,7 +117,7 @@ export default {
                   method: "post",
                   url: `/api/common/channel/group/delete`,
                   data: {
-                    channelIds: [data.dbId]
+                    channelIds: [data.id]
                   }
                 }).then((res) => {
                   console.log("移除成功")
@@ -225,7 +230,7 @@ export default {
         method: "delete",
         url: `/api/group/delete`,
         params: {
-          id: node.data.dbId,
+          id: node.data.id,
         }
       }).then((res) => {
         if (res.data.code === 0) {

web_src/src/components/dialog/shareChannelAdd.vue

@@ -14,6 +14,14 @@
             <el-option label="在线" value="true"></el-option>
             <el-option label="离线" value="false"></el-option>
           </el-select>
+          类型:
+          <el-select size="mini" style="width: 8rem; margin-right: 1rem;" @change="search" v-model="channelType" placeholder="请选择"
+                     default-first-option>
+            <el-option label="全部" value=""></el-option>
+            <el-option label="国标设备" value="gb"></el-option>
+            <el-option label="推流设备" value="push"></el-option>
+            <el-option label="拉流代理" value="proxy"></el-option>
+          </el-select>
           添加状态:
           <el-select size="mini" style="width: 8rem; margin-right: 1rem;" @change="search" v-model="hasShare" placeholder="请选择"
                      default-first-option>
@@ -46,9 +54,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>
@@ -131,6 +139,7 @@ export default {
           count: this.count,
           query: this.searchSrt,
           online: this.online,
+          channelType: this.channelType,
           platformId: this.platformId,
           hasShare: this.hasShare
         }