wenyin

src/layout/components/Sidebar/index.vue

@@ -79,6 +79,7 @@ export default {
     }
   },
   created() {
+    console.log(this.$route.name);
     if (this.$route.query.name) {
       this.sidebarRoutersfun();
     } else {
@@ -94,19 +95,25 @@ export default {
         if (item.path == this.$route.query.name) {
           // console.log(item);
           this.routs.push(item);
-          if (this.routs[0].children[0].children) {
-            this.defaultpath = [this.routs[0].children[0].path];
-            this.p =
-              this.routs[0].path +
-              "/" +
-              this.routs[0].children[0].path +
-              "/" +
-              this.routs[0].children[0].children[0].path;
-            this.$router.push({ path: this.p });
+          if (this.$route.name == "Notice") {
+            //  this.p = this.routs[0].path + "/" + this.routs[0].children[0].path;
+            this.$router.push({ path: "/system/notice" });
           } else {
-            this.defaultpath = [this.routs[0].path];
-            this.p = this.routs[0].path + "/" + this.routs[0].children[0].path;
-            this.$router.push({ path: this.p });
+            if (this.routs[0].children[0].children) {
+              this.defaultpath = [this.routs[0].children[0].path];
+              this.p =
+                this.routs[0].path +
+                "/" +
+                this.routs[0].children[0].path +
+                "/" +
+                this.routs[0].children[0].children[0].path;
+              this.$router.push({ path: this.p });
+            } else {
+              this.defaultpath = [this.routs[0].path];
+              this.p =
+                this.routs[0].path + "/" + this.routs[0].children[0].path;
+              this.$router.push({ path: this.p });
+            }
           }
         }
         // console.log(this.routs.length)

src/views/PrintsManage/manage/index.vue

@@ -921,6 +921,7 @@ export default {
       this.dyform.statusG = 0;
       this.dyform.printfileName = row.sendName;
       this.dyform.printNumber = row.printNumber;
+      this.dyform.printRoom=row.printRoom;
       this.dyform.type = row.type;
       // this.dyform.isReturn = row.isReturn + "";
       if (row.isPrintColor == 1) {
@@ -965,6 +966,7 @@ export default {
             process.env.VUE_APP_BASE_API +
             "/profile/print/" +
             res.printFileName;
+          //  location.href =res.file;
         }
       });
       // open.location.href="http://192.168.5.188:8080/priofile/print/202203211244.docx";

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -613,7 +613,7 @@ export default {
 
       option: {
         start: "06:00",
-        step: "00:30",
+        step: "00:05",
         end: "08:00",
       },
     };

src/views/login.vue

@@ -228,13 +228,13 @@ export default {
   }
 }
 .el-form-item__error{
-   margin-left: 58px;
-   margin-top:10px;
+   margin-left: 510px;
+   margin-top:15px !important;
 }
 .login-tip {
   font-size: 13px;
   text-align: center;
-  color: #bfbfbf;
+  color: #0a0606;
 }
 .login-code {
   width: 33%;
@@ -275,7 +275,7 @@ export default {
   border: 1px solid #01cfff;
 }
 .el-form-item__error {
-  left: 65px;
+  left: 510px !important;
 }
 .img {
   position: absolute;

src/views/pt.vue

@@ -910,8 +910,8 @@ export default {
       // this.open5 = true;
       // this.ggflg = true;
       // this.reset();
-      window.open(`/system/notice`, "_self");
-      // this.$router.push({ path: "/system/notice" }).catch(() => {});
+      // window.open(`/system/notice`, "_self");
+      this.$router.push({ path: "/system/notice" }).catch(() => {});
     },
     submitForm() {
       // addNotice(this.form).then((response) => {