Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jwtech-h5-page/config.js

jwtech-admin-page/src/assets/styles/common.scss

@@ -14,4 +14,4 @@
   .el-breadcrumb {
     display: none;
   }
-}
+}

jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/editPart.vue

@@ -507,7 +507,7 @@ export default {
             enterpriseType: "9",
           });
         }
-        // console.log(88888888888, this.unitOptions);
+        console.log(88888888888, this.unitOptions);
       });
     },
     unitFormat(row) {

jwtech-admin-page/src/views/loginbg.vue

@@ -123,8 +123,8 @@ export default {
       cookiePassword: "",
       publicKey: "",
       loginForm: {
-        username: "",
+        username: "admin",
-        password: "",
+        password: "Sgcjs@2023",
         rememberMe: false,
         code: "",
         uuid: "",

jwtech-admin-page/src/views/pointPolymerization/index.vue

@@ -2,6 +2,7 @@
   <div id="content">
     <div id="map" ref="map"></div>
     <div id="popup" class="ol-popup" style="background-color: #fff">
+      <span>查看详情</span>
       <div id="popup-closer" class="popup-closer">
         <i class="el-icon-error"></i>
       </div>
@@ -100,8 +101,25 @@ export default {
   mounted() {
     this.initMap();
     this.getProjectInfo();
+    window.addEventListener("click", this.projectNameClick);
   },
+  beforeDestroy() {
+    window.removeEventListener("click", this.projectNameClick);
+  },
+
   methods: {
+    projectNameClick(e) {
+      console.log(e);
+      if (e.target.id == "projectName") {
+        console.log(e.target.dataset.pid[0]);
+        this.$router.push({
+          path:
+            "/building/projectInfo/projectProcess?baseDataId=" +
+            e.target.dataset.pid[0],
+        });
+      }
+      return;
+    },
     /**
      * 初始化一个 openlayers 地图
      */
@@ -718,9 +736,11 @@ export default {
             const contentHtml = `
 
             <div style="display: flex;flex-direction: column;justify-content: center;align-items: flex-start;">
-              <span>项目名：${data.projectName}</span>
+              <span id='projectName' data-pID='${
+                data.id
+              }' style='cursor: pointer;'>项目名：${data.projectName}</span>
               <span>项目编码：${data.proCode}</span>
-              <span>项目类型：${this.projectTypeFormat(data)}</span>
+              <span>项目类型：${this.projectTypeFormat(data) || ""}</span>
 <span>建设性质：${this.constructionNatureFormat(data)}</span>
 
               </div>

jwtech-h5-page/config.js

@@ -1,6 +1,7 @@
 // 应用全局配置
 module.exports = {
-  baseUrl: 'http://localhost:18082/tianhui-admin-web',
+  // baseUrl: 'http://175.178.86.109:18082/tianhui-admin-web',
+  baseUrl: 'http://127.0.0.1:8002/jgThinking/thinking',
   // 应用信息
   appInfo: {
     // 应用名称