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 | 65 +++++++++++++++----------------- 1 files changed, 30 insertions(+), 35 deletions(-) diff --git a/src/views/fysp/evaluation/components/precheck/components/CompCheckArea.vue b/src/views/fysp/evaluation/components/precheck/components/CompCheckArea.vue index 457a050..b2ce350 100644 --- a/src/views/fysp/evaluation/components/precheck/components/CompCheckArea.vue +++ b/src/views/fysp/evaluation/components/precheck/components/CompCheckArea.vue @@ -8,6 +8,36 @@ <FYForm ref="formRef" :rules="evaConditionRules" :showButtons="false" @submit="nextStep"> <template #form-item="{ formObj }"> <CompQuickSet @quick-set="setOptions"></CompQuickSet> + <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="i" size="default" type="warning" + >璇ラ�夐」鏄敤浜庡喅瀹氳瘎浼颁富浣撳璞$殑鑾峰彇鏂瑰紡</el-text + ><br /> + <el-text tag="b" size="small">瀹堟硶鏈嶅姟璁板綍锛�</el-text><br /> + <el-text size="small" + >琛ㄧず鍦ㄨ瘎浼版椂锛岃瘎浼板璞℃槸浠庡畧娉曟湇鍔″皬绋嬪簭绯荤粺涓幏鍙栫殑褰撳墠鍙敤鐨勭敤鎴凤紱<br /> + 涓�鑸儏鍐典笅锛屽綋璇勪及瀵硅薄娌℃湁杩涜鐜板満宸℃煡锛屽彧鏈夊畧娉曟湇鍔$浉鍏宠褰曟椂锛岄噰鐢ㄦ閫夐」锛�</el-text + ><br /> + <el-text tag="b" size="small">鐜板満宸℃煡璁板綍锛�</el-text><br /> + <el-text size="small" + >琛ㄧず鍦ㄨ瘎浼版椂锛岃瘎浼板璞℃槸浠庣幇鍦哄贰鏌ョ洃绠$郴缁熶腑鑾峰彇鐨勬�讳换鍔′笅鐨勬墍鏈夌洃绠″満鏅紱<br /> + 涓�鑸儏鍐典笅锛屽綋璇勪及瀵硅薄鏈夎繘琛岀幇鍦哄贰鏌ワ紝閲囩敤姝ら�夐」锛� </el-text + ><br /> + </template> + <el-icon class="m-l-8 cursor-p" :size="16" color="var(--el-color-warning)" + ><QuestionFilled + /></el-icon> + </el-tooltip> + </el-form-item> <!-- 鍖哄幙 --> <FYOptionLocation :allOption="false" @@ -31,39 +61,6 @@ type="month" v-model:value="formObj.time" ></FYOptionTime> - <el-form-item label="涓绘暟鎹簮" prop="sourceType"> - <!-- <el-switch v-model="formObj.sourceType" @change="sceneOptionSourceInit = true" /> --> - <el-radio-group - v-model="formObj.sourceType" - size="small" - @change="sceneOptionSourceInit = true" - > - <el-radio-button label="1">瀹堟硶鏈嶅姟璁板綍</el-radio-button> - <el-radio-button label="2">鐜板満宸℃煡璁板綍</el-radio-button> - </el-radio-group> - <!-- <span class="m-l-16">{{ formObj.sourceType ? '瀹堟硶鏈嶅姟璁板綍' : '鐜板満宸℃煡璁板綍' }}</span> --> - <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 /> - <el-text tag="b" size="small">瀹堟硶鏈嶅姟璁板綍锛�</el-text><br /> - <el-text size="small" - >琛ㄧず鍦ㄨ瘎浼版椂锛岃瘎浼板璞℃槸浠庡畧娉曟湇鍔″皬绋嬪簭绯荤粺涓幏鍙栫殑褰撳墠鍙敤鐨勭敤鎴凤紱<br /> - 涓�鑸儏鍐典笅锛屽綋璇勪及瀵硅薄娌℃湁杩涜鐜板満宸℃煡锛屽彧鏈夊畧娉曟湇鍔$浉鍏宠褰曟椂锛岄噰鐢ㄦ閫夐」锛�</el-text - ><br /> - <el-text tag="b" size="small">鐜板満宸℃煡璁板綍锛�</el-text><br /> - <el-text size="small" - >琛ㄧず鍦ㄨ瘎浼版椂锛岃瘎浼板璞℃槸浠庣幇鍦哄贰鏌ョ洃绠$郴缁熶腑鑾峰彇鐨勬�讳换鍔′笅鐨勬墍鏈夌洃绠″満鏅紱<br /> - 涓�鑸儏鍐典笅锛屽綋璇勪及瀵硅薄鏈夎繘琛岀幇鍦哄贰鏌ワ紝閲囩敤姝ら�夐」锛� </el-text - ><br /> - </template> - <el-icon class="m-l-8 cursor-p" :size="16" color="var(--el-color-warning)" - ><QuestionFilled - /></el-icon> - </el-tooltip> - </el-form-item> </template> </FYForm> </FormCol> @@ -78,13 +75,11 @@ </template> <script> -import CompQuickSet from '../../CompQuickSet.vue'; /** * 璇勪及鑼冨洿鍚堣鎬ф鏌� */ export default { - components: { CompQuickSet }, props: { // 姝ラ涓嬫爣 modelValue: Number -- Gitblit v1.9.3