From f530bb1a7288c10b0731deea7f7b2864ebc98a92 Mon Sep 17 00:00:00 2001
From: mark <mark18340872469@163.com>
Date: 星期五, 30 九月 2022 16:46:49 +0800
Subject: [PATCH] 客户需求优化(页面
---
src/views/manageCenter/index.vue | 2 +-
src/api/report.ts | 2 +-
src/views/dataPush/components/point.vue | 6 +++---
src/views/dataPush/components/alarmPush.vue | 6 +++---
src/router/index.js | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/api/report.ts b/src/api/report.ts
index f949b4d..6f7fd07 100644
--- a/src/api/report.ts
+++ b/src/api/report.ts
@@ -65,7 +65,7 @@
/**
*
- * 鏁版嵁鎺ㄩ�� 璁惧淇℃伅缁存姢
+ * 鏁版嵁涓婁紶 璁惧淇℃伅缁存姢
鏌ヨ璁惧
*/
export const getDevicesList = (query: any) => {
diff --git a/src/router/index.js b/src/router/index.js
index 208257e..8a736cd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -135,7 +135,7 @@
name: "dataPush",
component: () => import(/* webpackChunkName: "about" */ "../views/dataPush"),
meta: {
- title: "鏁版嵁鎺ㄩ��"
+ title: "鏁版嵁涓婁紶"
}
},
{
diff --git a/src/views/dataPush/components/alarmPush.vue b/src/views/dataPush/components/alarmPush.vue
index 897efc8..006450a 100644
--- a/src/views/dataPush/components/alarmPush.vue
+++ b/src/views/dataPush/components/alarmPush.vue
@@ -9,11 +9,11 @@
:default-sort="{ prop: 'createTime', order: 'descending' }"
>
<el-table-column prop="alarmDate" label="鎶ヨ鏃ユ湡" show-overflow-tooltip></el-table-column>
- <el-table-column prop="channelName" label="璁惧鐨勭湡瀹炴姤璀﹂�氶亾鍚嶇О" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="channelName" label="閫氶亾鍚嶇О" show-overflow-tooltip></el-table-column>
<el-table-column prop="alarmType" label="鎶ヨ绫诲瀷" show-overflow-tooltip></el-table-column>
<el-table-column prop="alarmAction" label="鎶ヨ鍔ㄤ綔" show-overflow-tooltip></el-table-column>
- <el-table-column prop="channelCode" label="璁惧鐨勭湡瀹炴姤璀﹂�氶亾缂栫爜" show-overflow-tooltip></el-table-column>
- <el-table-column prop="alarmImage" label="鎶ヨ/閿�璀﹀浘鐗噓rl" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="channelCode" label="閫氶亾缂栫爜" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="alarmImage" 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>
diff --git a/src/views/dataPush/components/point.vue b/src/views/dataPush/components/point.vue
index 880abc7..4614ced 100644
--- a/src/views/dataPush/components/point.vue
+++ b/src/views/dataPush/components/point.vue
@@ -115,7 +115,7 @@
:picker-options="{
start: '00:00',
step: '00:30',
- end: ruleForm.EndTime ? ruleForm.EndTime : '23:30',
+ end: ruleForm.EndTime ? ruleForm.EndTime : '24:00',
maxTime: ruleForm.EndTime
}"
>
@@ -131,7 +131,7 @@
:picker-options="{
start: ruleForm.StartTime ? ruleForm.StartTime : '00:00',
step: '00:30',
- end: '23:30',
+ end: '24:00',
minTime: ruleForm.StartTime
}"
>
@@ -230,7 +230,7 @@
dataList: [],
tip: 1, // 鍖哄垎淇濆瓨杩樻槸缂栬緫 浣嗘槸鐜板湪娌℃湁缂栬緫
rules: {
- CameraName: [{ required: true, message: "璇烽�夋嫨璁惧鍚嶇О", trigger: "change" }],
+ CameraName: [{ required: true, message: "璇烽�夋嫨鐐逛綅鍚嶇О", trigger: "change" }],
ChannelCode: [{ required: true, message: "璇疯緭鍏ユ姤璀﹂�氶亾缂栫爜", trigger: "blur" }],
CompanyCode: [{ required: true, message: "璇疯緭鍏ヤ紒涓氱紪鐮�", trigger: "blur" }],
Sceneslist: [{ type: "array", required: true, message: "璇烽�夋嫨鎺ㄩ�佸満鏅�", trigger: "change" }],
diff --git a/src/views/manageCenter/index.vue b/src/views/manageCenter/index.vue
index e688e33..2681a49 100644
--- a/src/views/manageCenter/index.vue
+++ b/src/views/manageCenter/index.vue
@@ -322,7 +322,7 @@
},
{
- name: "鏁版嵁鎺ㄩ��",
+ name: "鏁版嵁涓婁紶",
icon: "/images/manageCenter/push.png",
openPath: "/dataPush",
path: "/dataPush",
--
Gitblit v1.8.0