Merge branch 'master' into yn

frontend/.env

@@ -13,8 +13,8 @@ VITE_REPORT=false
 # 浏览器是否显示vue的告警信息
 VUE_APP_SILENCE_WARNINGS=true
 
-VITE_COMPANY_WEBSITE=http://www.shining-electric.com/
-VITE_COMPANY_NAME=南京灿能电力自动化股份有限公司
+VITE_COMPANY_WEBSITE=https://baike.baidu.com/item/%E4%BA%91%E5%8D%97%E7%94%B5%E5%8A%9B%E6%8A%80%E6%9C%AF%E6%9C%89%E9%99%90%E8%B4%A3%E4%BB%BB%E5%85%AC%E5%8F%B8/20071982
+VITE_COMPANY_NAME=云南电力技术有限责任公司
 
 VITE_IS_SHOW_RAW_DATA=true
 # 开启激活验证

frontend/.env.development

@@ -19,6 +19,6 @@ VITE_API_URL=/api
 
 # 开发环境跨域代理，支持配置多个
 
-VITE_PROXY=[["/api","http://127.0.0.1:18092/"]]
+VITE_PROXY=[["/api","http://127.0.0.1:18093/"]]
 #VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
 #VITE_PROXY=[["/api","http://192.168.2.125:18092/"]]

frontend/.env.production

@@ -23,5 +23,5 @@ VITE_PWA=true
 
 # 线上环境接口地址
 #VITE_API_URL="/api" # 打包时用
-VITE_API_URL="http://127.0.0.1:18092/"
+VITE_API_URL="http://127.0.0.1:18093/"
 

frontend/src/layouts/LayoutTransverse/index.scss

@@ -10,7 +10,7 @@
     padding: 0 15px 0 0;
     border-bottom: 1px solid var(--el-header-border-color);
     // background-color: var(--el-header-bg-color);
-    background-color: var(--el-color-primary); //默认蓝色风格背景
+    background-color: #fff; //默认蓝色风格背景
     .logo {
       padding:0 10px 0 15px;
       margin-right: 30px;
@@ -23,7 +23,7 @@
         font-size: 21.5px;
         font-weight: bold;
         // color: var(--el-header-logo-text-color);
-        color: #fff; // logo文字颜色
+        color: var(--el-color-primary); // logo文字颜色
         white-space: nowrap;
       }
     }
@@ -33,15 +33,14 @@
       height: 100%;
       overflow: hidden;
       border-bottom: none;
-      background-color: var(--el-color-primary); //导航蓝色背景
+      background-color: #fff; //导航蓝色背景
       .el-menu-item {
-        color: #fff;
+        color: var(--el-color-primary);
       }
       .el-menu-item:hover {
         color: #fff; //一级导航划过颜色
         //background-color: #5274a5 !important; //一级导航划过背景色
-        background-color:var(--el-color-primary-light-3) !important; 
-
+        background-color:var(--el-color-primary-light-4) !important;
       }
       .el-sub-menu__hide-arrow {
         width: 65px;
@@ -50,15 +49,19 @@
       .el-menu-item.is-active {
         color: #fff !important; //一级导航文字选中颜色
         //background-color: #5274a5 !important; //一级导航选中背景色
-        background-color: var(--el-color-primary-light-3) !important; 
+        background-color: var(--el-color-primary-light-4) !important;
 
         border-bottom: 0 !important;
       }
+      .el-sub-menu__title:hover {
+        color: #fff !important;
+        background-color: var(--el-color-primary-light-4) !important;
+      }
       .el-sub-menu__title {
-        color: #fff;
+        color: var(--el-color-primary);
       }
       .is-opened:hover {
-        color: #fff;
+        color: var(--el-color-primary);
       }
       .is-active {
         background-color: var(--el-color-primary) !important;
@@ -68,12 +71,12 @@
           width: 0;
         }
         .el-sub-menu__title {
-          color: #fff !important; //二级导航文字选中颜色
+          color: var(--el-color-primary) !important; //二级导航文字选中颜色
           // background-color: var(--el-color-primary) !important;
           // background-color: #5274a5 !important;//二级导航选中背景色
       
           //background-color: #7588e5 !important; 
-          background-color: var(--el-color-primary-light-3) !important; 
+          background-color: var(--el-color-primary-light-4) !important;
           border-bottom-color: var(--el-color-primary) !important;
         }
       }

frontend/src/views/home/components/test.vue

@@ -679,6 +679,12 @@ watch(webMsgSend, function(newValue, oldValue) {
           case 'F_End':
             handleEndItem('F', newValue.desc, newValue.data)
             break
+          case 'Angle_Start':
+            handleStartItem('Angle', newValue.desc)
+            break
+          case 'Angle_End':
+            handleEndItem('Angle', newValue.desc, newValue.data)
+            break
           // 检测结束
           case 'Quit':
 

frontend/src/views/machine/controlSource/components/machineTree.vue

@@ -4,7 +4,7 @@
         default-expand-all
         :data="props.treeData"
         :props="defaultProps"
-        style="width: 100%"
+        style="width: 100%;margin-bottom: 80px;"
         :expand-on-click-node="false"
         :highlight-current="true"
         @node-click="handleNodeClick"

frontend/src/views/machine/testScript/components/setValuePopup.vue

@@ -1,13 +0,0 @@
-<template>
-    <div>
-
-    </div>
-</template>
-
-<script setup lang="ts">
-
-</script>
-
-<style scoped>
-
-</style>

frontend/src/views/machine/testScript/components/setValueTable.vue

@@ -321,13 +321,18 @@ const setUnit = (row: any) => {
         row.name == '电流有效值' ? (text = o) : ''
         row.name == '电流相角' ? (text = '°') : ''
     } else if (row.name == '电压序分量') {
-      text = '%Un V'
+      text = props.valueCode == 'Absolute'? 'V':'%Un V'
     } else if (row.name == '电流序分量') {
-      text = '%In A'
+      text = props.valueCode == 'Absolute'? 'A':'%In A'
+    } else if (row.name.includes('视在功率')) {
+      text = props.valueCode == 'Absolute' ? 'VA' : '%Un*In VA'
+    } else if (row.name.includes('无功功率')) {
+      text = props.valueCode == 'Absolute' ? 'Var' : '%Un*In Var'
+    } else if (row.name.includes('功率因数')) {
+      text = ''
     } else {
       text = unit.filter(item => item.label == row.pname)[0]?.unit
     }
-
     return text || ''
 }
 const save = () => {

frontend/src/views/plan/planList/components/planPopup.vue

@@ -112,8 +112,8 @@
                                 :key="index"
                                 :label="option.label"
                                 :value="option.value"
-                                :disabled="option.fluke!=1&&pqSourceArray?.find(item=>formContent.sourceIds==item.value)?.label.includes('FLUKE')"
                             />
+<!--                          :disabled="option.fluke!=1&&pqSourceArray?.find(item=>formContent.sourceIds==item.value)?.label.includes('FLUKE')"-->
                         </el-select>
                     </el-form-item>
                     <el-form-item :label-width="110" label="误差体系" prop="errorSysId">