diff --git a/src/assets/css/main.css b/src/assets/css/main.css index ee617822..91e23a58 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -31,6 +31,31 @@ /*滚动条边角*/ } +.amap-marker .p_title { + height: 44px; + background: rgba(1, 12, 28, 0.7); + border-radius: 22px; + display: flex; + align-items: center; + box-sizing: border-box; + padding: 8px; + white-space: nowrap; +} + +.amap-marker .p_title > img { + width: 30px; + height: 30px; + margin-right: 5px; +} + +.amap-marker .p_title > span { + font-size: 18px; + font-family: MicrosoftYaHei; + font-weight: 400; + color: #ffffff; + flex: 1; +} + .tips-model { padding: 10px; color: #fff; @@ -2311,11 +2336,19 @@ textarea { position: relative; } +.realTime .page-content .realTime-bottom .left-view > div.center { + justify-content: center; +} + .realTime .page-content .realTime-bottom .left-view > div .video-js { width: calc(100% - 400px); height: 100%; } +.realTime .page-content .realTime-bottom .left-view > div .video-js.w-100 { + width: 100%; +} + .realTime .page-content .realTime-bottom .left-view > div #video-js { position: absolute; left: 0; diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 4c5a8361..4912fbf1 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -33,6 +33,34 @@ } } +.amap-marker{ + .p_title { + // width:50px; + height: 44px; + background: rgba(1, 12, 28, 0.7); + border-radius:22px; + display: flex; + align-items: center; + box-sizing: border-box; + padding: 8px; + // overflow: hidden; + white-space: nowrap; + + >img { + width: 30px; + height: 30px; + margin-right: 5px; + } + + >span { + font-size: 18px; + font-family: MicrosoftYaHei; + font-weight: 400; + color: #ffffff; + flex: 1; + } + } +} .tips-model { padding: 10px; @@ -2444,10 +2472,15 @@ textarea { display: flex; align-items: center; position: relative; - + &.center{ + justify-content: center; + } .video-js { width: calc(100% - 400px); height: 100%; + &.w-100{ + width: 100%; + } } #video-js { diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index 1f2d61a9..d374fbba 100644 --- a/src/i18n/lang/en.js +++ b/src/i18n/lang/en.js @@ -31,7 +31,8 @@ module.exports = { roleRequired: "Role is required", deviceRequired: "Please add at least one device", passwordMismatch: "Passwords do not match", - sortRequired: "Sort code is required" + sortRequired: "Sort code is required", + fileName:'The file name cannot be empty', }, placeholder: { @@ -54,7 +55,8 @@ module.exports = { newPassword: "Enter new password", confirmPassword: "Confirm password", sortOrder: "Enter sort order", - role: "Select role" + role: "Select role", + fileName:'Please enter the download file name.' }, text: { sortOrder: "Sort Order", diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js index dbff58f3..a87cd9b7 100644 --- a/src/i18n/lang/zh.js +++ b/src/i18n/lang/zh.js @@ -43,7 +43,8 @@ module.exports = { oldPassword: "请输入原密码", newPassword: "请输入新密码", confirmPassword: "请输入确认密码", - role: "请选择角色" + role: "请选择角色", + fileName:'请输入下载文件名称' }, // 各个消息提示 @@ -62,7 +63,8 @@ module.exports = { roleRequired: "角色还未选择", deviceRequired: "请添加一个设备", passwordMismatch: "两次密码不一致", - sortRequired: "排序还未填写" + sortRequired: "排序还未填写", + fileName:'文件名称不能为空', }, text: { sortOrder: "排序", diff --git a/src/views/manage/deviceManage.vue b/src/views/manage/deviceManage.vue index 988e1537..e65bf37e 100644 --- a/src/views/manage/deviceManage.vue +++ b/src/views/manage/deviceManage.vue @@ -10,7 +10,7 @@
- {{$t('deviceManage.username')}} + {{$t('deviceManage.search.username')}}
- {{$t('deviceManage.deviceCode')}} + {{$t('deviceManage.search.deviceCode')}}
- +
+
摄像头右侧控制面板(1为显示)
+ +
+
{{$t('deviceManagement.dialogs.noteText')}}
@@ -229,9 +237,11 @@ export default { addModel1: false, nowData1: { deviceState: 0, + cameraName:1, }, deviceType: "", + }; }, computed:{ @@ -282,6 +292,7 @@ export default { this.nowData1.deviceTypeName = e this.deviceType = e; }, + openRoleModel(deviceId) { this.loading = this.$loading({ lock: true, @@ -308,7 +319,7 @@ export default { openAddModel1() { this.nowData1 = { deviceState: 0, - + cameraName:1, }; this.deviceType='' this.addModel1 = true; @@ -326,6 +337,7 @@ export default { this.$message.error(this.$t('message.deviceNameRequired')); return; } + var data = { ...this.nowData1, stationName: this.nowData1.deviceTypeName, diff --git a/src/views/page/historyData.vue b/src/views/page/historyData.vue index 6d9b6c21..209dde88 100644 --- a/src/views/page/historyData.vue +++ b/src/views/page/historyData.vue @@ -28,8 +28,8 @@
{{ $t('imageGallery.query') }}
-
- {{ $t('imageGallery.downloadImages') }} +
+ {{ $t('imageGallery.download') }}
{{ $t('imageGallery.dataStatistics') }} @@ -82,7 +82,7 @@
{{ $t('imageGallery.query') }}
-
+
{{ $t('imageGallery.download') }}
@@ -105,6 +105,23 @@
+ + +
{{ $t('placeholder.fileName') }}
+
+
+
+
{{ $t('placeholder.fileName') }}
+ +
+
+
+ + {{$t('index.cancel1')}} + {{$t('index.confirm1')}} + +
+ \ No newline at end of file + \ No newline at end of file