From f446dac8225ca860f65dd284a6949869e2363eb2 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 30 Oct 2024 09:21:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=85=B3=E7=B3=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iceserver/index.vue                 | 23 ++++++++-----
 .../components/addMappDialog.vue              |  5 +++
 src/views/mappingConfig/index.vue             | 32 +++++++++++++++++--
 vue.config.js                                 |  2 +-
 4 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/src/views/iceserver/index.vue b/src/views/iceserver/index.vue
index 5ba45573..7881f034 100644
--- a/src/views/iceserver/index.vue
+++ b/src/views/iceserver/index.vue
@@ -12,7 +12,7 @@
       >
         <el-card class="box-card">
           <div slot="header" class="clearfix">
-            <span> IEC服务器状态</span>
+            <span> 61850服务端</span>
           </div>
           <div class="concard">
             <p>
@@ -47,7 +47,7 @@
         </el-card>
       </div>
     </div>
-    <el-divider direction="vertical"></el-divider>
+    <!-- <el-divider direction="vertical"></el-divider> -->
     <div class="right">
       <div
         class="cardBox2"
@@ -78,6 +78,8 @@
                 <template slot-scope="scope">
                   <el-switch
                     v-model="scope.row.start"
+                    :active-value="1"
+                    :inactive-value="0"
                     active-text="开启"
                     inactive-text="关闭"
                     active-color="#13ce66"
@@ -284,18 +286,23 @@ export default {
 </script>
 <style lang="less">
 .iceConfig {
-  width: calc(100% - 24px);
+  width: calc(100% - 0px);
   overflow-x: hidden;
-  background: rgba(8, 9, 36, 0.28);
-  box-shadow: inset 0 4px 44px 0 #106cde;
-  padding: 0px 12px;
+  // background: rgba(8, 9, 36, 0.28);
+  // box-shadow: inset 0 4px 44px 0 #106cde;
+  padding: 0px 0px;
   height: 100%;
   display: flex;
+  justify-content: space-between;
   .left {
-    width: 50%;
+    width: 49%;
+    background: rgba(8, 9, 36, 0.28);
+    box-shadow: inset 0 4px 44px 0 #106cde;
   }
   .right {
-    width: 50%;
+    width: 49%;
+    background: rgba(8, 9, 36, 0.28);
+    box-shadow: inset 0 4px 44px 0 #106cde;
   }
   .el-divider--vertical {
     height: 100%;
diff --git a/src/views/mappingConfig/components/addMappDialog.vue b/src/views/mappingConfig/components/addMappDialog.vue
index 2cd58656..eb2dd707 100644
--- a/src/views/mappingConfig/components/addMappDialog.vue
+++ b/src/views/mappingConfig/components/addMappDialog.vue
@@ -352,6 +352,11 @@ export default {
         }
       }
       .deviceList {
+        overflow-y: auto;
+        height: 284px;
+        .el-select {
+          width: 240px !important;
+        }
         p {
           height: 40px;
           line-height: 40px;
diff --git a/src/views/mappingConfig/index.vue b/src/views/mappingConfig/index.vue
index 26b75e23..9d7c70db 100644
--- a/src/views/mappingConfig/index.vue
+++ b/src/views/mappingConfig/index.vue
@@ -17,20 +17,42 @@
         style="width: 100%"
         height="calc(100% - 40px)"
       >
-        <el-table-column prop="rptFrom" label="From"> </el-table-column>
+        <el-table-column prop="rptFrom" label="From">
+          <template slot-scope="scope">
+            <span :class="[scope.row.fromActive ? 'blue' : 'red']">{{
+              scope.row.rptFrom
+            }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="指向" width="80px" class-name="rowClass">
           <template slot-scope="scope">
+            <!-- 两边都是true -->
             <el-tag
               type="success"
               v-if="scope.row.fromActive && scope.row.toActive"
             >
               <i class="el-icon-right"></i
             ></el-tag>
+
+            <el-tag
+              type="info"
+              v-else-if="
+                scope.row.fromActive == false && scope.row.toActive == false
+              "
+            >
+              <i class="el-icon-right"></i
+            ></el-tag>
             <el-tag type="danger" v-else> <i class="el-icon-right"></i></el-tag>
           </template>
         </el-table-column>
 
-        <el-table-column prop="rptFrom" label="T0"> </el-table-column>
+        <el-table-column prop="rptTo" label="To">
+          <template slot-scope="scope">
+            <span :class="[scope.row.toActive ? 'blue' : 'red']">{{
+              scope.row.rptTo
+            }}</span>
+          </template>
+        </el-table-column>
 
         <el-table-column label="操作" class-name="editClass">
           <template slot-scope="scope">
@@ -168,6 +190,12 @@ export default {
         font-size: 16px;
       }
     }
+    .blue {
+      color: #67c23a;
+    }
+    .red {
+      color: #333;
+    }
   }
 }
 </style>
diff --git a/vue.config.js b/vue.config.js
index 7d41c9bc..0c7092d9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -22,7 +22,7 @@ module.exports = defineConfig({
         //表示拦截以/api开头的请求路径
         target: "http://192.168.1.190:88", //200服务器
         // target: "http://61.169.135.146:40080/", //dell服务器
-
+        //target: "http://192.168.50.197:8099/", //本地
         changOrigin: true, //是否开启跨域
         pathRewrite: {
           "^/api": "/cac-api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的