修改了地图相关链接

src/api/config.js

@@ -1,9 +1,9 @@
 // export const REQUEST_URL = 'http://192.168.1.43/wq';
 //接口地址
-export const REQUEST_URL = 'http://192.168.1.65/wq/';
+export const REQUEST_URL = 'http://192.168.1.88/wq/';
 // export const REQUEST_URL = 'http://192.168.1.55:8083';
 //地图地址
-export const webMap_URL = 'http://192.168.1.65/mapGis/';
+export const webMap_URL = 'http://cases-special.shader.com.cn/warehouse-gty/#/core/driving?code=gty-xlyy';
 //模型地址
 export const webGl_URL = 'http://192.168.1.65/webGL/';
 

src/components/directorateDecisionSupport/positioningMonitoring.vue

@@ -41,37 +41,37 @@
             </div>
           </div>
         </div>
-        <div class="right-bottom-max-box">
-          <p class="right-top-title">{{mapInfoData.title}}</p>
-          <p class="address-p">位置：{{mapInfoData.address}}</p>
-          <div class="right-bottom-big-box TabStrip">
-            <div class="right-title-box">
-              <img src="~@/assets/images/xian_1.png">
-              <p>任务详细信息</p>
-              <img src="~@/assets/images/xian_2.png">
-            </div>
-            <div class="text-box">
-              <p>单位名称：</p>
-              <p>{{mapInfoData.unitName}}</p>
-            </div>
-            <div class="text-box">
-              <p>医疗队名称：</p>
-              <p>{{mapInfoData.medicalName}}</p>
-            </div>
-            <div class="text-box">
-              <p>执行任务时间：</p>
-              <p>{{mapInfoData.taskPlayTime}} 至 {{mapInfoData.taskEndTime}}</p>
-            </div>
-            <div class="text-box">
-              <p>执行任务地点：</p>
-              <p>{{mapInfoData.taskAddress}}</p>
-            </div>
-            <div class="text-one-box">
-              <p>备注：</p>
-              <p>{{mapInfoData.text}}</p>
-            </div>
-          </div>
-        </div>
+        <!--<div class="right-bottom-max-box">-->
+          <!--<p class="right-top-title">{{mapInfoData.title}}</p>-->
+          <!--<p class="address-p">位置：{{mapInfoData.address}}</p>-->
+          <!--<div class="right-bottom-big-box TabStrip">-->
+            <!--<div class="right-title-box">-->
+              <!--<img src="~@/assets/images/xian_1.png">-->
+              <!--<p>任务详细信息</p>-->
+              <!--<img src="~@/assets/images/xian_2.png">-->
+            <!--</div>-->
+            <!--<div class="text-box">-->
+              <!--<p>单位名称：</p>-->
+              <!--<p>{{mapInfoData.unitName}}</p>-->
+            <!--</div>-->
+            <!--<div class="text-box">-->
+              <!--<p>医疗队名称：</p>-->
+              <!--<p>{{mapInfoData.medicalName}}</p>-->
+            <!--</div>-->
+            <!--<div class="text-box">-->
+              <!--<p>执行任务时间：</p>-->
+              <!--<p>{{mapInfoData.taskPlayTime}} 至 {{mapInfoData.taskEndTime}}</p>-->
+            <!--</div>-->
+            <!--<div class="text-box">-->
+              <!--<p>执行任务地点：</p>-->
+              <!--<p>{{mapInfoData.taskAddress}}</p>-->
+            <!--</div>-->
+            <!--<div class="text-one-box">-->
+              <!--<p>备注：</p>-->
+              <!--<p>{{mapInfoData.text}}</p>-->
+            <!--</div>-->
+          <!--</div>-->
+        <!--</div>-->
       </div>
     </div>
     <view-task-details
@@ -93,30 +93,41 @@
     },
     data () {
       return {
-        webMapURL:webMap_URL,
+        // webMapURL:webMap_URL,
+        webMapURL:'http://cases-special.shader.com.cn/warehouse-gty/#/core/driving?code=gty-xlyy',
         //页面状态
         pageType:1,
         // 列表数据
         rightTop:[
           {
             id:"1",
-            name:"新桥医院野战部队紧急拉动任务",
+            name:"高滩岩-陆军军医大学第一附属医院西南医院",
             type:"出发拉动",
+            url:'http://cases-special.shader.com.cn/warehouse-gty/#/core/driving?code=gty-xlyy',
           },
           {
             id:"2",
-            name:"新桥医院野战部队紧急拉动任务",
+            name:"高滩岩-陆军军医大学第二附属医院新桥医院",
             type:"出发拉动",
+            url:'http://cases-special.shader.com.cn/warehouse-gty/#/core/driving?code=gty-xqyy',
           },
           {
             id:"3",
-            name:"新桥医院野战部队紧急拉动任务",
+            name:"高滩岩-陆军特色医学中心-教学训练中心",
             type:"出发拉动",
+            url:'http://cases-special.shader.com.cn/warehouse-gty/#/core/driving?code=gty-jxxl',
           },
           {
             id:"4",
-            name:"新桥医院野战部队紧急拉动任务",
+            name:"高滩岩-陆军第958医院精神心理医学科",
+            type:"出发拉动",
+            url:'http://cases-special.shader.com.cn/warehouse-gty/#/core/driving?code=gty-jsxl',
+          },
+          {
+            id:"5",
+            name:"高滩岩-椒湾村",
             type:"出发拉动",
+            url:'http://cases-special.shader.com.cn/warehouse-gty/#/core/driving?code=gty-jwc',
           },
         ],
         //列表悬浮状态
@@ -148,7 +159,8 @@
       },
       //列表鼠标点击事件
       mouClick(item){
-        this.pageType = 2;
+        // this.pageType = 2;
+        this.$set(this,'webMapURL',item.url);
       },
       //鼠标悬浮事件
       intoOutMou(item){
@@ -200,6 +212,7 @@
           .left-bottom-box-webMapURL
             height:670px;
             width:1000px;
+            border: 1px solid #05BCE9;
           /*background:url("~@/assets/images/demo3.png");*/
           /*background-size 100% 100%*/
       .right-max-box
@@ -221,8 +234,9 @@
             color:$color_ff;
         .right-top-max-box
           width:731px;
-          height:292px;
-          background:url("~@/assets/images/min_back_02.png");
+          height:665px;
+          /*height:292px;*/
+          /*background:url("~@/assets/images/min_back_02.png");*/
           background-size 100% 100%
           overflow hidden
           .right-top-title
@@ -246,7 +260,8 @@
             p:nth-child(3)
               width:215px;
           .right-top-for-max-box
-            height:160px;
+            /*height:160px;*/
+            height:565px;
             margin:0 10px 0 7px;
             overflow-x:hidden;
             overflow-y:scroll;

src/components/directorateDecisionSupport/positioningMonitoringView/history.vue

@@ -90,7 +90,7 @@
             label="历史行驶轨迹"
             width="224">
             <template slot-scope="scope">
-              <p class="button-p cursor_pointer" @click="pageTypeClick">查看</p>
+              <p class="button-p cursor_pointer" @click="pageTypeClick(scope.row)">查看</p>
             </template>
           </el-table-column>
         </el-table>
@@ -105,6 +105,7 @@
       </el-pagination>
     </div>
     <view-historical-driving-trails
+      :propsData="propsData"
       v-if="pageType==2">
     </view-historical-driving-trails>
   </div>
@@ -128,35 +129,38 @@
         tableData:[
           {
             id:"1",
-            name:"第1318紧急拉动",
+            name:"第1315紧急拉动",
             warehouse:"战备拉动",
             supplies:"服务保障中心",
             unit:"野战医院",
-            typeBig:"2021-1-1 10:10",
+            typeBig:"2026-1-1 10:10",
             typeMin:"重庆市************",
-            intoBound:"本次任务内容主要为了本次任务出动主要是...",
+            intoBound:"高滩岩-陆军军医大学第一附属医院西南医院",
             outBound:"1",
+            url:'http://cases-special.shader.com.cn/warehouse-gty/#/core/driving?code=gty-xlyy',
           },
           {
             id:"2",
-            name:"第1318紧急拉动",
+            name:"第1316紧急拉动",
             warehouse:"战备拉动",
             supplies:"服务保障中心",
             unit:"野战医院",
-            typeBig:"2021-1-1 10:10",
+            typeBig:"2026-1-1 10:10",
             typeMin:"重庆市************",
-            intoBound:"本次任务内容主要为了本次任务出动主要是...",
+            intoBound:"高滩岩-陆军军医大学第二附属医院新桥医院",
             outBound:"1",
+            url:'http://cases-special.shader.com.cn/warehouse-gty/#/core/driving?code=gty-xqyy',
           },
           {
             id:"3",
-            name:"第1318紧急拉动",
+            name:"第1317紧急拉动",
             warehouse:"战备拉动",
             supplies:"服务保障中心",
             unit:"野战医院",
-            typeBig:"2021-1-1 10:10",
+            typeBig:"2026-1-1 10:10",
             typeMin:"重庆市************",
-            intoBound:"本次任务内容主要为了本次任务出动主要是...",
+            intoBound:"高滩岩-陆军特色医学中心-教学训练中心",
+            url:'http://cases-special.shader.com.cn/warehouse-gty/#/core/driving?code=gty-jxxl',
             outBound:"1",
           },
           {
@@ -165,9 +169,22 @@
             warehouse:"战备拉动",
             supplies:"服务保障中心",
             unit:"野战医院",
-            typeBig:"2021-1-1 10:10",
+            typeBig:"2026-1-1 10:10",
+            typeMin:"重庆市************",
+            intoBound:"高滩岩-陆军第958医院精神心理医学科",
+            url:'http://cases-special.shader.com.cn/warehouse-gty/#/core/driving?code=gty-jsxl',
+            outBound:"1",
+          },
+          {
+            id:"5",
+            name:"第1319紧急拉动",
+            warehouse:"战备拉动",
+            supplies:"服务保障中心",
+            unit:"野战医院",
+            typeBig:"2026-1-1 10:10",
             typeMin:"重庆市************",
-            intoBound:"本次任务内容主要为了本次任务出动主要是...",
+            intoBound:"高滩岩-椒湾村",
+            url:'http://cases-special.shader.com.cn/warehouse-gty/#/core/driving?code=gty-jwc',
             outBound:"1",
           },
         ],
@@ -188,6 +205,8 @@
             list:["全部","第一医疗队","第二医疗队",]
           },
         ],
+        //子组件传参
+        propsData:{},
       }
     },
 
@@ -198,7 +217,8 @@
 
     },
     methods: {
-      pageTypeClick(){
+      pageTypeClick(item){
+        this.$set(this,'propsData',item);
         this.pageType = 2;
       },
       //下拉菜单进入悬浮状态

src/components/directorateDecisionSupport/positioningMonitoringView/viewHistoricalDrivingTrails.vue

@@ -11,7 +11,10 @@
       <img src="~@/assets/images/xian_2.png">
     </div>
     <div class="map-box">
-
+      <iframe
+        class="left-bottom-box-webMapURL"
+        :src="webMapURL" scrolling="auto" frameborder="0">
+      </iframe>
     </div>
     <!--地图点中展示数据-->
     <div class="right-bottom-max-box">
@@ -51,6 +54,9 @@
 <script>
   export default {
     name: "viewHistoricalDrivingTrails",//查看历史行驶轨迹
+    props:{
+      propsData:{},
+    },
     data () {
       return {
         //地图点中展示数据
@@ -64,6 +70,7 @@
           taskAddress:"重庆市*****************83号",
           text:"****部门近期进行****活动,请务必保证仓库方面随时沟通联系."
         },
+        webMapURL:'',
       }
     },
 
@@ -71,7 +78,18 @@
 
     },
     mounted() {
-
+      console.log('this.propsData',this.propsData)
+      this.$set(this,'webMapURL',this.propsData.url)
+      this.$set(this,'mapInfoData',{
+        title:this.propsData.name,
+        address:this.propsData.typeMin,
+        unitName:this.propsData.supplies,
+        medicalName:this.propsData.unit,
+        taskPlayTime:this.propsData.typeBig,
+        taskEndTime:this.propsData.typeBig,
+        taskAddress:this.propsData.typeMin,
+        text:this.propsData.intoBound
+      });
     },
     methods: {
       // 调用父组件方法退出当前页面
@@ -122,10 +140,14 @@
     .map-box
       height:756px;
       width:1254px;
-      background:url("~@/assets/images/demo3.png");
+      /*background:url("~@/assets/images/demo3.png");*/
       background-size 100% 100%
       margin:0 auto;
       //地图点中展示数据
+      .left-bottom-box-webMapURL
+        height:756px;
+        width:1254px;
+        border: 1px solid #05BCE9;
     .right-bottom-max-box
       height:303px;
       width:450px;

src/components/home/homePage.vue

@@ -589,15 +589,17 @@
       margin:0 26px;
       //ecsium地图
       .max-big-center-top-box
-        height:559px;
-        width:932px;
-        margin:45px 0 15px;
+        height: 561px;
+        width: 934px;
+        margin: 11px 0 15px;
+        border: 1px solid #05BCE9;
         .webMapURL
           height:559px;
           width:932px;
       //  当前任务状态
       .max-big-center-bottom-box
-        height:286px;
+        /*height:286px;*/
+        height:320px;
         width:932px;
         background url("~@/assets/images/min_back_02.png")
         background-size 100% 100%