limeng 2 年之前
父节点
当前提交
18f375987d
共有 4 个文件被更改,包括 51 次插入31 次删除
  1. 9 0
      src/api/resources.js
  2. 1 1
      src/assets/styles/base.scss
  3. 5 9
      src/views/resources.vue
  4. 36 21
      src/views/resourcesdialog.vue

+ 9 - 0
src/api/resources.js

@@ -25,3 +25,12 @@ export function selectResourcesByLabel(label) {
     data:{"label":label}
   })
 }
+
+// 获取根据主键查询相应资源
+export function selectResourcesByIdLabel(id,label) {
+  return request({
+    url: '/center-traffic/traffic/selectResourcesByIdLabel',
+    method: 'post',
+    data:{"id":id,"label":label}
+  })
+}

+ 1 - 1
src/assets/styles/base.scss

@@ -555,7 +555,7 @@ div::-webkit-scrollbar {
 //弹层样式
 .diaWidth {
   width: 522px !important;
-  height: 766px !important;
+  height: 826px !important;
 }
 
 //弹层样式

+ 5 - 9
src/views/resources.vue

@@ -35,8 +35,7 @@
       </supermap>
       <vBottomMenu ref="bottomMenu"></vBottomMenu>
     </div>
-    <resourcesdialog ref="resourcesdialog"
-                        @getResource="getResource"></resourcesdialog>
+    <resourcesdialog ref="resourcesdialog"></resourcesdialog>
     <eventLocation ref="eventLocation"></eventLocation>
     <TVWall ref="TVWall"></TVWall>
     <el-dialog :title="cameraTitle" :visible.sync="cameraVisible" v-if="cameraVisible" customClass="videoCustomWidth"
@@ -119,6 +118,7 @@ export default {
     },
     //点击左侧某资源,将该资源进行落点
     selectResourcesByLabel(label){
+      console.log(label)
       let that = this;
       //每次点击,先将原有点位清空后重新落点
       this.markersList = [];
@@ -130,13 +130,9 @@ export default {
         this.initMarkers(this.resourcesList);
       })
     },
-    showResourcesDialog(id) {
-      console.log(id)
+    showResourcesDialog(param) {
       //资源信息弹出
-      this.$refs.resourcesdialog.showResourcesDialog(id);
-    },
-    getResource(){
-
+      this.$refs.resourcesdialog.showResourcesDialog(param);
     },
     initMarkers(list){
       if (list != null && list.length > 0) {
@@ -156,7 +152,7 @@ export default {
           }
           //根据标签确定资源的图标
           markersMap.icon = 'traffic-resources-' + this.resourcesList[i].label;
-          markersMap.parameter = this.resourcesList[i].id;
+          markersMap.parameter = this.resourcesList[i].id + "," + this.resourcesList[i].label;
           markersMap.click = 'showResourcesDialog';
           markersMap.lng = list[i].longitude;
           markersMap.lat = list[i].latitude;

+ 36 - 21
src/views/resourcesdialog.vue

@@ -12,31 +12,31 @@
         <div class="dia-event-info">
           <el-form>
             <el-form-item label="名称">
-              <el-input v-model="name" placeholder="未查询到数据"/>
+              <el-input v-model="name" readonly placeholder="未查询到数据"/>
             </el-form-item>
             <el-form-item label="用途" v-if="label=='warning_sign'">
-              <el-input v-model="effect" placeholder="未查询到数据"/>
+              <el-input v-model="effect" readonly placeholder="未查询到数据"/>
             </el-form-item>
             <el-form-item label="设置时间" v-if="label=='warning_sign'">
-              <el-input v-model="setTime" placeholder="未查询到数据"/>
+              <el-input v-model="setTime" readonly placeholder="未查询到数据"/>
             </el-form-item>
-            <el-form-item label="竣工日期" v-if="label=='bridge'||label=='culvert'">
-              <el-input v-model="completionDate" placeholder="未查询到数据"/>
+            <el-form-item label="竣工日期" v-if="label!='warning_sign'">
+              <el-input v-model="completionDate" readonly placeholder="未查询到数据"/>
             </el-form-item>
-            <el-form-item label="养护单位" v-if="label=='bridge'||label=='culvert'">
-              <el-input v-model="maintenanceUnit" placeholder="未查询到数据"/>
+            <el-form-item label="养护单位" v-if="label!='warning_sign'">
+              <el-input v-model="maintenanceUnit" readonly placeholder="未查询到数据"/>
             </el-form-item>
-            <el-form-item label="联系电话" v-if="label=='bridge'||label=='culvert'">
-              <el-input v-model="mainTel" placeholder="未查询到数据"/>
+            <el-form-item label="联系电话" v-if="label!='warning_sign'">
+              <el-input v-model="mainTel" readonly placeholder="未查询到数据"/>
             </el-form-item>
-            <el-form-item label="管理单位" v-if="label=='bridge'||label=='culvert'">
-              <el-input v-model="managementUnit" placeholder="未查询到数据"/>
+            <el-form-item label="管理单位" v-if="label!='warning_sign'">
+              <el-input v-model="managementUnit" readonly placeholder="未查询到数据"/>
             </el-form-item>
-            <el-form-item label="联系电话" v-if="label=='bridge'||label=='culvert'">
-              <el-input v-model="manaTel" placeholder="未查询到数据"/>
+            <el-form-item label="联系电话" v-if="label!='warning_sign'">
+              <el-input v-model="manaTel" readonly placeholder="未查询到数据"/>
             </el-form-item>
             <el-form-item label="备注">
-              <el-input v-model="remark" placeholder="未查询到数据" type="textarea"/>
+              <el-input v-model="remark" readonly placeholder="未查询到数据" type="textarea"/>
             </el-form-item>
           </el-form>
         </div>
@@ -46,7 +46,9 @@
 </template>
 
 <script>
-
+import {
+  selectResourcesByIdLabel
+} from '@/api/resources'
 export default {
   dicts: ['task_source'],
   watch: {},
@@ -54,7 +56,7 @@ export default {
   data() {
     return {
       id: null,
-      label: 'warning_sign',
+      label: null,
       eventDialog: false,
       name:"",
       effect:"",
@@ -73,14 +75,27 @@ export default {
       console.log('关闭事件弹窗')
       this.eventLogList = []
     },
-    showResourcesDialog(id) {
-      this.id = id
-      let that = this
+    showResourcesDialog(param) {
+      this.id = param.split(",")[0];
+      this.label = param.split(",")[1];
+      selectResourcesByIdLabel(this.id,this.label).then(res => {
+        console.log(this.label)
+        this.name = res.data.name;
+        if(this.label == 'warning_sign'){
+          this.effect = res.data.effect;
+          this.setTime = res.data.setTime;
+        }else{
+          this.completionDate = res.data.completionDate;
+          this.maintenanceUnit = res.data.maintenanceUnit;
+          this.mainTel = res.data.mainTel;
+          this.managementUnit = res.data.managementUnit;
+          this.manaTel = res.data.manaTel;
+        }
+        this.remark = res.data.remark;
+      })
       //获取事件详情
       this.eventDialog = true
-      console.log(this.id)
     }
-
   }
 }
 </script>