浏览代码

修改陆运达沃特

caojunjie 3 年之前
父节点
当前提交
c8a96c3146

二进制
src/file/newNews.mp3


+ 9 - 2
src/page/index/top/top-notice.vue

@@ -62,7 +62,7 @@ export default {
     //60秒轮训消息
     window.setInterval(() => {
       setTimeout(() => {
-        this.assistMessage()
+        this.assistMessage(true)
       },0)
     },60000)
     this.path = "wss://trade.tubaosoft.com/api/blade-client/websocket?user=" + this.$store.getters.userInfo.user_id
@@ -110,15 +110,22 @@ export default {
     close() {
       console.log("socket已经关闭")
     },
-    assistMessage(){
+    assistMessage(type){
       // 判断是否有token
       if (getToken() !== undefined) {
         //辅助消息接口
         getMessage().then(res=>{
+          if (type && res.data.unRead){
+            this.onAudio()
+          }
           this.getMessage(JSON.stringify(res))
         })
       }
     },
+    onAudio() {
+      let audio = new Audio(require('@/file/newNews.mp3'));
+      audio.play();
+    },
     goUrl(row){
       if(row.url){
         this.$router.push({

+ 2 - 1
src/router/views/index.js

@@ -1169,7 +1169,8 @@ export default [{
       },
       component: () => import( /* webpackChunkName: "views" */ '@/views/landTransportation/dispatchingCars/index')
     }]
-  },//陆运台账
+  },
+  //陆运台账
   {
     path: '/landTransportation/reportAnalysis/index',
     component: Layout,

+ 12 - 4
src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -1800,7 +1800,7 @@ export default {
       row.integralMultiples = event.integralMultiples
       this.quantityChange(row)
     },
-    queryData(id, isCopy = false){
+    queryData(id, isCopy = false,other){
       this.pageLoading = true
       this.saveLoading = true
       detail(id).then(async res => {
@@ -1912,6 +1912,9 @@ export default {
             delete item.pid
           })
         }
+        if (other === 'check'){
+          this.pleaseCheck()
+        }
       }).finally(() => {
         this.saveLoading = false
         this.pageLoading = false
@@ -3066,7 +3069,7 @@ export default {
       })
     },
     //修改提交触发
-    editCustomer(isBack = false, type) {
+    editCustomer(isBack = false, type,other) {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           const length = this.goodsActives === 'gift'? this.contactsData.length: this.goodsShowData.length
@@ -3154,14 +3157,16 @@ export default {
           this.saveLoading = true
           typeSave(this.form).then(res => {
             // this.$set(this.detailData, 'seeDisabled', true);
-            this.$message({type: "success", message: this.form.id ? "修改成功!" : "新增成功!"});
+            if (!other){
+              this.$message({type: "success", message: this.form.id ? "修改成功!" : "新增成功!"});
+            }
             if (isBack) {
               //成功关闭此页面回到列表页
               this.$emit("goBack");
               this.leaveDetailsKey(this.$route.name)
             } else {
               this.saveActives = ''
-              this.queryData(res.data.data.id)
+              this.queryData(res.data.data.id,false,other)
             }
             if (type == '发货') {
               let lsit = []
@@ -3618,6 +3623,9 @@ export default {
     },
     // 请核
     pleaseCheck() {
+      if (!this.form.id){
+        return this.editCustomer(false,'','check')
+      }
       const giftList = this.goodsActives == 'gift'? this.goodsShowData: this.giftData
       if (this.verification()) {
         this.$confirm(giftList.length == 0?"此单没有赠品,确定提交此次审批吗?": "您确定提交此次申请吗?", {

+ 14 - 2
src/views/landTransportation/dispatchingCars/index.vue

@@ -129,7 +129,7 @@ export default {
         pageSizes: [10, 50, 100, 200, 300]
       },
       option: {},
-      activeName: '',
+      activeName: '1',
       optionList: {
         stripe: true,
         align: 'center',
@@ -269,7 +269,8 @@ export default {
             search: true,
           }]
       },
-      home:false
+      home:false,
+      dispatchTimer:null
     }
   },
   activated() {
@@ -295,6 +296,17 @@ export default {
       this.option.searchMenuPosition = "right";
     }
   },
+  mounted() {
+    let this_ = this;
+    this_.dispatchTimer = setInterval(function(){
+      totalList(2).then(res=>{
+        this_.totalData = res.data.data
+      })
+    },5000)
+  },
+  beforeDestroy() {
+    clearInterval(this.dispatchTimer); //关闭
+  },
   methods: {
     //自定义列保存
     async saveColumn() {

+ 12 - 2
src/views/landTransportation/driver/index.vue

@@ -186,7 +186,7 @@ export default {
       dialogVisible: false,
       loadingTwo: false,
       loading: false,
-      activeName:'',
+      activeName:'2',
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -537,7 +537,8 @@ export default {
         }
         ],
       },
-      totalData:{}
+      totalData:{},
+      driverTimer:null
     }
   },
   async created() {
@@ -552,6 +553,15 @@ export default {
       this.goodsOptionCrud.searchMenuSpan = num * 8;
       this.goodsOptionCrud.searchMenuPosition = "right";
     }
+    let this_ = this
+    this_.driverTimer = setInterval(function(){
+      motorcadeDriver(4).then(res=>{
+        this_.totalData = res.data.data
+      })
+    },5000)
+  },
+  beforeDestroy() {
+    clearInterval(this.driverTimer); //关闭
   },
   methods: {
     //自定义列保存

+ 11 - 1
src/views/landTransportation/motorcadeDriver/index.vue

@@ -682,7 +682,8 @@ export default {
         ]
       },
       totalData: {},
-      activeName: '1'
+      activeName: '1',
+      dispatchACarTimer:null
     }
   },
   async created() {
@@ -717,6 +718,15 @@ export default {
       this.entrustOptionTwoT.searchMenuSpan = num * 8;
       this.entrustOptionTwoT.searchMenuPosition = "right";
     }
+    let this_ = this
+    this_.dispatchACarTimer = setInterval(function(){
+      motorcadeDriver(3).then(res=>{
+        this_.totalData = res.data.data
+      })
+    },5000)
+  },
+  beforeDestroy() {
+    clearInterval(this.dispatchACarTimer); //关闭
   },
   methods: {
     confirmChange() {

+ 13 - 1
src/views/landTransportation/placeAnOrder/index.vue

@@ -178,7 +178,7 @@ export default {
   data() {
     return {
       id: '',
-      activeName: null,
+      activeName: '999',
       show: true,
       query:{},
       selectionList:[],
@@ -335,6 +335,7 @@ export default {
           }]
       },
       home:false,
+      entrustTimer:null
     }
   },
   activated() {
@@ -358,6 +359,17 @@ export default {
       this.option.searchMenuPosition = "right";
     }
   },
+  mounted() {
+    let this_ = this
+    this_.entrustTimer = setInterval(function(){
+      totalList(1).then(res=>{
+        this_.totalData = res.data.data
+      })
+    },5000)
+  },
+  beforeDestroy() {
+    clearInterval(this.entrustTimer); //关闭
+  },
   methods: {
     selectionChange(list){
       this.selectionList = list

+ 2 - 3
src/views/wel/components/quick-launch.vue

@@ -98,10 +98,10 @@
           <span>付费</span>
         </div>
         <div class="content-icon" @click="inPage('smart')" v-if="sysType == 2">
-          <div style="width: 36px;height: 37px;border-radius: 10px;background-color: #0771e3;text-align: center;">
+          <div style="width: 36px;height: 37px;border-radius: 10px;background-color: #0771e3;text-align: center;margin-top: 1px">
             <i class="el-icon-basketball" style="color:#FFFFFF;font-size: 26px;line-height: 37px;"></i>
           </div>
-          <span>智慧大屏</span>
+          <span style="margin-top: 4px">智慧大屏</span>
         </div>
       </div>
       <div class="content" v-if="sysType == 6">
@@ -199,7 +199,6 @@ export default {
             );
             break;
           case "smart":
-            console.log(this.largeScreenToken)
             window.open( 'http://119.3.74.195:9527/view/'+ this.largeScreenToken +'?token=' + getToken())
             break;
         }