From 3832a82fb79d4cec4cca5e2854e54953f2095ef8 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期五, 06 九月 2024 16:55:08 +0800 Subject: [PATCH] 1. 添加溯源清单功能 2. 修复切换至走航监测界面后,之前正在加载的历史数据依旧展示至地图的问题 3. 添加折线图下载图片功能; 4. 添加数据导出功能; 5. 添加设备管理功能; 6. 添加数据弹框和溯源清单开关功能; 7. 优化3D里面的颜色展示逻辑,底部颜色由原来的因子最小值颜色改为当前量级的上一个量级对应的颜色 --- src/components/mission/MIssionCreate.vue | 45 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/components/mission/MIssionCreate.vue b/src/components/mission/MIssionCreate.vue index 1966572..c7d00f8 100644 --- a/src/components/mission/MIssionCreate.vue +++ b/src/components/mission/MIssionCreate.vue @@ -33,14 +33,6 @@ /> </el-form-item> <OptionType v-model="formObj.deviceType"></OptionType> - <!-- <el-form-item label="璁惧缂栧彿" prop="acountname"> - <el-input - size="small" - clearable - v-model="formObj.deviceCode" - placeholder="璁惧缂栧彿" - /> - </el-form-item> --> <OptionDevice :type="formObj.deviceType" v-model="formObj.deviceCode" @@ -60,8 +52,10 @@ </CardDialog> </template> <script setup> +import moment from 'moment'; import { ref, reactive, computed } from 'vue'; import missionApi from '@/api/missionApi'; +import thirdPartyDataApi from '@/api/thirdPartyDataApi'; import { useFormConfirm } from '@/composables/formConfirm'; import { useFetchData } from '@/composables/fetchData'; import { useMissionStore } from '@/stores/mission'; @@ -87,8 +81,21 @@ timeArray: [ { required: true, - message: '鏃堕棿涓嶈兘涓虹┖', - trigger: 'change' + // message: '鏃堕棿涓嶈兘涓虹┖', + trigger: 'change', + validator: (rule, value, callback) => { + if (value == null) { + callback(new Error('鏃堕棿涓嶈兘涓虹┖')); + } else { + const st = moment(value[0]); + const et = moment(value[1]); + const range = et.diff(st, 'second'); + if (range > 12 * 60 * 60) { + callback(new Error('浠诲姟鏃堕暱鏈�澶氫负12灏忔椂')); + } + } + callback(); + } } ] }); @@ -108,6 +115,8 @@ return missionApi.putNewMission(param.value).then((res) => { dialogVisible.value = false; missionStore.fetchMission(); + // 閫氱煡鏈嶅姟绔惎鍔ㄤ换鍔¤寖鍥村唴鐨勭涓夋柟鏁版嵁鑾峰彇浠诲姟 + thirdPartyDataApi.fetchMissionData(param.value.missionCode); }); }); } @@ -121,4 +130,20 @@ } } }); + +if (import.meta.env.VITE_DATA_MODE == 'jingan') { + formObj.value.location = { + pCode: '31', + pName: '涓婃捣甯�', + cCode: '3100', + cName: '涓婃捣甯�', + dCode: '310106', + dName: '闈欏畨鍖�' + }; +} </script> +<style scoped> +/* .el-form-item { + margin-bottom: 0px; +} */ +</style> -- Gitblit v1.9.3