From 9ff9df45da199ea384f554f15cc8bc635b1b1166 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 16 Jul 2024 08:43:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=AE=A1=E5=B1=95=E7=A4=BA=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/setChannelDialog.vue           | 24 +++++++++++++++----
 .../reportData/equipmentStatus/index.vue      | 11 +++++++--
 src/views/reportData/photostatis/index.vue    | 11 +++++++--
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/views/realTimeMonitor/components/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannelDialog.vue
index 6f7a11e..2406999 100644
--- a/src/views/realTimeMonitor/components/setChannelDialog.vue
+++ b/src/views/realTimeMonitor/components/setChannelDialog.vue
@@ -711,7 +711,11 @@ export default {
             //   value: this.channelForm.ltosd,
             // },
             { name: "name12", value: "osd.leftTop" },
-            { name: "value12", value: this.channelForm.ltosd },
+            {
+              name: "value12",
+              value:
+                this.channelForm.ltosd == null ? "" : this.channelForm.ltosd,
+            },
             { name: "type12", value: 1 },
             // {
             //   name: "osd.rightTop",
@@ -719,7 +723,11 @@ export default {
             //   value: this.channelForm.rtosd,
             // },
             { name: "name13", value: "osd.rightTop" },
-            { name: "value13", value: this.channelForm.rtosd },
+            {
+              name: "value13",
+              value:
+                this.channelForm.rtosd == null ? "" : this.channelForm.rtosd,
+            },
             { name: "type13", value: 1 },
             // {
             //   name: "osd.rightBottom",
@@ -727,7 +735,11 @@ export default {
             //   value: this.channelForm.lbosd,
             // },
             { name: "name14", value: "osd.leftBottom" },
-            { name: "value14", value: this.channelForm.lbosd },
+            {
+              name: "value14",
+              value:
+                this.channelForm.lbosd == null ? "" : this.channelForm.lbosd,
+            },
             { name: "type14", value: 1 },
             // {
             //   name: "osd.leftBottom",
@@ -735,7 +747,11 @@ export default {
             //   value: this.channelForm.rbosd,
             // },
             { name: "name15", value: "osd.rightBottom" },
-            { name: "value15", value: this.channelForm.rbosd },
+            {
+              name: "value15",
+              value:
+                this.channelForm.rbosd == null ? "" : this.channelForm.rbosd,
+            },
             { name: "type15", value: 1 },
             //视频分辨率
 
diff --git a/src/views/reportData/equipmentStatus/index.vue b/src/views/reportData/equipmentStatus/index.vue
index decb05a..3293dfb 100644
--- a/src/views/reportData/equipmentStatus/index.vue
+++ b/src/views/reportData/equipmentStatus/index.vue
@@ -54,7 +54,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="活动" class="activitybox">
+        <el-form-item
+          label="活动"
+          class="activitybox"
+          v-if="roleName === 'superadmin' || roleName === 'Matthew'"
+        >
           <el-select
             @keyup.enter.native="onSubmit()"
             v-model="formdata.activityId"
@@ -337,6 +341,7 @@ export default {
   },
   data() {
     return {
+      roleName: "",
       pickerOptions: {
         disabledDate(date) {
           return date.getTime() > Date.now(); // 禁用大于今天的日期
@@ -372,7 +377,9 @@ export default {
       tableheight: "100%",
     };
   },
-  created() {},
+  created() {
+    this.roleName = localStorage.getItem("userName");
+  },
   mounted() {
     this.getSearchdy();
     this.getProtocol();
diff --git a/src/views/reportData/photostatis/index.vue b/src/views/reportData/photostatis/index.vue
index 7c6481e..6a7bdf7 100644
--- a/src/views/reportData/photostatis/index.vue
+++ b/src/views/reportData/photostatis/index.vue
@@ -44,7 +44,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="活动" class="activitybox">
+        <el-form-item
+          label="活动"
+          class="activitybox"
+          v-if="roleName === 'superadmin' || roleName === 'Matthew'"
+        >
           <el-select
             @keyup.enter.native="onSubmit()"
             v-model="formdata.activityId"
@@ -270,9 +274,12 @@ export default {
       photoLoading: false,
       drawerSearch: false,
       tableheight: "100%",
+      roleName: "",
     };
   },
-  created() {},
+  created() {
+    this.roleName = localStorage.getItem("userName");
+  },
   mounted() {
     this.getSearchdy();
     this.getactiveList();