master24分支被占用

src/views/system/config/config.vue

@@ -1542,7 +1542,7 @@
 
     <el-tab-pane label="健康指标配置" name="his.healthIndexConfig">
       
-        <el-form ref="form24" :model="form24" label-width="200px">
+        <el-form ref="form26" :model="form26" label-width="200px">
           <!-- 红色提示 严格按照对应格式参数填写，指标参数只能是数字和特殊符号，数值保留一位小数，特殊符号只能有 < > ≥ ≤ ~ 不能有空格 -->
           <el-card class="box-card">
             <div slot="header" class="clearfix">
@@ -1559,25 +1559,25 @@
           </div>
           
           <el-form-item label="空腹血糖正常值">
-            <el-input v-model="form24.bloodGlucose.fasting.normal" placeholder="例如: 3.9-6.1">
+            <el-input v-model="form26.bloodGlucose.fasting.normal" placeholder="例如: 3.9-6.1">
               <template slot="append">mmol/L</template>
             </el-input>
           </el-form-item>
           
           <el-form-item label="餐后1小时血糖正常值">
-            <el-input v-model="form24.bloodGlucose.post1Hour.normal" placeholder="例如: 6.7-9.0">
+            <el-input v-model="form26.bloodGlucose.post1Hour.normal" placeholder="例如: 6.7-9.0">
               <template slot="append">mmol/L</template>
             </el-input>
           </el-form-item>
           
           <el-form-item label="餐后2小时血糖正常值">
-            <el-input v-model="form24.bloodGlucose.post2Hour.normal" placeholder="例如: ≤7.8">
+            <el-input v-model="form26.bloodGlucose.post2Hour.normal" placeholder="例如: ≤7.8">
               <template slot="append">mmol/L</template>
             </el-input>
           </el-form-item>
           
           <el-form-item label="血糖异常程度配置">
-            <el-table :data="form24.bloodGlucose.severity" style="width: 100%;">
+            <el-table :data="form26.bloodGlucose.severity" style="width: 100%;">
               <el-table-column prop="level" label="严重程度" width="120">
                 <template slot-scope="scope">
                   <el-tag :type="scope.row.level === 'normal' ? 'success' : 
@@ -1610,7 +1610,7 @@
 
           
           <el-form-item label="血压异常程度配置">
-            <el-table :data="form24.bloodPressure.severity" style="width: 100%;">
+            <el-table :data="form26.bloodPressure.severity" style="width: 100%;">
               <el-table-column prop="level" label="严重程度" width="120">
                 <template slot-scope="scope">
                   <el-tag :type="scope.row.level === 'normal' ? 'success' : 
@@ -1645,9 +1645,9 @@
           </div>
 
           <el-form-item label="性别分类配置">
-            <el-tabs v-model="form24.uricAcid.activeGender">
+            <el-tabs v-model="form26.uricAcid.activeGender">
               <el-tab-pane label="男性" name="male">
-                <el-table :data="form24.uricAcid.male" style="width: 100%;">
+                <el-table :data="form26.uricAcid.male" style="width: 100%;">
                   <el-table-column prop="level" label="风险等级" width="120">
                     <template slot-scope="scope">
                       <el-tag :type="scope.row.level === 'normal' ? 'success' : 
@@ -1671,7 +1671,7 @@
               </el-tab-pane>
               
               <el-tab-pane label="女性" name="female">
-                <el-table :data="form24.uricAcid.female" style="width: 100%;">
+                <el-table :data="form26.uricAcid.female" style="width: 100%;">
                   <el-table-column prop="level" label="风险等级" width="120">
                     <template slot-scope="scope">
                       <el-tag :type="scope.row.level === 'normal' ? 'success' : 
@@ -1704,7 +1704,7 @@
           </div>
 
           <el-form-item label="BMI异常程度配置">
-            <el-table :data="form24.bmi.severity" style="width: 100%;">
+            <el-table :data="form26.bmi.severity" style="width: 100%;">
               <el-table-column prop="level" label="严重程度" width="120">
                 <template slot-scope="scope">
                   <el-tag :type="scope.row.level === 'normal' ? 'success' : 
@@ -1736,9 +1736,9 @@
           </div>
 
           <el-form-item label="性别分类配置">
-            <el-tabs v-model="form24.waist.activeGender">
+            <el-tabs v-model="form26.waist.activeGender">
               <el-tab-pane label="男性" name="male">
-                <el-table :data="form24.waist.male" style="width: 100%;">
+                <el-table :data="form26.waist.male" style="width: 100%;">
                   <el-table-column prop="level" label="风险等级" width="120">
                     <template slot-scope="scope">
                       <el-tag :type="scope.row.level === 'normal' ? 'success' : 
@@ -1762,7 +1762,7 @@
               </el-tab-pane>
               
               <el-tab-pane label="女性" name="female">
-                <el-table :data="form24.waist.female" style="width: 100%;">
+                <el-table :data="form26.waist.female" style="width: 100%;">
                   <el-table-column prop="level" label="风险等级" width="120">
                     <template slot-scope="scope">
                       <el-tag :type="scope.row.level === 'normal' ? 'success' : 
@@ -1794,9 +1794,9 @@
           </div>
 
           <el-form-item label="性别分类配置">
-            <el-tabs v-model="form24.hip.activeGender">
+            <el-tabs v-model="form26.hip.activeGender">
               <el-tab-pane label="男性" name="male">
-                <el-table :data="form24.hip.male" style="width: 100%;">
+                <el-table :data="form26.hip.male" style="width: 100%;">
                   <el-table-column prop="level" label="风险等级" width="120">
                     <template slot-scope="scope">
                       <el-tag :type="scope.row.level === 'normal' ? 'success' : 
@@ -1820,7 +1820,7 @@
               </el-tab-pane>
               
               <el-tab-pane label="女性" name="female">
-                <el-table :data="form24.hip.female" style="width: 100%;">
+                <el-table :data="form26.hip.female" style="width: 100%;">
                   <el-table-column prop="level" label="风险等级" width="120">
                     <template slot-scope="scope">
                       <el-tag :type="scope.row.level === 'normal' ? 'success' : 
@@ -1847,7 +1847,7 @@
         </el-card>
         
         <div class="footer">
-          <el-button type="primary" @click="submitForm24">提交</el-button>
+          <el-button type="primary" @click="submitForm26">提交</el-button>
         </div>
       </el-form>
     </el-tab-pane>
@@ -1964,7 +1964,7 @@ export default {
       },
       form23:{
       },
-      form24: {
+      form26: {
         bloodGlucose: {
           fasting: { normal: "" },
           post1Hour: { normal: "" },
@@ -2087,7 +2087,7 @@ export default {
         dLevelMax: [{ required: true, message: '请输入D级最大值', trigger: 'blur' }],
       },
       rules21:{},
-      rules24: {}
+      rules26: {},
     };
   },
   created() {
@@ -2364,7 +2364,7 @@ export default {
             this.form22 =JSON.parse(response.data.configValue);
           }
           if (key === "his.healthIndexConfig") {
-            this.form24 =JSON.parse(response.data.configValue);
+            this.form26 =JSON.parse(response.data.configValue);
           }
           else if(key=="store.concept"){
             this.configId=response.data.configId;
@@ -2577,11 +2577,11 @@ export default {
         }
       });
     },
-    submitForm24() {
+    submitForm26() {
       const param = {
         configId:this.configId,
         configKey:this.configKey,
-        configValue: JSON.stringify(this.form24)
+        configValue: JSON.stringify(this.form26)
       };
       
       updateConfigByKey(param).then(response => {