build

.gitignore

@@ -1 +1,2 @@
 node_modules/
+.history

.idea/.gitignore

@@ -1,5 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/

.idea/data-dashboard.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/data-dashboard.iml" filepath="$PROJECT_DIR$/.idea/data-dashboard.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

src/aapi/report.js

@@ -3,10 +3,12 @@ import http from "@/api/axios";
 import { reportApi } from "@/config";
 const api = "admin/";
 
+const onlineReportApi = "http://rep.report.caixiao365.com/admin/Everyday/"
+
 export default {
   //业绩统计
   list: (data, params) => http(reportApi + api + "stats", data, "post", params),
   departstat: (data, params) => http(reportApi + api + "departstat", data, "post", params),
-  companyReport: (data, params) => http(reportApi + api + "departEveryDay", data, "post", params),
-  departmentReport: (data, params) => http(reportApi + api + "companyEveryMonth", data, "post", params)
+  companyReport: (data, params) => http(onlineReportApi + "departEveryDay", data, "post", params),
+  departmentReport: (data, params) => http(onlineReportApi + "companyEveryMonth", data, "post", params)
 };

src/api/report.js

@@ -3,10 +3,12 @@ import http from "@/api/axios";
 import { reportApi } from "@/config";
 const api = "admin/";
 
+const onlineReportApi = "http://rep.report.caixiao365.com/admin/Everyday/"
+
 export default {
   list: (data, params) => http(reportApi + api + "stats", data, "post", params),
-  departDay: (data, params) => http(reportApi + api + "departEveryDay", data, "post", params),
-  departMonth: (data, params) => http(reportApi + api + "departEveryMonth", data, "post", params),
-  companyEvery: (data, params) => http(reportApi + api + "companyEvery", data, "post", params),
-  companyEveryMonth: (data, params) => http(reportApi + api + "companyEveryMonth", data, "post", params),
+  departDay: (data, params) => http(onlineReportApi + "departEveryDay", data, "post", params),
+  departMonth: (data, params) => http(onlineReportApi + "departEveryMonth", data, "post", params),
+  companyEvery: (data, params) => http(onlineReportApi + "companyEvery", data, "post", params),
+  companyEveryMonth: (data, params) => http(onlineReportApi + "companyEveryMonth", data, "post", params),
 };

src/components/control-display/index.vue

@@ -20,7 +20,7 @@
             </el-date-picker>
         </div>
 
-       <template v-if="hasPlatformDimension">
+       <template v-if="hasPlatformDimension && date">
         <h3>利润报表看板(平台维度)</h3>
         <el-row class="myul" :gutter="20">
           <template v-for="(item, index) in platformData">
@@ -39,7 +39,7 @@
         </el-row>
        </template>
 
-       <template v-if="companies && companies.length > 0">
+       <template v-if="(companies && companies.length > 0) && date">
         <h3>利润报表看板(公司维度)</h3>
         <el-row class="myul" :gutter="20">
             <div v-for="(c,index) in companies">

src/pages/report.vue

@@ -41,9 +41,47 @@ export default {
       this.state.loading = true;
       const openid = getOpenid()
       const code = getParameterByName('code')
-      const result = await asyncRequest.userinfo({
-        ...( openid ? { openid } :  { code })
-      })
+      const result = await asyncRequest.userinfo({...( openid ? { openid } :  { code })})
+
+      // const result ={
+      // "code": 0,
+      // "message": "获取成功",
+      // "data": {
+		  //     "id": "1",
+		  //     "openid": "oOpc26KiZFBKIm7SB8knFGvov1qg",
+		  //     "mobile": "",
+		  //     "gender": "0",
+		  //     "nickname": "雪寒",
+		  //     "avatar": "",
+		  //     "subscribe_time": "2022-12-21 15:52:14",
+		  //     "addr": "\/\/",
+		  //     "status": "1",
+		  //     "is_show": ["1", "2", "4"],
+		  //     "companyArr": [{
+		  //     	"companyNo": "GS2302231125079621",
+		  //     	"companyName": "北京百辰荣达国际科贸有限公司",
+		  //     	"info": [1,2]
+		  //     }, {
+		  //     	"companyNo": "GS2302231323386950",
+		  //     	"companyName": "北京泓源广诚国际商贸有限公司",
+		  //     	"info": [1,2]
+		  //     }, {
+		  //     	"companyNo": "GS2304031312553746",
+		  //     	"companyName": "北京锦兴弘昌科技有限公司",
+		  //     	"info": [1, 2]
+		  //     }, {
+		  //     	"companyNo": "GS2302231124114965",
+		  //     	"companyName": "北京普润心堂商贸有限公司",
+		  //     	"info": [1, 2]
+		  //     }, {
+		  //     	"companyNo": "GS2203161855277894",
+		  //     	"companyName": "北京万宇恒通国际科贸有限公司",
+		  //     	"info": [1, 2]
+		  //     }],
+		  //     "addtime": "2023-04-10 18:11:07",
+		  //     "updatetime": "2023-05-09 16:22:33"
+      // 	}
+      // }
 
       this.state.loading = false
       switch(Number(result.code)){