Преглед на файлове

修复资料填报问题

iZaiZaiA преди 2 години
родител
ревизия
4efb244ac7
променени са 2 файла, в които са добавени 24 реда и са изтрити 31 реда
  1. 13 17
      src/test/index.vue
  2. 11 14
      src/views/data-fill/components/ListItem.vue

+ 13 - 17
src/test/index.vue

@@ -1,27 +1,23 @@
 <template>
     <div class="hc-page-box">
-        <HcCard title="表单组件测试">
-
-            <hc-form-checkbox-group :objs="[{key: 1,name: '复选框1'}, {key: 2,name: '复选框2'}]" :val="formData.key_1__9_1"
-                                    keyname="key_1__9_1" @change="checkboxGroupChange"></hc-form-checkbox-group>
-
+        <HcCard title="测试">
+            <el-button type="primary" hc-btn @click="screenShotClick">
+                <HcIcon name="screenshot"/>
+                <span>测试截图</span>
+            </el-button>
         </HcCard>
     </div>
 </template>
 
 <script setup>
-import { ref } from "vue";
-import HcFormCheckboxGroup from "~com/plugins/table-form/hc-form-checkbox-group.vue"
-
-const formData = ref({
-    key_1__9_1: ''
-})
+import {ref, watch, onMounted} from "vue";
 
-const checkboxGroupChange = ({val, key}) => {
-    formData.value[key] = val
+const screenShotClick = async () => {
+    let captureStream = await navigator.mediaDevices.getDisplayMedia({
+        audio: false,
+        video: true,
+        preferCurrentTab: true
+    });
+    console.log(captureStream)
 }
 </script>
-
-<style lang="scss" scoped>
-
-</style>

+ 11 - 14
src/views/data-fill/components/ListItem.vue

@@ -91,13 +91,22 @@
     <!--插入设计值/频率-->
     <HcDialog :show="IDVFModal" title="插入设计值/频率" widths="600px" saveText="确认插入" @close="IDVFModal = false" @save="IDVFModalSaveClick">
         <el-alert title="填写完设计值和频率,系统自动计算实测值" type="warning" :closable="false"/>
-        <el-form ref="formIDVFRef" :model="formIDVFModel" :rules="formIDVFRules" label-width="auto" size="large">
+        <el-form ref="formIDVFRef" :model="formIDVFModel" label-width="auto" size="large">
+            <div class="form-item-div text-center mb-3">
+                <el-radio-group size="large" v-model="formIDVFModel.radio">
+                    <el-radio :label="1">公路工程</el-radio>
+                    <el-radio :label="2" class="ml-4">水利水电</el-radio>
+                </el-radio-group>
+            </div>
             <el-form-item label="设计值">
                 <el-input v-model="formIDVFModel.design" placeholder="请输入设计值"/>
             </el-form-item>
             <el-form-item label="频率">
                 <el-input v-model="formIDVFModel.size" placeholder="请输入频率"/>
             </el-form-item>
+            <el-form-item label="合格点数">
+                <el-input v-model="formIDVFModel.size1" placeholder="请填写合格点数(不填写则默认全部合格)"/>
+            </el-form-item>
         </el-form>
     </HcDialog>
 
@@ -548,18 +557,6 @@ const handleMenuSelect = ({key}) => {
 const IDVFModal = ref(false)
 const formIDVFRef = ref(null)
 const formIDVFModel = ref({design: '', size: '', dev: '', key: '', pkId: ''})
-const formIDVFRules = {
-    design: {
-        required: true,
-        trigger: "blur",
-        message: "请输入设计值"
-    },
-    size: {
-        required: true,
-        trigger: "blur",
-        message: "请输入频率"
-    }
-}
 
 //插入特殊字符
 const specialModal = ref(false)
@@ -676,7 +673,7 @@ const renewData = () => {
 
 //获取表单数据
 const getFormData = () => {
-    const formArr = deepClone(formData.value);
+    const formArr = formData.value;
     return formArr.filter((item) => {
         return (item.pkeyId??'') !== '' && item.isCollapseLoad;
     })