From 7571edb8bab5da6ebf877b295adee37c37c90c64 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 9 Dec 2019 17:33:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=9B=BE=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/MarketingCenter/ProjectProgress.js | 2 +- .../PartDrawingMaintenance/index.vue | 175 ++++++------------ 2 files changed, 61 insertions(+), 116 deletions(-) diff --git a/src/api/MarketingCenter/ProjectProgress.js b/src/api/MarketingCenter/ProjectProgress.js index 1c38e9ac..db1445c6 100644 --- a/src/api/MarketingCenter/ProjectProgress.js +++ b/src/api/MarketingCenter/ProjectProgress.js @@ -26,7 +26,7 @@ export function search3() { method: 'post', data: { type: '3', - name: 'SELECT count(客户名称) as 客户数量,[省份] FROM [客户关系管理系统_客户_查询数据_MESWOR_视图]where [客户名称是否启用] = 1 group by [省份]' + name: `select 项目名称,sum(已收金额) as 已收金额,SUM(应收金额) as 应收金额 from 视图_分批资金查询 where 是否启用= 1 group by 项目流水号,项目名称` } }) } diff --git a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue index 08799cb4..a498b651 100644 --- a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue +++ b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue @@ -2,7 +2,7 @@
项目名称 - + 机床图号 - + 组号 - + - + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + @@ -63,8 +56,8 @@ export default { var dataX = [] var lineData = [] for (let i = 0; i < data.length; i++) { - dataX.push(data[i].项目名称) - lineData.push((Math.random() * 100).toFixed(2)) + dataX.push(data[i].开票时间) + lineData.push(data[i].开票金额) } var myChart1 = echarts.init(document.getElementById('myChart1')) myChart1.clear() @@ -80,21 +73,24 @@ export default { containLabel: true }, tooltip: { - trigger: 'axis' + trigger: 'axis', + axisPointer: { + type: 'shadow' + } }, xAxis: { type: 'category', - name: '项目名称', - axisLabel: { - interval: 0, - rotate: 40, - margin: 10 - }, + name: '年份', + // axisLabel: { + // interval: 0, + // rotate: 40, + // margin: 10 + // }, data: dataX }, yAxis: { type: 'value', - name: '完成进度(%)', + name: '金额', min: 0, scale: 'true' }, @@ -180,69 +176,23 @@ export default { drawLine3(data) { var dataX = [] var lineData = [] + var lineData2 = [] for (let i = 0; i < data.length; i++) { - dataX.push({ - value: parseInt(data[i].客户数量), - name: data[i].省份 - }) - lineData.push(data[i].省份) + dataX.push(data[i].项目名称) + lineData.push(data[i].已收金额) + lineData2.push(data[i].待收金额) } var myChart3 = echarts.init(document.getElementById('myChart3')) myChart3.clear() myChart3.setOption({ - title: { - text: '客户分布图', - x: 'center' - }, tooltip: { - trigger: 'item', - formatter: '{a}
{b} : {c} ({d}%)' + trigger: 'axis', + axisPointer: { + type: 'shadow' + } }, legend: { - orient: 'vertical', - left: 'left', - data: lineData - }, - series: [ - { - name: '省份', - type: 'pie', - radius: '55%', - center: ['50%', '60%'], - data: dataX, - itemStyle: { - emphasis: { - shadowBlur: 10, - shadowOffsetX: 0, - shadowColor: 'rgba(0, 0, 0, 0.5)' - } - } - } - ] - }) - }, - search4() { - this.loading1 = true - var myChart1 = echarts.init(document.getElementById('myChart1')) - myChart1.clear() - search1().then(response => { - this.loading1 = false - this.drawLine1(response.data) - }) - }, - drawLine4(data) { - var dataX = [] - var lineData = [] - for (let i = 0; i < data.length; i++) { - dataX.push(data[i].项目名称) - lineData.push((Math.random() * 100).toFixed(2)) - } - var myChart1 = echarts.init(document.getElementById('myChart1')) - myChart1.clear() - myChart1.setOption({ - title: { - left: 'center', - text: '直方图' + data: ['已收金额', '待收金额'] }, grid: { left: '3%', @@ -250,36 +200,44 @@ export default { bottom: '3%', containLabel: true }, - tooltip: { - trigger: 'axis' - }, xAxis: { type: 'category', - name: '项目名称', + data: dataX, axisLabel: { interval: 0, rotate: 40, margin: 10 - }, - data: dataX + } }, yAxis: { - type: 'value', - name: '完成进度(%)', - min: 0, - scale: 'true' + type: 'value' }, series: [ { - name: '测量值', + name: '已收金额', type: 'bar', - data: lineData, + stack: '总量', + color: '#67C23A', + label: { + normal: { + show: true, + position: 'inside' + } + }, + data: lineData + }, + { + name: '待收金额', + type: 'bar', + stack: '总量', + color: 'rgb(213,58,53)', label: { normal: { show: true, position: 'top' } - } + }, + data: lineData2 } ] }) From e74d9398ebd67ed4ba039569a7bff2a118a05317 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 10 Dec 2019 17:26:41 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 8 ++++---- src/views/MarketingCenter/ProjectProgress/index.vue | 2 +- src/views/MarketingCenter/ShippingInquiries/index.vue | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 14923715..2cb92ad8 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,14 +17,14 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 -export const MESUploadFile = `http://192.168.0.110:8002/submit/MESUploadFile.ashx` -export const MESDownloadFile = `http://192.168.0.110:8002/submit/MESDownloadFile.ashx` +export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` +export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/MarketingCenter/ProjectProgress/index.vue b/src/views/MarketingCenter/ProjectProgress/index.vue index 9a28e364..6b835551 100644 --- a/src/views/MarketingCenter/ProjectProgress/index.vue +++ b/src/views/MarketingCenter/ProjectProgress/index.vue @@ -68,7 +68,7 @@ export default { }, grid: { left: '3%', - right: '4%', + right: '8%', bottom: '3%', containLabel: true }, diff --git a/src/views/MarketingCenter/ShippingInquiries/index.vue b/src/views/MarketingCenter/ShippingInquiries/index.vue index 7a50e33f..b31b352d 100644 --- a/src/views/MarketingCenter/ShippingInquiries/index.vue +++ b/src/views/MarketingCenter/ShippingInquiries/index.vue @@ -101,10 +101,10 @@