Merge branch master into devNew

internals/webpack/css.js

@@ -196,4 +196,4 @@ function css({
 module.exports = {
     createCSSRule,
     css
-}
+}
\ No newline at end of file

package.json

@@ -119,7 +119,7 @@
         "@wisdom-map/util":"1.2.9",
         "@wisdom-utils/components": "0.1.370",
         "@wisdom-utils/runtime": "0.0.51",
-        "@wisdom-utils/utils": "0.1.407",
+        "@wisdom-utils/utils": "0.1.408",
         "animate.css": "^4.1.1",
         "antd": "4.21.2",
         "bcryptjs": "2.4.3",

public/web5Config.json

@@ -6,6 +6,9 @@
     {
       "title": "Water"
     },
+    {
+      "title": "Water2"
+    },
     {
       "title": "信息化"
     },
@@ -26,6 +29,15 @@
     },
     {
       "title": "项目 - 封丘"
+    },
+    {
+      "title": "项目 - 店头"
+    },
+    {
+      "title": "项目 - 长春"
+    },
+    {
+      "title": "项目 - 铁门关"
     }
   ]
-}
+}
\ No newline at end of file

src/api/service/base.js

@@ -22,6 +22,7 @@ export const API = {
   CHANGE_PASSWORD: 'cityinterface/rest/services.svc/changepassword',
   CHANGE_PASSWORD_SAFE: '/PandaOMS/OMS/UserCenter/UpdateUserPassword',
   HD_AUTH_LOGIN: '/PandaCore/GCK/BussinessAuth/HDAuthLogin',
+  AUTH_HDU_SER: '/PandaWater/CityWater/SJZGX/AuthHDUSer',
   IOT_CHANGE_PASSWORD: 'CityInterface/rest/services/OMS.svc/U_UpdatePasswordQuickGCK',
   FILE_DOWNLOAD: '/cityinterface/rest/services/filedownload.svc/download',
   UPDATE_AVATAR: '/CityInterface/rest/services/OMs.svc/U_EditUser',
@@ -89,6 +90,11 @@ const services = {
     method: constants.REQUEST_METHOD_GET,
     type: constants.REQUEST_HTTP,
   },
+  AuthHDUSer: {
+    url: API.AUTH_HDU_SER,
+    method: constants.REQUEST_METHOD_GET,
+    type: constants.REQUEST_HTTP,
+  },
   authorizationToken: {
     url: API.AUTHORIZATION_TOKEN,
     method: constants.REQUEST_METHOD_GET,

src/index.ejs

@@ -9,7 +9,7 @@
     <!-- Allow installing the app to the homescreen -->
     <meta name="mobile-web-app-capable" content="yes" />
     <!-- <link rel="icon" href="/favicon.ico" /> -->
-<!--    <link type="text/css" rel="stylesheet" id="theme-style" href="https://panda-water.cn/civbase/theme/sunset.css">-->
+    <link type="text/css" rel="stylesheet" id="theme-style" href="/civbase/Assets/esri/css/main.css">
     <script src="/civbase/event.js"></script>
     <script crossorigin src="/civbase/isomorphic-fetch.js"></script>
     <script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script>

src/pages/bootpage/template/constants.js

@@ -8,6 +8,7 @@ import Demonstration from './demonstration';
 import PandaBootPage from './panda';
 import IntegrationPage from './integration';
 import IntegrationPage2 from './integration2';
+import TaihuPage from './project/taihu';
 export const guidePage = [
   // type 为true 则需要 功能配置 isPanda 为true
   {
@@ -15,9 +16,13 @@ export const guidePage = [
     value: 'default',
   },
   {
-    label: '集成登录演示',  
+    label: '集成登录演示',
     value: 'integration2',
   },
+  {
+    label: '太湖集成登录',
+    value: 'taihuPage',
+  },
   {
     label: '演示环境(旧版)',
     type: true,
@@ -34,4 +39,5 @@ export const BootPageTemplate = {
   panda: PandaBootPage,
   integration2: IntegrationPage2,
   demonstration: Demonstration,
+  taihuPage: TaihuPage,
 };

src/pages/bootpage/template/integration2/data.json

 {
-    "业务中心": [
-        {
-            "name": "工作台",
-            "label": "",
-            "url": ""
-        },
-        {
-            "name": "应用中心",
-            "url": ""
-        },
-        {
-            "name": "指标中心",
-            "url": ""
-        },
-        {
-            "name": "报表中心",
-            "url": ""
-        }
-    ],
-    "运营中心": [
-        {
-            "name": "综合展示",
-            "label": "",
-            "url": ""
-        },
-        {
-            "name": "原水制水",
-            "url": ""
-        },
-        {
-            "name": "管网输配",
-            "url": ""
-        },
-        {
-            "name": "营销客服",
-            "url": ""
-        }
-    ],
-    "应用系统": [
-        {
-            "name": "生产管理",
-            "label": "",
-            "url": ""
-        },
-        {
-            "name": "供水管网探测",
-            "url": ""
-        },
-        {
-            "name": "管网运营",
-            "url": ""
-        },
-        {
-            "name": "管网调度",
-            "url": ""
-        },
-        {
-            "name": "漏损管控",
-            "url": ""
-        },
-        {
-            "name": "二次供水平台",
-            "url": ""
-        },
-        {
-            "name": "营收系统",
-            "url": ""
-        },
-        {
-            "name": "抄表系统",
-            "url": ""
-        },
-        {
-            "name": "报装系统",
-            "url": ""
-        },
-        {
-            "name": "网上营业厅",
-            "url": ""
-        }
-    ],
-    "支撑平台": [
-        {
-            "name": "公共平台",
-            "url": ""
-        },
-        {
-            "name": "报警平台",
-            "url": ""
-        },
-        {
-            "name": "组态平台",
-            "url": ""
-        },
-        {
-            "name": "GIS发布平台",
-            "url": ""
-        },
-        {
-            "name": "物理网设备管理",
-            "url": ""
-        },
-        {
-            "name": "行业大数据平台",
-            "url": ""
-        }
-    ]
-}
+  "业务中心": [
+    {
+      "name": "工作台",
+      "label": "",
+      "url": ""
+    },
+    {
+      "name": "应用中心",
+      "url": ""
+    },
+    {
+      "name": "指标中心",
+      "url": ""
+    },
+    {
+      "name": "报表中心",
+      "url": ""
+    }
+  ],
+  "运营中心": [
+    {
+      "name": "综合展示",
+      "label": "",
+      "url": ""
+    },
+    {
+      "name": "原水制水",
+      "url": ""
+    },
+    {
+      "name": "管网输配",
+      "url": ""
+    },
+    {
+      "name": "营销客服",
+      "url": ""
+    }
+  ],
+  "应用系统": [
+    {
+      "name": "生产管理",
+      "label": "",
+      "url": ""
+    },
+    {
+      "name": "供水管网探测",
+      "url": ""
+    },
+    {
+      "name": "管网运营",
+      "url": ""
+    },
+    {
+      "name": "管网调度",
+      "url": ""
+    },
+    {
+      "name": "漏损管控",
+      "url": ""
+    },
+    {
+      "name": "二次供水平台",
+      "url": ""
+    },
+    {
+      "name": "营收系统",
+      "url": ""
+    },
+    {
+      "name": "抄表系统",
+      "url": ""
+    },
+    {
+      "name": "报装系统",
+      "url": ""
+    },
+    {
+      "name": "网上营业厅",
+      "url": ""
+    }
+  ],
+  "支撑平台": [
+    {
+      "name": "公共平台",
+      "url": ""
+    },
+    {
+      "name": "报警平台",
+      "url": ""
+    },
+    {
+      "name": "组态平台",
+      "url": ""
+    },
+    {
+      "name": "GIS发布平台",
+      "url": ""
+    },
+    {
+      "name": "物理网设备管理",
+      "url": ""
+    },
+    {
+      "name": "行业大数据平台",
+      "url": ""
+    }
+  ],
+  "标题": "智慧水务综合监控平台"
\ No newline at end of file
+}

src/pages/bootpage/template/integration2/index.js

@@ -71,10 +71,8 @@ const Integration = props => {
       })
       .then(res => {
         if (res.code === 0 && res.data) {
-          const data = JSON.parse(res.data);
-          console.log('🚀 ~ data:', data);
-          setConfigData(data || defaultConfig);
-          // setListData(data?.list || []);
+          const data = JSON.parse(res.data) || defaultConfig;
+          setConfigData(data);
         }
       });
   };
@@ -216,7 +214,9 @@ const Integration = props => {
       >
         <div className={styles.integration_title}>
           <div className={styles.integration_title_left} />
-          <div className={styles.integration_title_text} />
+          <div className={styles.integration_title_text}>
+            <span>{configData?.['标题'] || '智慧水务综合监控平台'}</span>
+          </div>
           <div className={styles.integration_title_right} />
         </div>
         <div className={styles.integration_row} type="业务中心">

src/pages/bootpage/template/integration2/integration.less

-@imgSrc: '@/assets/images/integration/';
+@imgSrc: '@/assets/images/integration2/';
+
+
 
 .integration {
   width: 100%;
@@ -627,6 +629,7 @@
   //支撑平台end
   &_title {
     display: flex;
+    // align-items: center;
 
     &_left {
       width: 372px;
@@ -636,10 +639,21 @@
     }
 
     &_text {
-      width: 820px;
-      height: 97px;
-      background: url('@{imgSrc}/标题.png') center/100% 100% no-repeat;
-
+      flex: none;
+      color: #fff;
+
+      span {
+        line-height: 97px;
+        color: #fff;
+        font-size: 60px;
+        letter-spacing: 4px;
+        font-family: 'PangMenZhengDaoBiaoTiTi';
+        background: linear-gradient(0deg, #56A1EF 0%, #FFFFFF 59%);
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+        position: relative;
+        top: -8px;
+      }
     }
 
     &_right {

src/pages/bootpage/template/project/taihu/data.json

+{
+  "综合管控": [
+    {
+      "name": "统一平台",
+      "english": "Unified Platform",
+      "label": "",
+      "url": ""
+    },
+    {
+      "name": "OA办公",
+      "url": "",
+      "english": "OA Office"
+    },
+    {
+      "name": "仓储系统",
+      "url": "",
+      "english": "Warehouse System"
+    },
+    {
+      "name": "可视化大屏幕",
+      "url": "",
+      "english": "Large visual screen"
+    }
+  ],
+  "智慧生产调度": [
+    {
+      "name": "生产调度",
+      "label": "",
+      "url": ""
+    },
+    {
+      "name": "科学调度",
+      "url": ""
+    },
+    {
+      "name": "二次供水",
+      "url": ""
+    },
+    {
+      "name": "应急指挥",
+      "url": ""
+    },
+    {
+      "name": "农饮水监测",
+      "url": ""
+    },
+    {
+      "name": "水力模型",
+      "url": ""
+    },
+    {
+      "name": "设备管理",
+      "url": ""
+    }
+  ],
+  "智慧管网管理": [
+    {
+      "name": "管网GIS",
+      "label": "",
+      "url": ""
+    },
+    {
+      "name": "GIS数据维护",
+      "url": ""
+    },
+    {
+      "name": "管网巡检",
+      "url": ""
+    }
+  ],
+  "智慧漏损控制": [
+    {
+      "name": "漏损控制",
+      "label": "",
+      "url": "",
+      "english": "Leakage control"
+    }
+  ],
+  "数据支撑": [
+    {
+      "name": "物联网平台",
+      "url": ""
+    },
+    {
+      "name": "数据统一管理",
+      "url": ""
+    },
+    {
+      "name": "GIS发布平台",
+      "url": ""
+    }
+  ],
+  "业务支撑": [
+    {
+      "name": "BMP流程引擎",
+      "url": ""
+    },
+    {
+      "name": "可视化工具",
+      "url": ""
+    },
+    {
+      "name": "低代码工具",
+      "url": ""
+    },
+    {
+      "name": "报表工具",
+      "url": ""
+    }
+  ],
+  "标题": "安徽太湖县智慧水务管控平台"
+}

src/pages/user/login/index.js

@@ -2,7 +2,7 @@
  * @Author: 634665781 634665781@qq.com
  * @Date: 2022-07-08 14:28:01
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-27 18:35:51
+ * @LastEditTime: 2024-07-20 20:07:23
  * @FilePath: \CivWeb\src\pages\user\login\index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -23,6 +23,7 @@ import DarkNoEffect from './template/noEffect/DarkNoEffect';
 import CloudLogin from './template/cloud';
 import CloudNewLogin from './template/cloudNew';
 import WaterLogin from './template/water';
+import WaterLogin2 from './template/water/water.js';
 import JSZHLogin from './template/project/JSZH';
 import ChengmaiLogin from './template/project/chengmai';
 import HuhehaoteLogin from './template/project/huhehaote';
@@ -52,6 +53,9 @@ import ChinaShuiwu from './template/project/chinaShuiwu';
 import current from './template/current/index';
 import Linyou from './template/project/linyou';
 import FengqiuLogin from './template/project/fengqiu';
+import DiantouLogin from './template/project/diantou';
+import ChangchunLogin from './template/project/changchun';
+import TiemenguanLogin from './template/project/tiemenguan';
 import { AppInitState } from '../../../render';
 const LoginTemplate = {
   '新春.html': baseLoginNewYear,
@@ -71,6 +75,7 @@ const LoginTemplate = {
   '广州登录页.html': EnergGzV2,
   'DarkNoEffect.html': DarkNoEffect,
   'Water.html': WaterLogin,
+  'Water2.html': WaterLogin2,
   '项目 - 江水置换.html': JSZHLogin,
   '节水主题二.html': EnergJS2,
   '项目 - 澄迈.html': ChengmaiLogin,
@@ -101,6 +106,9 @@ const LoginTemplate = {
   '项目 - 中国水务.html': ChinaShuiwu,
   '项目 - 麟游.html': Linyou,
   '项目 - 封丘.html': FengqiuLogin,
+  '项目 - 店头.html': DiantouLogin,
+  '项目 - 长春.html': ChangchunLogin,
+  '项目 - 铁门关.html': TiemenguanLogin,
   default: BaseLogin,
 };
 /* eslint-disable */

src/pages/user/login/login.js

@@ -40,8 +40,13 @@ class Login {
         return a.split('=')[0] == 'uniwater_utoken';
       });
     this.uniwater_utoken = paramsFind?.split('=')[1] ?? '';
-
-    if (this.uniwater_utoken) {
+    // 单页面免登重定向地址
+    const redirect =
+      params &&
+      params.find(function(a) {
+        return a.split('=')[0] === 'redirect';
+      });
+    if (this.uniwater_utoken && !redirect) {
       this.getTokenForThird();
     }
 
@@ -56,6 +61,13 @@ class Login {
     }
   }
 
+  // 第三方单页面免登
+  getTokenThirdLogin(tk) {
+    const self = this;
+    self.globalConfig.token = tk;
+    self.updateConfig && self.updateConfig(self.globalConfig);
+  }
+
   // 单点登录接口_xule_20231214
   getTokenForThird() {
     const self = this;

src/pages/user/login/noSecret.js

@@ -36,7 +36,13 @@ const Login = forwardRef((props, _ref) => {
   });
   // 需要在 GetGateWay 和 GetConfig 之后再执行登录。避免信息错落乱
   const hasLogin = useRef();
-  useEffect(() => {
+  const getAuthDataInfo = async () => {
+    const value = params.getParams('uniwater_utoken');
+    const hdtoken = value && value !== 'undefined' ? value : null;
+    const authRes = hdtoken ? await appService.AuthHDUSer({ token: hdtoken, ignoreSite: true }) : '';
+    return authRes?.data || '';
+  };
+  useEffect(async () => {
     action.globalConfig = props.global;
     // eslint-disable-next-line no-prototype-builtins
     if (
@@ -47,11 +53,12 @@ const Login = forwardRef((props, _ref) => {
     ) {
       hasLogin.current = true;
       window.hasLogin = true;
+      const authData = !token ? await getAuthDataInfo() : '';
       const isGZproject = window.globalConfig.subtitle === '广州节约用水管理系统';
       if (window.globalConfig && window.globalConfig.hasGateWay && !isGZproject) {
         appService
           .authorizationToken({
-            loginName: token,
+            loginName: token || authData,
             type: 'token',
             generateType: params.getParams('generateType') || '',
           })
@@ -78,6 +85,7 @@ const Login = forwardRef((props, _ref) => {
             action.transformLoginHander(res, false);
           });
       } else {
+        if (authData) action.getTokenThirdLogin(authData);
         action.init(site);
       }
     }