update

src/assets/scss/_base.scss

@@ -23,6 +23,13 @@ img {
   vertical-align: middle;
 }
 
+/* El-Message
+------------------------------ */
+.el-message {
+  .el-message__content {
+    font-size: 24px;
+  }
+}
 
 /* Utils
 ------------------------------ */

src/views/basic/carInfo.vue

@@ -22,6 +22,9 @@
           <icon-svg class="iconClass" name="新建"></icon-svg>
           新增
         </el-button>
+        <el-button size="small" type="success" @click="resetCarStatus()">
+          重置车辆状态
+        </el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -160,6 +163,32 @@
           this.$refs.addOrUpdate.init(id)
         })
       },
+      // 重置车辆状态
+      resetCarStatus () {
+        this.$confirm(`确定重置车辆状态?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl('/vehicle/resetStatus'),
+            method: 'post'
+          }).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {})
+      },
       // 删除
       deleteHandle (id) {
         this.$confirm(`确定对[id=${id}]进行删除操作?`, '提示', {

src/views/common/ex-warehouse-info.vue

@@ -34,18 +34,60 @@
         align="center"
         label="客户信息">
       </el-table-column>
+      <el-table-column
+        prop="productName"
+        header-align="center"
+        align="center"
+        label="产品名称">
+      </el-table-column>
+      <el-table-column
+        prop="orderNo"
+        header-align="center"
+        align="center"
+        label="订单号">
+      </el-table-column>
+      <el-table-column
+        prop="taskCode"
+        header-align="center"
+        align="center"
+        label="任务编码">
+      </el-table-column>
+      <el-table-column
+        prop="currTaskId"
+        header-align="center"
+        align="center"
+        label="当前任务ID">
+      </el-table-column>
+      <el-table-column
+        prop="materialDes"
+        header-align="center"
+        align="center"
+        label="物料牌号">
+      </el-table-column>
+      <el-table-column
+        prop="craftIll"
+        header-align="center"
+        align="center"
+        label="工艺要求">
       <el-table-column
         prop="quantity"
         header-align="center"
         align="center"
         label="数量">
       </el-table-column>
+      <el-table-column
+        prop="weight"
+        header-align="center"
+        align="center"
+        label="重量">
+      </el-table-column>
       <el-table-column
         prop="unit"
         header-align="center"
         align="center"
         label="单位">
       </el-table-column>
+      </el-table-column>
     </el-table>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>

src/views/common/ex-warehouse.vue

@@ -34,9 +34,14 @@
     </el-card>
     <el-card class="base-container" style="margin-top: 20px; min-height: 200px">
       <el-row :gutter="30" style="padding: 20px;">
-        <el-col class="footer-item-container" :span="6" v-for="count in 4" :key="count">
+        <el-col class="footer-item-container" :offset="3" :span="6">
-          <el-card class="footer-item-box base-container" @click.native="selectPlat(count)">
+          <el-card class="footer-item-box base-container" @click.native="selectPlat(1)">
-            <div class="plat" style="font-size: 24px">液压台{{ count }}</div>
+            <div class="plat" style="font-size: 24px">出口液压台1</div>
+          </el-card>
+        </el-col>
+        <el-col class="footer-item-container" :offset="6" :span="6">
+          <el-card class="footer-item-box base-container" @click.native="selectPlat(2)">
+            <div class="plat" style="font-size: 24px">出口液压台2</div>
           </el-card>
         </el-col>
       </el-row>
@@ -157,7 +162,8 @@ export default {
   .wareBox-button {
     position: absolute;
     bottom: 0;
-    right: 0;
+    margin-left: -22px;
+    font-size: 18px;
   }
 }
 .line {
@@ -168,7 +174,7 @@ export default {
   border-right: 200px solid #ddd;
 }
 .enableBox {
-  background: #EFF3FF;
+  background: #aaccFF;
 }
 .disableBox {
   background: #F4F4F4;

src/views/common/home.vue

@@ -100,7 +100,7 @@
         <template slot-scope="scope">
           <span>{{
             scope.row.taskType === 0
-              ? "缓存到窑炉加工"
+              ? "炉子加工"
               : scope.row.taskType === 1
               ? "出炉到缓存"
               : scope.row.taskType === 2

src/views/common/order-auto-submit.vue

@@ -28,8 +28,8 @@
       <el-form-item v-if="dataForm.autoTaskType === 2" label="开始加工炉">
         <el-form-item label="加工起点" prop="startPosition" style="margin-bottom: 24px">
           <el-select v-model="dataForm.startPosition" :disabled="!(dataForm.autoTaskType)">
-            <el-option value="YYT003" label="液压台3"></el-option>
+            <el-option value="YYT003" label="入口液压台3"></el-option>
-            <el-option value="YYT004" label="液压台4"></el-option>
+            <el-option value="YYT004" label="入口液压台4"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="加工炉" prop="firstPosition" style="margin-bottom: 24px">
@@ -46,8 +46,8 @@
       <el-form-item label="清洗炉">
         <el-form-item label="加工起点" v-if="dataForm.autoTaskType !== 2" prop="startPosition" style="margin-bottom: 24px">
           <el-select v-model="dataForm.startPosition" :disabled="!(dataForm.autoTaskType)">
-            <el-option value="YYT003" label="液压台3"></el-option>
+            <el-option value="YYT003" label="入口液压台3"></el-option>
-            <el-option value="YYT004" label="液压台4"></el-option>
+            <el-option value="YYT004" label="入口液压台4"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="加工炉" prop="secPosition" style="margin-bottom: 24px">

src/views/common/order-process.vue

@@ -15,10 +15,8 @@
       </el-form-item>
       <el-form-item style="margin-left:1%">
         <el-select v-model="startPosition" size="small" placeholder="任务起点位置" clearable>
-          <el-option value="YYT001" label="液压台1" />
+          <el-option value="YYT003" label="入口液压台3" />
-          <el-option value="YYT002" label="液压台2" />
+          <el-option value="YYT004" label="入口液压台4" />
-          <el-option value="YYT003" label="液压台3" />
-          <el-option value="YYT004" label="液压台4" />
         </el-select>
         <!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startPosition}}</el-button> -->
       </el-form-item>
@@ -199,7 +197,7 @@
             message: '请选择窑炉',
             type: 'warning'
           })
-        } else if (!this.processType) {
+        } else if (!this.processType && this.processType !== 0) {
           this.$message.warning('请选择加工类型')
         } else {
           this.$confirm(`确定提交任务?`, '提示', {

src/views/main.vue

@@ -41,7 +41,9 @@
       return {
         loading: false,
         websock: '',
-        url: ''
+        url: '',
+        id: 1,
+        heart: null
       }
     },
     components: {
@@ -67,14 +69,16 @@
       }
     },
     created () {
-      const baseurl = window.SITE_CONFIG.baseUrl
+      this.url = window.SITE_CONFIG.baseWsUrl
-      this.url = baseurl.slice(5)
       this.getUserInfo()
       this.initWebSocket()
     },
     mounted () {
       this.resetDocumentClientHeight()
     },
+    destroyed () {
+      clearInterval(this.heart)
+    },
     methods: {
       // 重置窗口可视高度
       resetDocumentClientHeight () {
@@ -98,15 +102,20 @@
         // })
       },
       initWebSocket () { // 初始化weosocket
-        const path = `ws:${this.url}/qj/websocket/${'id'}`
+        const path = `${this.url}qj/websocket/${this.id}`
         this.websock = new WebSocket(path)
         this.websock.onmessage = this.websocketonmessage
         this.websock.onopen = this.websocketonopen
         this.websock.onerror = this.websocketonerror
         this.websock.onclose = this.websocketclose
       },
-      websocketonopen () { // 连接建立之后执行send方法发送数据
+      websocketonopen () { // 连接建立之后建立心跳
-        this.websocketsend(JSON.stringify())
+        this.heartFun()
+      },
+      heartFun () { // 心跳函数
+        this.heart = setInterval(() => {
+          this.websocketsend('1')
+        }, 30000)
       },
       websocketonerror () { // 连接建立失败重连
         this.initWebSocket()
@@ -118,8 +127,8 @@
           duration: 15000
         })
       },
-      websocketsend () { // 数据发送
+      websocketsend (msg) { // 数据发送
-        this.websock.send()
+        this.websock.send(msg)
       },
       websocketclose (e) {  // 关闭
         console.log('断开连接', e)

src/views/order/components/current-order-task.vue

@@ -44,6 +44,9 @@
         prop="taskType"
         label="任务类型"
       >
+        <template slot-scope="scope">
+          {{ scope.row.taskType >= 0 ? taskTypeList[scope.row.taskType] : '' }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="remark"
@@ -102,7 +105,11 @@ export default {
       pageIndex: 1,
       pageSize: 10,
       totalPage: 0,
-      dataListLoading: false
+      dataListLoading: false,
+      taskTypeList: {
+        0: '初始加工',
+        1: '复加工'
+      }
     }
   },
   activated () {

src/views/order/current-task.vue

@@ -37,6 +37,9 @@
       <el-table-column
         prop="createTime"
         label="发起时间">
+        <template slot-scope="scope">
+          {{ scope.row.createTime ? moment(scope.row.createTime).format('YYYY-MM-D HH:mm:ss') : '' }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="taskSource"
@@ -55,7 +58,7 @@
         <template slot-scope="scope">
           <span>{{
             scope.row.taskType === 0
-              ? "缓存到窑炉加工"
+              ? "炉子加工"
               : scope.row.taskType === 1
               ? "出炉到缓存"
               : scope.row.taskType === 2
@@ -83,7 +86,7 @@
         width="80"
         label="详情">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="Detail(scope.row.id)">详情</el-button>
+          <el-button v-if="scope.row.status === 0" type="text" size="small" @click="Detail(scope.row.id)">详情</el-button>
         </template>
       </el-table-column>
       <el-table-column
@@ -119,6 +122,7 @@
 </template>
 
 <script>
+  import moment from 'moment'
   // 任务状态列表
   const statusList = {
     0: '等待执行',
@@ -138,7 +142,8 @@
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        statusList
+        statusList,
+        moment
       }
     },
     activated () {

src/views/report/car-alarm.vue

@@ -52,6 +52,9 @@
       <el-table-column
         prop="createTime"
         label="报警时间">
+        <template slot-scope="scope">
+          {{ scope.row.createTime ? moment(scope.row.createTime).format('YYYY-MM-D HH:mm:ss') : '' }}
+        </template>
       </el-table-column>
       <!-- <el-table-column
         prop="time"
@@ -75,6 +78,8 @@
 </template>
 
 <script>
+  import moment from 'moment'
+
   export default {
     data () {
       return {
@@ -88,7 +93,8 @@
         totalPage: 0,
         dataListLoading: false,
         selectionDataList: [],
-        carList: []
+        carList: [],
+        moment
       }
     },
     created () {

src/views/report/kiln-alarm.vue

@@ -57,6 +57,9 @@
         prop="createTime"
         label="报警时间"
       >
+        <template slot-scope="scope">
+          {{ scope.row.createTime ? moment(scope.row.createTime).format('YYYY-MM-D HH:mm:ss') : '' }}
+        </template>
       </el-table-column>
       <!-- <el-table-column
         prop="time"
@@ -83,6 +86,8 @@
 </template>
 
 <script>
+import moment from 'moment'
+
 export default {
   data () {
     return {
@@ -96,7 +101,8 @@ export default {
       totalPage: 0,
       dataListLoading: false,
       selectionDataList: [],
-      kilnList: []
+      kilnList: [],
+      moment
     }
   },
   created () {

src/views/report/order-history.vue

@@ -43,6 +43,9 @@
       <el-table-column
         prop="createTime"
         label="获取时间">
+        <template slot-scope="scope">
+          {{ scope.row.createTime ? moment(scope.row.createTime).format('YYYY-MM-D HH:mm:ss') : '' }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="idenCardNum"
@@ -132,6 +135,7 @@
 </template>
 
 <script>
+  import moment from 'moment'
   import orderDetail from './components/order-history-detail'
   // 任务状态列表
   const statusList = {
@@ -163,7 +167,8 @@
         dataListLoading: false,
         orderDetailVisible: false,
         statusList,
-        orderVoidList
+        orderVoidList,
+        moment
       }
     },
     components: {

src/views/report/task-history.vue

@@ -62,6 +62,9 @@
         prop="createTime"
         label="发起时间"
       >
+        <template slot-scope="scope">
+          {{ scope.row.createTime ? moment(scope.row.createTime).format('YYYY-MM-D HH:mm:ss') : '' }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="taskSource"
@@ -83,7 +86,7 @@
         <template slot-scope="scope">
           <span>{{
             scope.row.taskType === 0
-              ? "缓存到窑炉加工"
+              ? "炉子加工"
               : scope.row.taskType === 1
               ? "出炉到缓存"
               : scope.row.taskType === 2
@@ -145,6 +148,7 @@
 </template>
 
 <script>
+import moment from 'moment'
 // 任务状态列表
 const statusList = {
   0: '等待执行',
@@ -167,7 +171,8 @@ export default {
       totalPage: 0,
       dataListLoading: false,
       orderDetailVisible: false,
-      statusList
+      statusList,
+      moment
     }
   },
   activated () {

static/config/index-prod.js

@@ -14,6 +14,8 @@
 
   // api接口请求地址
   window.SITE_CONFIG['baseUrl'] = '/api';
+  // WS请求地址
+  window.SITE_CONFIG['baseWsUrl'] = 'ws://192.168.6.66:8080/'
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名

static/config/index-qa.js

@@ -6,6 +6,8 @@
 
   // api接口请求地址
   window.SITE_CONFIG['baseUrl'] = 'http://localhost:8080/renren-fast';
+  // WS请求地址
+  window.SITE_CONFIG['baseWsUrl'] = 'ws://192.168.1.7:8080/'
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名

static/config/index-uat.js

@@ -6,6 +6,8 @@
 
   // api接口请求地址
   window.SITE_CONFIG['baseUrl'] = 'http://localhost:8080/renren-fast';
+  // WS请求地址
+  window.SITE_CONFIG['baseWsUrl'] = 'ws://192.168.1.7:8080/'
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名

static/config/index.js

@@ -12,7 +12,9 @@
   window.SITE_CONFIG = {}
 
   // api接口请求地址
-  window.SITE_CONFIG['baseUrl'] = 'http://192.168.0.134:8080/'
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.7:8080/'
+  // WS请求地址
+  window.SITE_CONFIG['baseWsUrl'] = 'ws://192.168.1.7:8080/'
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain'] = './' // 域名