From bf399dc65aa67c4355b0fdc516f8da5ca7234c82 Mon Sep 17 00:00:00 2001
From: mark <mark18340872469@163.com>
Date: 星期日, 09 十月 2022 16:34:22 +0800
Subject: [PATCH] Merge branch 'shandong' of http://192.168.5.5:10010/r/web/saas-web into shandong
---
src/views/search/components/ModelCard.vue | 6
src/views/dataPush/components/device.vue | 8
src/views/dataPush/components/point.vue | 58 ++++---
src/views/dataPush/components/dataPush.vue | 2
src/components/subComponents/ModelCard.vue | 349 ++++++++++++-------------------------------
5 files changed, 138 insertions(+), 285 deletions(-)
diff --git a/src/components/subComponents/ModelCard.vue b/src/components/subComponents/ModelCard.vue
index 412e1ea..76a9fe5 100644
--- a/src/components/subComponents/ModelCard.vue
+++ b/src/components/subComponents/ModelCard.vue
@@ -1,10 +1,6 @@
<template>
<div class="model-card-box" :style="`height:${height};width:${width};`">
- <el-tabs
- style="height: 100%;"
- @before-leave="changeTabs"
- v-model="activeName"
- >
+ <el-tabs style="height: 100%;" @before-leave="changeTabs" v-model="activeName">
<el-tab-pane label="澶у浘" name="pic">
<div
class="model-card-box-left"
@@ -20,77 +16,45 @@
</p>
<!-- 浜鸿劯绫诲瀷 -->
<img-down
- v-if="
- data.targetInfo !== null && data.targetInfo[0].picSmUrl !== ''
- "
+ v-if="data.targetInfo !== null && data.targetInfo[0].picSmUrl !== ''"
:url="data.picMaxUrl[0]"
></img-down>
<!-- 鏅�歽olo绫� -->
<img-down
- v-else-if="
- (data.targetInfo == null ||
- data.targetInfo[0].picSmUrl == '') &&
- data.picMaxUrl.length == 1
- "
+ v-else-if="(data.targetInfo == null || data.targetInfo[0].picSmUrl == '') && data.picMaxUrl.length == 1"
:url="data.picMaxUrl[0]"
></img-down>
<!-- 鎸佺画鏃堕棿yolo绫� -->
<el-carousel
- v-else-if="
- (data.targetInfo == null ||
- data.targetInfo[0].picSmUrl == '') &&
- data.picMaxUrl.length > 1
- "
+ v-else-if="(data.targetInfo == null || data.targetInfo[0].picSmUrl == '') && data.picMaxUrl.length > 1"
trigger="click"
height="100%"
:autoplay="false"
>
- <el-carousel-item
- v-for="(item, index) in data.picMaxUrl"
- :key="index"
- >
+ <el-carousel-item v-for="(item, index) in data.picMaxUrl" :key="index">
<img-down :url="item"></img-down>
</el-carousel-item>
</el-carousel>
<!-- yolo绫诲ぇ鍥� -->
- <div
- class="describe"
- v-if="
- data.targetInfo == null || data.targetInfo[0].picSmUrl == ''
- "
- >
+ <div class="describe" v-if="data.targetInfo == null || data.targetInfo[0].picSmUrl == ''">
<p>
- <span class="fontStyleForModel" style="font-weight:normal">{{
- data.picDate | formatTime
- }}</span>
+ <span class="fontStyleForModel" style="font-weight:normal">{{ data.picDate | formatTime }}</span>
</p>
<p>
- <span class="fontStyleForModel">{{ data.cameraAddr }}</span>
- <span
- class="fontStyleForModel analyServer"
- style="margin-left:20px;"
- >{{ data.analyServerName }}</span
- >
+ <span class="fontStyleForModel">{{ data.cameraName }}</span>
+ <span class="fontStyleForModel analyServer" style="margin-left:20px;">{{ data.analyServerName }}</span>
</p>
<p></p>
<p style="width:100%">
- <span
- v-for="(item, index) in data.alarmRules"
- :key="index + 'rule'"
- >
+ <span v-for="(item, index) in data.alarmRules" :key="index + 'rule'">
<span class="fontStyleForModel">{{ data.taskName }}</span
>
- <span
- v-if="item.alarmLevel !== '鎾ら槻'"
- class="fontStyleForModel"
- >{{ item.alarmLevel }}</span
+ <span v-if="item.alarmLevel !== '鎾ら槻'" class="fontStyleForModel">{{ item.alarmLevel }}</span
>
- <span v-if="item.isLink" class="fontStyleForModel"
- >鑱斿姩浠诲姟</span
- >
+ <span v-if="item.isLink" class="fontStyleForModel">鑱斿姩浠诲姟</span>
<span v-if="index < data.alarmRules.length - 1">/ </span>
</span>
</p>
@@ -99,46 +63,26 @@
<!-- 浜鸿劯绫诲ぇ鍥� -->
<div class="describeBigImage" v-else>
<p>
- <span class="fontStyleForModel">{{
- data.picDate | formatTime
- }}</span>
+ <span class="fontStyleForModel">{{ data.picDate | formatTime }}</span>
</p>
<p class="align-right">
- <span
- class="fontStyleForModel text-overflow"
- :title="data.cameraAddr"
- >{{ data.cameraAddr }}</span
- >
- <span
- class="fontStyleForModel text-overflow"
- :title="data.cameraAddr"
- style="margin-left:20px;"
- >{{ data.analyServerName }}</span
- >
+ <span class="fontStyleForModel text-overflow" :title="data.cameraName">{{ data.cameraName }}</span>
+ <span class="fontStyleForModel text-overflow" :title="data.analyServerName" style="margin-left:20px;">{{
+ data.analyServerName
+ }}</span>
</p>
<p style="width:100%">
- <span
- v-for="(item, index) in data.alarmRules"
- :key="index + 'rule'"
- >
+ <span v-for="(item, index) in data.alarmRules" :key="index + 'rule'">
<span class="fontStyleForModel">{{ data.taskName }}</span
>
- <span
- v-if="item.alarmLevel !== '鎾ら槻'"
- class="fontStyleForModel"
- >{{ item.alarmLevel }}</span
+ <span v-if="item.alarmLevel !== '鎾ら槻'" class="fontStyleForModel">{{ item.alarmLevel }}</span
>
- <span v-if="item.isLink" class="fontStyleForModel"
- >鑱斿姩浠诲姟</span
- >
+ <span v-if="item.isLink" class="fontStyleForModel">鑱斿姩浠诲姟</span>
<span v-if="index < data.alarmRules.length - 1">/ </span>
</span>
</p>
<p style="width:100%">
- <span
- style="white-space: nowrap;font-weight: 600;font-size: 13px;"
- >{{ data.showLabels }}</span
- >
+ <span style="white-space: nowrap;font-weight: 600;font-size: 13px;">{{ data.showLabels }}</span>
</p>
</div>
</div>
@@ -146,16 +90,10 @@
<!-- 寮规鍙充晶 -->
<div
- v-if="
- data.targetInfo &&
- data.targetInfo !== null &&
- data.targetInfo[0].picSmUrl !== ''
- "
+ v-if="data.targetInfo && data.targetInfo !== null && data.targetInfo[0].picSmUrl !== ''"
class="model-card-box-right"
:style="
- data.targetInfo &&
- data.targetInfo !== null &&
- data.targetInfo[0].picSmUrl !== ''
+ data.targetInfo && data.targetInfo !== null && data.targetInfo[0].picSmUrl !== ''
? 'width: 35%;box-sizing: border-box;'
: ''
"
@@ -164,17 +102,10 @@
<b>鎶撴媿鍥�</b>
</p>
<!-- 宸﹀彸涓ゅ紶鐨勪汉鑴稿姣旀ā寮� -->
- <div
- class="img-box"
- v-if="data.baseInfo && data.baseInfo.length >= 1"
- ref="picSmBox"
- >
+ <div class="img-box" v-if="data.baseInfo && data.baseInfo.length >= 1" ref="picSmBox">
<div class="card-img-box-compear-left">
<!-- <img :src="'/httpImage/'+data.targetInfo[0].picSmUrl" ref="picSm" /> -->
- <img-down
- :url="data.targetInfo[0].picSmUrl"
- :isPreview="false"
- ></img-down>
+ <img-down :url="data.targetInfo[0].picSmUrl" :isPreview="false"></img-down>
</div>
<el-carousel
@change="changeInitialIndex"
@@ -185,91 +116,57 @@
v-if="data.baseInfo[0].targetPicUrl != ''"
class="card-img-box-compear-right"
>
- <el-carousel-item
- v-for="(item, index) in data.baseInfo"
- :key="index"
- >
+ <el-carousel-item v-for="(item, index) in data.baseInfo" :key="index">
<!-- <img :src="'/httpImage/'+item.targetPicUrl" /> -->
- <img-down
- :url="item.targetPicUrl"
- :isPreview="false"
- ></img-down>
+ <img-down :url="item.targetPicUrl" :isPreview="false"></img-down>
</el-carousel-item>
</el-carousel>
<div
class="img-compareScore"
v-if="data.baseInfo[0].targetPicUrl != ''"
- :style="
- data.baseInfo[initialIndex].bwType === '1'
- ? `background: red;`
- : `background: green;`
- "
+ :style="data.baseInfo[initialIndex].bwType === '1' ? `background: red;` : `background: green;`"
>
<b>{{ data.baseInfo[initialIndex].compareScore | percentage }}</b>
</div>
</div>
<!-- 娌℃湁姣斿鐨勪汉鑴歌瘑鍒ā寮� -->
- <div
- class="img-box"
- v-if="!data.baseInfo && data.targetInfo[0].picSmUrl !== ''"
- >
- <div
- class="card-img-box-compear-left"
- style="width:60%;margin-top:5px"
- >
+ <div class="img-box" v-if="!data.baseInfo && data.targetInfo[0].picSmUrl !== ''">
+ <div class="card-img-box-compear-left" style="width:60%;margin-top:5px">
<!-- <img :src="'/httpImage/'+data.targetInfo[0].picSmUrl" /> -->
- <img-down
- :url="data.targetInfo[0].picSmUrl"
- :isPreview="false"
- ></img-down>
+ <img-down :url="data.targetInfo[0].picSmUrl" :isPreview="false"></img-down>
</div>
</div>
- <div
- class="baseInfo"
- v-if="data.baseInfo && data.baseInfo[0].targetPicUrl != ''"
- >
+ <div class="baseInfo" v-if="data.baseInfo && data.baseInfo[0].targetPicUrl != ''">
<div class="baseInfo_list">
<p>
<span class="labelInfo">搴曞簱</span>
- <span
- class="val"
- :title="data.baseInfo[initialIndex].tableName"
- >{{ data.baseInfo[initialIndex].tableName }}</span
- >
+ <span class="val" :title="data.baseInfo[initialIndex].tableName">{{
+ data.baseInfo[initialIndex].tableName
+ }}</span>
</p>
<p>
<span class="labelInfo">濮撳悕</span>
- <span
- class="val"
- :title="data.baseInfo[initialIndex].targetName"
- >{{ data.baseInfo[initialIndex].targetName }}</span
- >
+ <span class="val" :title="data.baseInfo[initialIndex].targetName">{{
+ data.baseInfo[initialIndex].targetName
+ }}</span>
</p>
<p>
<span class="labelInfo">鎬у埆</span>
- <span class="val">{{
- data.baseInfo[initialIndex].labels | sex
- }}</span>
+ <span class="val">{{ data.baseInfo[initialIndex].labels | sex }}</span>
</p>
<p>
<span class="labelInfo">韬唤璇佸彿</span>
- <span class="val">{{
- data.baseInfo[initialIndex].labels | idCard
- }}</span>
+ <span class="val">{{ data.baseInfo[initialIndex].labels | idCard }}</span>
</p>
<p>
<span class="labelInfo">鎵嬫満鍙�</span>
- <span class="val">{{
- data.baseInfo[initialIndex].labels | phoneNum
- }}</span>
+ <span class="val">{{ data.baseInfo[initialIndex].labels | phoneNum }}</span>
</p>
<p>
<span class="labelInfo">浜哄憳绛夌骇</span>
- <span
- class="val"
- :title="data.baseInfo[initialIndex].monitorLevel"
- >{{ data.baseInfo[initialIndex].monitorLevel }}</span
- >
+ <span class="val" :title="data.baseInfo[initialIndex].monitorLevel">{{
+ data.baseInfo[initialIndex].monitorLevel
+ }}</span>
</p>
</div>
</div>
@@ -293,35 +190,23 @@
>
鎮ㄧ殑娴忚鍣ㄤ笉鏀寔 video 鏍囩銆�
</video> -->
- <wasm-player
- :videoUrl="data.videoUrl"
- :isStream="false"
- ></wasm-player>
+ <wasm-player :videoUrl="data.videoUrl" :isStream="false"></wasm-player>
</div>
</div>
<div
v-if="data.targetInfo !== null && data.targetInfo[0].picSmUrl !== ''"
class="model-card-box-right"
:style="
- data.targetInfo !== null && data.targetInfo[0].picSmUrl !== ''
- ? 'width: 35%;box-sizing: border-box;'
- : ''
+ data.targetInfo !== null && data.targetInfo[0].picSmUrl !== '' ? 'width: 35%;box-sizing: border-box;' : ''
"
>
<p class="img-box-title">
<b>鎶撴媿鍥�</b>
</p>
<!-- 宸﹀彸涓ゅ紶鐨勪汉鑴稿姣旀ā寮� -->
- <div
- class="img-box"
- v-if="data.baseInfo && data.baseInfo.length >= 1"
- ref="picSmBox"
- >
+ <div class="img-box" v-if="data.baseInfo && data.baseInfo.length >= 1" ref="picSmBox">
<div class="card-img-box-compear-left">
- <img-down
- :url="data.targetInfo[0].picSmUrl"
- :isPreview="false"
- ></img-down>
+ <img-down :url="data.targetInfo[0].picSmUrl" :isPreview="false"></img-down>
</div>
<el-carousel
@change="changeInitialIndex"
@@ -332,88 +217,57 @@
class="card-img-box-compear-right"
:arrow="data.baseInfo.length > 1 ? 'always' : 'never'"
>
- <el-carousel-item
- v-for="(item, index) in data.baseInfo"
- :key="index"
- >
+ <el-carousel-item v-for="(item, index) in data.baseInfo" :key="index">
<!-- <img :src="'/httpImage/'+item.targetPicUrl" /> -->
- <img-down
- :url="item.targetPicUrl"
- :isPreview="false"
- ></img-down>
+ <img-down :url="item.targetPicUrl" :isPreview="false"></img-down>
</el-carousel-item>
</el-carousel>
<div
class="img-compareScore"
v-if="data.baseInfo[0].targetPicUrl != ''"
- :style="
- data.baseInfo[initialIndex].bwType === '1'
- ? `background: red;`
- : `background: green;`
- "
+ :style="data.baseInfo[initialIndex].bwType === '1' ? `background: red;` : `background: green;`"
>
<b>{{ data.baseInfo[initialIndex].compareScore | percentage }}</b>
</div>
</div>
<!-- 娌℃湁姣斿鐨勪汉鑴歌瘑鍒ā寮� -->
<div class="img-box" v-if="!data.baseInfo && data.picMaxUrl">
- <div
- class="card-img-box-compear-left"
- style="width:60%;margin-top:5px"
- >
+ <div class="card-img-box-compear-left" style="width:60%;margin-top:5px">
<!-- <img :src="'/httpImage/'+data.targetInfo[0].picSmUrl" /> -->
- <img-down
- :url="data.targetInfo[0].picSmUrl"
- :isPreview="false"
- ></img-down>
+ <img-down :url="data.targetInfo[0].picSmUrl" :isPreview="false"></img-down>
</div>
</div>
- <div
- class="baseInfo"
- v-if="data.baseInfo && data.baseInfo[0].targetPicUrl != ''"
- >
+ <div class="baseInfo" v-if="data.baseInfo && data.baseInfo[0].targetPicUrl != ''">
<div class="baseInfo_list">
<p>
<span class="labelInfo">搴曞簱</span>
- <span
- class="val"
- :title="data.baseInfo[initialIndex].tableName"
- >{{ data.baseInfo[initialIndex].tableName }}</span
- >
+ <span class="val" :title="data.baseInfo[initialIndex].tableName">{{
+ data.baseInfo[initialIndex].tableName
+ }}</span>
</p>
<p>
<span class="labelInfo">濮撳悕</span>
- <span
- class="val"
- :title="data.baseInfo[initialIndex].targetName"
- >{{ data.baseInfo[initialIndex].targetName }}</span
- >
+ <span class="val" :title="data.baseInfo[initialIndex].targetName">{{
+ data.baseInfo[initialIndex].targetName
+ }}</span>
</p>
<p>
<span class="labelInfo">鎬у埆</span>
- <span class="val">{{
- data.baseInfo[initialIndex].labels | sex
- }}</span>
+ <span class="val">{{ data.baseInfo[initialIndex].labels | sex }}</span>
</p>
<p>
<span class="labelInfo">韬唤璇佸彿</span>
- <span class="val">{{
- data.baseInfo[initialIndex].labels | idCard
- }}</span>
+ <span class="val">{{ data.baseInfo[initialIndex].labels | idCard }}</span>
</p>
<p>
<span class="labelInfo">鎵嬫満鍙�</span>
- <span class="val">{{
- data.baseInfo[initialIndex].labels | phoneNum
- }}</span>
+ <span class="val">{{ data.baseInfo[initialIndex].labels | phoneNum }}</span>
</p>
<p>
<span class="labelInfo">浜哄憳绛夌骇</span>
- <span
- class="val"
- :title="data.baseInfo[initialIndex].monitorLevel"
- >{{ data.baseInfo[initialIndex].monitorLevel }}</span
- >
+ <span class="val" :title="data.baseInfo[initialIndex].monitorLevel">{{
+ data.baseInfo[initialIndex].monitorLevel
+ }}</span>
</p>
</div>
</div>
@@ -425,65 +279,58 @@
<script>
Date.prototype.Format = function(fmt) {
var o = {
- 'M+': this.getMonth() + 1, //鏈堜唤
- 'd+': this.getDate(), //鏃�
- 'H+': this.getHours(), //灏忔椂
- 'm+': this.getMinutes(), //鍒�
- 's+': this.getSeconds(), //绉�
- 'q+': Math.floor((this.getMonth() + 3) / 3), //瀛ｅ害
- S: this.getMilliseconds(), //姣
+ "M+": this.getMonth() + 1, //鏈堜唤
+ "d+": this.getDate(), //鏃�
+ "H+": this.getHours(), //灏忔椂
+ "m+": this.getMinutes(), //鍒�
+ "s+": this.getSeconds(), //绉�
+ "q+": Math.floor((this.getMonth() + 3) / 3), //瀛ｅ害
+ S: this.getMilliseconds() //姣
}
- if (/(y+)/.test(fmt))
- fmt = fmt.replace(
- RegExp.$1,
- (this.getFullYear() + '').substr(4 - RegExp.$1.length)
- )
+ if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length))
for (var k in o)
- if (new RegExp('(' + k + ')').test(fmt))
- fmt = fmt.replace(
- RegExp.$1,
- RegExp.$1.length == 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
- )
+ if (new RegExp("(" + k + ")").test(fmt))
+ fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length))
return fmt
}
-import WasmPlayer from '@/components/wasmPlayer'
-import imgDown from '@/components/subComponents/imgDown'
+import WasmPlayer from "@/components/wasmPlayer"
+import imgDown from "@/components/subComponents/imgDown"
export default {
components: {
WasmPlayer,
- imgDown,
+ imgDown
},
props: {
height: {
type: String,
- default: '100%',
+ default: "100%"
},
width: {
type: String,
- default: '100%',
+ default: "100%"
},
data: {
type: Object,
require: false,
default: function() {
return {}
- },
- },
+ }
+ }
},
filters: {
formatTime(t) {
- return new Date(t).Format('yyyy-MM-dd HH:mm:ss')
+ return new Date(t).Format("yyyy-MM-dd HH:mm:ss")
},
percentage(score) {
- return score.toFixed(2) + '%'
+ return score.toFixed(2) + "%"
},
sex(v) {
try {
let obj = JSON.parse(v)
return obj.sex
} catch (error) {
- return v.split('/')[0]
+ return v.split("/")[0]
}
},
idCard(v) {
@@ -491,7 +338,7 @@
let obj = JSON.parse(v)
return obj.idCard
} catch (error) {
- return v.split('/')[1]
+ return v.split("/")[1]
}
},
phoneNum(v) {
@@ -499,20 +346,20 @@
let obj = JSON.parse(v)
return obj.phone
} catch (error) {
- return v.split('/')[2]
+ return v.split("/")[2]
}
- },
+ }
},
mounted() {
- console.log('ModelCard data', this.data)
+ console.log("ModelCard data", this.data)
console.log(this.data.baseInfo)
console.log(this.initialIndex)
//this.VideoPhotoData.activeName = "pic"
},
data() {
return {
- activeName: 'pic',
- initialIndex: 0,
+ activeName: "pic",
+ initialIndex: 0
}
},
methods: {
@@ -523,15 +370,15 @@
this.initialIndex = index
},
downloadfile() {
- this.filecontent = 'this is my file content'
- let a = document.createElement('a')
+ this.filecontent = "this is my file content"
+ let a = document.createElement("a")
- a.href = 'data:text/json;charset=utf-8,' + this.filecontent
+ a.href = "data:text/json;charset=utf-8," + this.filecontent
// a.url = "http://192.168.20.112:6154/93,02c5aea4fc614e";
- a.download = 'video.mp4'
+ a.download = "video.mp4"
a.click()
- },
- },
+ }
+ }
}
</script>
<style lang="scss">
diff --git a/src/views/dataPush/components/dataPush.vue b/src/views/dataPush/components/dataPush.vue
index 586205c..163e278 100644
--- a/src/views/dataPush/components/dataPush.vue
+++ b/src/views/dataPush/components/dataPush.vue
@@ -10,7 +10,7 @@
<point></point>
</el-tab-pane>
<el-tab-pane name="alarmPush">
- <span slot="label"><i class="el-icon-phone"></i> 鎶ヨ鎺ㄩ�佹棩蹇�</span>
+ <span slot="label"><i class="el-icon-phone"></i> 鎶ヨ涓婃姤鏃ュ織</span>
<alarmPush></alarmPush>
</el-tab-pane>
</el-tabs>
diff --git a/src/views/dataPush/components/device.vue b/src/views/dataPush/components/device.vue
index 0fe0f61..0d6b90f 100644
--- a/src/views/dataPush/components/device.vue
+++ b/src/views/dataPush/components/device.vue
@@ -3,7 +3,7 @@
<div class="search">
<div class="left">
<div class="id">
- 璁惧鍚嶇О
+ 璁惧鍚嶇О/IP/缂栫爜
<el-input v-model="inputText" placeholder="璇疯緭鍏�" clearable></el-input>
</div>
</div>
@@ -26,7 +26,7 @@
ref="multipleTable"
:data="dataList"
:fit="true"
- :default-sort="{ prop: 'createTime', order: 'descending' }"
+ :default-sort="{ prop: 'devCode', order: 'ascending' }"
>
<el-table-column prop="devName" label="璁惧鍚嶇О" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="devId" label="璁惧ID" show-overflow-tooltip></el-table-column> -->
@@ -35,8 +35,8 @@
<el-table-column prop="companyCode" label="浼佷笟缂栫爜" show-overflow-tooltip></el-table-column>
<el-table-column prop="state" label="鐘舵��" show-overflow-tooltip>
<template slot-scope="scope">
- <div v-if="scope.row.state == 0" class="status green">绂荤嚎</div>
- <div v-else class="status">鍦ㄧ嚎</div>
+ <div v-if="scope.row.state == 0" class="status">绂荤嚎</div>
+ <div v-else class="status green">鍦ㄧ嚎</div>
</template>
</el-table-column>
diff --git a/src/views/dataPush/components/point.vue b/src/views/dataPush/components/point.vue
index 4614ced..9b9be52 100644
--- a/src/views/dataPush/components/point.vue
+++ b/src/views/dataPush/components/point.vue
@@ -3,7 +3,7 @@
<div class="search">
<div class="left">
<div class="id">
- 鐐逛綅鍚嶇О
+ 鐐逛綅鍚嶇О/浼佷笟缂栫爜/鍦烘櫙
<el-input v-model="inputText" placeholder="璇疯緭鍏�" clearable></el-input>
</div>
</div>
@@ -17,26 +17,20 @@
<span class="iconfont"></span>
<span>娣诲姞鐐逛綅</span>
</div>
- <!-- <div class="switchBox">
- 鎬荤偣浣嶅紑鍏�
- <el-switch
- v-model="value1"
- width="60"
- active-color="#13ce66"
- inactive-color="#f0f3f5"
- @change="changeAll($event)"
- >
- </el-switch>
- </div> -->
</div>
-
+ <div class="switchBox">
+ 寮�鍚笂鎶�
+ <el-table-column prop="Enable" label="寮�鍏�" width="70px" show-overflow-tooltip>
+ <el-switch v-model="value1" active-color="#0065ff" @change="changeAll($event)"> </el-switch>
+ </el-table-column>
+ </div>
<div class="table-area">
<el-table
id="multipleTable"
ref="multipleTable"
:data="dataList"
:fit="true"
- :default-sort="{ prop: 'createTime', order: 'descending' }"
+ :default-sort="{ prop: 'companyCode', order: 'ascending' }"
>
<el-table-column prop="cameraName" label="鐐逛綅鍚嶇О" width="130px" show-overflow-tooltip></el-table-column>
<el-table-column prop="channelCode" label="鎶ヨ閫氶亾缂栫爜" show-overflow-tooltip></el-table-column>
@@ -47,12 +41,7 @@
</el-table-column>
<el-table-column prop="Enable" label="寮�鍏�" width="70px" show-overflow-tooltip>
<template slot-scope="scope">
- <el-switch
- v-model="scope.row.enable"
- @change="changeSwitch($event, scope.row)"
- active-color="#13ce66"
- inactive-color="#f0f3f5"
- >
+ <el-switch v-model="scope.row.enable" @change="changeSwitch($event, scope.row)" active-color="#0065ff">
</el-switch>
</template>
</el-table-column>
@@ -459,7 +448,6 @@
}
</script>
-<style scoped lang="scss"></style>
<style scoped lang="scss">
.sub-account {
padding: 20px;
@@ -625,10 +613,7 @@
margin: 20px 0;
text-align: center;
justify-content: space-between;
- .switchBox {
- display: flex;
- align-items: center;
- }
+
.add {
margin-right: 20px;
width: 126px;
@@ -655,7 +640,15 @@
}
}
}
-
+ .switchBox {
+ display: flex;
+ align-items: center;
+ float: right;
+ position: absolute;
+ right: 20px;
+ top: 130px;
+ font-size: 14px;
+ }
.el-table ::v-deep {
background-color: rgb(233, 235, 238);
padding: 1px;
@@ -779,4 +772,17 @@
color: #0065ff;
border-color: #0065ff;
}
+
+/* .el-switch__core {
+ width: 40px !important;
+ height: 20px;
+}
+.el-switch__core::after {
+ width: 16px;
+ height: 16px;
+ margin-top: -1px;
+}
+.el-switch.is-checked .el-switch__core::after {
+ margin-left: -17px;
+} */
</style>
diff --git a/src/views/search/components/ModelCard.vue b/src/views/search/components/ModelCard.vue
index 4bfa5ab..10703d1 100644
--- a/src/views/search/components/ModelCard.vue
+++ b/src/views/search/components/ModelCard.vue
@@ -44,7 +44,7 @@
<span class="fontStyleForModel" style="font-weight: normal">{{ data.picDate | formatTime }}</span>
</p>
<p>
- <span class="fontStyleForModel">{{ data.cameraAddr }}</span>
+ <span class="fontStyleForModel">{{ data.cameraName }}</span>
<span class="fontStyleForModel analyServer" style="margin-left: 20px">{{ data.analyServerName }}</span>
</p>
<p></p>
@@ -66,8 +66,8 @@
<span class="fontStyleForModel">{{ data.picDate | formatTime }}</span>
</p>
<p class="align-right">
- <span class="fontStyleForModel text-overflow" :title="data.cameraAddr">{{ data.cameraAddr }}</span>
- <span class="fontStyleForModel text-overflow" :title="data.cameraAddr" style="margin-left: 20px">{{
+ <span class="fontStyleForModel text-overflow" :title="data.cameraName">{{ data.cameraName }}</span>
+ <span class="fontStyleForModel text-overflow" :title="data.analyServerName" style="margin-left: 20px">{{
data.analyServerName
}}</span>
</p>
--
Gitblit v1.8.0