系数调整

build/extraResources/java/application.yml.template

@@ -115,3 +115,6 @@ activate:
   private-key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcUyYhVqczGxblL+o/xZzF/8nf+LjrfUE/dS1aRHM7uMDD0cgCArhjtfneFePrMxt+Z7W8yNBzSarub8qsfhaVNikV7Es7oaeTygfjQXTi2n4AFkir3fM07J08RpWhl5M8f8uWTCuvFUYAw00gq55typqmnbkmJa2VIUy/iQf+cMCP7abz4/jNhUzUR3qA7TV4oMRgTdIEDUp63YF8dOC+JH8XxYrCVeHXV6fLCwmesdMzl0lB2VTEKMfLbXhOmF5g7P9y/16VCcN8UBuZlbyYfn+GAxJOSbeHi5HshOKfoSuD7Jz+3WQZpNavOWjIFExKIU38/CvnJCOP7XBCqpSTAgMBAAECggEAYeWokWRE3TpvwiOZnUpR/aVMdVi75a3ROL5XIpqPV61B+t/bU3cEpl0GF9C5pUeiRi0IoStZb3mI9D1KPW/REKyUWkhabQO1gFYbTnRlkNOn6MILzKX4cwJjDaZeeo4EBPU7N+qHyOOXrU6hdH5FfxhMdV983ajm5eeuupxER1C2kAcIklTeVpTX6EKOgZb5LBp5ssOVm2P42pOauvcRozRcvZmqnErXmukv0H4l3EVNt4rHpTn9riHUC63e8JfiYzVaF6zuNUxv6nHEft0/SRMw11XSTnNfDzcKqgjz6ksFBS/6eQQYKESk+ONC53HUuYHFAknkwsPupDCT2W8FIQKBgQDLHT/xCU3nxGr4vFKBDNaO2D5oK20ECbBO4oDvLWWmQG7f+6TsMy8PgVdMnoL4RfqGlwFAKEpS6KVFHnBVqnNEhcdy9uCI7x7Xx8UnyUtxj1EDTm76uta9Ki9OrlqB6tImDM9+Ya3vGktW37ht4WOx2OsJRhG1dbf6RLwFlH7DWwKBgQDFBxvi5I1BR6hg6Tj7xd2SqOT2Y+BED3xuSYENhWbmMhLJDResaB7mjztbxlYaY2mOE0holWm2uDmVFFhMh4jYXik4hYH8nmDzq9mDpZCZ9pyjYqnAP8THoAa8EbgrUWB8A6BPH4iL3KbMnBfBKY0pIr2xrvnjQjNBAgta7KDRKQKBgCe6oe4wxrdF2TKsC2tIqpMoQxS3Icy/ZGgZr+SYuaBKTCWtoDW/UT40K3JGMxIDBhzbXphBCUCsVt9tM8Xd4EwP6tJW7dZ7B0pnve2pVwNwaAVAiz6p2yUHIle+jN+Koe5lZRSwYIg7WW81tWpwwsJfzqFyvjYDP6hJV4mz4ROvAoGAaRcdnKvjXApomShMqJ4lTPChD3q+SA8qg3jZSOj6tZXHx00gb2kp8jg7pPvpOTIFPy6x1Ha9aCRjMk0ju84fA6lVuzwa1S907wOehUVuF3Eeo1cgy9Y3k3KbpPyeixxgpkUY4JslLdSHc2NemD0dee951qhJyRmqVOZOQDUuoeECgYEAqBw2cAFk3vM97WY06TSldGA8ajVHx3BYRjj+zl62NTQthy8fw3tqxb3c5e8toOmZWKjZvDhg2TRLhsDDQWEYg3LZG87REqVIjgEPcpjNLidjygGX8n3JF2o0O5I/EMvl0s/+LVQONfduOBvhwDqr8QNisbLsyneiAq7umewMolo="
   public-key: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnFMmIVanMxsW5S/qP8Wcxf/J3/i4631BP3UtWkRzO7jAw9HIAgK4Y7X53hXj6zMbfme1vMjQc0mq7m/KrH4WlTYpFexLO6Gnk8oH40F04tp+ABZIq93zNOydPEaVoZeTPH/LlkwrrxVGAMNNIKuebcqapp25JiWtlSFMv4kH/nDAj+2m8+P4zYVM1Ed6gO01eKDEYE3SBA1Ket2BfHTgviR/F8WKwlXh11enywsJnrHTM5dJQdlUxCjHy214TpheYOz/cv9elQnDfFAbmZW8mH5/hgMSTkm3h4uR7ITin6Erg+yc/t1kGaTWrzloyBRMSiFN/Pwr5yQjj+1wQqqUkwIDAQAB"
 
+
+error:
+  removeCount: 14

frontend/src/views/machine/standardDevice/components/standardDevicePopup.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig" align-center>
-        <el-tabs type="border-card">
+    <el-tabs type="border-card" v-model="activeName">
-            <el-tab-pane label="设备台账信息">
+      <el-tab-pane label="设备台账信息" name="devInfo">
         <div>
           <el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false" label-width="auto" class="form-three">
             <el-divider>设备信息</el-divider>
@@ -72,33 +72,43 @@
           </el-form>
         </div>
       </el-tab-pane>
-          <el-tab-pane label="通道系数">
+      <el-tab-pane label="通道系数" name="gainInfo">
-            <el-tabs type="border-card" height="100%">
+        <el-tabs type="border-card" style="margin: 15px 0px;">
           <el-tab-pane v-for="(item, index) in formContent.gainList" :label="'通道'+(index+1)">
-<!--                <el-table :data="item" :border="true" style="width: 100%">-->
+            <el-form :model='item' ref='gainFormRef' :disabled="true" class="form-four">
-<!--                  <el-table-column label="ua" prop="uaGain" />-->
+              <el-form-item label-width="30" label-position="left" label="ua" prop="uaGain">
-<!--                  <el-table-column label="ub" prop="ubGain" />-->
-<!--                  <el-table-column label="uc" prop="ucGain" />-->
-<!--                  <el-table-column lable="cc" prop="u0Gain" />-->
-<!--                  <el-table-column label="ia" prop="iaGain" />-->
-<!--                  <el-table-column label="ib" prop="ibGain" />-->
-<!--                  <el-table-column label="ic" prop="icGain" />-->
-<!--                  <el-table-column label="i0" prop="i0Gain" />-->
-<!--                  <el-table-column label="uab" prop="uabGain" />-->
-<!--                  <el-table-column label="ubc" prop="ubcGain" />-->
-<!--                  <el-table-column label="uca" prop="ucaGain" />-->
-<!--                </el-table>-->
-                <el-form :model='item' ref='gainFormRef' :rules='rules' :disabled="true" class="form-three">
-                  <el-form-item label="ua" prop="uaGain">
                 <el-input v-model="item.uaGain"/>
               </el-form-item>
-                  <el-form-item label="ub" prop="ubGain"/>
+              <el-form-item label-width="30" label-position="left" label="ub" prop="ubGain">
-                  <el-form-item label="uc" prop="ucGain"/>
+                <el-input v-model="item.ubGain"/>
-                  <el-form-item label="u0" prop="u0Gain"/>
+              </el-form-item>
-                  <el-form-item label="ia" prop="iaGain"/>
+              <el-form-item label-width="30" label-position="left" label="uc" prop="ucGain">
-                  <el-form-item label="ib" prop="ibGain"/>
+                <el-input v-model="item.ucGain"/>
-                  <el-form-item label="ic" prop="icGain"/>
+              </el-form-item>
-                  <el-form-item label="i0" prop="i0Gain"/>
+              <el-form-item label-width="30" label-position="left" label="u0" prop="u0Gain">
+                <el-input v-model="item.u0Gain"/>
+              </el-form-item>
+              <el-form-item label-width="30" label-position="left" label="ia" prop="iaGain">
+                <el-input v-model="item.iaGain"/>
+              </el-form-item>
+              <el-form-item label-width="30" label-position="left" label="ib" prop="ibGain">
+                <el-input v-model="item.ibGain"/>
+              </el-form-item>
+              <el-form-item label-width="30" label-position="left" label="ic" prop="icGain">
+                <el-input v-model="item.icGain"/>
+              </el-form-item>
+              <el-form-item label-width="30" label-position="left" label="i0" prop="i0Gain">
+                <el-input v-model="item.i0Gain"/>
+              </el-form-item>
+              <el-form-item label-width="30" label-position="left" label="uab" prop="uabGain">
+                <el-input v-model="item.uabGain"/>
+              </el-form-item>
+              <el-form-item label-width="30" label-position="left" label="ubc" prop="uabGain">
+                <el-input v-model="item.ubcGain"/>
+              </el-form-item>
+              <el-form-item label-width="30" label-position="left" label="uca" prop="ucaGain">
+                <el-input v-model="item.ucaGain"/>
+              </el-form-item>
             </el-form>
           </el-tab-pane>
         </el-tabs>
@@ -115,18 +125,14 @@
 </template>
 <script setup lang='ts'>
 
-import IPAddress from '@/components/IpAddress/index.vue'
 import {dialogBig} from '@/utils/elementBind'
 import {type StandardDevice} from '@/api/device/interface/standardDevice.ts'
 import {ElMessage, type FormItemRule} from 'element-plus'
 import {addPqStandardDev, updatePqStandardDev} from '@/api/device/standardDevice/index.ts'
 import {computed, reactive, type Ref, ref} from 'vue'
 import {useDictStore} from '@/stores/modules/dict'
-import { CirclePlus, Delete, EditPen } from '@element-plus/icons-vue'
 import {type Device} from '@/api/device/interface/device.ts'
 // 使用 dayjs 库格式化
-import dayjs from 'dayjs'
-import {tr} from "element-plus/es/locale";
 
 // 存储设备类型选项
 const devTypeOptions = ref<Device.ResDev[]>([])
@@ -152,6 +158,8 @@ const pqChannelArray = ref([
     label: '4',
   },
 ])
+const activeName=ref('devInfo')
+
 
 function useMetaInfo() {
   const dialogVisible = ref(false)
@@ -291,6 +299,7 @@ const pqChannelArray = ref([
 
 // 打开弹窗，可能是新增，也可能是编辑
 const open = async (sign: string, data: StandardDevice.ResPqStandardDevice, devType: Device.ResDev[]) => {
+  activeName.value = 'devInfo'
   // 重置表单
   dialogFormRef.value?.resetFields()
   devTypeOptions.value = devType