Merge branch 'plus1.1.0' of https://git.yfzx.zjtys.com.cn/cold-coffee/cxsfjx_project into plus1.1.0

src/route/navigation.tsx

@@ -5,17 +5,17 @@ const whiteRoutes = ["/login", "/sso"]
 
 export default (router: Router) => {
     router.beforeEach((to, from, next) => {
-        // const token = localStorage.getItem(TOKEN_KEY)
-        // if (whiteRoutes.includes(to.path)) {
-        //     return next()
-        // }
+        const token = localStorage.getItem(TOKEN_KEY)
+        if (whiteRoutes.includes(to.path)) {
+            return next()
+        }
 
-        // if (!token) {
-        //     router.replace(BaseRouteRouter.LOGIN);
-        // } else {
-        //     next()
-        // }
+        if (!token) {
+            router.replace(BaseRouteRouter.LOGIN);
+        } else {
             next()
+        }
+        // next()
     })
     return router
 }
\ No newline at end of file

src/views/dataCenter/industrial/model/BusinessIncome/index.vue

@@ -105,7 +105,7 @@ export default defineComponent({
             color: PieColor[`level_${index + 1}`],
           },
           tooltip: {
-            borderColor: "none",
+            borderColor: "#ffffff",
             className: "business-pie-tooltip",
             formatter: `<div class="business-pie-tooltip">
                 <span class='title'>${item.label}</span>：

src/views/dataCenter/industrial/model/IncomExtendLine/index.vue

@@ -214,7 +214,7 @@ export default defineComponent({
 
       padding: 10px 15px;
       margin-right: 15px;
-          background: rgba(25, 125, 237, 0.2);
+          background: rgba(25, 125, 237, 0.15);
       border-radius: 5px;
       font-size: 14px;
       color: #d4f7ff;

src/views/dataCenter/industrial/model/Industrial/index.vue

@@ -332,7 +332,7 @@ export default defineComponent({
 
       padding: 10px 15px;
       margin-right: 15px;
-      background: rgba(25, 125, 237, 0.2);
+      background: rgba(25, 125, 237, 0.15);
       border-radius: 5px;
       font-size: 14px;
       color: #d4f7ff;

src/views/dataCenter/innovation/model/ScientificInvestment/index.vue

@@ -102,7 +102,7 @@ export default defineComponent({
             color: PieColor[`level_${index + 1}`],
           },
           tooltip: {
-            // borderColor: "none",
+            borderColor: "#fff",
             // extraCssText: "z-index:99999;",
             confine: true,
             className: "business-pie-tooltip",

src/views/dataCenter/map/model/Map/index.vue

@@ -23,7 +23,7 @@ export default defineComponent({
     options() {
       return {
         tooltip: {
-          borderColor: "#333",
+          // borderColor: "#333",
           formatter: function (params) {
             return params.name;
           },

src/views/dataCenter/map/model/Performance/index.vue

@@ -86,6 +86,8 @@ export default defineComponent({
       return {
         tooltip: {
           trigger: "axis",
+
+          // borderColor: "#ffffff",
           axisPointer: {
             type: "shadow",
             shadowStyle: {
@@ -238,7 +240,7 @@ export default defineComponent({
   color: #4191ff;
 }
 .per-formance-echart .color_1::before {
-  background: #4f2d11;
+  background: #23bcf9;
 }
 .per-formance-echart .color_2::before {
   background: #429a9d;

src/views/dataCenter/resourceShare/model/TotalContrac/index.vue

@@ -120,6 +120,8 @@ export default defineComponent({
               color: PieColor[`level_${index + 1}`],
             },
             tooltip: {
+              borderColor: "#fff",
+
               className: "resource-share-tooltip",
               formatter: `<div class="resource-share-tooltip">
                 <span class='title'>${valItem.label}</span>：