From 261a15df4997528eb8d8b1d5c01cc733eaf6ee30 Mon Sep 17 00:00:00 2001
From: 13218645326 <sjf13651675634@163.com>
Date: Sat, 2 Dec 2023 17:14:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/echartsCom/Pie3dCom.vue |  17 ++--
 src/components/echartsCom/barCom.vue   |   2 +-
 src/http/api.md                        |  17 ++++
 src/http/api/echartApi.ts              |  38 ++++++++
 src/http/index.ts                      |  11 ++-
 src/views/screen/sharePlatform.vue     | 122 ++++++++++++++++++++++---
 vite.config.ts                         |  42 ++++-----
 7 files changed, 199 insertions(+), 50 deletions(-)
 create mode 100644 src/http/api.md
 create mode 100644 src/http/api/echartApi.ts

diff --git a/src/components/echartsCom/Pie3dCom.vue b/src/components/echartsCom/Pie3dCom.vue
index 3cec34d..dc29913 100644
--- a/src/components/echartsCom/Pie3dCom.vue
+++ b/src/components/echartsCom/Pie3dCom.vue
@@ -4,7 +4,14 @@
 <script setup lang="ts">
 import Highcharts from "highcharts"
 import highcharts3d from 'highcharts/highcharts-3d'
+const props = defineProps({
+    list:{
+        type:Array,
+        default:[]
+    }
+})
 onMounted(() => {
+    console.log("props-list",props.list)
     Highcharts.chart('container', options)
 })
 
@@ -43,15 +50,7 @@ const options = {
     },
     series: [{
         name: '设备数量',
-        data: [
-            ['广东电网', 8],
-            ['广西电网', 3],
-            ['云南电网', 1],
-            ['贵州电网', 6],
-            ['海南电网', 8],
-            ['深圳供电局', 4],
-            ['超高压公司', 4]
-        ]
+        data:props.list
     }]
 }
 
diff --git a/src/components/echartsCom/barCom.vue b/src/components/echartsCom/barCom.vue
index aca24a6..17e9998 100644
--- a/src/components/echartsCom/barCom.vue
+++ b/src/components/echartsCom/barCom.vue
@@ -130,7 +130,7 @@ const propsVal = defineProps({
 onMounted(() => {
     const BarEchartDomEl = document.getElementById("BarEchartDom" + propsVal.domId);
     myChart = echarts.init(BarEchartDomEl);
-    console.log("mychart-bar-003", option)
+    console.log("mychart-bar-003", propsVal)
     myChart.setOption(option);
 
 })
diff --git a/src/http/api.md b/src/http/api.md
new file mode 100644
index 0000000..6ff7e74
--- /dev/null
+++ b/src/http/api.md
@@ -0,0 +1,17 @@
+平台入驻设备总数: http://10.40.92.64:9501/maDevInfo/list 已经对接
+
+查询自有以及上架可租设备数量:已经对接
+          http://10.40.92.64:9501/maDevInfo/type-list
+          获取企业所属设备状态为自有的设备数量: 已经对接
+          http://10.40.92.64:9501/maDevInfo/company-list
+          查询在租以及待租设备数量: 已经对接
+          http://10.40.92.64:9501/maDevInfo/matype-list
+          查询今日订单额以及订单数量: 已经对接
+          http://10.40.92.64:9501/maOrderInfo/today-list
+          租赁订单月统计: 已经对接
+          http://10.40.92.64:9501/maOrderInfo/list
+
+
+
+
+
diff --git a/src/http/api/echartApi.ts b/src/http/api/echartApi.ts
new file mode 100644
index 0000000..a2e5880
--- /dev/null
+++ b/src/http/api/echartApi.ts
@@ -0,0 +1,38 @@
+import { get, post } from '../index'
+
+// 平台入驻设备总数
+export function apiMaDevInfoList() {
+    return get('maDevInfo/list', {})
+}
+// 查询自有以及上架可租设备数量
+export function apiMaDevInfoTypeList() {
+    return get('maDevInfo/type-list', {})
+}
+// 获取企业所属设备状态为自有的设备数量:
+export function apiMaDevInfoCompanyList() {
+    return get('maDevInfo/company-list', {})
+}
+//           查询在租以及待租设备数量:
+export function apiMaDevInfoMatypeList() {
+    return get('maDevInfo/matype-list', {})
+}
+//      查询今日订单额以及订单数量:
+export function apiMaOrderInfoTodayList() {
+    return get('maOrderInfo/today-list', {})
+}
+//      租赁订单月统计:
+export function apiMaOrderInfoList() {
+    return get('maOrderInfo/list', {})
+}
+// export function apiMaDevInfoList() {
+//     return get('maDevInfo/list', {})
+// }
+// export function apiMaDevInfoList() {
+//     return get('maDevInfo/list', {})
+// }
+// export function apiMaDevInfoList() {
+//     return get('maDevInfo/list', {})
+// }
+// export function apiMaDevInfoList() {
+//     return get('maDevInfo/list', {})
+// }
diff --git a/src/http/index.ts b/src/http/index.ts
index 7f1166f..98ebcb8 100644
--- a/src/http/index.ts
+++ b/src/http/index.ts
@@ -28,7 +28,7 @@ service.interceptors.response.use(
         return res.data
     },
     (error) => {
- 
+        
         console.log('error-异常', error)
     }
 )
@@ -40,7 +40,8 @@ export function get(url: string, params: any) {
             .get(url, { params })
             .then((res: any) => {
                 NProgress.done()
-                if (res.code == '0000') {
+                console.log("res-get",res)
+                if (res.code == '200') {
                     resolve(res.data)
                 } else {
                     reject(res.data)
@@ -62,10 +63,10 @@ export function post(url: string, params: any) {
             .then((res: any) => {
                 NProgress.done()
                 console.log('---------------------------', res)
-                if (res.code == '0000') {
+                if (res.code == '200') {
                     resolve(res.data)
                 } else {
-                    reject(res)
+                    reject(res.data)
                 }
             })
             .catch((err) => {
@@ -89,7 +90,7 @@ export function upload(url: string, params: any) {
             })
             .then((res: any) => {
                 NProgress.done()
-                if (res.code == '0000') {
+                if (res.code == '200') {
                     resolve(res.data)
                 } else {
                     reject(res.data)
diff --git a/src/views/screen/sharePlatform.vue b/src/views/screen/sharePlatform.vue
index b3c4766..04be2e5 100644
--- a/src/views/screen/sharePlatform.vue
+++ b/src/views/screen/sharePlatform.vue
@@ -14,10 +14,10 @@
             <div class="equipment_count">
                 <div class="sub_title">平台入驻装备总数</div>
                 <div class="count_list">
-                    <div class="count_item" v-for="(item, index) in equipmentCountInfo.listCount" :key="index">
+                    <div class="count_item" v-for="(item, index) in equipmentCountInfo.listCount.slice(0,4)" :key="index">
                         {{ item }}
                     </div>
-                    <div class="count_item">
+                    <div class="count_item" v-if="equipmentCountInfo.listCount.length>4">
                         +
                     </div>
                 </div>
@@ -96,7 +96,7 @@
                     </div>
                 </div>
                 <div class="enterprise_device">
-                    <Pie3dCom></Pie3dCom>
+                    <Pie3dCom :list="pie3DList.list" v-if="pie3DList.list.length>0"></Pie3dCom>
                 </div>
 
 
@@ -119,7 +119,7 @@
                             :barWidth="barComProps.barWidth" :formatCallBack="barComProps.formatCallBack"></barCom>
                     </div>
                     <div class="bottom_row_center_bar_right">
-                        <barCom :domId="2" :title="barComPropsSimple.title" :xAxisData="barComPropsSimple.xAxisData"
+                        <barCom v-if="barComPropsSimple.xAxisData.length>0"  ref="barSimpleRef" :domId="2" :title="barComPropsSimple.title" :xAxisData="barComPropsSimple.xAxisData"
                             :titleStyle="barComProps.titleStyle" :yAxisProps="barComPropsSimple.yAxisProps"
                             :seriseData="barComPropsSimple.seriseData"
                             :emphasisItemStyle="barComPropsSimple.emphasisItemStyle"
@@ -153,15 +153,14 @@
 </template>
   
 <script lang="ts" setup>
-// import lineCom from "../../components/echartsCom/lineCom.vue"
-import mapEcharts from "../../components/echartsCom/mapEcharts.vue"
 import barCom from "../../components/echartsCom/barCom.vue"
 import Pie3dCom from "../../components/echartsCom/Pie3dCom.vue"
 import hotProvider from "../../components/customCom/hotProvider.vue"
 import equipmentLeasing from "../../components/customCom/equipmentLeasing.vue"
 import { getImg } from "utils/index"
+import {apiMaDevInfoList,apiMaDevInfoTypeList,apiMaDevInfoCompanyList,apiMaDevInfoMatypeList,apiMaOrderInfoTodayList,apiMaOrderInfoList} from "http/api/echartApi"
 const equipmentCountInfo: any = reactive({
-    listCount: ['9', '9', '9', '9'],
+    listCount: [],
     selfCount: "999",
     shelfCount: "999"
 })
@@ -170,22 +169,22 @@ const middleCountList = reactive({
     list: [
         {
             icon: getImg("/src/assets/img/money1.png"),
-            count: "546465",
+            count: "",
             title: "今日订单"
         },
         {
             icon: getImg("/src/assets/img/money2.png"),
-            count: "5645646",
+            count: "",
             title: "累计金额"
         },
         {
             icon: getImg("/src/assets/img/money3.png"),
-            count: "546465",
+            count: "",
             title: "在用设备"
         },
         {
             icon: getImg("/src/assets/img/money2.png"),
-            count: "5645646",
+            count: "",
             title: "待租设备"
         }
     ]
@@ -246,13 +245,13 @@ const barComProps = reactive({
     }
 })
 
-const barComPropsSimple = reactive({
+const barComPropsSimple:any = reactive({
     title: "租赁订单月统计",
     titleStyle: {
         color: "#0099FF",
         paddingTop: 20
     },
-    xAxisData: ['点', '击', '柱', '子', '或', '者', '两', '指', '在'],
+    xAxisData:[], //["123213","werwe","ewrwer"],
     yAxisProps: {
         type: "value",
         splitLine: {//是否显示 y轴横线
@@ -265,7 +264,7 @@ const barComPropsSimple = reactive({
         },
         show: true
     },
-    seriseData: [220, 182, 191, 234, 290, 330, 310, 120, 362],//数据
+    seriseData:[],// [12,22,33],//数据
     itemStyle: [//柱状图的默认颜色 渐变
         { offset: 0, color: '#10A1B8' },
         { offset: 1, color: '#5BE3FF' }
@@ -348,6 +347,101 @@ const barComPropsHorizontal = reactive({
         return fromatStr
     }
 })
+const pie3DList = reactive({
+    list:[]
+})
+onMounted(()=>{
+    iniTapiMaDevInfoList()
+    iniTapiMaDevInfoTypeList()
+    iniTapiMaDevInfoCompanyList()
+    iniTapiMaDevInfoMatypeList()
+    iniTapiMaOrderInfoTodayList()
+    iniTapiMaOrderInfoList()
+})
+
+
+const iniTapiMaDevInfoList = async()=>{
+    // 平台入驻设备总数
+    try {
+        const res:any =  await apiMaDevInfoList()
+        console.log("apiMaDevInfoList",res)
+        equipmentCountInfo.listCount=(res+'').split("")
+    } catch (error) {
+        console.log(error)
+    }
+
+}
+
+const iniTapiMaDevInfoTypeList = async()=>{
+    // 查询自有以及上架可租设备数量
+    try {
+        const res:any =  await apiMaDevInfoTypeList()
+        console.log("apiMaDevInfoTypeList",res)
+        equipmentCountInfo.selfCount =res.self.count
+        equipmentCountInfo.shelfCount =res.rent.count
+    } catch (error) {
+        console.log(error)
+    }
+
+}
+const iniTapiMaDevInfoCompanyList = async()=>{
+    // 获取企业所属设备状态为自有的设备数量:
+    try {
+        const res:any =  await apiMaDevInfoCompanyList()
+        console.log("apiMaDevInfoCompanyList",res)
+        let resultList:any = []
+        res.forEach((ele:any)=>{
+            const item = [
+                ele.coType,
+                ele.count
+            ]
+            resultList.push(item)
+        })
+        pie3DList.list =resultList
+    } catch (error) {
+        console.log(error)
+    }
+
+}
+const iniTapiMaDevInfoMatypeList = async()=>{
+    // 查询在租以及待租设备数量:
+    try {
+        const res:any =  await apiMaDevInfoMatypeList()
+        console.log("apiMaDevInfoMatypeList",res)
+        middleCountList.list[2].count=res.rent.count
+        middleCountList.list[3].count=res.use.count
+    } catch (error) {
+        console.log(error)
+    }
+
+}
+const iniTapiMaOrderInfoTodayList = async()=>{
+    //查询今日订单额以及订单数量:
+    try {
+        const res:any =  await apiMaOrderInfoTodayList()
+        console.log("apiMaOrderInfoTodayList",res)
+        middleCountList.list[0].count=res[0].count
+        middleCountList.list[1].count=res[0].money
+    } catch (error) {
+        console.log(error)
+    }
+
+}
+
+const barSimpleRef = ref()
+const iniTapiMaOrderInfoList = async()=>{
+    //租赁订单月统计:
+    try {
+        const res:any =  await apiMaOrderInfoList()
+    
+        barComPropsSimple.xAxisData=res.map((ele:any)=>ele.month)
+        barComPropsSimple.seriseData=res.map((ele:any)=>ele.count)
+    } catch (error) {
+        console.log(error)
+    }
+
+}
+
 
 
 </script>
diff --git a/vite.config.ts b/vite.config.ts
index a2294a4..a5ddc2c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -86,36 +86,36 @@ export default ({ mode }: any) => {
           rewrite: (path) => path.replace(/^\/proxyApi/, ''),
           configure: (proxy, _options) => {
             proxy.on('error', (err, _req, _res) => {
-              console.log('proxy error', err)
+              // console.log('proxy error', err)
             })
 
             proxy.on('start', (req, res, target) => {
-              console.log(
-                'Proxy Start:',
-                req.method,
-                req.url,
-                req.headers,
-                _options
-              )
+              // console.log(
+              //   'Proxy Start:',
+              //   req.method,
+              //   req.url,
+              //   req.headers,
+              //   _options
+              // )
             })
             proxy.on('proxyReq', (proxyReq, req, _res) => {
-              console.log(
-                'Sending Request to the Target:',
-                req.method,
-                req.url,
-                req.headers,
-                _options
-              )
+              // console.log(
+              //   'Sending Request to the Target:',
+              //   req.method,
+              //   req.url,
+              //   req.headers,
+              //   _options
+              // )
               proxyReq.removeHeader('origin')
               // 跨域解决
             })
             proxy.on('proxyRes', (proxyRes, req, _res) => {
-              console.log(
-                'Received Response from the Target:',
-                proxyRes.statusCode,
-                proxyRes.headers,
-                req.url
-              )
+              // console.log(
+              //   'Received Response from the Target:',
+              //   proxyRes.statusCode,
+              //   proxyRes.headers,
+              //   req.url
+              // )
             })
           }
         }