优化水印

src/views/realTimeMonitor/components/setChannel/setChannelDialog copy.vue

@@ -963,6 +963,7 @@ export default {
     selectItem2(item) {
       console.log(item.value);
       this.channelForm.rtosd += item.name + ":" + item.value + "  ";
+      console.log(this.channelForm.rtosd);
     },
     selectItem3(item) {
       console.log(item.value);

src/views/realTimeMonitor/components/setChannel/setChannelDialog.vue

@@ -956,7 +956,10 @@ export default {
     },
     selectItem2(item) {
       console.log(item.value);
+      console.log(item.name);
+      console.log(this.channelForm.rtosd);
       this.channelForm.rtosd += item.name + ":" + item.value + "  ";
+      console.log(this.channelForm.rtosd);
     },
     selectItem3(item) {
       console.log(item.value);
@@ -1081,19 +1084,23 @@ export default {
               this.channelForm.aival = resultContent.recognization;
               this.channelForm.roteval = resultContent.orientation;
               this.channelForm.rtosd =
-                resultContent.osd.rightTop != "null"
+                resultContent.osd.rightTop !== null &&
+                resultContent.osd.rightTop !== undefined
                   ? resultContent.osd.rightTop
                   : "";
               this.channelForm.ltosd =
-                resultContent.osd.leftTop != "null"
+                resultContent.osd.leftTop !== null &&
+                resultContent.osd.leftTop !== undefined
                   ? resultContent.osd.leftTop
                   : "";
               this.channelForm.lbosd =
-                resultContent.osd.leftBottom != "null"
+                resultContent.osd.leftBottom !== null &&
+                resultContent.osd.leftBottom !== undefined
                   ? resultContent.osd.leftBottom
                   : "";
               this.channelForm.rbosd =
-                resultContent.osd.rightBottom != "null"
+                resultContent.osd.rightBottom !== null &&
+                resultContent.osd.rightBottom !== undefined
                   ? resultContent.osd.rightBottom
                   : "";
               this.channelForm.videoCX = resultContent.videoCX;

src/views/realTimeSearch/index.vue

@@ -200,6 +200,7 @@
           @size-change="handleSizeChange"
           :current-page="page"
           :page-size="pageSize"
+          :page-sizes="[20, 50, 100, 200]"
           layout="sizes, prev, pager, next, jumper,total"
           :total="total"
           background

src/views/reportData/photostatis/index.vue

@@ -320,6 +320,13 @@ export default {
   },
   created() {
     this.roleName = localStorage.getItem("userName");
+    let pageSizeFromStorage = localStorage.getItem("photoPageSize");
+    // 使用三元运算符设置this.pageSize
+    this.pageSize =
+      pageSizeFromStorage !== null && pageSizeFromStorage !== ""
+        ? parseInt(pageSizeFromStorage, 10)
+        : 20;
+
     // this.picflag = localStorage.getItem("picflag");
     // const backButtonRouteGuard = this.$router.beforeEach((to, from, next) => {
     //   if (from.name == "reportData" && this.picflag == "true") {
@@ -519,6 +526,7 @@ export default {
     //每页条数
     handleSizeChange(val) {
       this.pageSize = val;
+      localStorage.setItem("photoPageSize", this.pageSize);
       //this.getPhotoFun();
     },
     //点击装置查看历史图片