From bfb1606a202ecfb1523c1ac13ee5ae78dbf14528 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sun, 25 Apr 2021 14:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
public/map/popup/html/SupervisoryMapYdata.html | 188 ++++++++++++++++-------------------------------
1 files changed, 64 insertions(+), 124 deletions(-)
diff --git a/public/map/popup/html/SupervisoryMapYdata.html b/public/map/popup/html/SupervisoryMapYdata.html
index 9f40e6d..9c7d171 100644
--- a/public/map/popup/html/SupervisoryMapYdata.html
+++ b/public/map/popup/html/SupervisoryMapYdata.html
@@ -134,6 +134,8 @@
width: 70%;
color: #5d5d5d;
font-size: 12px;
+ position: relative;
+ left: -10px;
}
@@ -148,6 +150,7 @@
height: 260px;
overflow: auto;
}
+
.el-tabs__active-bar {
@@ -167,100 +170,40 @@
<!-- <div class="aaa bbb">13223456745</div> -->
<input type="text" id="sidIput" ref="sidIput" style="display:none">
<div class="flare-liu-top" style="background-image: linear-gradient(to right, #F35B5B , #F35B5B">
- <div class="f-l-t-heard">{{datas.place}}</div>
+ <div class="f-l-t-heard">{{datas.tenant_name}}</div>
<div class="f-l-t-right">
- <div class="f-l-t-r-number">名称：{{datas.deviceNumber}}</div>
- <div class="f-l-t-r-time">接警时间：{{datas.jjTime}}</div>
+ <div class="f-l-t-r-number">级别：{{datas.dj}}</div>
+ <div class="f-l-t-r-time">建立时间：{{datas.create_time}}</div>
</div>
</div>
<div class="flare-liu-body">
<el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="警情信息" name="first">
+ <el-tab-pane label="业主信息" name="first">
<div class="r-b-top">
- <div class="r-b-t-main-once">
- <span class="r-b-t-left">ID：</span>
- <span class="r-b-t-right">{{ datas.alarmPeople }}</span>
- </div>
- <div class="r-b-t-main-once">
- <span class="r-b-t-left">地址：</span>
- <span class="r-b-t-right">{{ datas.galarmPeople }}</span>
- </div>
- <div class="r-b-t-main-once">
- <span class="r-b-t-left">类型：</span>
- <span class="r-b-t-right">{{ datas.galarmPeople }}</span>
- </div>
- <div class="r-b-t-main-once">
- <span class="r-b-t-left">域名：</span>
- <span class="r-b-t-right">{{ datas.galarmPeople }}</span>
- </div>
- <!-- <div class="r-b-t-main-once">
- <span class="r-b-t-left">使用方：</span>
- <span class="r-b-t-right">？？</span>
- </div> -->
- <!-- <div class="r-b-t-main">
- <div class="rbt-l">
- <span class="r-b-t-left">警情内容：</span>
- <span class="r-b-t-right">{{ datas.content }} </span>
- </div>
- <div class="rbt-r">
- <span class="r-b-t-left">警情类型：</span>
- <span class="r-b-t-right">{{datas.waringType}}</span>
- </div>
- </div> -->
<div class="r-b-t-main">
<div class="rbt-l">
<span class="r-b-t-left">联系人：</span>
- <span class="r-b-t-right">{{ datas.oneContacts }} </span>
+ <span class="r-b-t-right">{{ datas.linkman }} </span>
</div>
<div class="rbt-r">
- <span class="r-b-t-left">联系电话：</span>
- <span class="r-b-t-right">{{datas.onePhone}}</span>
+ <span class="r-b-t-left">电话：</span>
+ <span class="r-b-t-right">{{datas.contact_number}}</span>
</div>
</div>
- <!-- <div class="r-b-t-main">
- <div class="rbt-l">
- <span class="r-b-t-left">二级负责人：</span>
- <span class="r-b-t-right">{{ datas.twoContacts }} </span>
- </div>
- <div class="rbt-r">
- <span class="r-b-t-left">call：</span>
- <span class="r-b-t-right">{{datas.twoPhone}}</span>
- </div>
+ <div class="r-b-t-main-once">
+ <span class="r-b-t-left">地址：</span>
+ <span class="r-b-t-right">{{ datas.address }}</span>
</div>
- <div class="r-b-t-main">
- <div class="rbt-l">
- <span class="r-b-t-left">三级负责人：</span>
- <span class="r-b-t-right">{{ datas.threeContacts }} </span>
- </div>
- <div class="rbt-r">
- <span class="r-b-t-left">call：</span>
- <span class="r-b-t-right">{{datas.threePhone}}</span>
- </div>
- </div> -->
+ <div class="r-b-t-main-once">
+ <span class="r-b-t-left">业主简介：</span>
+ <span class="r-b-t-right">{{ datas.content }}</span>
+ <!-- <span class="r-b-t-right introduce"></span> -->
+ </div>
+
</div>
</el-tab-pane>
- <!-- <el-tab-pane label="现场图片" name="second">
- <el-card class="scene-image-box">
- <el-image v-for="(item, index) in imgSrc" :key="index" :src="item" :preview-src-list="srcList"
- v-show="imgSrc.length > 0"></el-image>
- <span v-show="imgSrc.length == 0">暂无现场图片</span>
- </el-card> -->
-
- <!-- <el-card class="scene-image-box">
- <el-image v-for="url in imgSrc" :key="url" :src="url" :preview-src-list="srcList" v-show="imgSrc.length"></el-image> -->
- <!--<el-image v-for="url in imgSrc" :key="url" :src="url" v-show="imgSrc.length"></el-image>
- <span v-show="imgSrc.length == 0">暂无现场图片</span>
- </el-card>
-
-
- </el-tab-pane> -->
- <!-- <el-tab-pane label="现场视频" name="third">
- <el-card>
- <video :src="feedbackVideo" style="width: 100%; height: 100%; object-fit: fill" controls
- v-show="feedbackVideo != ''"></video>
- <span v-show="feedbackVideo == ''">暂无现场视频</span>
- </el-card>
- </el-tab-pane> -->
+
+ <!-- <el-tab-pane label="现场视频" name="third"><el-card></el-card></el-tab-pane> -->
</el-tabs>
</div>
</div>
@@ -275,59 +218,56 @@
data: {
datas: {},
activeName: 'first',
- imgSrc: [],
- srcList: [],
- feedbackVideo: "",
- // aaa: "",
- // address: "南昌市东湖区永外正街17号",
- // addvcd: "",
- // city: "",
- // coordinate: "POINT(0 0)",
- // createtime: "2021-03-17 10:06:23",
- // district: "",
- // dj: "三级甲等",
- // haveJW: "无地图经纬度",
- // id: 10,
- // information: "<em>南昌一附院</em>一般指南昌大学第一附属医院。南昌大学第一附属医院有东湖院区和象湖院区两个院区，其中东湖院区位于江西省南昌市东湖区永外正街17号，始建于1939年，是一所集医疗、教学、科研、预防保健、康养于一体三级甲等综合医院",
- // isDelete: -1,
- // jd: "",
- // phone: "0791-88692748",
- // province: "",
- // type: "医院",
- // wd: "",
- // yname: "南昌大学第一附属医院",
- // ynumber: "CLRK202103171006232744",
+ // account_number: -1,
+ // address: "江西省南昌市永外正街17号南昌大学一附院人事处",
+ // background_url: "",
+ // city: "3601",
+ // contact_number: "0791-88695116",
+ // content: "昌大学第一附属医院是一所集医疗、教学、科研、预防保健、康养于一体三级甲等综合医院，是江西省、南昌市医保定点医院",
+ // create_dept: "1123598813738675201",
+ // create_time: "2021-01-26 15:48:06",
+ // create_user: "1123598821738675201",
+ // ctime: "1939-08-10 00:00:00",
+ // datasource_id: "1161483357481541634",
+ // district: "360113",
+ // dj: " 三级甲等",
+ // domain: "",
+ // ht: " 综合医院",
+ // id: "1353972967828533249",
+ // is_deleted: 0,
+ // jd: "115.91029100000003",
+ // license_key: "77cfee8356bb00cf9917f072f228ee10e7d0f5f15b257a66adc0192ee0ca33034019abaa8f441ed91da8f295f5cc7f1d04dac41a822fe51f5c29cb43ff85b240",
+ // linkman: "赵明明",
+ // province: "36",
+ // status: 1,
+ // tenant_id: "963841",
+ // tenant_name: "南昌大学第一附属医院",
+ // type: "0",
+ // update_time: "2021-04-25 11:17:36",
+ // update_user: "1123598821738675201",
+ // wd: "25.87018472992316",
+
+ // category
+ // attributes
+ // developers
+ // had
+ // housetype
+ // ho
+ // content
+ // id
+ // nature
+ // motto
+ // ctime
+ // content
+ // hn
},
methods: {
getdatas(dat) {
console.log(dat);
+ $('.introduce').append(dat.information)
},
handleClick(tab, event) {//标签tab点击事件
// console.log(tab, event);
- },
- getImgAndVideo() {
- var that = this;
- // console.log(this.datas.id)
- axios({
- method: "post",
- url: "/api/blade-jfpts/feedback/feedback/selectFeedEdit",
- params: {
- jid: this.datas.id,
- },
- }).then((resdata) => {
- var dL = resdata.data.data;
- if (dL.length != 0) {
- if (dL[0].tp.length > 0) {
- // console.log(dL[0].tp);
- that.imgSrc = dL[0].tp;
- that.srcList = dL[0].tp;
- }
- if (dL[0].sp.length > 0) {
- // console.log(dL[0].sp);
- that.feedbackVideo = dL[0].sp[0];
- }
- }
- });
},
},
mounted() {
--
Gitblit v1.9.3