Merge branch 'main' of http://39.108.216.210:3000/web/admin into main

src/styles/view/project/edit-formula.scss

@@ -155,4 +155,8 @@
     .hc-formula-card-project {
         position: relative;
     }
+    //允许偏差值范围
+    .hc-formula-card-range {
+        position: relative;
+    }
 }

src/views/project/list/edit-formula.vue

@@ -126,7 +126,7 @@
                     </hc-body>
                 </div>
                 <!-- 函数公式运算执行溯源 -->
-                <div v-if="!isResetFun" class="border-dashed-card hc-formula-card-project mb-14px">
+                <div v-if="!isResetFun && !deviationRangeShow" class="border-dashed-card hc-formula-card-project mb-14px">
                     <div class="header mb-14px text-14px">函数公式运算执行溯源</div>
                     <div class="body relative">
                         <el-select v-model="projectId" filterable clearable class="mr-14px w-380px" placeholder="选择项目" @change="projectChange">
@@ -138,6 +138,10 @@
                         <el-button type="info" @click="projectQueryClick">查询</el-button>
                     </div>
                 </div>
+                <!-- 允许偏差值范围 -->
+                <div v-if="deviationRangeShow && !isResetFun" class="border-dashed-card hc-formula-card-range mb-14px">
+                    允许偏差值范围
+                </div>
             </div>
             <template #action>
                 <el-button @click="drawerClose">取消</el-button>
@@ -212,6 +216,10 @@ const retainNum = ref(2)
 //允许偏差值范围
 const deviationRangeShow = ref(false)
 const setDeviationRange = () => {
+    if (isResetFun.value) {
+        window?.$message.warning('请先关闭重置函数')
+        return
+    }
     deviationRangeShow.value = !deviationRangeShow.value
 }