From 6c74bf912e251347714099a84585f825b32a1c08 Mon Sep 17 00:00:00 2001 From: zmc <zmc_li@foxmail.com> Date: 星期一, 18 十二月 2023 17:52:05 +0800 Subject: [PATCH] Merge branch 'feature-001' of ssh://114.215.109.124:29418/supervision-vue into feature-001 --- src/views/fysp/evaluation/components/CompPreCheck.vue | 176 ++++++++++++++++++++-------------------------------------- 1 files changed, 60 insertions(+), 116 deletions(-) diff --git a/src/views/fysp/evaluation/components/CompPreCheck.vue b/src/views/fysp/evaluation/components/CompPreCheck.vue index 0199703..f99b60b 100644 --- a/src/views/fysp/evaluation/components/CompPreCheck.vue +++ b/src/views/fysp/evaluation/components/CompPreCheck.vue @@ -1,117 +1,76 @@ <template> - <FYSearchBar @search="preCheck"> - <template #options> - <!-- 鍖哄幙 --> - <FYOptionLocation - :allOption="false" - :level="3" - :checkStrictly="false" - v-model:value="formSearch.locations" - ></FYOptionLocation> - <!-- 鍦烘櫙绫诲瀷 --> - <FYOptionScene - :allOption="false" - :type="2" - v-model:value="formSearch.scenetype" - ></FYOptionScene> - <!-- 鏃堕棿 --> - <FYOptionTime :initValue="false" type="month" v-model:value="formSearch.time"></FYOptionTime> + <el-steps :active="stepIndex" finish-status="success" style="" align-center> + <el-step title="璇勪及鑼冨洿" /> + <el-step title="鏁版嵁婧愭鏌�" /> + <el-step title="璞佸厤鏉$洰" /> + <el-step title="鑷姩璇勪及" /> + </el-steps> + + <el-card v-if="stepIndex == 0" shadow="never"> + <template #header> + <div><el-text tag="b" size="large">閫夋嫨璇勪及鑼冨洿</el-text></div> + <el-text size="small" type="info">鍖呮嫭鍖哄幙銆佸満鏅被鍨嬩互鍙婃湀浠�</el-text> </template> - </FYSearchBar> - <el-row> - <span>蹇嵎閫夋嫨</span> - <el-button v-for="(v, i) in quickSetting" :key="i" type="primary" @click="quickSet(v)">{{ - v.name - }}</el-button> - </el-row> + <FYForm :form-info="evaConditon" :rules="evaConditionRules" :showButtons="false"> + <template #form-item="{ formObj }"> + <!-- 鍖哄幙 --> + <FYOptionLocation + :allOption="false" + :level="3" + :checkStrictly="false" + v-model:value="formObj.locations" + ></FYOptionLocation> + <!-- 鍦烘櫙绫诲瀷 --> + <FYOptionScene + :allOption="false" + :type="2" + v-model:value="formObj.scenetype" + ></FYOptionScene> + <!-- 鏃堕棿 --> + <FYOptionTime + :initValue="true" + type="month" + v-model:value="formObj.time" + ></FYOptionTime> + </template> + </FYForm> + <template #footer> + <el-row justify="space-around"> + <el-button type="primary" size="default">涓嬩竴姝�</el-button> + </el-row> + </template> + </el-card> + <el-card v-if="stepIndex == 1" shadow="never"> Never2 </el-card> + <el-card v-if="stepIndex == 2" shadow="never"> Never3 </el-card> + <el-card v-if="stepIndex == 3" shadow="never"> Never4 </el-card> </template> <script> -import dayjs from 'dayjs' +import dayjs from 'dayjs'; /** * 鑷姩璇勪及鏉′欢鍚堣鎬ф鏌� */ export default { name: 'CompPreCheck', - props: { - quickSetting: { - type: Array, - default: () => { - return [ - { - name: '闈欏畨宸ュ湴', - locations: { - pCode: '31', - pName: '涓婃捣甯�', - cCode: '3100', - cName: '涓婃捣甯�', - dCode: '310106', - dName: '闈欏畨鍖�' - }, - scenetype: { label: '宸ュ湴', value: '1' } - }, - { - name: '寰愭眹椁愰ギ', - locations: { - pCode: '31', - pName: '涓婃捣甯�', - cCode: '3100', - cName: '涓婃捣甯�', - dCode: '310104', - dName: '寰愭眹鍖�' - }, - scenetype: { label: '椁愰ギ', value: '5' } - }, - { - name: '閲戝北宸ュ湴', - locations: { - pCode: '31', - pName: '涓婃捣甯�', - cCode: '3100', - cName: '涓婃捣甯�', - dCode: '310116', - dName: '閲戝北鍖�' - }, - scenetype: { label: '宸ュ湴', value: '1' } - }, - { - name: '閲戝北鐮佸ご', - locations: { - pCode: '31', - pName: '涓婃捣甯�', - cCode: '3100', - cName: '涓婃捣甯�', - dCode: '310116', - dName: '閲戝北鍖�' - }, - scenetype: { label: '鐮佸ご', value: '2' } - }, - { - name: '閲戝北鎼呮媽绔�', - locations: { - pCode: '31', - pName: '涓婃捣甯�', - cCode: '3100', - cName: '涓婃捣甯�', - dCode: '310116', - dName: '閲戝北鍖�' - }, - scenetype: { label: '鎼呮媽绔�', value: '3' } - } - ] - } - } - }, + props: {}, emits: ['preCheck'], data() { return { - formSearch: { - locations: {}, - scenetype: {}, - time: dayjs().add(-1, 'M').date(1).toDate() + // 鎿嶄綔姝ラ涓嬫爣 + stepIndex: 0, + // 璇勪及浠诲姟鑼冨洿 + evaConditon: {}, + evaConditionRules: { + acountname: [ + { + required: true, + message: '璐︽埛鍚嶄笉鑳戒负绌�', + trigger: 'blur' + } + ] } - } + }; }, methods: { /** @@ -119,23 +78,8 @@ * 妫�鏌ユ墍閫夎寖鍥村唴鍚勯」璇勪及鏁版嵁婧愭槸鍚﹀畬鏁� */ preCheck() { - const param = { - locations: this.formSearch.locations, - scenetype: this.formSearch.scenetype, - time: dayjs(this.formSearch.time).format('YYYY-MM-DD') - } - this.$emit('preCheck', param) - }, - - /** - * 蹇�熻缃潯浠� - */ - quickSet(set) { - this.formSearch.locations = set.locations - this.formSearch.scenetype = set.scenetype - - // this.preCheck() + // this.$emit('preCheck', param) } } -} +}; </script> -- Gitblit v1.9.3