From 11295ac61002bb0725970bfb683dade1f143bd93 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 09 七月 2024 09:25:59 +0800
Subject: [PATCH] 更新代码
---
src/views/system/point/index.vue | 20 ++++++++++
src/views/system/check/result/detail/detail.vue | 2 -
src/views/system/monitor/video/index.vue | 42 +++++++++++++++++---
src/views/system/check/rule/index.vue | 2
src/layout/components/Navbar.vue | 9 +---
src/router/index.js | 3 -
6 files changed, 60 insertions(+), 18 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 7defbcf..4b85178 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -116,15 +116,12 @@
path: '/screen'
})
},
+
toSystemA() {
- this.$router.push({
- path: '/screen'
- })
+ window.open('https://www.baidu.com/')
},
toSystemB() {
- this.$router.push({
- path: '/screen'
- })
+ window.open('https://www.baidu.com/')
}
}
}
diff --git a/src/router/index.js b/src/router/index.js
index ca9f532..7a8b8f5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -74,7 +74,6 @@
}
]
},
-
// {
// path: '',
// component: Layout,
@@ -122,7 +121,7 @@
path: 'index/:type/:typeId',
component: () => import('@/views/system/data-manage/data-detail'),
name: 'DataDetail',
- meta: {
+ meta: {
title: '鏁版嵁璇︽儏',
activeMenu: '/data-manage'
}
diff --git a/src/views/system/check/result/detail/detail.vue b/src/views/system/check/result/detail/detail.vue
index b6db3cf..293f590 100644
--- a/src/views/system/check/result/detail/detail.vue
+++ b/src/views/system/check/result/detail/detail.vue
@@ -1,7 +1,5 @@
<template>
<div class="app-container">
- <el-page-header @back="goBack()" content="璇︽儏椤甸潰">
- </el-page-header>
<el-container>
<el-main>
diff --git a/src/views/system/check/rule/index.vue b/src/views/system/check/rule/index.vue
index 756382a..1e09d0c 100644
--- a/src/views/system/check/rule/index.vue
+++ b/src/views/system/check/rule/index.vue
@@ -236,7 +236,7 @@
ruleDetail: null,
videoPointNum: null,
vehicleCheckpointNum: null,
- faceChceckpointNum: null,
+ faceCheckpointNum: null,
createTime: null,
updateTime: null,
deleted: null
diff --git a/src/views/system/monitor/video/index.vue b/src/views/system/monitor/video/index.vue
index fbf6ef4..09020f8 100644
--- a/src/views/system/monitor/video/index.vue
+++ b/src/views/system/monitor/video/index.vue
@@ -124,8 +124,16 @@
<el-table-column type="selection" align="center" />
<el-table-column label="璁惧鍚嶇О" align="center" prop="name" width="280" fixed/>
<el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180"/>
- <el-table-column label="鏍囩" align="center" prop="publicSecurity" width="180" v-if="columns[0].visible"/>
- <el-table-column label="鍖哄煙" align="center" prop="address" width="180" v-if="columns[1].visible"/>
+ <el-table-column label="鏍囩" align="center" prop="publicSecurity" width="180" v-if="columns[0].visible">
+ <template slot-scope="scope">
+ <div>{{"鐪佸巺"}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍖哄煙" align="center" prop="address" width="180" v-if="columns[1].visible">
+ <template slot-scope="scope">
+ <div>{{"鑷祦浜曞尯"}}</div>
+ </template>
+ </el-table-column>
<el-table-column label="璁惧鐘舵��" align="center" prop="onState" v-if="columns[2].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
@@ -136,11 +144,31 @@
<dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
</template>
</el-table-column>
- <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180" v-if="columns[4].visible"/>
- <el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" width="180" v-if="columns[5].visible"/>
- <el-table-column label="淇′护鏃跺欢(ms)" align="center" prop="sipDelay" width="180" v-if="columns[6].visible"/>
- <el-table-column label="瑙嗛鏃跺欢(ms)" align="center" prop="videoDelay" width="180" v-if="columns[7].visible"/>
- <el-table-column label="鍏抽敭甯ф椂寤�(ms)" align="center" prop="iframeDelay" width="180" v-if="columns[8].visible"/>
+ <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180" v-if="columns[4].visible">
+ <template slot-scope="scope">
+ <div>{{"2023骞�08鏈�03鏃�"}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" width="180" v-if="columns[5].visible">
+ <template slot-scope="scope">
+ <div>{{"杩愮淮鍏徃鐢�"}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="淇′护鏃跺欢(ms)" align="center" prop="sipDelay" width="180" v-if="columns[6].visible">
+ <template slot-scope="scope">
+ <div>{{"100"}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="瑙嗛鏃跺欢(ms)" align="center" prop="videoDelay" width="180" v-if="columns[7].visible">
+ <template slot-scope="scope">
+ <div>{{"200"}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍏抽敭甯ф椂寤�(ms)" align="center" prop="iframeDelay" width="180" v-if="columns[8].visible">
+ <template slot-scope="scope">
+ <div>{{"300"}}</div>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 6d51e3f..4a8c416 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -47,6 +47,16 @@
<dict-tag :options="dict.type.point_tag" :value="scope.row.pointTags" />
</template>
</el-table-column>
+ <el-table-column label="鐐逛綅寮�濮嬫椂闂�" align="center" prop="startTime" width="180">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐐逛綅缁撴潫鏃堕棿" align="center" prop="endTime" width="180">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
<el-table-column label="鐩戠閮ㄩ棬" align="center" prop="deptName" />
<el-table-column label="杩愮淮绫诲埆" align="center" prop="category">
@@ -102,6 +112,11 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鐐逛綅鏃跺尯" prop="timezone">
+ <el-date-picker @change="dateChange" v-model="form.timezone" type="daterange" align="right" unlink-panels
+ range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
<el-form-item label="鐐逛綅澶囨敞" prop="remark">
<el-input type="textarea" v-model="form.remark"/>
</el-form-item>
@@ -125,6 +140,11 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="杩愮淮鏃堕棿娈�" prop="timezone">
+ <el-date-picker @change="dateChange" v-model="batchEditForm.timezone" type="daterange" align="right"
+ unlink-panels range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitBatchEdit">纭� 瀹�</el-button>
--
Gitblit v1.8.0