|
|
@@ -45,17 +45,16 @@
|
|
|
</el-switch> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-if="infoWindowVisible" class="infohis-window" >
|
|
|
+ <div v-if="infoWindowVisible" class="infohis-window">
|
|
|
<p class="close flex j-s">
|
|
|
<span>历史记录</span>
|
|
|
<span style="color: #c3c3c3;font-size:18px" @click="infoWindowVisible = false"> ×</span>
|
|
|
</p>
|
|
|
- <el-table :data="tableData" border style="width: 100%; overflow: auto;"
|
|
|
- :header-cell-style="{
|
|
|
- background: '#F2F7FC',
|
|
|
- fontWeight: '700',
|
|
|
- color: '#606266',
|
|
|
- }">
|
|
|
+ <el-table :data="tableData" border style="width: 100%; overflow: auto;" :header-cell-style="{
|
|
|
+ background: '#F2F7FC',
|
|
|
+ fontWeight: '700',
|
|
|
+ color: '#606266',
|
|
|
+ }">
|
|
|
<el-table-column prop="userId" label="工号" width="150">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="userName" label="姓名" width="80">
|
|
|
@@ -67,7 +66,7 @@
|
|
|
</el-table>
|
|
|
<div class="bottomFixed">
|
|
|
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageNum"
|
|
|
- :page-sizes="[5,10, 20, 30, 50, 100]" :page-size="pageSize" layout="total, sizes, prev, pager, next"
|
|
|
+ :page-sizes="[5, 10, 20, 30, 50, 100]" :page-size="pageSize" layout="total, sizes, prev, pager, next"
|
|
|
:total="totalSum">
|
|
|
</el-pagination>
|
|
|
</div>
|
|
|
@@ -123,13 +122,16 @@
|
|
|
<div v-show="activeName == 2">
|
|
|
<div style="margin-bottom: 10px;">
|
|
|
<span style="color: #262626;font-weight: 700;font-size: 14px;">时间筛选 </span>
|
|
|
- <el-date-picker size="small" @change="historyDateFun" v-model="historyDate" type="date" placeholder="选择日期" format="yyyy 年 MM 月 dd 日"
|
|
|
- value-format="yyyy-MM-dd">
|
|
|
+ <el-date-picker v-model="historyDate" type="daterange" size="small" @change="historyDateFun"
|
|
|
+ value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
|
|
|
</el-date-picker>
|
|
|
+ <!-- <el-date-picker size="small" @change="historyDateFun" v-model="historyDate" type="date" placeholder="选择日期" format="yyyy 年 MM 月 dd 日"
|
|
|
+ value-format="yyyy-MM-dd">
|
|
|
+ </el-date-picker>-->
|
|
|
</div>
|
|
|
<div class="flex j-s">
|
|
|
<div class="info-title"><i></i>历史在线人数统计</div>
|
|
|
- <div class="info-online"><i></i>在线总人数：{{ onlineHisData }}</div>
|
|
|
+ <div class="info-online"><i></i>使用人数：{{ onlineHisData }}</div>
|
|
|
</div>
|
|
|
<div id="echarts_box" v-show="isCollapse" style="width: 460px;height:300px;"></div>
|
|
|
|
|
|
@@ -168,14 +170,9 @@
|
|
|
{{ scope.row.source == '1' ? '渠道' : '代理' }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="操作">
|
|
|
+ <el-table-column label="操作">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- style="color:#3865E9 "
|
|
|
- @click.native.prevent="historicRecords(scope.row)"
|
|
|
- type="text"
|
|
|
- size="small">
|
|
|
+ <el-button style="color:#3865E9 " @click.native.prevent="historicRecords(scope.row)" type="text" size="small">
|
|
|
历史记录
|
|
|
</el-button>
|
|
|
</template>
|
|
|
@@ -257,13 +254,15 @@ export default {
|
|
|
circle: null,
|
|
|
activeName: '1',
|
|
|
historyDate: '',
|
|
|
- onlineData:'',
|
|
|
- onlineHisData:'',
|
|
|
- radius:'100000',
|
|
|
+ onlineData: '',
|
|
|
+ onlineHisData: '',
|
|
|
+ radius: '100000',
|
|
|
markers: [],
|
|
|
- lineZx:null,
|
|
|
- lineLx:null,
|
|
|
- status:null
|
|
|
+ lineZx: null,
|
|
|
+ lineLx: null,
|
|
|
+ status: null,
|
|
|
+ positionType: null,
|
|
|
+ historyData: []
|
|
|
};
|
|
|
},
|
|
|
mounted() {
|
|
|
@@ -284,90 +283,138 @@ export default {
|
|
|
this.map.destroy();
|
|
|
},
|
|
|
methods: {
|
|
|
- historicRecords(row){
|
|
|
- this.rowId=row.userId
|
|
|
+ historicRecords(row) {
|
|
|
+ this.rowId = row.userId
|
|
|
this.detail()
|
|
|
},
|
|
|
- handHistory(tab, event){
|
|
|
- if(tab.name=='2'){
|
|
|
+ handHistory(tab, event) {
|
|
|
+ if (tab.name == '2') {
|
|
|
this.queryAnalysis();
|
|
|
}
|
|
|
+ else{
|
|
|
+ this.positionType=1
|
|
|
+ this.initMap();
|
|
|
+ }
|
|
|
},
|
|
|
- historyDateFun(val){
|
|
|
- this.queryAnalysis({dates:val});
|
|
|
+ historyDateFun(val) {
|
|
|
+ this.historyData = val
|
|
|
+ this.queryAnalysis({ startTime: val[0], endTime: val[1] });
|
|
|
},
|
|
|
queryAnalysis(param) {
|
|
|
- this.$api.user.ipAddrGetPcAddress(param).then((res) => {
|
|
|
- if (res.code == 200) {
|
|
|
- this.onlineHisData=res.data.onlineNum
|
|
|
- this.formatAnalysisDate(res.data.list)
|
|
|
- }
|
|
|
- else{
|
|
|
+ this.$api.user.ipAddrGetPcAddress({source:this.source ,...param}).then((res) => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ this.onlineHisData = res.data.onlineNum
|
|
|
+ this.formatAnalysisDate(res.data.list)
|
|
|
+ var _this = this;
|
|
|
+
|
|
|
+ _this.map = new AMap.Map("containerMap", {
|
|
|
+ viewMode: "3D", //是否为3D地图模式
|
|
|
+ zoom: 8, //初始化地图级别
|
|
|
+ expandZoomRange: true, //支持可以扩展最大缩放级别
|
|
|
+ center: this.location,
|
|
|
+ resizeEnable: true,
|
|
|
+ mapStyle: "amap://styles/normal" //地图样式，彩色
|
|
|
+ });
|
|
|
+ _this.map.on("complete", () => {
|
|
|
+ //处理后台返回要用到的数据
|
|
|
+ // _this.positionData = res.data.data
|
|
|
+ if (res.data.pcAddressList.length > 0){
|
|
|
+
|
|
|
+ _this.positionType = res.data.pcAddressList[0].type
|
|
|
+ _this.positionData = res.data.pcAddressList.map(item => ({
|
|
|
+ userName: item.userName,
|
|
|
+ id: item.id,
|
|
|
+ userId: item.userId,
|
|
|
+ address: item.address,
|
|
|
+ leaderName: item.leaderName ? item.leaderName : '无',
|
|
|
+ // onlineImg: item.status ? "Frame-1(2).png" : "Frame(2).png",
|
|
|
+ onlineImg: "Frame-1(2).png",
|
|
|
+ operationTime: item.operationTime,
|
|
|
+ source: item.source,
|
|
|
+ status: item.status ? "#1CE247" : "#B2B2B2",
|
|
|
+ // status: item.status ? "在线" : "离线",
|
|
|
+ positionArr: [item.longitude, item.latitude]
|
|
|
+ }));
|
|
|
+ _this.mapPoint();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ // if (location.href.indexOf("&guide=1") !== -1) {
|
|
|
+ // _this.map.setStatus({ scrollWheel: fal0e });
|
|
|
+ // }
|
|
|
+ }
|
|
|
+ else {
|
|
|
this.$message.error(res.msg)
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
formatAnalysisDate(data) {
|
|
|
const dateList = data.map(function (item) {
|
|
|
- return item.time.split(" ")[1]+':00'
|
|
|
+ return item.time.split(" ")[1] ? item.time.split(" ")[1] + ':00' : item.time.split(" ")[0]
|
|
|
});
|
|
|
const valueList = data.map(function (item) {
|
|
|
return item.countNum;
|
|
|
});
|
|
|
|
|
|
let option = {
|
|
|
- visualMap: {
|
|
|
- show: false,
|
|
|
- type: 'continuous',
|
|
|
- seriesIndex: 0,
|
|
|
- min: 0,
|
|
|
- max: 400
|
|
|
- },
|
|
|
-
|
|
|
+ visualMap: {
|
|
|
+ show: false,
|
|
|
+ type: 'continuous',
|
|
|
+ seriesIndex: 0,
|
|
|
+ min: 0,
|
|
|
+ max: 400
|
|
|
+ },
|
|
|
+
|
|
|
tooltip: {
|
|
|
trigger: 'axis'
|
|
|
},
|
|
|
- xAxis:{
|
|
|
- data: dateList,
|
|
|
- axisLine: {
|
|
|
- lineStyle: {
|
|
|
- color: "#86909C ",
|
|
|
- }
|
|
|
+ xAxis: {
|
|
|
+ data: dateList,
|
|
|
+ axisLine: {
|
|
|
+ lineStyle: {
|
|
|
+ color: "#86909C ",
|
|
|
}
|
|
|
- },
|
|
|
+ }
|
|
|
+ },
|
|
|
yAxis: {
|
|
|
name: "人数", //命名
|
|
|
axisLine: {
|
|
|
- lineStyle: {
|
|
|
- color: "#86909C ",
|
|
|
- }
|
|
|
+ lineStyle: {
|
|
|
+ color: "#86909C ",
|
|
|
}
|
|
|
+ }
|
|
|
},
|
|
|
- series: [{
|
|
|
+ series: [{
|
|
|
type: 'line',
|
|
|
showSymbol: false,
|
|
|
data: valueList,
|
|
|
lineStyle: {
|
|
|
color: {
|
|
|
type: 'linear',
|
|
|
- x: 0,
|
|
|
- y: 0,
|
|
|
- x2: 0,
|
|
|
- y2: 1,
|
|
|
- colorStops: [
|
|
|
- {offset: 0, color: '#3865E9'},
|
|
|
- {offset: 1, color: '#A6D2F3'},
|
|
|
- ],
|
|
|
+ x: 0,
|
|
|
+ y: 0,
|
|
|
+ x2: 0,
|
|
|
+ y2: 1,
|
|
|
+ colorStops: [
|
|
|
+ { offset: 0, color: '#3865E9' },
|
|
|
+ { offset: 1, color: '#A6D2F3' },
|
|
|
+ ],
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}],
|
|
|
}
|
|
|
myChart.setOption(option)
|
|
|
|
|
|
},
|
|
|
morelFun() {
|
|
|
- this.$api.user
|
|
|
- .queryPcAddressInfo({ lng: this.position[0], lat: this.position[1], source: this.source,pageSize: 5, pageNum: this.personnelPageNum })
|
|
|
+ let data = {
|
|
|
+ startTime: this.historyData.length > 0 && this.positionType == 2 ? this.historyData[0] : '',
|
|
|
+ endTime: this.historyData.length > 0 && this.positionType == 2 ? this.historyData[1] : '',
|
|
|
+ }
|
|
|
+ let api = this.positionType == 1 ? 'queryPcAddressInfo' : 'queryPcAddressHistoryInfo'
|
|
|
+ this.$api.user[api]({
|
|
|
+ lng: this.position[0], lat: this.position[1], source: this.source, pageSize: 5,
|
|
|
+ pageNum: this.personnelPageNum, ...data
|
|
|
+ })
|
|
|
.then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.personnelTotalSize = res.data.totalSize
|
|
|
@@ -388,7 +435,7 @@ export default {
|
|
|
if (_this.circle) {
|
|
|
_this.map.remove(_this.circle)
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
_this.circle = new AMap.Circle({
|
|
|
center: [longitude, latitude],
|
|
|
@@ -421,7 +468,7 @@ export default {
|
|
|
|
|
|
})
|
|
|
_this.circleEditor.on('adjust', function (event) {
|
|
|
- _this.radius=event.radius
|
|
|
+ _this.radius = event.radius
|
|
|
_this.onCircularFun({ latitude: event.lnglat.lat, longitude: event.lnglat.lng, radius: event.radius })
|
|
|
|
|
|
})
|
|
|
@@ -432,56 +479,56 @@ export default {
|
|
|
})
|
|
|
|
|
|
})
|
|
|
-
|
|
|
- // 将点标记添加到地图map上
|
|
|
+
|
|
|
+ // 将点标记添加到地图map上
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
async onCircularFun(data) {
|
|
|
let _this = this;
|
|
|
- // // 首先创建 AMap.Icon 实例：
|
|
|
- // var icon = new AMap.Icon({
|
|
|
- // size: new AMap.Size(40, 40), // 图标尺寸
|
|
|
- // image: '../../assets/Frame(2).png',
|
|
|
- // imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
|
|
|
- // imageSize: new AMap.Size(40, 40), // 根据所设置的大小拉伸或压缩图片
|
|
|
- // });
|
|
|
- // // 将 Icon 实例添加到 marker 上:
|
|
|
- // var marker = new AMap.Marker({
|
|
|
- // position: new AMap.LngLat(data.longitude, data.latitude),// icon在地图上显示的位置，数组内对应经纬度
|
|
|
- // offset: new AMap.Pixel(-20, -36),//设置icon在地上的偏移量
|
|
|
- // icon: icon, // 添加 Icon 实例
|
|
|
- // zoom: 13, //缩放等级
|
|
|
- // });
|
|
|
- // _this.map.add(marker);
|
|
|
- // this.addMarker(data)
|
|
|
+ // // 首先创建 AMap.Icon 实例：
|
|
|
+ // var icon = new AMap.Icon({
|
|
|
+ // size: new AMap.Size(40, 40), // 图标尺寸
|
|
|
+ // image: '../../assets/Frame(2).png',
|
|
|
+ // imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
|
|
|
+ // imageSize: new AMap.Size(40, 40), // 根据所设置的大小拉伸或压缩图片
|
|
|
+ // });
|
|
|
+ // // 将 Icon 实例添加到 marker 上:
|
|
|
+ // var marker = new AMap.Marker({
|
|
|
+ // position: new AMap.LngLat(data.longitude, data.latitude),// icon在地图上显示的位置，数组内对应经纬度
|
|
|
+ // offset: new AMap.Pixel(-20, -36),//设置icon在地上的偏移量
|
|
|
+ // icon: icon, // 添加 Icon 实例
|
|
|
+ // zoom: 13, //缩放等级
|
|
|
+ // });
|
|
|
+ // _this.map.add(marker);
|
|
|
+ // this.addMarker(data)
|
|
|
let res = await _this.$api.user.ipAddrLocations(data)
|
|
|
- if (res.code == 200) {
|
|
|
- if (res.data && res.data.length > 0) {
|
|
|
- //处理后台返回要用到的数据
|
|
|
- // _this.positionData = res.data.data
|
|
|
- _this.positionData = res.data.map(item => ({
|
|
|
- userName: item.userName,
|
|
|
- id: item.id,
|
|
|
- userId: item.userId,
|
|
|
- address: item.address,
|
|
|
- leaderName: item.leaderName,
|
|
|
- // onlineImg: item.status ? "Frame-1(2).png" : "Frame(2).png",
|
|
|
- onlineImg: "Frame-1(2).png",
|
|
|
- operationTime: item.operationTime,
|
|
|
- source: item.source,
|
|
|
- // status: item.status ? "在线" : "离线",
|
|
|
- positionArr: [item.longitude, item.latitude]
|
|
|
- }));
|
|
|
- _this.mapPoint();
|
|
|
- }
|
|
|
- else {
|
|
|
- _this.positionData=[]
|
|
|
- _this.loading = false; //地图加载完成
|
|
|
- }
|
|
|
- } else {
|
|
|
- _this.$message.error(res.msg)
|
|
|
- _this.loading = false;
|
|
|
+ if (res.code == 200) {
|
|
|
+ if (res.data && res.data.length > 0) {
|
|
|
+ //处理后台返回要用到的数据
|
|
|
+ // _this.positionData = res.data.data
|
|
|
+ _this.positionData = res.data.map(item => ({
|
|
|
+ userName: item.userName,
|
|
|
+ id: item.id,
|
|
|
+ userId: item.userId,
|
|
|
+ address: item.address,
|
|
|
+ leaderName: item.leaderName ? item.leaderName : '无',
|
|
|
+ // onlineImg: item.status ? "Frame-1(2).png" : "Frame(2).png",
|
|
|
+ onlineImg: "Frame-1(2).png",
|
|
|
+ operationTime: item.operationTime,
|
|
|
+ source: item.source,
|
|
|
+ // status: item.status ? "在线" : "离线",
|
|
|
+ positionArr: [item.longitude, item.latitude]
|
|
|
+ }));
|
|
|
+ _this.mapPoint();
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ _this.positionData = []
|
|
|
+ _this.loading = false; //地图加载完成
|
|
|
}
|
|
|
+ } else {
|
|
|
+ _this.$message.error(res.msg)
|
|
|
+ _this.loading = false;
|
|
|
+ }
|
|
|
|
|
|
},
|
|
|
queryPcNum() {
|
|
|
@@ -576,7 +623,12 @@ export default {
|
|
|
this.sourceqd = null
|
|
|
}
|
|
|
this.source = null
|
|
|
- this.initMap();
|
|
|
+ if(this.positionType==1){
|
|
|
+ this.initMap();
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.queryAnalysis({ startTime: this.historyData[0], endTime: this.historyData[1] });
|
|
|
+ }
|
|
|
},
|
|
|
sourcedlChange(val) {
|
|
|
if (val) {
|
|
|
@@ -584,7 +636,12 @@ export default {
|
|
|
this.sourceqd = null
|
|
|
}
|
|
|
this.source = 2
|
|
|
- this.initMap();
|
|
|
+ if(this.positionType==1){
|
|
|
+ this.initMap();
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.queryAnalysis({ startTime: this.historyData[0], endTime: this.historyData[1] });
|
|
|
+ }
|
|
|
},
|
|
|
sourceqdChange(val) {
|
|
|
if (val) {
|
|
|
@@ -592,7 +649,12 @@ export default {
|
|
|
this.sourcedl = null
|
|
|
}
|
|
|
this.source = 1
|
|
|
- this.initMap();
|
|
|
+ if(this.positionType==1){
|
|
|
+ this.initMap();
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.queryAnalysis({ startTime: this.historyData[0], endTime: this.historyData[1] });
|
|
|
+ }
|
|
|
},
|
|
|
onLineChange(val) {
|
|
|
if (val) {
|
|
|
@@ -653,7 +715,7 @@ export default {
|
|
|
this.marker = new AMap.Marker({
|
|
|
// icon: '//a.amap.com/jsapi_demos/static/demo-c: this.pointenter/icons/po: this.pointi-marker-default.png',
|
|
|
icon: '../../assets/Frame(2).png',
|
|
|
- position:new AMap.LngLat(data.longitude, data.latitude),
|
|
|
+ position: new AMap.LngLat(data.longitude, data.latitude),
|
|
|
offset: new AMap.Pixel(-13, -30) //icon中心点的偏移量
|
|
|
})
|
|
|
this.marker.setMap(this.map) //设置icon
|
|
|
@@ -684,12 +746,13 @@ export default {
|
|
|
if (res.data && res.data.length > 0) {
|
|
|
//处理后台返回要用到的数据
|
|
|
// _this.positionData = res.data.data
|
|
|
+ this.positionType = res.data[0].type
|
|
|
_this.positionData = res.data.map(item => ({
|
|
|
userName: item.userName,
|
|
|
id: item.id,
|
|
|
userId: item.userId,
|
|
|
address: item.address,
|
|
|
- leaderName: item.leaderName?item.leaderName:'无',
|
|
|
+ leaderName: item.leaderName ? item.leaderName : '无',
|
|
|
// onlineImg: item.status ? "Frame-1(2).png" : "Frame(2).png",
|
|
|
onlineImg: "Frame-1(2).png",
|
|
|
operationTime: item.operationTime,
|
|
|
@@ -721,9 +784,9 @@ export default {
|
|
|
// [114.464586, 39.099962] // 右上角坐标
|
|
|
// ]);
|
|
|
// _this.map.limitBounds(bounds);
|
|
|
- if (location.href.indexOf("&guide=1") !== -1) {
|
|
|
- _this.map.setStatus({ scrollWheel: false });
|
|
|
- }
|
|
|
+ // if (location.href.indexOf("&guide=1") !== -1) {
|
|
|
+ // _this.map.setStatus({ scrollWheel: false });
|
|
|
+ // }
|
|
|
},
|
|
|
|
|
|
mapPoint() {
|
|
|
@@ -744,7 +807,6 @@ export default {
|
|
|
|
|
|
_this.infoWindow = new AMap.InfoWindow({ offset: new AMap.Pixel(0, -4), closeWhenClickMap: true, }); //信息窗口
|
|
|
var position = JSON.parse(JSON.stringify(_this.positionData));
|
|
|
-
|
|
|
for (var i = 0; i < position.length; i++) {
|
|
|
var labelMarker = new AMap.LabelMarker({
|
|
|
position: position[i].positionArr
|
|
|
@@ -777,18 +839,25 @@ export default {
|
|
|
labelsLayer.add(labelMarker);
|
|
|
this.loading = false; //地图加载完成
|
|
|
},
|
|
|
- markerClick(e) {
|
|
|
+ markerClick(e,) {
|
|
|
let _this = this
|
|
|
this.position = e.target._position
|
|
|
// _this.morelFun()
|
|
|
- this.$api.user
|
|
|
- .queryPcAddressInfo({ lng: e.target._position[0], lat: e.target._position[1], source: this.source,pageSize: 5, pageNum: this.personnelPageNum })
|
|
|
+ let data = {
|
|
|
+ startTime: this.historyData.length > 0 && this.positionType == 2 ? this.historyData[0] : '',
|
|
|
+ endTime: this.historyData.length > 0 && this.positionType == 2 ? this.historyData[1] : '',
|
|
|
+ }
|
|
|
+ let api = this.positionType == 1 ? 'queryPcAddressInfo' : 'queryPcAddressHistoryInfo'
|
|
|
+ this.$api.user[api]({
|
|
|
+ lng: e.target._position[0], lat: e.target._position[1], source: this.source, pageSize: 5,
|
|
|
+ pageNum: this.personnelPageNum, ...data
|
|
|
+ })
|
|
|
.then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.personnelTotalSize = res.data.totalSize
|
|
|
this.personnelData = res.data.content
|
|
|
let content = e.target.content
|
|
|
- content = e.target.content + `<div style="font-weight: 700;display: flex; justify-content: space-between;align-items: center;">
|
|
|
+ content = e.target.content + `<div style="font-weight: 700;display: flex; justify-content: space-between;align-items: center;">
|
|
|
<span>共${_this.personnelTotalSize}人信息</span>
|
|
|
<div style="background: linear-gradient( 270deg, #225FFE 0%, #23CAFF 100%);padding:4px 8px;color:#fff;border-radius: 4px 4px 4px 4px;" onclick="personnelclick()">查看更多</div>
|
|
|
</div>`
|
|
|
@@ -799,6 +868,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
@@ -834,7 +904,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
span:first-child::before {
|
|
|
- content: '';
|
|
|
+ content: '';
|
|
|
display: inline-block;
|
|
|
width: 9px;
|
|
|
height: 9px;
|
|
|
@@ -866,7 +936,8 @@ export default {
|
|
|
width: 30vw;
|
|
|
box-shadow: 0px 5px 10px #ddd;
|
|
|
}
|
|
|
-.infohis-window{
|
|
|
+
|
|
|
+.infohis-window {
|
|
|
position: absolute;
|
|
|
top: 0;
|
|
|
right: 0;
|
|
|
@@ -876,6 +947,7 @@ export default {
|
|
|
width: 25vw;
|
|
|
box-shadow: 0px 5px 10px #ddd;
|
|
|
}
|
|
|
+
|
|
|
.personnel-window {
|
|
|
position: fixed;
|
|
|
bottom: 10px;
|
|
|
@@ -916,10 +988,11 @@ export default {
|
|
|
}
|
|
|
|
|
|
/deep/ {
|
|
|
- .el-button--primary{
|
|
|
+ .el-button--primary {
|
|
|
background: #3355FF !important;
|
|
|
border-color: #3355FF !important;
|
|
|
}
|
|
|
+
|
|
|
.el-tabs__item:hover,
|
|
|
.el-tabs__item.is-active {
|
|
|
color: #3865E9;
|
|
|
@@ -1000,17 +1073,19 @@ export default {
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
}
|
|
|
- .info-online{
|
|
|
+
|
|
|
+ .info-online {
|
|
|
font-size: 14px;
|
|
|
line-height: 30px;
|
|
|
- i {
|
|
|
- display: inline-block;
|
|
|
- width: 8px;
|
|
|
- height: 8px;
|
|
|
- background: #1CE247;
|
|
|
- border-radius: 50%;
|
|
|
- margin-right: 10px;
|
|
|
- }
|
|
|
+
|
|
|
+ i {
|
|
|
+ display: inline-block;
|
|
|
+ width: 8px;
|
|
|
+ height: 8px;
|
|
|
+ background: #1CE247;
|
|
|
+ border-radius: 50%;
|
|
|
+ margin-right: 10px;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</style>
|
lihongxiao