From 512d5d7e79e0a64b36e24cbe5d7c5f8d0adc0b94 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 26 九月 2024 17:46:48 +0800
Subject: [PATCH] 1.升级了element-plus版本 2.对外支持模块新设备匹配工地功能完成 3.新增设备匹配模块单挑匹配记录编辑功能（未完成）
---
src/views/fysp/evaluation/components/precheck/components/CompCheckArea.vue | 70 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/src/views/fysp/evaluation/components/precheck/components/CompCheckArea.vue b/src/views/fysp/evaluation/components/precheck/components/CompCheckArea.vue
index 3aea097..b2ce350 100644
--- a/src/views/fysp/evaluation/components/precheck/components/CompCheckArea.vue
+++ b/src/views/fysp/evaluation/components/precheck/components/CompCheckArea.vue
@@ -8,35 +8,17 @@
<FYForm ref="formRef" :rules="evaConditionRules" :showButtons="false" @submit="nextStep">
<template #form-item="{ formObj }">
<CompQuickSet @quick-set="setOptions"></CompQuickSet>
- <!-- 鍖哄幙 -->
- <FYOptionLocation
- :allOption="false"
- :level="3"
- :initValue="false"
- :checkStrictly="false"
- v-model:value="formObj._locations"
- ></FYOptionLocation>
- <!-- 鍦烘櫙绫诲瀷 -->
- <FYOptionScene
- :allOption="false"
- :initValue="false"
- :sourceInit="sceneOptionSourceInit"
- :type="formObj.sourcetype ? 1 : 2"
- v-model:value="formObj._scenetype"
- ></FYOptionScene>
- <!-- 鏃堕棿 -->
- <FYOptionTime
- prop="time"
- :initValue="true"
- type="month"
- v-model:value="formObj.time"
- ></FYOptionTime>
- <el-form-item label="涓绘暟鎹簮" prop="sourcetype">
- <el-switch v-model="formObj.sourcetype" @change="sceneOptionSourceInit = true" />
- <span class="m-l-16">{{ formObj.sourcetype ? '瀹堟硶鏈嶅姟璁板綍' : '鐜板満宸℃煡璁板綍' }}</span>
+ <el-form-item label="涓绘暟鎹簮" prop="sourceType">
+ <el-radio-group
+ v-model="formObj.sourceType"
+ size="small"
+ @change="sceneOptionSourceInit = true"
+ >
+ <el-radio-button :value="1">瀹堟硶鏈嶅姟璁板綍</el-radio-button>
+ <el-radio-button :value="2">鐜板満宸℃煡璁板綍</el-radio-button>
+ </el-radio-group>
<el-tooltip placement="bottom-start" effect="light">
<template #content>
- <!-- <el-text tag="b" size="default">璇存槑</el-text><br /> -->
<el-text tag="i" size="default" type="warning"
>璇ラ�夐」鏄敤浜庡喅瀹氳瘎浼颁富浣撳璞＄殑鑾峰彇鏂瑰紡</el-text
><br />
@@ -56,6 +38,29 @@
/></el-icon>
</el-tooltip>
</el-form-item>
+ <!-- 鍖哄幙 -->
+ <FYOptionLocation
+ :allOption="false"
+ :level="3"
+ :initValue="false"
+ :checkStrictly="false"
+ v-model:value="formObj._locations"
+ ></FYOptionLocation>
+ <!-- 鍦烘櫙绫诲瀷 -->
+ <FYOptionScene
+ :allOption="false"
+ :initValue="false"
+ :sourceInit="sceneOptionSourceInit"
+ :type="formObj.sourceType"
+ v-model:value="formObj._scenetype"
+ ></FYOptionScene>
+ <!-- 鏃堕棿 -->
+ <FYOptionTime
+ prop="time"
+ :initValue="true"
+ type="month"
+ v-model:value="formObj.time"
+ ></FYOptionTime>
</template>
</FYForm>
</FormCol>
@@ -70,13 +75,11 @@
</template>
<script>
-import CompQuickSet from '../../CompQuickSet.vue';
/**
* 璇勪及鑼冨洿鍚堣鎬ф鏌�
*/
export default {
- components: { CompQuickSet },
props: {
// 姝ラ涓嬫爣
modelValue: Number
@@ -92,6 +95,13 @@
message: '鏃堕棿涓嶈兘涓虹┖',
trigger: 'change'
}
+ ],
+ sourceType: [
+ {
+ required: true,
+ message: '涓绘暟鎹簮蹇呴』閫夋嫨',
+ trigger: 'change'
+ }
]
},
// 褰撳満鏅�夐」鍒囨崲鏁版嵁婧愭椂锛屾槸鍚︽竻绌哄綋鍓嶉�夐」鍊�
@@ -103,7 +113,7 @@
this.sceneOptionSourceInit = false;
this.$refs.formRef.formObj._locations = param.locations;
this.$refs.formRef.formObj._scenetype = param.scenetype;
- this.$refs.formRef.formObj.sourcetype = param.sourcetype;
+ this.$refs.formRef.formObj.sourceType = param.sourceType;
},
submit() {
this.$refs.formRef.onSubmit(false);
--
Gitblit v1.9.3