no message

package-lock.json

@@ -2410,6 +2410,11 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "aring-vue-marquee": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/aring-vue-marquee/-/aring-vue-marquee-2.0.8.tgz",
+      "integrity": "sha512-KyxSVfQFqM3l+nBF2lbsupk906kpV1q9hHpq5M1fRxEl4cgq37Khc1ItmByXyvzZMPQiQj5Rql4pGAYSsZGbEw=="
+    },
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",

package.json

@@ -22,6 +22,7 @@
   "dependencies": {
     "@jiaminghi/data-view": "^2.10.0",
     "@riophae/vue-treeselect": "^0.4.0",
+    "aring-vue-marquee": "^2.0.8",
     "axios": "^0.21.1",
     "clipboard": "2.0.4",
     "codemirror": "^5.49.2",

src/api/stock.js

@@ -80,4 +80,12 @@ export function getItemCode(stockCode) {
   })
 }
 
-export default { add, edit, del,containerIn,containerOut,callStock,getItemCode,lineReturn}
+export function stockMsg(data) {
+  return request({
+    url: 'api/stock/stockMsg',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del,containerIn,containerOut,callStock,getItemCode,lineReturn,stockMsg}

src/main.js

@@ -21,6 +21,7 @@ import './assets/icons' // icon
 import './router/index' // permission control
 
 
+
 const TableProps = Element.Table.props
 const TableColumnProps = Element.TableColumn.props
 TableProps.border = {type: Boolean, default: true} // 边框

src/views/base-data/stock/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
@@ -76,8 +77,13 @@
             :show-file-list="true">
           <el-button size="mini" type="success" icon="el-icon-upload2">导入</el-button>
         </el-upload>
+
       </crudOperation>
 
+
+
+
+
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
                  :title="crud.status.title" width="350px">
@@ -206,6 +212,8 @@
         <pagination/>
       </div>
 
+
+
     </div>
 
   </div>
@@ -386,7 +394,7 @@ export default {
     toReturnEntity(data) {
       this.$refs.returnContainer.dialog = true
       this.$refs.returnContainer.returnEntityClick(data)
-    }
+    },
   }
 }
 </script>

src/views/databigscreen/DeptData.vue

@@ -1,13 +1,32 @@
 <template>
   <div id="div1" style="height: 700px;width: 100%">
     <dv-border-box-11 title="库位信息化看板" style="background-color: black;width: 100%">
-      <div class="div2">当前时间: {{ currentTime }} 周{{ dayOfWeek }}
+      <div class="div2">
+        当前时间: {{ currentTime }} 周{{ dayOfWeek }}
 
       </div>
+
       <!--      <div id="container"></div>-->
       <div id="threeDEarth"></div>
       <dv-border-box-8 class="grid-container" :reverse="true">
+        <div style="display: flex; align-items: center;">
 
+
+          <img :src="imageUrl" style="weight: 16px;height: 16px;" alt="Logo" v-if="msg">
+          <div style="flex-grow: 1; overflow: hidden;">
+            <vue-marquee
+                :speed="10"
+                :delayTime="500"
+                :mouseover="true"
+                color="white"
+                direction="left"
+            >
+
+              <span style="font-size: 18px;font-weight: bold">{{ msg }}</span>
+            </vue-marquee>
+          </div>
+
+        </div>
         <dv-border-box-10 class="box10" v-for="(div, index) in divs" :key="index">
           <el-tooltip placement="top" class="item" effect="dark">
             <div slot="content">
@@ -71,10 +90,18 @@ import crudPoint from "@/api/point";
 import crudAgvTask from "@/api/agvTask"
 import CRUD from "@crud/crud";
 import 'echarts-gl';
+import VueMarquee from 'aring-vue-marquee';
+import stockUrl from "@/api/stock";
 
 export default {
+  name: 'DeptData',
+  components: {
+    VueMarquee
+  },
   data() {
     return {
+      msg: '',
+      imageUrl: require("@/assets/images/igw-l-news-noticewhite.png"),
       total: 0,
       pageSize: 25,
       currentPage: 1,
@@ -138,7 +165,8 @@ export default {
     this.queryAgvTaskInfo();//AGV任务列表
     this.queryListInfo(this.currentPage, this.pageSize)//库位图
     this.intervalId = setInterval(this.printNextItem, 5000);//定时分页调用
-
+    this.stockMsg();
+    this.initWebSocket();
   },
   methods: {
     updateTime() {
@@ -252,6 +280,38 @@ export default {
         clearInterval(this.intervalId);
         this.intervalId = null;
       }
+    },
+    initWebSocket() {
+      const wsUri = (process.env.VUE_APP_WS_API === '/' ? '/' : (process.env.VUE_APP_WS_API + '/')) + 'webSocket/stock'
+      this.websock = new WebSocket(wsUri)
+      this.websock.onerror = this.webSocketOnError
+      this.websock.onmessage = this.webSocketOnMessage
+    },
+    webSocketOnError(e) {
+      this.$notify({
+        title: 'WebSocket连接发生错误',
+        type: 'error',
+        duration: 0
+      })
+    }, webSocketOnMessage(e) {
+      const data = JSON.parse(e.data)
+      if (data.msgType === 'INFO') {
+        this.msg = data.msg
+      } else if (data.msgType === 'ERROR') {
+        this.$notify({
+          title: '',
+          message: data.msg,
+          dangerouslyUseHTMLString: true,
+          type: 'error',
+          duration: 0
+        })
+      }
+    },
+    webSocketSend(agentData) {
+      this.websock.send(agentData)
+    },
+    stockMsg() {
+      stockUrl.stockMsg()
     }
 
   }
@@ -293,6 +353,7 @@ export default {
   top: 640px;
   left: 30%;
 }
+
 #container {
   width: 30px;
   height: 30px;
@@ -304,6 +365,10 @@ export default {
   top: 34px;
 }
 
+.marquee-item {
+  margin-right: 50px;
+}
+
 #threeDEarth {
   /* width: 30px;
    height: 30px;

src/views/monitor/log/index.vue

@@ -4,6 +4,7 @@
       <Search/>
       <crudOperation>
         <el-button
+          v-if="false"
           slot="left"
           class="filter-item"
           type="danger"