diff --git a/src/api/MarketingCenter/ProjectProgress.js b/src/api/MarketingCenter/ProjectProgress.js index 1c38e9ac..e8808f52 100644 --- a/src/api/MarketingCenter/ProjectProgress.js +++ b/src/api/MarketingCenter/ProjectProgress.js @@ -5,8 +5,8 @@ export function search1() { url: '', method: 'post', data: { - type: '1', - name: '合同信息管理_项目名称_总_查询' + type: '3', + name: `select SUM(开票金额) as 开票金额,replace(convert(varchar(5), 操作时间, 121),'-','') as 开票时间 from 合同信息管理_开票记录_视图 group by replace(convert(varchar(5), 操作时间, 121),'-','')` } }) } @@ -26,7 +26,7 @@ export function search3() { method: 'post', data: { type: '3', - name: 'SELECT count(客户名称) as 客户数量,[省份] FROM [客户关系管理系统_客户_查询数据_MESWOR_视图]where [客户名称是否启用] = 1 group by [省份]' + name: `select 项目名称,CONVERT(nvarchar(50),sum(已收金额)) as 已收金额,CONVERT(nvarchar(50),sum(应收金额)) as 应收金额,CONVERT(nvarchar(50),(sum(应收金额)-sum(已收金额))) as 待收金额 from 视图_分批资金查询 where 是否启用= 1 group by 项目流水号,项目名称` } }) } diff --git a/src/utils/request.js b/src/utils/request.js index b168c85f..fc41e22d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,16 +17,16 @@ 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.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.104:8079/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.104:8079/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/MarketingCenter/ProjectProgress/index.vue b/src/views/MarketingCenter/ProjectProgress/index.vue index e0e031e4..6b835551 100644 --- a/src/views/MarketingCenter/ProjectProgress/index.vue +++ b/src/views/MarketingCenter/ProjectProgress/index.vue @@ -3,7 +3,7 @@ - 项目完成进度查询 + 年营销金额图表 查询
@@ -19,18 +19,11 @@ - 年营销金额图表 + 在执行项目金额及回款 查询
- - - 在执行项目金额及回款 - 查询 -
- -
@@ -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() @@ -75,26 +68,29 @@ export default { }, grid: { left: '3%', - right: '4%', + right: '8%', bottom: '3%', 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 } ] }) 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 @@