含水率弹窗

src/views/data-fill/collapse-form/index.vue

@@ -391,6 +391,11 @@
             </div>
         </template>
     </HcDialog>
+
+    <!-- 含水率 -->
+    <HcDialog is-to-body :show="waterModal" title="这是测试弹窗" @close="waterModalClose" @save="waterSaveClick">
+        <HcWater v-if="waterModal" />
+    </HcDialog>
 </template>
 
 <script setup>
@@ -407,6 +412,7 @@ import HcTestFile from './test-file.vue'
 import HcFormula from './formula.vue'
 import HcCopy from './test-copy.vue'
 import NoDataSvg from '~src/assets/view/no-data.svg'
+import HcWater from './water.vue'
 import {
     arrIndex, deepClone, downloadBlob,
     getArrValue, getObjVal, getObjValue, isNullES, setPosRange,
@@ -655,10 +661,11 @@ const setTableFormMenu = (info) => {
         newArr.push({ label: '清除数据', key: 'clear' })
     }
     console.log(treenodeDataInfo.value, 'treenodeDataInfo')
-    const { isConcrete } = treenodeDataInfo.value
-    if (isConcrete === 1) {//等于1是混凝土节点，有含水率功能
-        newArr.push({ label: '清除数据', key: 'water' })
-    }
+    // const { isConcrete } = treenodeDataInfo.value
+    // if (isConcrete === 1) {//等于1是混凝土节点，有含水率功能
+    //     newArr.push({ label: '含水率', key: 'water' })
+    // }
+    newArr.push({ label: '含水率', key: 'water' })
     tableFormMenu.value = newArr
 }
 
@@ -733,6 +740,7 @@ const handleMenuSelect = async ({ key }) => {
 
     } else if (key === 'water') {
         console.log('含水率')
+        waterModal.value = true
     }
 }
 
@@ -1585,6 +1593,15 @@ const downModal = (item)=>{
     // }
     getdownloadExcel(pkeyId)
 }
+
+//含水率弹窗
+const waterModal = ref(false)
+const waterModalClose = ()=>{
+    waterModal.value = false
+}
+const waterSaveClick = ()=>{
+    console.log(111111111)
+}
 // 暴露出去
 defineExpose({
     getFormData,

src/views/data-fill/collapse-form/water.vue

@@ -0,0 +1,28 @@
+<!--  -->
+<template>
+    <div>
+        <el-form ref="waterRormref" :model="waterModal" label-width="auto" size="large">
+            <el-form-item label="黄砂">
+                <el-input v-model="waterModal.value1" placeholder="请输入" />
+            </el-form-item>
+            <el-form-item label="碎（砾）石1">
+                <el-input v-model="waterModal.value2" placeholder="请输入" />
+            </el-form-item>
+            <el-form-item label="碎（砾）石2">
+                <el-input v-model="waterModal.value3" placeholder="请输入" />
+            </el-form-item>
+            <el-form-item label="碎（砾）石3">
+                <el-input v-model="waterModal.value4" placeholder="请输入" />
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+const waterRormref = ref(null)
+const waterModal = ref({})
+</script>
+
+<style lang='scss' scoped>
+</style>