地图图标

gassafety-web/src/views/dataMonitoring/realtimeData/realtimedetail.vue

@@ -184,65 +184,7 @@
         });
 
       },
-      //   getMap() {
-      //   var myChart = this.$echarts.init(document.getElementById('map'))
-      //   let option = {
-      //     xAxis: {
-      //       type: 'category',
-      //       // data: this.dataX,
-      //       data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-      //       boundaryGap: false, //控制日期是否在中间显示
-      //       axisLabel: {
-      //         show: true, //是否显示日期
-      //         interval: 0, //强制显示全部 // rotate: 40,//倾斜的角度
-      //         textStyle: {
-      //           color: '#000', //日期的颜色
-      //           fontSize: 12 //字体的大小
-      //         }
-      //       },
-      //       axisLine: {
-      //         lineStyle: {
-      //           color: '#ccc' // x轴的颜色
-      //         }
-      //       }
-      //     },
-      //     yAxis: {
-      //       type: 'value',
-      //       axisLabel: {
-      //         formatter: '{value}',
-      //         textStyle: {
-      //           color: '#000' //数字的颜色
-      //         },
-      //         inside: false //控制数据是否在内侧还是外侧显示
-      //       },
-      //       axisLine: {
-      //         lineStyle: {
-      //           color: '#ccc' // 折线的颜色
-      //         }
-      //       }
-      //     },
-      //     series: [
-      //       {
-      //         // data: this.dataY,
-      //         data: [820, 932, 901, 934, 1290, 1330, 1320],
-      //         type: 'line',
-      //         symbol: 'circle', //是否显示实心的折线圆点
-      //         smooth: true, //让折线有弧度
-      //         symbolSize: 7, //折线圆点的大小
-      //         itemStyle: {
-      //           normal: {
-      //             color: '#efc883', //折线点的颜色
-      //             lineStyle: {
-      //               color: '#efc883' //折线的颜色
-      //             },
-      //             label: { show: true } //是否在折线点上显示数字
-      //           }
-      //         }
-      //       }
-      //     ]
-      //   }
-      //   myChart.setOption(option)
-      // },
+      
       initData(getData1, getData2, getData3) {
         // 基于准备好的dom，初始化echarts实例
         var myChart1 = echarts.init(document.getElementById('main1'));
@@ -568,7 +510,19 @@
           this.dataListdetail2.push(obj2);
           this.dataListdetail3.push(obj3);
           this.form = response.data;
+          this.active = parseInt(response.data.orderStatus) + 1;
+          this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);
+          this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form)
+            console.log("this.form.longitude",this.form.longitude)
+          console.log("this.form", this.form)
 
+          // if (this.form.length > 0) {
+            
+          // }
+          // for (var i = 0; i < this.form.length; i++) {
+          //   let obj = this.form[i];
+          //   this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj)
+          // }
 
           var getData1 = [];
           var getData2 = [];
@@ -600,15 +554,9 @@
 
 
 
-          console.log("this.form.deviceReportDataList", this.form.deviceReportDataList)
-          this.active = parseInt(response.data.orderStatus) + 1;
-          if (this.form.length > 0) {
-            this.gaoMap.resetMapCenter([this.form[0].longitude, this.form[0].latitude]);
-          }
-          for (var i = 0; i < this.form.length; i++) {
-            let obj = this.form[i];
-            this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj)
-          }
+          
+          
+          
 
           if (this.form.orderType == '1') {
             // 获取设备列表树

gassafety-web/src/views/deviceInspection/inspectionPlan/inspectiondetail.vue

@@ -11,14 +11,14 @@
           <div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png" style="width: 25px;" alt=""></div>
         </div>
 
-        <div style="width: 100%;height: 500px;">
+        <div style="width: 100%;height: 440px;">
           <el-divider></el-divider>
           <div style="color: #31EAEA;width: 30%;height: 30px;">
             <ul><li>详细信息</li></ul>
           </div>
           <div >
-            <div style="float: left;width: 50%; ">
-              <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;width: 50%;">
+            <div style="float: left;width: 50%;">
+              <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;width: 50%;margin-bottom: 25px;">
                 <el-form-item label="计划名称:" prop="planName">
                   <font>{{form.planName}}</font>
                 </el-form-item>
@@ -26,7 +26,7 @@
                   <font>{{form.address}}</font>
                 </el-form-item>
                 <el-form-item label="计划描述:" prop="remarks">
-                  <div style="height: 90px;width: 250px; border: 1px solid rgb(187, 183, 183);margin-top: 10px;overflow-y: auto;padding: 5px;border-radius: 5px;">
+                  <div style="height: 90px;width: 700px; border: 1px solid rgb(187, 183, 183);margin-top: 10px;overflow-y: auto;padding: 5px;border-radius: 5px;">
                     <font>{{form.remarks}}</font>
                   </div>
                 </el-form-item>
@@ -35,9 +35,12 @@
                 <el-form-item label="计划执行时间:" prop="startTime">
                   <font>{{form.startTime}}至{{form.endTime}}</font>
                 </el-form-item>
+                <el-form-item label="计划状态:" prop="startTime">
+                  <font>{{form.planStatus}}</font>
+                </el-form-item>
               </el-form>
 
-              <el-table height="175px" :data="form.inspectionDataList" style="width: 800px; margin-left: 50px; margin-top: 20px">
+              <el-table max-height="175px" :data="form.inspectionDataList" style="width: 800px; margin-left: 50px;">
                 <el-table-column label="设备名称" align="center" prop="deviceName" />
                 <el-table-column label="设备编号" align="center" prop="deviceCode" />
                 <el-table-column label="设备类型" align="center" prop="deviceType" />
@@ -59,7 +62,7 @@
               </el-table>
             </div>
 
-            <div id="marbox" style="width: 700px;height: 400px;float: left;margin-top: -35px; border: 1px solid rgb(218, 213, 213);">
+            <div id="marbox" style="width: 700px;height: 400px;float: left;margin-top: -25px; border: 1px solid rgb(218, 213, 213);">
               <div style="width: 100%;height: 100%" id="container"></div>
             </div>
           </div>