From 6bc32c75a287256054880e04c2f6d0672ec8c455 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Sun, 19 Nov 2023 09:28:46 +0800 Subject: [PATCH] 2023-11-19 --- src/api/gd36524/allData.js | 66 + src/router/index.js | 10 + src/views/echarts/barlineEacharts2.vue | 139 ++ src/views/echarts/pieLineEacharts2.vue | 168 +++ src/views/mortgage/allData.vue | 1276 +++++++++++++++++ .../{index - 副本.vue => index2.vue} | 53 +- src/views/mortgage/yqpb.vue | 6 +- 7 files changed, 1711 insertions(+), 7 deletions(-) create mode 100644 src/api/gd36524/allData.js create mode 100644 src/views/echarts/barlineEacharts2.vue create mode 100644 src/views/echarts/pieLineEacharts2.vue create mode 100644 src/views/mortgage/allData.vue rename src/views/mortgage/{index - 副本.vue => index2.vue} (95%) diff --git a/src/api/gd36524/allData.js b/src/api/gd36524/allData.js new file mode 100644 index 0000000..7b8d8d5 --- /dev/null +++ b/src/api/gd36524/allData.js @@ -0,0 +1,66 @@ +import request from '@/utils/request' + +export default { + + // 左侧数据总览 + getProjectDaily: function(data) { + return request({ + url: '/datacenter/getProjectDailyNew', + method: 'post', + data: data + }); + }, + + // 库存分析图 , + getReportInventory: function(data) { + return request({ + url: '/datacenter/getReportInventoryNew', + method: 'post', + data: data + }); + }, + + // 获取基础信息 , + getProjectBySid: function(data) { + return request({ + url: '/datacenter/getProjectBySid?projectSid='+data, + method: 'get', + data: data + }); + }, + + // 获取仓库sid, + getProjectIsJk: function(data) { + return request({ + url: '/datacenter/getProjectIsJk?projectSid='+data, + method: 'get' + }); + }, + + // 获取摄像头 设备列表, + getOtherList: function(data) { + return request({ + url: '/datacenter/getOtherList?type=1&ckId='+data, + method: 'get' + }); + }, + + + // 实时监控 , + getVedioPcLiveById: function(data) { + return request({ + url: '/datacenter/getVedioPcLiveByIdNew?id=' + data, + method: 'get' + }); + }, + + + // 回放监控 , + getVedioPcRecById: function(data) { + return request({ + url: '/datacenter/getVedioPcRecByIdNew?id=' + data, + method: 'get' + }); + }, + +} \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index daa8d5b..e1d2a1b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -59,11 +59,21 @@ export const constantRoutes = [ name:'mortgage', component:()=>import('@/views/mortgage/index.vue') }, + { + path:"/mortgage2", + name:'mortgage2', + component:()=>import('@/views/mortgage/index2.vue') + }, { path:"/yqpb", name:'yqpb', component:()=>import('@/views/mortgage/yqpb.vue') }, + { + path:"/allData", + name:'allData', + component:()=>import('@/views/mortgage/allData.vue') + }, // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } diff --git a/src/views/echarts/barlineEacharts2.vue b/src/views/echarts/barlineEacharts2.vue new file mode 100644 index 0000000..3237439 --- /dev/null +++ b/src/views/echarts/barlineEacharts2.vue @@ -0,0 +1,139 @@ + + + \ No newline at end of file diff --git a/src/views/echarts/pieLineEacharts2.vue b/src/views/echarts/pieLineEacharts2.vue new file mode 100644 index 0000000..f6b4641 --- /dev/null +++ b/src/views/echarts/pieLineEacharts2.vue @@ -0,0 +1,168 @@ + + + diff --git a/src/views/mortgage/allData.vue b/src/views/mortgage/allData.vue new file mode 100644 index 0000000..58c83aa --- /dev/null +++ b/src/views/mortgage/allData.vue @@ -0,0 +1,1276 @@ + + + + + \ No newline at end of file diff --git a/src/views/mortgage/index - 副本.vue b/src/views/mortgage/index2.vue similarity index 95% rename from src/views/mortgage/index - 副本.vue rename to src/views/mortgage/index2.vue index 181156e..e24ec4a 100644 --- a/src/views/mortgage/index - 副本.vue +++ b/src/views/mortgage/index2.vue @@ -259,10 +259,13 @@ }], wareValue: "常温仓", day: [{ - value: "选项1", + value: "7", + label: "7日", + }, { + value: "15", label: "15日", }], - dayValue: "15日", + dayValue: "15", dialogVisible: false, videos: true, lookvideo: false, @@ -300,9 +303,40 @@ date:[], changwencang:[], gongyinglian:[], + }, + // 跳转接参 + params:{ + projectSid :'', + projectName:"", + orderDate:"", } }; }, + + mounted() { + + + // 获取url中的参数 + const searchParams = new URLSearchParams(/(?<=#.*\?).*/.exec(window.location.href)[0]); + console.log("searchParams>>>>",searchParams) + // 根据参数名获取参数值 + const projectSid = searchParams.get('projectSid'); + const projectName = searchParams.get('projectName'); + const orderDate = searchParams.get('orderDate'); + console.log("projectSid>>>>",projectSid) + console.log("projectName>>>>",projectName) + console.log("orderDate>>>>",orderDate) + + + this.params={ + projectSid:projectSid, + projectName:projectName, + orderDate:orderDate, + } + this.times = orderDate + + }, + created() { this.loadList() this.getOtherList(); @@ -312,7 +346,15 @@ }, methods: { getReportInventory(){ - req.getReportInventory().then(res => { + + var params = { + startDate: this.times, + intervalTime: this.dayValue, + projectSid:this.params.projectSid + } + + console.log('params:', params) + req.getReportInventory(params).then(res => { console.log('getReportInventory:', res) this.chartData2 = { @@ -388,7 +430,8 @@ loadList() { var params = { - orderDate: this.times + orderDate: this.times, + projectSid:this.params.projectSid } console.log('params:', params) @@ -468,6 +511,7 @@ this.times = val this.loadList() this.getInventory() + this.getReportInventory() // this.getOtherList(); // this.getStatusCount(); }, @@ -503,6 +547,7 @@