From 79535d14e6fb259c372f1c1c6fb0946b91a27752 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 26 Apr 2023 14:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87=E5=B1=95?=
=?UTF-8?q?=E7=A4=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/components/carouselChart.vue | 2 +-
.../components/addPhotoDialog.vue | 89 ++++++++++---------
.../photographicDevice/index.vue | 15 ++--
.../components/deviceUpgrade.vue | 4 +-
.../components/pictureTags.vue | 4 +-
5 files changed, 61 insertions(+), 53 deletions(-)
diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index 57f18b9..7d5b760 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -40,7 +40,7 @@
>
![]()
- {{ $moment(item.photoTime).format("YYYY-MM-DD ") }}
+ {{ $moment(item.photoTime).format("HH:mm:ss") }}
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
-
+
@@ -86,9 +93,9 @@ export default {
return {
formInfo: {},
rules: {
- displayName: [
- { required: true, message: "请输入显示名", trigger: "blur" },
- ],
+ // displayName: [
+ // { required: true, message: "请输入显示名", trigger: "blur" },
+ // ],
cmdid: [{ required: true, message: "请输入装置ID", trigger: "blur" }],
lineid: [
{ required: true, message: "请输入线路编号", trigger: "blur" },
@@ -100,25 +107,25 @@ export default {
{ required: true, message: "请输入是否带云台", trigger: "blur" },
],
- equipName: [
- { required: true, message: "请输入装置名称", trigger: "blur" },
- ],
- model: [{ required: true, message: "请输入装置型号", trigger: "blur" }],
- latitude: [{ required: true, message: "请输入纬度", trigger: "blur" }],
- longitude: [{ required: true, message: "请输入经度", trigger: "blur" }],
- orgId: [{ required: true, message: "请输入原始 ID", trigger: "blur" }],
- essentialInfoVersion: [
- { required: true, message: "请输入版本号", trigger: "blur" },
- ],
- bsIdentifier: [
- { required: true, message: "请输入出厂编号", trigger: "blur" },
- ],
- bsManufacturer: [
- { required: true, message: "请输入生产厂家", trigger: "blur" },
- ],
- bsProductionDate: [
- { required: true, message: "请输入生产日期", trigger: "blur" },
- ],
+ // equipName: [
+ // { required: true, message: "请输入装置名称", trigger: "blur" },
+ // ],
+ // model: [{ required: true, message: "请输入装置型号", trigger: "blur" }],
+ // latitude: [{ required: true, message: "请输入纬度", trigger: "blur" }],
+ // longitude: [{ required: true, message: "请输入经度", trigger: "blur" }],
+ // orgId: [{ required: true, message: "请输入原始 ID", trigger: "blur" }],
+ // essentialInfoVersion: [
+ // { required: true, message: "请输入版本号", trigger: "blur" },
+ // ],
+ // bsIdentifier: [
+ // { required: true, message: "请输入出厂编号", trigger: "blur" },
+ // ],
+ // bsManufacturer: [
+ // { required: true, message: "请输入生产厂家", trigger: "blur" },
+ // ],
+ // bsProductionDate: [
+ // { required: true, message: "请输入生产日期", trigger: "blur" },
+ // ],
},
//表单数组，对象
formArr: [],
@@ -227,7 +234,7 @@ export default {
display: flex;
flex-wrap: wrap;
.el-form-item {
- width: 246px;
+ width: 260px;
margin-right: 16px;
.el-form-item__label {
padding-right: 0px;
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 8223635..d4c9b84 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -17,6 +17,13 @@
@row-click="handleRowClick"
v-loading="loading"
>
+
+
{{ scope.row.cmdid }}
-
-
+
diff --git a/src/views/realTimeMonitor/components/deviceUpgrade.vue b/src/views/realTimeMonitor/components/deviceUpgrade.vue
index d9e0625..42aad99 100644
--- a/src/views/realTimeMonitor/components/deviceUpgrade.vue
+++ b/src/views/realTimeMonitor/components/deviceUpgrade.vue
@@ -15,9 +15,9 @@
:file-list="fileList"
>
点击上传
-
+
-
+ > -->