From 477cf59fa21e5030eb9baca012da8524e08c2e32 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 23 Jul 2024 17:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E9=81=93=E8=AE=BE=E7=BD=AE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setChannel/setChannelDialog.vue           | 53 +++++++++++--------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/views/realTimeMonitor/components/setChannel/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannel/setChannelDialog.vue
index 3dc8f37..e961332 100644
--- a/src/views/realTimeMonitor/components/setChannel/setChannelDialog.vue
+++ b/src/views/realTimeMonitor/components/setChannel/setChannelDialog.vue
@@ -7,12 +7,7 @@
     width="870px"
     @close="handleclose"
   >
-    <div class="zzinfo">
-      装置编号：{{ areaData.name
-      }}<el-button type="text" icon="el-icon-refresh" @click="searchBtn"
-        >刷新</el-button
-      >
-    </div>
+    <div class="zzinfo">装置编号：{{ areaData.name }}</div>
     <div class="channelsetBox" v-loading="channelsetLoading">
       <!-- 通道设置 -->
       <div class="channelList">
@@ -280,6 +275,8 @@
           </el-option>
         </el-select>
       </div>
+      <el-divider></el-divider>
+      <!-- 水印 -->
       <div class="textAreabox">
         <div class="lt">
           <h4>左上osd</h4>
@@ -410,13 +407,14 @@
           </el-popover>
         </div>
       </div>
+      <el-divider></el-divider>
       <div class="moreParams">
         <div class="parambox" v-for="(val, index) in moreForm" :key="index">
-          <h4>name</h4>
+          <h4>属性名</h4>
           <el-input v-model="val.parmasName" size="mini"></el-input>
-          <h4>value</h4>
+          <h4>属性值</h4>
           <el-input v-model="val.parmasValue" size="mini"></el-input>
-          <h4>type</h4>
+          <h4>属性类型</h4>
           <el-select size="mini" v-model="val.parmasType" placeholder="请选择">
             <el-option
               v-for="item in typeOption"
@@ -446,19 +444,28 @@
       </div>
     </div>
     <div slot="footer" class="dialog-footer">
-      <div class="jsonBox" v-if="resultJson !== ''">
-        <el-popover
-          placement="right"
-          width="200"
-          trigger="click"
-          popper-class="jsonclass"
+      <div class="btnleft">
+        <el-button type="text" icon="el-icon-refresh" @click="searchBtn"
+          >刷新</el-button
         >
-          <pre>{{ resultJson }}</pre>
-          <el-button type="text" slot="reference" :disabled="channelsetLoading"
-            >展示JSON</el-button
+        <div class="jsonBox" v-if="resultJson !== ''">
+          <el-popover
+            placement="right"
+            width="200"
+            trigger="click"
+            popper-class="jsonclass"
           >
-        </el-popover>
+            <pre>{{ resultJson }}</pre>
+            <el-button
+              type="text"
+              slot="reference"
+              :disabled="channelsetLoading"
+              >展示JSON</el-button
+            >
+          </el-popover>
+        </div>
       </div>
+
       <div class="btngrop">
         <el-button @click="handleclose" :disabled="channelsetLoading"
           >取 消</el-button
@@ -1644,9 +1651,13 @@ export default {
     display: grid;
     grid-template-columns: 1fr auto;
     // justify-content: space-between;
-    .jsonBox {
-      text-align: left;
+    .btnleft {
+      display: flex;
+      .jsonBox {
+        text-align: left;
+      }
     }
+
     .btngrop {
       .el-button--default,
       .el-button--primary {