From 2dec808df0b57d353e401ee41a40b60f5b08f87a Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Tue, 4 Jun 2024 17:36:11 +0800 Subject: [PATCH] 1 --- src/components/Charts/index.vue | 6 +- src/store/index.js | 4 +- src/store/modules/bigdata.js | 142 ++++ src/views/dashboard/index.vue | 22 +- src/views/dataShow/btns.vue | 15 +- src/views/dataShow/index.vue | 66 +- src/views/dataShow/leftBottom.vue | 3 +- src/views/dataShow/map.vue | 4 +- src/views/dataShow/map1.vue | 169 +++++ src/views/dataShow/right1.vue | 42 +- src/views/dataShow/right2.vue | 41 +- src/views/dataShow/right3.vue | 7 +- src/views/dataShow/tooltip.vue | 30 +- src/views/safety/component/addSafetyPlan.vue | 256 +++++++ src/views/safety/safetyPlan.vue | 665 +++++++++++++++++++ 15 files changed, 1369 insertions(+), 103 deletions(-) create mode 100644 src/store/modules/bigdata.js create mode 100644 src/views/dataShow/map1.vue create mode 100644 src/views/safety/component/addSafetyPlan.vue create mode 100644 src/views/safety/safetyPlan.vue diff --git a/src/components/Charts/index.vue b/src/components/Charts/index.vue index 16b5f09..4008418 100644 --- a/src/components/Charts/index.vue +++ b/src/components/Charts/index.vue @@ -190,7 +190,7 @@ export default { color: 'rgba(255,255,255,.8)', fontSize: 12 }, - data: newData.lease.map(item => item?.zulinkaishiqixian??'') + data: newData.lease?.map(item => item?.zulinkaishiqixian??'') || [] }, // 下方Y轴 yAxis: { @@ -298,7 +298,7 @@ export default { color: this.colorList.areaBtoG } }, - data: newData.lease.map(i => i?.zulinmianji??0), + data: newData.lease?.map(i => i?.zulinmianji??0) || [], lineSmooth: true, markLine: { silent: true, @@ -339,7 +339,7 @@ export default { }, silent: true, barWidth: '50%', - data: newData.lease.map(i => i?.zulinmianji??0), + data: newData.lease?.map(i => i?.zulinmianji??0) || [], animation: false } ] diff --git a/src/store/index.js b/src/store/index.js index 461e409..5f1a9ac 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -6,6 +6,7 @@ import permission from './modules/permission' import settings from './modules/settings' import user from './modules/user' import form from './modules/form' +import bigdata from "./modules/bigdata" Vue.use(Vuex) @@ -15,7 +16,8 @@ const store = new Vuex.Store({ permission, settings, user, - form + form, + bigdata }, getters }) diff --git a/src/store/modules/bigdata.js b/src/store/modules/bigdata.js new file mode 100644 index 0000000..2009784 --- /dev/null +++ b/src/store/modules/bigdata.js @@ -0,0 +1,142 @@ +import { index } from "@/api/system/baseForm"; +import * as $moment from "moment"; +const state = { + assets: [[],[]], + leases: [], + adventLeases: [], + safety: [], + type: 1, +} +let config = {} + +const mutations = { + SET_ASSETS: (state, assets) => { + state.assets = assets + }, + SET_LEASES: (state, leases) => { + state.leases = leases + }, + SET_ADVENT_LEASES: (state, adventLeases) => { + state.adventLeases = adventLeases + }, + SET_TYPE: (state, type) => { + state.type = type + }, + SET_SAFETY: (state, safety) => { + state.safety = safety + } +} + +const actions = { + getAssets({ commit, state }) { + return new Promise((resolve, reject) => { + Promise.all([ + index({ + table_name: "houses", + page: 1, + page_size: 999 + },false), + index({ + table_name: "lands", + page: 1, + page_size: 999 + }) + ]).then(res => { + const [houses,lands] = res; + commit("SET_ASSETS",[houses.data,lands.data]) + resolve([houses.data,lands.data]) + }).catch(err => { + reject(err) + }) + }) + }, + getLeases({ commit, state }) { + return new Promise((resolve, reject) => { + index({ + table_name: "leases", + page: 1, + page_size: 999, + filter: [ + { + key: 'zulinjieshuqixian', + op: 'range', + value: `${$moment().format("YYYY-MM-DD")},2999-12-31` + }, + { + key: 'zulinkaishiqixian', + op: 'range', + value: `${$moment(0).format("YYYY-MM-DD")},${$moment().format("YYYY-MM-DD")}` + } + ] + }).then(res => { + commit("SET_LEASES", res.data) + resolve(res) + }).catch(err => { + reject(err) + }) + }) + }, + async getAdventLeases({ commit, state }) { + if (!config.time || !config.unit) { + const res = await index({ + table_name: 'warnings', + filter: [ + { + key: 'flag', + op: 'eq', + value: 'contract' + } + ] + },false) + config.time = Number(res.data[0]?.time); + config.unit = res.data[0]?.unit; + } + return new Promise((resolve, reject) => { + let preDate = $moment().add(config.time, config.unit).format("YYYY-MM-DD") + index({ + table_name: "leases", + page: 1, + page_size: 999, + filter: [ + { + key: 'zulinjieshuqixian', + op: 'range', + value: `${$moment().format("YYYY-MM-DD")},${preDate}` + }, + { + key: 'zulinkaishiqixian', + op: 'range', + value: `` + } + ] + }).then(res => { + commit("SET_ADVENT_LEASES", res.data) + resolve(res) + }).catch(err => { + reject(err) + }) + }) + }, + getSafety({ commit, state }) { + return new Promise((resolve, reject) => { + index({ + table_name: "asset_safety_inspections", + page: 1, + page_size: 999 + }).then(res => { + commit("SET_SAFETY", res.data) + resolve(res) + }).catch(err => { + reject(err) + }) + }) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 2966d70..10a46a7 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -5,7 +5,7 @@
-

代办通知

+

待办通知

@@ -90,7 +90,7 @@
-
+
{{ item.zichanmingcheng }} {{ $moment(new Date(item.riqi)).format('YYYY-MM-DD') }}
@@ -266,7 +266,7 @@ }, systems: [], systemTotal: 0, - assetSafetyInspectionsSelect: { + assetSafetyPlanSelect: { table_name: 'asset_safety_inspections', page: 1, page_size: 10, @@ -278,8 +278,8 @@ } ] }, - assetSafetyInspectionsTotal: 0, - assetSafetyInspections: [], + assetSafetyPlanTotal: 0, + assetSafetyPlan: [], noticeSelect: { table_name: 'notices', page: 1, @@ -471,11 +471,11 @@ this.notices = res; this.noticeTotal = res.length; }, - async getAssetSafetyInspections () { - this.assetSafetyInspectionsSelect.filter[0].value = `${this.$moment().format("YYYY-MM-DD")},${this.$moment().add(this.config.time, this.config.unit).format("YYYY-MM-DD")}` - const res = await index(this.assetSafetyInspectionsSelect,false); - this.assetSafetyInspections = res.data; - this.assetSafetyInspectionsTotal = res.total; + async getAssetSafetyPlan () { + this.assetSafetyPlanSelect.filter[0].value = `${this.$moment().format("YYYY-MM-DD")},${this.$moment().add(this.config.time, this.config.unit).format("YYYY-MM-DD")}` + const res = await index(this.assetSafetyPlanSelect,false); + this.assetSafetyPlan = res.data; + this.assetSafetyPlanTotal = res.total; }, async getSystems () { const res = await index(this.systemSelect,false); @@ -499,7 +499,7 @@ this.getSystems(); this.getConfig().then(_ => { this.getLeases(); - this.getAssetSafetyInspections(); + this.getAssetSafetyPlan(); }) //this.loadData(); }, diff --git a/src/views/dataShow/btns.vue b/src/views/dataShow/btns.vue index c57d40c..26153cb 100644 --- a/src/views/dataShow/btns.vue +++ b/src/views/dataShow/btns.vue @@ -1,6 +1,6 @@