合并

.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'
 # 朱银

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'
   });
 };

src/views/contract/bidCost/index.vue

@@ -44,7 +44,7 @@
           </el-form-item>
           <el-form-item>
             <el-button
-              type="primary"
+              type="warning"
               icon="view"
               @click="handleViewInfo"
               v-hasPermi="['bidding:biddingLimitList:getVersionDetail']"

src/views/contract/limitPrice/index.vue

@@ -39,7 +39,14 @@
             <el-button type="primary" v-if="reviewStatus == 'draft'" @click="clickApprovalSheet()">审核</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" v-if="reviewStatus != 'draft'" @click="clickApprovalSheet()">查看流程</el-button>
+            <el-button
+              type="warning"
+              icon="view"
+              v-if="reviewStatus != 'draft'"
+              @click="clickApprovalSheet()"
+              v-hasPermi="['tender:tenderPlanLimitList:getVersionDetail']"
+              >查看流程</el-button
+            >
           </el-form-item>
         </el-form>
       </el-card>

src/views/largeScreen/components/RevenueContractCard.vue

@@ -23,7 +23,7 @@ const props = defineProps({
   },
   // 数值
   value: {
-    type: Number,
+    type: Number || String,
     default: 205805.17
   },
   // 单位

src/views/largeScreen/components/centerPage.vue

@@ -147,14 +147,21 @@ const initEcharts = () => {
     },
     tooltip: {
       trigger: 'item',
-      formatter: (params: any) => {
+      backgroundColor: 'rgba(3, 26, 52, 0.8)',
-        // 自定义提示框内容，显示更多项目信息
+      borderColor: '#1e3a6e',
-        const data = params.data;
+      textStyle: {
-        return `
+        color: '#fff'
-          <div style="font-weight: bold;">${data.name}</div>
+      },
-          <div>地点：${data.projectSite}</div>
+      formatter: function (params: any) {
-          <div>经纬度：${data.value[0].toFixed(6)}, ${data.value[1].toFixed(6)}</div>
+        if (params.data) {
-        `;
+          // 处理散点数据
+          const data = params.data;
+          return `
+                    <div style="font-weight: bold;">${data.name}</div>
+                    <div>地点：${data.projectSite}</div>
+                    <div>经纬度：${data.value[0].toFixed(6)}, ${data.value[1].toFixed(6)}</div>
+                `;
+        }
       }
     },
     series: [
@@ -219,4 +226,4 @@ onUnmounted(() => {
     height: 60%;
   }
 }
-</style>
+</style>

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],
+      data: [2800, 300, 3900, 3000, 2450, 2670, 3320],
-    name: ['麻辣牛肉', '水煮肉片', '酸菜鱼', '辣子鸡丁', '烧白', '冬瓜排骨汤', '清炒油麦菜'],
+      name: ['麻辣牛肉', '水煮肉片', '酸菜鱼', '辣子鸡丁', '烧白', '冬瓜排骨汤', '清炒油麦菜'],
-    ratio: [4000, 4000, 4000, 4000, 4000, 4000, 4000]
+      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%',
+      left: '9%',
-      top: '10%',          // 顶部留一点空间给 legend
+      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('<br/>');
       },
       textStyle: {
@@ -758,8 +759,11 @@ export const getBarOptions = (data: any) => {
       {
         axisLabel: {
           formatter: function (value) {
-            value = value + '万';
+            if (value >= 1000) {
-            return value;
+              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,
+          fontSize: 10
-          padding: 5
         }
       }
     ]
@@ -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;
-}
+};

src/views/tender/bidd/index.vue

@@ -39,13 +39,14 @@
               </el-form-item>
               <el-form-item>
                 <el-button
-                  type="primary"
+                  type="warning"
+                  icon="view"
                   @click="handleAudit()"
                   v-if="versionsData.status == 'draft'"
                   v-hasPermi="['tender:tenderPlanLimitList:getVersionDetail']"
                   >审核</el-button
                 >
-                <el-button type="warning" @click="handleAudit()" v-else v-hasPermi="['tender:tenderPlanLimitList:getVersionDetail']"
+                <el-button type="warning" icon="view" @click="handleAudit()" v-else v-hasPermi="['tender:tenderPlanLimitList:getVersionDetail']"
                   >查看流程</el-button
                 >
               </el-form-item>