Merge branch 'sit'

src/layout/components/Navbar.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="navbar">
-     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <hamburger
+      id="hamburger-container"
+      :is-active="sidebar.opened"
+      class="hamburger-container"
+      @toggleClick="toggleSideBar"
+    />
 
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
 
@@ -142,13 +147,13 @@ export default {
       statsTime: 0,
       endTime: 0,
       checked: false,
-      lastNotice: null,
+      lastNotice: null, //最后一次提示时间
       parmValue: {
         type: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
-      activeMsg: null,
+      activeMsg: null, //消息展示对象
     };
   },
   mounted() {
@@ -161,42 +166,41 @@ export default {
       } else {
         this.lastNotice = null;
       }
+      console.log(this.lastNotice);
       this.loading = true;
-      const res = await asyncRequest.list(this.parmValue);
-      if (
-        res &&
-        res.code === 0 &&
-        res.data &&
-        res.data.list &&
-        res.data.list.length > 0
-      ) {
-        this.activeMsg = res.data.list[0];
-        this.isShow = true;
-        if (this.lastNotice + "" !== "null") {
-          if (this.activeMsg.addtime === this.lastNotice.addtime) {
-            if (this.lastNotice.type === "1") {
-              this.checked = true;
+      const { code, data } = await asyncRequest.list(this.parmValue);
+      if (code === 0) {
+        const { list, count } = data;
+        if (count !== 0) {
+          this.activeMsg = list[0];
+          this.isShow = true;
+          if (this.lastNotice + "" !== "null") {
+            const { type, addtime, sys_type } = this.activeMsg;
+            if (
+              addtime === this.lastNotice.addtime &&
+              sys_type === this.lastNotice.sys_type
+            ) {
+              if (type === "1") {
+                this.checked = true;
+              } else {
+                this.checked = false;
+              }
             } else {
               this.checked = false;
             }
           } else {
+            this.page_set_notice();
             this.checked = false;
           }
+          if (type === 1) {
+            this.typeShow();
+          } else {
+            this.showModel = true;
+          }
         } else {
-          let model = {
-            type: this.checked ? "1" : "0",
-            addtime: this.activeMsg.addtime,
-          };
-          setNotice(JSON.stringify(model));
-          this.checked = false;
-        }
-        if (type === 1) {
-          this.typeShow();
-        } else {
-          this.showModel = true;
+          this.$message.warning("暂无信息推送！");
         }
-
-      } else if (res && res.code >= 100 && res.code <= 104) {
+      } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
         this.activeMsg = null;
@@ -237,12 +241,18 @@ export default {
       this.$router.push(`/login?redirect=${this.$route.fullPath}`);
     },
     submit() {
+      this.page_set_notice();
+      this.showModel = false;
+    },
+    //保存提交结果
+    page_set_notice() {
+      const { sys_type, addtime } = this.activeMsg;
       let model = {
         type: this.checked ? "1" : "0",
-        addtime: this.activeMsg.addtime,
+        sys_type: sys_type,
+        addtime: addtime,
       };
       setNotice(JSON.stringify(model));
-      this.showModel = false;
     },
   },
 };
@@ -297,8 +307,8 @@ export default {
 
   .breadcrumb-container {
     float: left;
-   width: 500px;
-   //min-width: calc(1200px - 200px - 150px);
+    width: 500px;
+    //min-width: calc(1200px - 200px - 150px);
   }
 
   .errLog-container {

src/store/modules/user.js

@@ -157,8 +157,13 @@ const actions = {
             list = list.filter((item) => item.child && item.child.length > 0)
             let arrag = []
             let btnList = []
-            console.log(list)
+            // console.log(list)
+            let isok = false;
             list.forEach(v1 => {
+              const {menu_route,child}=v1
+              if (menu_route==='bigScreen'&&child.length) {
+                isok = true
+              }
               let pItem = {
                 name: v1.menu_route,
                 path: `/${v1.menu_route}`,
@@ -189,6 +194,14 @@ const actions = {
               arrag.push(pItem)
             })
             console.log(arrag);
+
+            list.forEach(asd => {
+              // console.log(asd);
+              const {menu_route,child}=asd
+              if (menu_route==='bigScreen'&&child.length) {
+                isok = true
+              }
+            })
             // 生成页面权限
             commit("navListFn", arrag);
             // 生成按钮权限
@@ -196,7 +209,7 @@ const actions = {
             // 生成路由
             initRouter(arrag, that);
             // state.commit("loginInfoCommit", res.data);
-            resolve("success")
+            resolve(isok ? "success-dataV" : 'success')
           } else if (res.code >= 100 && res.code <= 104) {
             resolve("noToken")
           } else {

src/views/login/index.vue

@@ -31,7 +31,7 @@
             name="username"
             type="text"
             tabindex="1"
-             maxlength="11"
+            maxlength="11"
             autocomplete="on"
           />
         </el-form-item>
@@ -55,7 +55,7 @@
               name="password"
               tabindex="2"
               autocomplete="on"
-               maxlength="16"
+              maxlength="16"
               @keyup.native="checkCapslock"
               @blur="capsTooltip = false"
               @keyup.enter.native="handleLogin"
@@ -266,8 +266,12 @@ export default {
       this.$store
         .dispatch("user/getMenuList", this)
         .then((res) => {
+          console.log(res);
           window.vm.$router.push({
-            path: this.redirect || "/welcome",
+            path:
+              this.redirect || res === "success-dataV"
+                ? "/bigScreen/datavScr"
+                : "/welcome",
             query: this.otherQuery,
           });
           this.loading = false;

src/views/purchaseIn/workbench/index.vue

@@ -9,15 +9,15 @@
         <li class="po-li">
           <div class="taskTitle color1">咨询单任务</div>
           <div class="taskList clear">
-          
-               
             <div
               class="task-item"
               v-for="item in list"
               :key="item"
               @click="routeGoto('workbenchDetail', { id: item.infoNo })"
-              :style=" item.is_feed == 1 ? 'background: skyblue;' : 'background:none;'"
-            >   
+              :style="
+                item.is_feed == 1 ? 'background: skyblue;' : 'background:none;'
+              "
+            >
               <ul class="fl item-ul">
                 <li class="fl item-li">
                   <span class="label">任务编号：</span>
@@ -117,6 +117,8 @@ export default {
   },
   data() {
     return {
+      num: 60,
+      timer: null,
       roleLevel: roleLevel,
       loading: false,
       showModel: false,
@@ -186,7 +188,26 @@ export default {
   mounted() {
     this.searchList();
   },
+  beforeDestroy() {
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
+  },
   methods: {
+    async well_timer() {
+      this.timer = setInterval(async () => {
+        if (this.num !== 0) {
+          this.num--;
+        } else {
+          if (this.timer) {
+            await this.searchList();
+            this.num = 60;
+          } else {
+            this.clearTime();
+          }
+        }
+      }, 1000);
+    },
     restSearch() {
       // 表格 - 分页
       this.pageInfo = {
@@ -307,6 +328,7 @@ export default {
           console.log(this.list[0]);
         }
         this.pageInfo.total = Number(count);
+        await this.well_timer();
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
@@ -409,9 +431,9 @@ export default {
               border-right: 1px dashed #e6ebf5;
             }
           }
-          .tast-item-active{
+          .tast-item-active {
             width: 20%;
-              background: skyblue;
+            background: skyblue;
             &:nth-child(3n + 1) {
               border-right: 1px dashed #e6ebf5;
             }
@@ -453,7 +475,7 @@ export default {
           // padding: 0 0 0 5px;
           margin: 56px 0 0 0;
           background: #fff;
-          
+
           height: calc(100% - 56px);
           width: 100%;
           overflow-y: scroll;