style(configuratePage):组态页面样式修改

refactor(SecurityConfig):取消组态页面相关接口的登录校验

framework/src/main/java/com/dcs/framework/config/SecurityConfig.java

@@ -116,6 +116,7 @@ public class SecurityConfig
                         .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                         .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
                         .antMatchers("/webSocket/**", "/modbus/getDataTwinEquipmentValues/**", "/datatwin/**", "/influxdb/**","/hnyz/param/getIndexList"
+                                ,"/hnyz/configuration/config/**","/hnyz/extension/layout/","/modbus/**"
 //                                , "/**"
                         ).permitAll()
                         .antMatchers("/ws/**").permitAll()

ui/src/components/DCS/WaterTankComponent.vue

@@ -290,7 +290,7 @@ const waterLevelConfig = computed(() => ({
         .water_level_pos3 {
             position: absolute;
             top: 18%;
-            left: 30%;
+            left: 29.5%;
         }
 
         .water_level_pos4 {

ui/src/views/configuratePage/blockOut/index.vue

@@ -3,11 +3,11 @@
         <HeaderComponent title="排堵流程"></HeaderComponent>
         <div class="content_page">
             <M1Tank title="M1" :valveArr="valveMap.M1" :waterLevelValue="30"
-                :pressureValue="sensorHelper.getDataArrByCode('M1yl')[0]" :temperatureValue="110"
-                :iconSize="getTankSize('M1')" :weightValue="100" :style="getTankStyle('M1')"></M1Tank>
+                :pressureValue="sensorHelper.getDataArrByCode('M1yl')[0]"
+                :iconSize="getTankSize('M1')"  :style="getTankStyle('M1')"></M1Tank>
             <M1Tank title="M2" :valveArr="valveMap.M2" :waterLevelValue="30"
-                :pressureValue="sensorHelper.getDataArrByCode('M1yl')[0]" :temperatureValue="110"
-                :iconSize="getTankSize('M2')" :weightValue="100" :style="getTankStyle('M2')"></M1Tank>
+                :pressureValue="sensorHelper.getDataArrByCode('M1yl')[0]" 
+                :iconSize="getTankSize('M2')"  :style="getTankStyle('M2')"></M1Tank>
             <div class="icon_others">
                 <div class="other1">
                     <div class="other_title"> 储气罐</div>

ui/src/views/configuratePage/heatExchange/index.vue

@@ -3,7 +3,7 @@
         <HeaderComponent title="换热流程"></HeaderComponent>
         <div class="content_page">
             <M1Tank title="M1" :valveArr="valveMap.M1" :iconSize="getTankSize('M1')" :waterLevelValue="30"
-                :pressureValue="sensorHelper.getDataArrByCode('M1yl')[0]" :temperatureValue="30" :weightValue="300"
+                :pressureValue="sensorHelper.getDataArrByCode('M1yl')[0]"
                 :style="getTankStyle('M1')">
             </M1Tank>
             <Z1Tank title="Z1" :valveArr="valveMap.Z1" :iconSize="300" class="hr_z1Tank"></Z1Tank>
@@ -11,8 +11,8 @@
             <J1Tank title="J1" :valveArr="valveMap.J1" :iconSize="300" class="hr_j1Tank"></J1Tank>
             <J1Tank title="J2" :valveArr="valveMap.J2" :iconSize="300" class="hr_j2Tank"></J1Tank>
             <M1Tank title="M2" valvePosition="right" :valveArr="valveMap.M2" :waterLevelValue="30"
-                :pressureValue="sensorHelper.getDataArrByCode('M2yl')[0]" :temperatureValue="110"
-                :iconSize="getTankSize('M2')" :weightValue="100" :style="getTankStyle('M2')">
+                :pressureValue="sensorHelper.getDataArrByCode('M2yl')[0]" 
+                :iconSize="getTankSize('M2')" :style="getTankStyle('M2')">
             </M1Tank>
             <!-- 泵 -->
             <div class="pumps">

ui/src/views/configuratePage/m1Hydrolyze/index.vue

@@ -3,26 +3,27 @@
         <HeaderComponent title="M1水解"></HeaderComponent>
         <div class="content_page">
             <M1Tank title="M1" :valveArr="valveMap.M1" :waterLevelValue="30"
-                :pressureValue="sensorHelper.getDataArrByCode('M1yl')[0]" :temperatureValue="30" :weightValue="300"
-                :iconSize="getTankSize('M1')" :style="getTankStyle('M1')">
+                :pressureValue="sensorHelper.getDataArrByCode('M1yl')[0]" :iconSize="getTankSize('M1')"
+                :style="getTankStyle('M1')">
             </M1Tank>
             <S1Tank title="S1" :fanStatus="fanStatus" :valveArr="valveMap.S1"
                 :pressureValue="sensorHelper.getDataArrByCode('S1yl')[0]" :waterLevelValue="30"
-                :temperatureValue="sensorHelper.getDataArrByCode('S1wd')[0]" :weightValue="100"
-                :iconSize="getTankSize('S1',300)" :style="getTankStyle('S1')">
+                :temperatureValue="sensorHelper.getDataArrByCode('S1wd')[0]" :iconSize="getTankSize('S1', 300)"
+                :style="getTankStyle('S1')">
             </S1Tank>
             <S1Tank title="S2" :fanStatus="fanStatus" :valveArr="valveMap.S2"
                 :pressureValue="sensorHelper.getDataArrByCode('S2yl')[0]" :waterLevelValue="30"
-                :temperatureValue="sensorHelper.getDataArrByCode('S2wd')[0]" :weightValue="100"
-                :iconSize="getTankSize('S2',300)" :style="getTankStyle('S2')">
+                :temperatureValue="sensorHelper.getDataArrByCode('S2wd')[0]" :iconSize="getTankSize('S2', 300)"
+                :style="getTankStyle('S2')">
             </S1Tank>
-            <S1Tank title="S3" :fanStatus="fanStatus" :valveArr="valveMap.S3" :pressureValue="0.444"
-                :waterLevelValue="30" :temperatureValue="20" :iconSize="getTankSize('S3',300)" :weightValue="100" class="m1Flow_s3Tank">
+            <S1Tank title="S3" :fanStatus="fanStatus" :valveArr="valveMap.S3" :waterLevelValue="30"
+                :iconSize="getTankSize('S3', 300)" class="m1Flow_s3Tank">
             </S1Tank>
             <div class="pumps">
                 <!-- lb9 -->
                 <div :style="getTankStyle('LB9')">
-                    <Pump title="进料泵" :pumpDataArr="pumpHelper.getDataArrByCode('LB9')" :iconSize="getTankSize('LB9',300)"></Pump>
+                    <Pump title="进料泵" :pumpDataArr="pumpHelper.getDataArrByCode('LB9')"
+                        :iconSize="getTankSize('LB9', 300)"></Pump>
                 </div>
             </div>
             <div class="icon_others">
@@ -385,7 +386,7 @@ onBeforeUnmount(() => {
 
 
 const flowId = 5 // 当前页面对应的流程 ID
-const { layoutMap, fetchLayoutParams, getTankStyle ,getTankSize} = useLayout(flowId)
+const { layoutMap, fetchLayoutParams, getTankStyle, getTankSize } = useLayout(flowId)
 
 //更新页面配置
 function updatePageConfig() {

ui/src/views/configuratePage/m2OutMaterial/index.vue

@@ -2,19 +2,19 @@
     <div class="page">
         <HeaderComponent title="M2出料"></HeaderComponent>
         <div class="content_page">
-            <M1Tank title="M2" :valveArr="valveMap.M2" :waterLevelValue="30"
-                :pressureValue="sensorHelper.getDataArrByCode('M2yl')[0]" :temperatureValue="110" :iconSize="getTankSize('M2')"
-                :weightValue="100" :style="getTankStyle('M2')"></M1Tank>
-            <S1Tank title="S1" :fanStatus="fanStatus" :valveArr="valveMap.S1" :iconSize="getTankSize('S1',300)" :weightValue="100"
+            <M1Tank title="M2" :valveArr="valveMap.M2" :waterLevelValue="30" 
+                :pressureValue="sensorHelper.getDataArrByCode('M2yl')[0]" :iconSize="getTankSize('M2')"
+                :style="getTankStyle('M2')"></M1Tank>
+            <S1Tank title="S1" :fanStatus="fanStatus" :valveArr="valveMap.S1" :iconSize="getTankSize('S1',300)"
                 :pressureValue="sensorHelper.getDataArrByCode('S1yl')[0]" :waterLevelValue="30"
                 :temperatureValue="sensorHelper.getDataArrByCode('S1wd')[0]" :style="getTankStyle('S1')">
             </S1Tank>
-            <S1Tank title="S2" :fanStatus="fanStatus" :valveArr="valveMap.S2" :iconSize="getTankSize('S2',300)" :weightValue="100"
+            <S1Tank title="S2" :fanStatus="fanStatus" :valveArr="valveMap.S2" :iconSize="getTankSize('S2',300)" 
                 :pressureValue="sensorHelper.getDataArrByCode('S2yl')[0]" :waterLevelValue="30"
                 :temperatureValue="sensorHelper.getDataArrByCode('S2wd')[0]" :style="getTankStyle('S2')">
             </S1Tank>
-            <S1Tank title="S3" :fanStatus="fanStatus" :valveArr="valveArr_S3" :pressureValue="0.444"
-                :waterLevelValue="30" :temperatureValue="20" :iconSize="getTankSize('S3',300)" :weightValue="100" class="m2Flow_s3Tank">
+            <S1Tank title="S3" :fanStatus="fanStatus" :valveArr="valveArr_S3"
+                :waterLevelValue="30" :iconSize="getTankSize('S3',300)"  class="m2Flow_s3Tank">
             </S1Tank>
             <WaterTank title="P1" :tankType="3" class="m2Flow_p1Tank" :iconSize="300"></WaterTank>
 
@@ -310,6 +310,10 @@ const sensorArr = [
         code: 'M2wd',
         value: [30],
     },
+    {
+        code: 'M2yl',
+        value: [0.4],
+    },
     {
         code: 'S1yl',
         value: [0.6],