feat: 接口基础对接 / 全局接口请求配置

config/webpack.dev.js

@@ -140,6 +140,11 @@ module.exports = merge(common, {
         changeOrigin:true,
 
       },
+      "/data-screen": {
+        target: "http://10.8.8.185:31233",
+        changeOrigin:true,
+        pathRewrite: { '^/data-screen': '' },
+      },
       "/mock":{
         target: "http://172.24.81.106:9999",
         pathRewrite: { '^/mock': '/api' },

src/assets/css/styleTemplate.less

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 茶百道主题样式
  * @Date: 2022-10-27 10:56:37 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-10-30 17:41:41
+ * @Last Modified time: 2023-11-01 16:02:46
  */
 
 @import url("../../themes/themes.less");
@@ -474,7 +474,7 @@
                 color: #fff;
                 position: absolute;
                 right: 0%;
-                top: 0.5em;
+                top: 0.4em;
 
                 li {
                   height: 25%;
@@ -665,8 +665,7 @@
             justify-content: center;
 
             .topMsg_number_2 {
-              font-size: 0.75em;
-              color: #fff;
+              font-size: 0.2em;
             }
 
             .topMsg_number_p {

src/components/MassageCart/view.jsx

@@ -346,7 +346,7 @@ export default observer(function (props) {
         onCancel={() => {
           setIsShowDetail(false);
           //关闭对话框-更新top实时小红点数量
-          getUnReadNum();
+          // getUnReadNum();
           getMessageList();
         }}
         footer={

src/pages/frame/api.js

@@ -18,18 +18,6 @@ export function getUserResourceTree(params) {
 }
 
 /**
- * 获取用户报表中心和驾驶舱结构树
- * @returns
- */
-export function getAllReportResource(params) {
-  return request({
-    url: "/api/sys/resource/getLoginUserFineResourceTree",
-    method: "GET",
-    data: params,
-  });
-}
-
-/**
  * 根据id查询定制 菜单资源描述
  * @params resourceId 报表ID
  * @returns

src/pages/frame/component/modelMsg/view.jsx

@@ -42,7 +42,7 @@ export default class extends Component {
     sessionStorage.setItem("accountId", localStorage.getItem("accountId"))
     this.props.onRef(this);
     //修复报表页面打开+刷新后，因缓存保存了旧的token导致token失效
-    this.getSheetTokenMod();
+    // this.getSheetTokenMod();
     console.log(window.location.href.indexOf('isMobile') > -1)
     console.log(sessionStorage.getItem("isMobileReload"))
     //单独处理从移动门户登录进来,不能监听路由的场景
@@ -150,11 +150,11 @@ export default class extends Component {
               window.ws.onmessage = function (evt) {
                 console.log("你有一条新的消息");
                 // 不用管返回了啥内容，更新获取消息接口
-                getUnReadMessageNum().then(({ data, resultCode }) => {
-                  if (+resultCode === 0) {
-                    $store.app.setNewsCount(+data);
-                  }
-                });
+                // getUnReadMessageNum().then(({ data, resultCode }) => {
+                //   if (+resultCode === 0) {
+                //     $store.app.setNewsCount(+data);
+                //   }
+                // });
               };
 
               window.ws.onclose = function (evt) {

src/pages/frame/component/top/view.jsx

@@ -4,10 +4,7 @@ import { observer, observable } from "mobx-react";
 import { useHistory, useLocation } from "react-router-dom";
 import { UserOutlined, QuestionCircleOutlined } from "@ant-design/icons";
 import {
-  getResourceTree,
   getUserResourceTree,
-  getAllReportResource,
-  getMenuDesc,
 } from "../../api";
 import { getUnReadMessageNum } from "@apis/personal";
 import { saveMenu } from "@apis/enter.js";
@@ -342,7 +339,7 @@ export default observer(function (props) {
     //更新 小红点数量
     getUnReadNum();
     //获取用户未读消息和未处理消息
-    messageTipList();
+    // messageTipList();
   };
 
   const close_xxpop = () => {
@@ -454,11 +451,6 @@ export default observer(function (props) {
 
   //获取 问题反馈-问题报表-树结构
   const getProbReport = () => {
-    getAllReportResource().then(({ data, resultCode }) => {
-      if (+resultCode === 0) {
-        setProbReport(handleData(data));
-      }
-    });
   };
   //递归-问题报表
   const handleData = (data) => {
@@ -516,7 +508,7 @@ export default observer(function (props) {
     //获取小红点实时未读数量
     getUnReadNum();
     //重新获取待办列表
-    messageTipList();
+    // messageTipList();
   };
 
   //消息公告-一键已读
@@ -526,7 +518,7 @@ export default observer(function (props) {
     setReadStatus({ ...config }).then(({ data, resultCode }) => {
       if (+resultCode === 0) {
         getUnReadNum();
-        messageTipList();
+        // messageTipList();
       }
     });
   };
@@ -572,68 +564,15 @@ export default observer(function (props) {
     ) {
       $store.sysMenu.setIsShowLeftMenuSearch(true);
     }
-    getUserResourceTree().then(({ data, resultCode }) => {
-      //测试菜单问题
-      if (+resultCode === 0) {
-        const list = data.map((item, index) => {
-          return item;
-        });
-        $store.sysMenu.setMenuList(
-          list.filter((item) => item.resourceName !== "测试模块化与权限")
-        );
-
-        // 计算菜单显示
-        let el = menuRef.current || {};
-        let tagCount = Math.floor(el.offsetWidth / 80);
-        let rendNum = el.offsetWidth % 80;
-
-        if (rendNum < 85) {
-          --tagCount;
-        }
-        // console.log('tagCount',tagCount)
-
-        $store.sysMenu.setNorList(
-          $store.sysMenu.menuList.slice(0, Math.max(0, tagCount))
-        );
-        // //加载首页通知
-        // const home_f = utils.findNodeTree($store.sysMenu.menuList, '/home/index', "resourceUrl");
-        // if (home_f && home_f.resourceId) {
-        //   listUserModuleBulletinsNew({
-        //     pageSize:2,
-        //     pageNum:1,
-        //     effectStatus:1,
-        //     displayArea:home_f.resourceId
-        //   }).then((res) => {
-        //     if (res?.data && res?.data?.records) {
-        //       //首页特殊处理  展示在首页的通知栏
-        //       $store.app.setShowTips( res?.data?.records);
-        //       for (let index = 0; index < 1; index++) {
-        //         const element = res?.data?.records[index];
-        //         if (isTimes('', element.effectStartTime, element.effectEndTime)) {
-        //           this.ModelBox.setState({ showContactModalVisible: true, activeItem: element });
-        //           break
-        //         }
-        //       }
-        //     }
-        //   })
-        // }
-
-
-        if ($store.sysMenu.menuList.length > tagCount) {
-          $store.sysMenu.setShowMore(true);
-          $store.sysMenu.setMoreList($store.sysMenu.menuList.slice(tagCount));
-        }
-      }
-    });
     //获取问题反馈-问题报表-树结构
     getProbReport();
     //获取用户未读消息和未处理消息
-    messageTipList();
-    getUnReadMessageNum().then(({ data, resultCode }) => {
-      if (+resultCode === 0) {
-        $store.app.setNewsCount(+data);
-      }
-    });
+    // messageTipList();
+    // getUnReadMessageNum().then(({ data, resultCode }) => {
+    //   if (+resultCode === 0) {
+    //     $store.app.setNewsCount(+data);
+    //   }
+    // });
     console.log($store.app.avator);
   }, []);
 
@@ -684,12 +623,12 @@ export default observer(function (props) {
   //获取 未读消息的数量
   const getUnReadNum = () => {
     let accountId = sessionStorage.getItem("accountId");
-    getUnReadMessageNum(accountId).then(({ data, resultCode }) => {
-      if (+resultCode === 0) {
-        setUnReadNum(data);
-        $store.app.setNewsCount(+data);
-      }
-    });
+    // getUnReadMessageNum(accountId).then(({ data, resultCode }) => {
+    //   if (+resultCode === 0) {
+    //     setUnReadNum(data);
+    //     $store.app.setNewsCount(+data);
+    //   }
+    // });
   };
 
   /**控制输入字数 */

src/pages/login/view.jsx

@@ -136,11 +136,11 @@ export default function () {
                 window.ws.onmessage = function (evt) {
                   console.log("你有一条新的消息");
                   // 不用管返回了啥内容，更新获取消息接口
-                  getUnReadMessageNum().then(({ data, resultCode }) => {
-                    if (+resultCode === 0) {
-                      $store.app.setNewsCount(+data);
-                    }
-                  });
+                  // getUnReadMessageNum().then(({ data, resultCode }) => {
+                  //   if (+resultCode === 0) {
+                  //     $store.app.setNewsCount(+data);
+                  //   }
+                  // });
                 };
 
                 window.ws.onclose = function (evt) {

src/pages/tqcDataVHome/api.js

@@ -0,0 +1,26 @@
+import request from "@utils/request";
+
+
+/**碳排放 */
+export function dataengineCenterOneservice(params) {
+    return request({
+      url: "/data-screen/dataengine-center-oneservice/list/1356250396177503367",
+      method: "POST",
+      data: {
+        "apiId":"1356250396177503367",
+        "appKey":"200000134",
+        "env":"PROD",
+        "reqProtocol":1,
+        "returnFields":[
+            "byear",
+            "missionsIntensity",
+            "missionsTotal",
+            "biz_id"
+        ],
+        "pageNum":1,
+        "pageSize":10,
+        "useResultCache":false
+    },
+    });
+  }
+  

src/pages/tqcDataVHome/component/leftMenoyView.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 库存金额
  * @Date: 2023-10-23 09:32:12 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-10-30 17:50:01
+ * @Last Modified time: 2023-11-02 13:57:00
  */
 
 
@@ -265,7 +265,7 @@ class LeftMenoyView extends Component {
           if (index > 5) {
             index = 0;
           }
-        }, 30000);
+        }, 2000);
       }
       fun();
       setTimeout(function () {
@@ -297,16 +297,16 @@ class LeftMenoyView extends Component {
           trigger: 'item',
           position: ['50%', '50%'],
           formatter: function (params, ticket, callback) {
-            $.get('detail?name=' + params.name, function (content) {
-              callback(ticket, toHTML(content));
-            });
+            // $.get('detail?name=' + params.name, function (content) {
+            //   callback(ticket, toHTML(content));
+            // });
             return `<div class="testDiv"><p class="p1">
               ${params.percent ? params.percent.toFixed() : 0}<spanp class="p3">%</span>
             </p>
             <p class="p2">${params.name}</p>
             </div>`;
           },
-          backgroundColor: 'black',
+          backgroundColor: 'rgba(0,0,0,0)',
 
           textStyle: {
             color: '#fff',

src/pages/tqcDataVHome/component/mapView.jsx

@@ -14,7 +14,7 @@
         preload 属性 :
         设置 auto , 表示 预先加载视频 ;
         设置 none , 表示 不预先加载视频 ;
- * @Last Modified time: 2023-11-01 14:59:33
+ * @Last Modified time: 2023-11-01 15:54:40
  */
 import React, { useState, useEffect, Component } from "react";
 import { useHistory, useLocation, withRouter } from "react-router-dom";
@@ -100,7 +100,7 @@ class MapView extends Component {
   render() {
     const { changGif } = this.state;
     return (
-      <div class="video_box video_box_hide animate__animated animate__zoomOut animate__delay-2s animate__slower">
+      <div class="video_box video_box_hide animate__animated animate__fadeOut animate__delay-2s animate__slower">
           <video src={require("@assets/imgs/dataVImg/homeVideo.mp4").default} autoplay="autoplay" class="video1"></video>
       </div>
     )

src/pages/tqcDataVHome/component/rightBottomView.jsx

@@ -10,6 +10,9 @@ import React, { useState, useEffect, Component } from "react";
 import styles from "../style.less";
 import { useHistory, useLocation, withRouter } from "react-router-dom";
 import mod from '../mod';
+import {
+  dataengineCenterOneservice,
+} from "../api";
 
 @withRouter
 
@@ -23,10 +26,19 @@ class RightBottomView extends Component {
   }
 
   componentDidMount() {
+    this.getUrl()
     this.setData();
     this.setData2();
   }
 
+  getUrl(){
+    dataengineCenterOneservice().then(({ data, resultCode }) => {
+      if (+resultCode === 0) {
+      }
+    });
+
+  }
+
   setData() {
     setTimeout(() => {
       // 基于准备好的dom，初始化echarts实例

src/pages/tqcDataVHome/view.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 
  * @Date: 2023-10-25 10:32:44 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-10-25 17:48:42
+ * @Last Modified time: 2023-11-01 16:03:12
  */
 /*
  * @Author: dayan_hjm 
@@ -131,14 +131,14 @@ class Home extends Component {
       //产量计划完成率
       var p1 = document.getElementById('plannedCompletionBox');
       const datas_ = plannedCompletionData[plannedCompletionNum-1];
-      var res = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_.value + '</span><span class="topMsg_number_2">%</span><p class="topMsg_number_p">'+datas_.name+'</p></div>';
+      var res = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_.value + '</span><span class="topMsg_number_2" style={{fontSize: "0.75em",color: "#fff"}}>%</span><p class="topMsg_number_p">'+datas_.name+'</p></div>';
       p1.innerHTML = res;
 
       //百万工时损工率
       var p2 = document.getElementById('manHourBox');
       const datas_2 = manHourData[manHourNum-1];
-      var res = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_2.value + '</span><span class="topMsg_number_2">%</span><p class="topMsg_number_p">'+datas_2.name+'</p></div>';
-      p2.innerHTML = res;
+      var res2 = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_2.value + '</span><span class="topMsg_number_2">%</span><p class="topMsg_number_p">'+datas_2.name+'</p></div>';
+      p2.innerHTML = res2;
 
       const num_ = plannedCompletionNum+1 >= plannedCompletionData.length ? 1 : plannedCompletionNum+1;
       const num_2 = manHourNum+1 >= manHourData.length ? 1 : manHourNum+1;
@@ -273,7 +273,9 @@ class Home extends Component {
             </div>
           </div>
           <div className="bottom_box">
-
+              <p style={{color:"#6a818d"}}>
+                更新时间:2023-10-18
+              </p>
           </div>
 
         </div>

src/utils/request.js

@@ -41,12 +41,12 @@ instance.interceptors.response.use(
     if (+response.data.resultCode === -1) {
       message.destroy();
       // //兼容PC钉钉/微信转跳系统，去除提示token失效
-      // if (window.location.href.indexOf("authCode") == -1 && window.location.href.indexOf("code") == -1) {
-      //   message.error(response.data.resultMsg || "系统异常,请联系管理员处理!", 4).then(() => {
-      //     localStorage.setItem("refUrl", window.location.hash.substr(1));
-      //     window.location.href = `//${window.location.host}/transfer.html#/login`;
-      //   });
-      // }
+      if (window.location.href.indexOf("authCode") == -1 && window.location.href.indexOf("code") == -1) {
+        message.error(response.data.resultMsg || "系统异常,请联系管理员处理!", 4).then(() => {
+          // localStorage.setItem("refUrl", window.location.hash.substr(1));
+          // window.location.href = `//${window.location.host}/transfer.html#/login`;
+        });
+      }
       return Promise.reject();
     } else if (
       (response.headers["content-disposition"] || "").match(/filename/i)
@@ -129,6 +129,21 @@ export default function (option) {
   let relationship = JSON.parse(sessionStorage.getItem("nodeData") || "{}");
   option.headers = option.headers || {};
   option.headers["token"] = localStorage.getItem("token") || sessionStorage.getItem("token");
+
+  //大屏参数 -------start
+  //碳排放
+  const token_1 = '19c3cdb58b80e44f2490b8eba3b7f938';
+
+  instance.defaults.headers.common["sign"] = token_1;
+  instance.defaults.headers.common["account"] = "yunxi_fuxue";
+  instance.defaults.headers.common["apiId"] = "1356250396177503367";
+  instance.defaults.headers.common["Cache-Control"] = "no-cache";
+  instance.defaults.headers.common["appKey"] = "200000134";
+  instance.defaults.headers.common["execType"] = "3";
+  instance.defaults.headers.common["env"] = "PROD";
+
+  //大屏参数 -------end
+
   option.headers["visitId"] = sessionStorage.getItem("unionId");
   option.headers["pageId"] = relationship.pageId;
   option.headers["resourceId"] = sessionStorage.getItem("curNodeId");