Merge remote-tracking branch 'origin/master'

@@ -50,7 +50,8 @@
                     async:false, 
                     data:{username:'案件查处',password:'123'},
                     success:(res) => {
-                        window.open(`http://10.6.144.88:10001/frontweb/index.jsp?type=${label}`)
+                        // window.open(`http://10.6.144.88:10001/frontweb/index.jsp?type=${label}`)
+                        window.open(`http://192.168.5.143:80/frontweb/index.jsp?type=${label}`)
                     },
                     fail: () => {
 

@@ -34,7 +34,7 @@
         </div>
         
         <div style="margin-top: 16px;"> 
-            <auxiliaryReview @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></auxiliaryReview>
+            <auxiliaryReview @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx' @EAddProject='EAddProject'></auxiliaryReview>
         </div>
     </div>
 </template>
@@ -84,6 +84,10 @@
             EGzfx() {
                 this.$emit('EGzfx');
             },
+            // 新增项目
+            EAddProject() {
+                this.$emit('EAddProject');
+            },
         }
     }
 </script>

@@ -6,6 +6,6 @@
  */
 export default {
     url: '',
-    loginUrl: 'http://10.6.144.88:10001/orup',
+    loginUrl: 'http://192.168.5.143:80/orup',
     mapToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJhMzMwMjAwZS1lODRmLTRhNzQtODBkOS01YjZkM2ZkYzRmOGMiLCJpZCI6MzE3MzEsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1OTU5MDA0Njd9.K5Rnvdzv5vDjlEbBH-2vEPMJYPgBDs__uvQHZz6jXTc'
 }
\ No newline at end of file

@@ -54,7 +54,7 @@
             <bottomNav></bottomNav>
         </div>
         <div class="leftAssert">
-            <leftAssert @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></leftAssert>
+            <leftAssert @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx' @EAddProject='EAddProject'></leftAssert>
         </div>
         <!-- <div class="mapPop">
             <mapPop></mapPop>
@@ -87,6 +87,11 @@
             <kgAnalusis @closePop='closePop'></kgAnalusis>
         </div>
 
+        <div class="add-project-msg" v-if='addProjectMsg'>
+            <addProjectMsg @closeAddProjectMsg='EcloseAddProjectMsg'></addProjectMsg>
+        </div>
+
+
         <div id="cesiumContainer">
             <div id="vertical-slider" style="display: none;"></div>
             <div id="horizontal-slider" style="display: none;"></div>
@@ -142,7 +147,10 @@
     import tjxAnslysis from '../components/tjxAnslysis'; // 天际线分析
     import yyAnslysis from '../components/yyAnslysis'; // 阴影分析
     import kgAnalusis from '../components/kgAnalusis'; // 控高分析
-    import visualField from '../components/visualField' //可视域分析
+    import visualField from '../components/visualField'; //可视域分析
+    import addProjectMsg from '../components/addProjectMsg'; // 建设项目信息表 
+
+
     import URL_CONFIG from "./../config/urlConfig.vue";
     const Cesium = window.Cesium;
     
@@ -163,6 +171,8 @@
             tjxAnslysis,
             yyAnslysis,
             kgAnalusis,
+
+            addProjectMsg,
         },
         data() {
             return {
@@ -191,7 +201,9 @@
                 keepArr: ['isReturn', 'enlarge', 'narrow', 'coordinate', 'distance',
                     'area', 'marker', 'rollerShutter', 'splitScreen', 'toNorth', 
                     'topSee', 'roundSee', 'horizon', 'allSee', 'ymAnslysis', 
-                    'tjxAnslysis', 'yyAnslysis', 'visualField', 'kgAnalusis']
+                    'tjxAnslysis', 'yyAnslysis', 'visualField', 'kgAnalusis'],
+
+                addProjectMsg: false, // 建设项目信息表
             }
         },
         mounted() {
@@ -392,6 +404,9 @@
             closePop(val) {
                 this[val] = false;
             },
+            EcloseAddProjectMsg() {
+                this.addProjectMsg = false;
+            },
             onlySelect(val) {
                 this.keepArr.forEach(ele => {
                     if(val == ele) {
@@ -412,6 +427,10 @@
             // 光照分析
             EGzfx() {
             },
+            // 打开新增项目列表
+            EAddProject() {
+                this.addProjectMsg = true;
+            }
         }
     }
 </script>
@@ -572,6 +591,14 @@
         top: 416px;
     }
 
+    .add-project-msg {
+        position: absolute;
+        z-index: 1000;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+    }
+
     .tjx-anslysis {
         top: 265px;
     }