diff --git a/.env.development b/.env.development index 2ef074f..bd5354f 100644 --- a/.env.development +++ b/.env.development @@ -8,7 +8,7 @@ VITE_APP_ENV = 'development' # 李陈杰 209 VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 曾涛 -# VITE_APP_BASE_API = 'http://192.168.110.180:8899' +VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 罗成 # VITE_APP_BASE_API = 'http://192.168.110.213:8899' # 朱银 diff --git a/src/api/largeScreen/index.ts b/src/api/largeScreen/index.ts index 1a0da4c..87acda0 100644 --- a/src/api/largeScreen/index.ts +++ b/src/api/largeScreen/index.ts @@ -15,7 +15,7 @@ export const totalAmount = () => { /** * 查询项目位置列表 * - */ export const projectGis = (clientid) => { + */ export const projectGis = (clientid?: any) => { return request({ url: '/money/big/screen/project/gis', method: 'get', @@ -57,7 +57,8 @@ export const totalAmount = () => { /** * 支出合同分析 * - */ export const expensesAnalyze = (clientid) => { + */ +export const expensesAnalyze = (clientid) => { return request({ url: '/money/big/screen/expenses/analyze', method: 'get', @@ -79,14 +80,14 @@ export const totalAmount = () => { export const monthMoney = () => { return request({ url: '/money/big/screen/monthMoney', - method: 'get', + method: 'get' }); }; // 现金流 export const monthCash = () => { return request({ url: '/money/big/screen/monthCash', - method: 'get', + method: 'get' }); }; // 现金流总和 @@ -94,6 +95,6 @@ export const monthCash = () => { export const cashTotal = () => { return request({ url: '/money/big/screen/cashTotal', - method: 'get', + method: 'get' }); }; diff --git a/src/views/contract/bidCost/index.vue b/src/views/contract/bidCost/index.vue index d746c53..46e9499 100644 --- a/src/views/contract/bidCost/index.vue +++ b/src/views/contract/bidCost/index.vue @@ -44,7 +44,7 @@ 审核 - 查看流程 + 查看流程 diff --git a/src/views/largeScreen/components/RevenueContractCard.vue b/src/views/largeScreen/components/RevenueContractCard.vue index ff4d3bc..f2e7583 100644 --- a/src/views/largeScreen/components/RevenueContractCard.vue +++ b/src/views/largeScreen/components/RevenueContractCard.vue @@ -23,7 +23,7 @@ const props = defineProps({ }, // 数值 value: { - type: Number, + type: Number || String, default: 205805.17 }, // 单位 diff --git a/src/views/largeScreen/components/centerPage.vue b/src/views/largeScreen/components/centerPage.vue index 952a419..e631b63 100644 --- a/src/views/largeScreen/components/centerPage.vue +++ b/src/views/largeScreen/components/centerPage.vue @@ -147,14 +147,21 @@ const initEcharts = () => { }, tooltip: { trigger: 'item', - formatter: (params: any) => { - // 自定义提示框内容，显示更多项目信息 - const data = params.data; - return ` -
${data.name}
-
地点：${data.projectSite}
-
经纬度：${data.value[0].toFixed(6)}, ${data.value[1].toFixed(6)}
- `; + backgroundColor: 'rgba(3, 26, 52, 0.8)', + borderColor: '#1e3a6e', + textStyle: { + color: '#fff' + }, + formatter: function (params: any) { + if (params.data) { + // 处理散点数据 + const data = params.data; + return ` +
${data.name}
+
地点：${data.projectSite}
+
经纬度：${data.value[0].toFixed(6)}, ${data.value[1].toFixed(6)}
+ `; + } } }, series: [ @@ -219,4 +226,4 @@ onUnmounted(() => { height: 60%; } } - \ No newline at end of file + diff --git a/src/views/largeScreen/components/optionList.ts b/src/views/largeScreen/components/optionList.ts index 0daec3b..2a6572f 100644 --- a/src/views/largeScreen/components/optionList.ts +++ b/src/views/largeScreen/components/optionList.ts @@ -1,3 +1,4 @@ +import { to } from 'await-to-js'; import * as echarts from 'echarts/core'; import { text } from 'stream/consumers'; // import { PictorialBarChart } from 'echarts/charts' @@ -255,7 +256,6 @@ export const getLineOption = (lineData: any) => { const maxData = Math.max(...lineData.line1.flat()); const option = { - backgroundColor: '', tooltip: { trigger: 'axis', @@ -313,7 +313,7 @@ export const getLineOption = (lineData: any) => { axisLabel: { textStyle: { color: '#fff' - }, + } } }, yAxis: { @@ -579,10 +579,10 @@ export const getDishesOption = (data?: any) => { // 菜品库存图 export const getInventoryOption = () => { const res = { - data: [2800, 300, 3900, 3000, 2450, 2670, 3320], - name: ['麻辣牛肉', '水煮肉片', '酸菜鱼', '辣子鸡丁', '烧白', '冬瓜排骨汤', '清炒油麦菜'], - ratio: [4000, 4000, 4000, 4000, 4000, 4000, 4000] - }, + data: [2800, 300, 3900, 3000, 2450, 2670, 3320], + name: ['麻辣牛肉', '水煮肉片', '酸菜鱼', '辣子鸡丁', '烧白', '冬瓜排骨汤', '清炒油麦菜'], + ratio: [4000, 4000, 4000, 4000, 4000, 4000, 4000] + }, dataIndex = 1; const option = { xAxis: { @@ -698,13 +698,13 @@ export const getBarOptions = (data: any) => { const option = { backgroundColor: '', grid: { - left: '8%', - top: '10%', // 顶部留一点空间给 legend + left: '9%', + top: '10%', // 顶部留一点空间给 legend bottom: '8%', right: '2%' }, legend: { - data: ['现金流入', '现金流出'], // 与 series.name 对应 + data: ['现金流入', '现金流出'], // 与 series.name 对应 top: '0%', textStyle: { color: '#fff', fontSize: 12 } }, @@ -716,7 +716,8 @@ export const getBarOptions = (data: any) => { formatter: (params: any) => { // params 是数组，对应每条柱子 return params - .map((p: any) => `${p.seriesName}：${p.value} 万元`) + .map((p: any) => `${p.seriesName}：${Number(p.value).toFixed(2)} 万元`) + .join('
'); }, textStyle: { @@ -758,8 +759,11 @@ export const getBarOptions = (data: any) => { { axisLabel: { formatter: function (value) { - value = value + '万'; - return value; + if (value >= 1000) { + return value / 1000 + '千万'; + } else { + return value + '万'; + } }, color: 'rgba(255, 255, 255, 0.8)' }, @@ -825,7 +829,9 @@ export const getBarOptions = (data: any) => { }, label: { show: false, - formatter: '{c}', + formatter: function (params) { + return Number(params.value).toFixed(2); + }, position: 'top', color: '#fff', fontSize: 10 @@ -864,11 +870,12 @@ export const getBarOptions = (data: any) => { }, label: { show: true, - formatter: '{c}', + formatter: function (params) { + return Number(params.value).toFixed(2); + }, position: 'top', color: '#fff', - fontSize: 10, - padding: 5 + fontSize: 10 } } ] @@ -898,7 +905,6 @@ export const getBarOptions2 = (data: any) => { tooltip: { trigger: 'item', show: true - }, legend: { top: '5%', @@ -929,10 +935,10 @@ export const getBarOptions2 = (data: any) => { { value: 3, name: '100万以下' }, { value: 4, name: '100-500万' }, { value: 5, name: '500-1000万' }, - { value: 4, name: '1000万以上' }, + { value: 4, name: '1000万以上' } ] } ] }; return option; -} \ No newline at end of file +}; diff --git a/src/views/tender/bidd/index.vue b/src/views/tender/bidd/index.vue index 50c8a02..f06a0c7 100644 --- a/src/views/tender/bidd/index.vue +++ b/src/views/tender/bidd/index.vue @@ -39,13 +39,14 @@ 审核 - 查看流程