详情

gassafety-web/src/utils/gaodeMap.js

@@ -207,6 +207,22 @@ class gaodeMap {
         editWindow.form.longitude = e.lnglat.lng;
         editWindow.form.latitude = e.lnglat.lat;
       });
+    }else{
+      marker.on("mouseover",function(){
+        marker.setLabel({
+            offset: new AMap.Pixel(0, -10),  //设置文本标注偏移量
+            content: "<div class='info'>"+data.deviceName+"</div>", //设置文本标注内容
+            direction: 'top' //设置文本标注方位
+        });
+
+      });
+      marker.on("mouseout",function(){
+        marker.setLabel({
+          content: null
+      });
+
+      });
+     
     }
 
     this.markers.push(marker);

gassafety-web/src/views/workOrder/basicsInfo/detail.vue

@@ -60,14 +60,14 @@
               </el-form-item>
               <el-form-item label="设备名称:" prop="deviceName">
                 <font v-if="form.orderType != 1">{{form.deviceName}}</font>
-                <font
+                <el-tree
                   :data="deviceOptions"
                   :props="defaultProps"
                   :expand-on-click-node="false"
                   ref="tree"
                   @node-click="handleNodeClick"
                   v-if="form.orderType == 1"
-                /></font>
+                />
               </el-form-item>
               <el-form-item label="设备位置:" v-if="form.orderType != 1">
                 <font>{{form.address}}</font>
@@ -123,29 +123,37 @@
                         <span v-if="activity.deviceType == 4">压力表</span>
                       </p>
                       <p>设备名称：{{activity.deviceName}}</p>
-                      <p></p>
+                      <p>是否有隐患：
+                        <span v-if="activity.ishiddenDanger == 1">是</span>
+                        <span v-if="activity.ishiddenDanger == 2">否</span>
+                      </p>
+                      <div style="width: 600px;">
+                        <p>反馈信息：
+                          <span>{{activity.contents}}</span>
+                        </p>
+                      </div>
                     </div>
                     <div style="float: left;margin-left: 50px; width: 250px;">
                       <p v-if="activity.dealStatus == 3">是否解决：未解决</p>
                       <p v-if="activity.dealStatus != 3">是否解决：已解决</p>
                       <p>反馈时间：{{activity.feedbackTime}}</p>
-                    </div>
-                  </div>
-                  <div style="width: 600px;">
-                    <p style="margin-left: 50px;">反馈信息：
-                      <span>{{activity.contents}}</span>
+                      <p>处理状态：
+                        <span v-if="activity.dealStatus == 1">不需要处理</span>
+                        <span v-if="activity.dealStatus == 2">已处理完成</span>
+                        <span v-if="activity.dealStatus == 3">未处理完成</span>
                       </p>
                     </div>
                   </div>
+                </div>
                   <div class="feedbackTime-div">
                     <div class="feedbackTime">
-                      <el-image :src="activity.pictureUrl1" :preview-src-list="[activity.pictureUrl1]" v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 70px;"></el-image>
+                      <el-image :src="activity.pictureUrl1" :preview-src-list="[activity.pictureUrl1]" v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 90px;"></el-image>
                     </div>
                     <div class="feedbackTime">
-                      <el-image :src="activity.pictureUrl2" :preview-src-list="[activity.pictureUrl2]"  v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 70px;"></el-image>
+                      <el-image :src="activity.pictureUrl2" :preview-src-list="[activity.pictureUrl2]"  v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 9s0px;"></el-image>
                     </div>
                     <div class="feedbackTime">
-                      <el-image :src="activity.pictureUrl3" :preview-src-list="[activity.pictureUrl3]"  v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 70px;"></el-image>
+                      <el-image :src="activity.pictureUrl3" :preview-src-list="[activity.pictureUrl3]"  v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 90px;"></el-image>
                     </div>
                   </div>
                 </el-card>
@@ -417,10 +425,11 @@ export default {
       float: left;margin-left: 150px;margin-top: 10px;
     }
     .feedbackTime{
-      height: 100px;
-      width: 100px;
+      height: 120px;
+      width: 120px;
       float: left;
       margin-left: 15px;
+      margin-top: 5px;
       margin-bottom: 15px;
       display: flex;
       justify-content: center;
@@ -435,6 +444,9 @@ export default {
     .detail .el-form-item{
         margin-bottom: 0px;
     }
+    .el-tree{
+      margin-top: 5px;
+    }
     .avatar-uploader{
         width: 25%;
         float: left;