From 0752207f8c459ea4bdc6c68a855c5e42390cd217 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Tue, 16 Jan 2024 17:31:17 +0800 Subject: [PATCH] 1 --- package.json | 1 + src/views/order/component/normalCreate.vue | 68 +-------- src/views/order/handle.vue | 24 +++ src/views/order/orderSummary.vue | 162 +++++++++++++++++++++ 4 files changed, 193 insertions(+), 62 deletions(-) create mode 100644 src/views/order/orderSummary.vue diff --git a/package.json b/package.json index b9020ab..25fa77b 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "avue-plugin-map": "^1.0.1", "axios": "0.18.1", "core-js": "3.6.5", + "docx": "^8.5.0", "echarts": "^4.2.1", "element-ui": "2.15.13", "file-saver": "^2.0.5", diff --git a/src/views/order/component/normalCreate.vue b/src/views/order/component/normalCreate.vue index c0ef31e..2e1bb07 100644 --- a/src/views/order/component/normalCreate.vue +++ b/src/views/order/component/normalCreate.vue @@ -62,6 +62,7 @@ import LxHeader from "@/components/LxHeader/index.vue"; // import step3 from "@/views/order/component/step3.vue"; import createDispatch from "@/views/order/component/createDispatch.vue"; import dispatchList from "@/views/order/component/dispatchList.vue"; +import axios from "axios"; export default { components: { LxHeader, @@ -137,68 +138,10 @@ export default { } }, methods: { - // handleNext ({ data, step }) { - // console.log(data,step) - // switch (step) { - // case 1: - // let uid = uuid(); - // this.data = data.map(equipmentId => { - // return { - // no: uid, - // equipment_id: equipmentId, - // start_time: '', - // end_time: '', - // content: '', - // level: 1, - // status: 1 - // } - // }) - // this.currentStep = 1; - // break; - // case 2: - // this.data = data; - // this.currentStep = 2; - // break; - // case 3: - // let promiseAll = this.data.map(i => { - // delete i['equipment_id-span'] - // delete i['_index'] - // delete i['_rowKey'] - // i.start_time = `${this.$moment().format('YYYY-MM-DD')} ${i.start_time}`; - // i.end_time = `${this.$moment().format('YYYY-MM-DD')} ${i.end_time}`; - // - // return save({ - // table_name: 'transfers', - // ...i - // },false) - // }) - // let loadingInstance = this.$loading({ - // lock:true, - // background:"rgba(0,0,0,0.4)", - // text:"正在加载中..." - // }) - // Promise.all(promiseAll).then(res => { - // this.data = []; - // loadingInstance.close(); - // this.currentStep = 3; - // }).catch(_ => { - // loadingInstance.close(); - // }) - // break; - // } - // }, - // - // handleForward ({ data, step }) { - // switch (step) { - // case 2: - // this.data = data; - // this.currentStep = 0; - // break; - // case 3: - // this.currentStep = 1; - // break; - // } - // }, + async getWeatherInfo () { + const res = await axios.get('https://restapi.amap.com/v3/weather/weatherInfo?city=320500&key=15ecd1e7de61e684959f43d8965a89f0') + console.log(res) + }, async getWeather () { this.weather = (await index({ @@ -228,6 +171,7 @@ export default { } }, created() { + this.getWeatherInfo() this.getWeather() } } diff --git a/src/views/order/handle.vue b/src/views/order/handle.vue index 293848e..6c3f7c6 100644 --- a/src/views/order/handle.vue +++ b/src/views/order/handle.vue @@ -255,6 +255,9 @@ > 克隆调令 + + 批量下发 + @@ -397,6 +400,27 @@ export default { }; }, methods: { + async distributeTransfers () { + let promiseAll = this.$refs['xyTable'].getSelection().map(i => { + for (let key in i) { + if (/_relation/g.test(key)) { + delete i[key] + } + } + i.status = 2; + return save({ + table_name: 'transfers', + ...i + }) + }) + const res = await Promise.all(promiseAll) + this.$message({ + type: 'success', + message: `下发${res.length}条调令` + }) + this.$refs['xyTable'].getTableData() + }, + cloneTransfer () { this.$router.push({ name: 'menu_14', diff --git a/src/views/order/orderSummary.vue b/src/views/order/orderSummary.vue new file mode 100644 index 0000000..7f4739c --- /dev/null +++ b/src/views/order/orderSummary.vue @@ -0,0 +1,162 @@ + + + + + + + + + + + + 查询 + + + 导出 + + + + + + + + {{ $moment(selectDate).format('YYYY年MM月DD日') }}调度指令执行情况 + + + {{ index }} + + {{ item.equipment ? item.equipment.area : '' }} + + {{ item.content }} + + + + + + + + +