From 8495cd0f23aa35bc78b8a653aadcd4907c9fcdfc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Tue, 10 Dec 2024 22:45:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92?=
 =?UTF-8?q?=E6=A0=91=E4=BB=A5=E5=8F=8A=E4=B8=9A=E5=8A=A1=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E6=A0=91=E6=B7=BB=E5=8A=A0=E9=80=9A=E9=81=93=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BB=A5=E5=8F=8A=E6=B7=BB=E5=8A=A0=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=88=86=E7=BB=84=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dialog/GbChannelSelect.vue | 26 ++++++++++++-------
 web_src/src/components/dialog/groupEdit.vue   | 14 +++++-----
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/web_src/src/components/dialog/GbChannelSelect.vue b/web_src/src/components/dialog/GbChannelSelect.vue
index 62a09066..258e313e 100644
--- a/web_src/src/components/dialog/GbChannelSelect.vue
+++ b/web_src/src/components/dialog/GbChannelSelect.vue
@@ -64,16 +64,22 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        style="text-align: right"
-        @size-change="handleSizeChange"
-        @current-change="currentChange"
-        :current-page="currentPage"
-        :page-size="count"
-        :page-sizes="[10, 25, 35, 50, 200, 1000, 50000]"
-        layout="total, sizes, prev, pager, next"
-        :total="total">
-      </el-pagination>
+      <div style="display: grid; grid-template-columns: 1fr 1fr">
+        <div style="text-align: left; line-height: 32px">
+          <i class="el-icon-info"></i>未找到通道，可在国标设备/通道中选择编辑按钮， 选择{{dataType === 'civilCode'?'行政区划':'父节点编码'}}
+        </div>
+        <el-pagination
+          style="text-align: right"
+          @size-change="handleSizeChange"
+          @current-change="currentChange"
+          :current-page="currentPage"
+          :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>
diff --git a/web_src/src/components/dialog/groupEdit.vue b/web_src/src/components/dialog/groupEdit.vue
index 72795cb4..1c77bc84 100755
--- a/web_src/src/components/dialog/groupEdit.vue
+++ b/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=>{
-        console.log("2222")
-        console.log(code)
+      this.$refs.chooseCivilCode.openDialog(code=>{
         this.group.civilCode = code;
-      }, deviceId)
+      });
     },
     close: function () {
       this.showDialog = false;