diff --git a/.env.development b/.env.development index 7170c1a..93fd5e9 100644 --- a/.env.development +++ b/.env.development @@ -3,5 +3,4 @@ ENV = 'development' # base api VUE_APP_BASE_API = '/api' - -VUE_APP_PUBLIC_PATH = "/" +VUE_APP_URL = "http://192.168.0.104:7009" diff --git a/src/api/gd36524/store.js b/src/api/gd36524/store.js index a982dac..6dce68c 100644 --- a/src/api/gd36524/store.js +++ b/src/api/gd36524/store.js @@ -2,11 +2,72 @@ import request from '@/utils/request' export default { - list: function(data) { - return request({ - url: '/store/list', - method: 'post', - data: data - }); - } + list: function(data) { + return request({ + url: '/store/list', + method: 'post', + data: data + }); + }, + + // 左侧数据总览 + getProjectDaily: function(data) { + return request({ + url: '/datacenter/getProjectDaily', + method: 'post', + data: data + }); + }, + + // 获取指定设备列表, + getOtherList: function(data) { + return request({ + url: '/datacenter/getOtherList?type=1&ckId=1a10a17b-9c56-4ef9-8986-194a858e3832', + method: 'get' + }); + }, + + // 获取摄像头状态数量 , + getStatusCount: function(data) { + return request({ + url: '/datacenter/getStatusCount?ckId=1a10a17b-9c56-4ef9-8986-194a858e3832', + method: 'get' + }); + }, + + // 实时监控 , + getVedioPcLiveById: function(data) { + return request({ + url: '/datacenter/getVedioPcLiveById?id=' + data, + method: 'get' + }); + }, + + + // 回放监控 , + getVedioPcRecById: function(data) { + return request({ + url: '/datacenter/getVedioPcRecById?id=' + data, + method: 'get' + }); + }, + + // 库存货值 , + getInventory: function(data) { + return request({ + url: '/datacenter/getInventory?orderDate=' + data, + method: 'get' + }); + }, + + // 库存分析图 , + getReportInventory: function(data) { + return request({ + url: '/datacenter/getReportInventory', + method: 'post', + data: data + }); + }, + + } \ No newline at end of file diff --git a/src/views/echarts/barlineEacharts.vue b/src/views/echarts/barlineEacharts.vue index 716adfe..875d1c7 100644 --- a/src/views/echarts/barlineEacharts.vue +++ b/src/views/echarts/barlineEacharts.vue @@ -76,93 +76,51 @@ export default { } = {}) { this.chart.setOption({ color: ['#ff9900', '#10aeff'], - legend: { - top: 10, - left: "center", - itemWidth: 10, - itemHeight: 10, - // padding: [5, 10], - textStyle: { - fontSize: 14, - color: "#000", - padding: [3, 0, 0, 0], - }, - data: ['常温仓', '供应链仓'], - }, - grid: { - left: "0%", - right: "0%", - bottom: "5%", - containLabel: true, - }, - xAxis: { - type: "category", - axisLabel: { - color: "#96A4F4", - }, - nameTextStyle: { - // y轴name的样式调整 - color: "#f00", - fontSize: 10, - }, - axisLine: { - lineStyle: { - color: "#96A4F4", - }, - - }, - axisTick: { - show: false, - }, - data: ['12/1', '12/2', '12/3', '12/4', '12/5', '12/6', '12/7', '12/8', '12/9','12/10','12/11','12/12','12/13'], - }, - yAxis: { - type: "value", - axisLabel: { - color: "#96A4F4", - }, - - axisLine: { - lineStyle: { - color: "#96A4F4", - }, - width: 5, - }, - axisTick: { - show: false, - }, - splitLine: { - lineStyle: { - color: "rgba(000, 000, 000, 0.3)", - }, - width:5 - }, - }, - series: [ - { - name: "常温仓", - type: "bar", - stack: "总量", - barWidth: "45%", - label: { - show: false, - position: "insideRight", - }, - data: [1320, 1302, 901, 634, 1390, 1330, 1320, 1000, 500], - }, - { - name: "供应链仓", - type: "bar", - stack: "总量", - barWidth: "45%", - label: { - show: false, - position: "insideRight", - }, - data: [1320, 1302, 901, 634, 1390, 1330, 1320, 1000, 500], - }, - ], - }); + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'shadow' + } + }, + legend: {}, + grid: { + left: '3%', + right: '4%', + bottom: '3%', + containLabel: true + }, + xAxis: [ + { + type: 'category', + data: this.chartData.date + } + ], + yAxis: [ + { + type: 'value' + } + ], + series: [ + + { + name: '常温仓', + type: 'bar', + stack: 'Search Engine', + emphasis: { + focus: 'series' + }, + data: this.chartData.changwencang + }, + { + name: '供应链', + type: 'bar', + stack: 'Search Engine', + emphasis: { + focus: 'series' + }, + data: this.chartData.gongyinglian + } + ]}); this.chart.on("click", function (param) { this.callParents(param); }); diff --git a/src/views/echarts/pieLineEacharts.vue b/src/views/echarts/pieLineEacharts.vue index 05d26b3..f71965b 100644 --- a/src/views/echarts/pieLineEacharts.vue +++ b/src/views/echarts/pieLineEacharts.vue @@ -77,14 +77,15 @@ export default { this.chart.setOption({ title: [ { - text: '75.62%', - subtext: '质押率50%', + text: this.chartData.pledgeRatePercent+"%", + subtext: "质押率 " + this.chartData.bankPledgeRate + "%", textStyle:{ - fontSize:20, - color:"#ff7e4b" + fontSize:16, + color:this.chartData.state == '2' ? "#ff7e4b" : "#ccc" + }, subtextStyle: { - fontSize: 18, + fontSize: 14, color: '#bbbaba' }, textAlign:"center", @@ -104,11 +105,12 @@ export default { legend: { type:"plain", icon:'rect', + y: 'center', + x:"right", orient: 'vertical', left:'70%', align:'left', - top:'middle', - layout:'horizontal', + top:'0', itemGap:30, padding:[20,29,40,0], textStyle: { @@ -122,7 +124,7 @@ export default { }, series: [ { - name:'标题', + name:'标签', type:'pie', center: ['35%', '50%'], radius: ['40%', '65%'], @@ -141,14 +143,15 @@ export default { smooth:true, } }, - data: [ - {value:335, legendname:'种类01',name:"账户余额",itemStyle:{color:"#5087ec"}}, - {value:310, legendname:'种类02',name:"应收账款",itemStyle:{color:"#68bbc4"}}, - {value:234, legendname:'种类03',name:"物质库存价值",itemStyle:{color:"#58a55c"}}, - {value:154, legendname:'种类04',name:"在途货物价值",itemStyle:{color:"#f2bd42"}}, - {value:335, legendname:'种类05',name:"预付款",itemStyle:{color:"#ee752f"}}, + data: this.chartData.data + // [ + // {value:335, legendname:'种类01',name:"账户余额",itemStyle:{color:"#5087ec"}}, + // {value:310, legendname:'种类02',name:"应收账款",itemStyle:{color:"#68bbc4"}}, + // {value:234, legendname:'种类03',name:"物质库存价值",itemStyle:{color:"#58a55c"}}, + // {value:154, legendname:'种类04',name:"在途货物价值",itemStyle:{color:"#f2bd42"}}, + // {value:335, legendname:'种类05',name:"预付款",itemStyle:{color:"#ee752f"}}, - ] + // ] } ] }); diff --git a/src/views/mortgage/index - 副本.vue b/src/views/mortgage/index - 副本.vue new file mode 100644 index 0000000..181156e --- /dev/null +++ b/src/views/mortgage/index - 副本.vue @@ -0,0 +1,1179 @@ + + + + \ No newline at end of file diff --git a/src/views/mortgage/index.vue b/src/views/mortgage/index.vue index 09384eb..181156e 100644 --- a/src/views/mortgage/index.vue +++ b/src/views/mortgage/index.vue @@ -1,883 +1,1179 @@ \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index e31206a..c78bbfb 100644 --- a/vue.config.js +++ b/vue.config.js @@ -40,7 +40,7 @@ module.exports = { }, proxy: { '/api': { // 匹配所有以 '/api'开头的请求路径 - target: 'http://127.0.0.1:7104', + target: process.env.VUE_APP_URL, // target: process.env.VUE_APP_URL, // 代理目标的基础路径 changeOrigin: true, // 支持跨域 pathRewrite: { // 重写路径: 去掉路径中开头的'/api'