为行政区划树以及业务分组树添加通道增加提示以及添加业务分组支持选择行政区划

web_src/src/components/dialog/GbChannelSelect.vue

@@ -64,16 +64,22 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
+      <div style="display: grid; grid-template-columns: 1fr 1fr">
-        style="text-align: right"
+        <div style="text-align: left; line-height: 32px">
-        @size-change="handleSizeChange"
+          <i class="el-icon-info"></i>未找到通道，可在国标设备/通道中选择编辑按钮， 选择{{dataType === 'civilCode'?'行政区划':'父节点编码'}}
-        @current-change="currentChange"
+        </div>
-        :current-page="currentPage"
+        <el-pagination
-        :page-size="count"
+          style="text-align: right"
-        :page-sizes="[10, 25, 35, 50, 200, 1000, 50000]"
+          @size-change="handleSizeChange"
-        layout="total, sizes, prev, pager, next"
+          @current-change="currentChange"
-        :total="total">
+          :current-page="currentPage"
-      </el-pagination>
+          :page-size="count"
+          :page-sizes="[10, 25, 35, 50, 200, 1000, 50000]"
+          layout="total, sizes, prev, pager, next"
+          :total="total">
+        </el-pagination>
+      </div>
+
     </el-dialog>
   </div>
 </template>

web_src/src/components/dialog/groupEdit.vue

@@ -22,7 +22,7 @@
           </el-form-item>
           <el-form-item label="行政区划" prop="name">
             <el-input v-model="group.civilCode" >
-              <el-button slot="append" @click="buildCivilCode(group.civilCode)">生成</el-button>
+              <el-button slot="append" @click="buildCivilCode(group.civilCode)">选择</el-button>
             </el-input>
           </el-form-item>
 
@@ -37,17 +37,17 @@
       </div>
     </el-dialog>
     <channelCode ref="channelCode"></channelCode>
-    <regionCode ref="regionCode"></regionCode>
+    <chooseCivilCode ref="chooseCivilCode"></chooseCivilCode>
   </div>
 </template>
 
 <script>
 import channelCode from "./channelCode.vue";
-import regionCode from "./regionCode.vue";
+import ChooseCivilCode from "./chooseCivilCode.vue";
 
 export default {
   name: "groupEdit",
-  components: {channelCode, regionCode},
+  components: {ChooseCivilCode, channelCode},
   computed: {},
   props: [],
   created() {},
@@ -116,11 +116,9 @@ export default {
       }, deviceId, 5 , lockContent);
     },
     buildCivilCode: function (deviceId){
-      this.$refs.regionCode.openDialog(code=>{
+      this.$refs.chooseCivilCode.openDialog(code=>{
-        console.log("2222")
-        console.log(code)
         this.group.civilCode = code;
-      }, deviceId)
+      });
     },
     close: function () {
       this.showDialog = false;