Merge pull request '新增看板' (#14) from zwq into master

Reviewed-on: #14

config/index.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-11-19 10:10:51
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-05 16:16:24
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-01 11:05:12
  * @Description: file content
  * @FilePath: \mt-qj-wms-ui\config\index.js
  */
@@ -31,7 +31,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: 'localhost', // can be overwritten by process.env.HOST
     port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/assets/scss/_base.scss

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

src/router/index.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2021-11-15 08:20:28
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-05 16:05:35
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-01 11:11:17
  * @Description:
  */
 /**
@@ -39,6 +39,7 @@ const mainRoutes = {
     // 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否
     // 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理!
     { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页', isTab: true } },
+    { path: '/board', component: _import('common/board'), name: 'board', meta: { title: '车间生产看板', isTab: false } },
     { path: '/orderProcess', component: _import('common/order-process'), name: 'orderProcess', meta: { title: '订单加工', isTab: true } },
     { path: '/orderAuto', component: _import('common/order-auto'), name: 'orderAuto', meta: { title: '自动任务', isTab: true } },
     { path: '/exWarehouse', component: _import('common/ex-warehouse'), name: 'exWarehouse', meta: { title: '货物出库', isTab: true } },

src/views/basic/carInfo.vue

@@ -22,9 +22,6 @@
           <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
@@ -163,32 +160,6 @@
           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/board-part-table.vue

@@ -0,0 +1,53 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-03-07 15:31:13
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-01 16:58:50
+ * @Description:
+-->
+<template>
+  <div class="main-body">
+    <el-table
+      size='mini'
+      :data="tableData"
+      :header-cell-style="{background:'#082c34',color:'#acb9be',padding:'0px'}"
+      :cell-style="{background:'#04222d',color:'#acb9be',padding:'5px 0px'}"
+      style="width: 100%"
+    >
+      <el-table-column type="index" label="序号" width="30" align="center"> </el-table-column>
+      <el-table-column prop="name" label="客户名称" align="center"> </el-table-column>
+      <el-table-column prop="code" label="订单编号" align="center"> </el-table-column>
+      <el-table-column prop="num" label="数量" width="50" align="center"> </el-table-column>
+      <el-table-column prop="productName" label="产品名称" align="center"> </el-table-column>
+      <el-table-column prop="weight" label="重量" width="50" align="center"> </el-table-column>
+      <el-table-column prop="process" label="加工方式" width="60" align="center"> </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'board-part-table',
+  components: {},
+  props: {
+    tableData: {
+      type: Array,
+      default: []
+    }
+  },
+  data () {
+    return {}
+  },
+  created () {},
+  methods: {}
+}
+</script>
+
+<style lang="scss" scoped>
+.main-body{
+  margin: 5px;
+}
+.main-body /deep/ .cell{
+  padding: 0px;
+}
+</style>

src/views/common/board-part.vue

@@ -0,0 +1,226 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-03-07 15:31:13
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-01 16:58:00
+ * @Description:
+-->
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="tipDiv"></div>
+      加工单信息
+    </div>
+    <div class="main-body">
+      <div class="main-header">
+        <el-row :gutter="8">
+          <el-col :span="8">
+            <div class="front">
+              <img
+                :src="'/static/img/lu/'+imgUrl+'.png'"
+                style="display:block;margin:auto"
+              />炉号
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-row>
+              <div class="mid top-info">
+                1293803
+                <div style="color: #fff;margin: 5px 0;">加工单编号</div>
+              </div>
+            </el-row>
+            <el-row>
+              <div class="mid bottom-info">
+                129
+                <div style="color: #fff;margin: 5px 0;">工艺号</div>
+              </div>
+            </el-row>
+          </el-col>
+          <el-col :span="8">
+            <div class="back">
+              <el-progress
+                :percentage="80"
+                :stroke-width="8"
+                :show-text="false"
+              ></el-progress>
+              <div style="margin: 5px 0;">{{ hour }}:{{ minute }}:{{ second }}</div>
+                <div style="color: #fff;font-size:14px">剩余时间</div>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="main-table">
+      <div class="tipDiv"></div>
+      标识信息卡
+      </div>
+      <part-table :tableData="tableData"></part-table>
+    </div>
+  </div>
+</template>
+
+<script>
+import partTable from './board-part-table.vue'
+export default {
+  components: {partTable},
+  props: {
+    tableData: {
+      type: Array,
+      default: () => []
+    },
+    countdown: {
+      type: Object,
+      default: () => ({
+        'hours': 1,
+        'minutes': 10,
+        'seconds': 0
+      })
+    },
+    imgUrl: {
+      type: String,
+      default: 'BMA1'
+    }
+  },
+  data () {
+    return {
+      hours: 1,
+      minutes: 12,
+      seconds: 0
+    }
+  },
+  created () {
+    this.hours = this.countdown.hours
+    this.minutes = this.countdown.minutes
+    this.seconds = this.countdown.seconds
+  },
+  mounted () {
+    this.add()
+  },
+  watch: {
+    // 监听数值变化
+    second: {
+      handler (newVal) {
+        this.num(newVal)
+      }
+    },
+    minute: {
+      handler (newVal) {
+        this.num(newVal)
+      }
+    },
+    hour: {
+      handler (newVal) {
+        this.num(newVal)
+      }
+    }
+  },
+  computed: {
+    // 初始化数据
+    second () {
+      return this.num(this.seconds)
+    },
+    minute () {
+      return this.num(this.minutes)
+    },
+    hour () {
+      return this.num(this.hours)
+    }
+  },
+  methods: {
+    num (n) {
+      return n < 10 ? '0' + n : '' + n
+    },
+    // 倒计时函数
+    add () {
+      let time = window.setInterval(() => {
+        if (this.hours !== 0 && this.minutes === 0 && this.seconds === 0) {
+          this.hours -= 1
+          this.minutes = 59
+          this.seconds = 59
+        } else if (
+          this.hours === 0 &&
+          this.minutes !== 0 &&
+          this.seconds === 0
+        ) {
+          this.minutes -= 1
+          this.seconds = 59
+        } else if (
+          this.hours === 0 &&
+          this.minutes === 0 &&
+          this.seconds === 0
+        ) {
+          this.seconds = 0
+          window.clearInterval(time)
+        } else if (
+          this.hours !== 0 &&
+          this.minutes !== 0 &&
+          this.seconds === 0
+        ) {
+          this.minutes -= 1
+          this.seconds = 59
+        } else {
+          this.seconds -= 1
+        }
+      }, 1000)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.title {
+  color: #ffffff;
+  font-size: 22px;
+  margin: 8px 0;
+  .tipDiv {
+    border-radius: 3px;
+    width: 8px;
+    height: 22px;
+    margin-right: 20px;
+    background-color: #54fdef;
+    float: left;
+  }
+}
+.main-body{
+  background-color: #04242d;
+.main-header {
+  .front {
+    min-height: 136px;
+    border-radius: 4px;
+    padding: 6px;
+    color: #ffffff;
+    text-align: center;
+    background: linear-gradient(to bottom, #133e46 0%, #04202c 100%);
+  }
+  .mid {
+    min-height: 64px;
+    border-radius: 4px;
+    margin-bottom: 5px;
+    padding: 6px;
+    color: #48dcd1;
+    text-align: center;
+    background: linear-gradient(to bottom, #0b2c36 0%, #04202c 100%);
+  }
+  .back {
+    min-height: 136px;
+    padding: 25px 5px;
+    text-align: center;
+    font-size: 30px;
+    color: #48dcd1;
+  }
+  .back /deep/ .el-progress-bar__inner {
+    background: linear-gradient(to right, #62fbb9 0%, #fdd64a 100%);
+  }
+}
+.main-table{
+  color: #ffffff;
+  margin: 10px;
+  .tipDiv{
+    width: 8px;
+    height: 8px;
+    margin: 3px 10px 3px 0;
+    background-color: #54fdef;
+    float: left;
+  }
+}
+}
+</style>

src/views/common/board.vue

@@ -0,0 +1,128 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-03-07 15:31:13
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-04 10:49:38
+ * @Description:
+-->
+<template>
+  <div class="main-body">
+    <div class="container-title">
+      浙江求精科技车间生产看板
+    </div>
+    <el-row :gutter="20" style="margin:20px">
+      <el-col :span="8">
+        <board :tableData="tableData1" imgUrl='BMA1'></board>
+      </el-col>
+      <el-col :span="8">
+        <board :tableData="tableData2" imgUrl='BMA2' :countdown="countdown"></board>
+      </el-col>
+      <el-col :span="8">
+        <board :tableData="tableData2" imgUrl='BMA3'></board>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20" style="margin:20px">
+      <el-col :span="8">
+        <board :tableData="tableData2" imgUrl='BMA4' :countdown="countdown1"></board>
+      </el-col>
+      <el-col :span="8">
+        <board :tableData="tableData2" imgUrl='BMB1'></board>
+      </el-col>
+      <el-col :span="8">
+        <board :tableData="tableData1" imgUrl='BMB2' :countdown="countdown"></board>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20" style="margin:20px">
+      <el-col :span="8">
+        <board :tableData="tableData2" imgUrl='BMB3' :countdown="countdown"></board>
+      </el-col>
+      <el-col :span="8">
+        <board :tableData="tableData1" imgUrl='BMC1'></board>
+      </el-col>
+      <el-col :span="8">
+        <board :tableData="tableData2" imgUrl='BMC2' :countdown="countdown1"></board>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import board from './board-part'
+export default {
+  name: 'Board',
+  components: { board },
+  data () {
+    return {
+      tableData1: [
+        {
+          name: '樟子松',
+          code: '1103434',
+          num: 12,
+          productName: '株洲铁',
+          weight: 123,
+          process: '压缩'
+        },
+        {
+          name: '阿斯蒂芬',
+          code: '1103434',
+          num: 122,
+          productName: '株洲铁',
+          weight: 815,
+          process: '压缩'
+        },
+        {
+          name: '风都',
+          code: '1103434',
+          num: 334,
+          productName: '株洲铁',
+          weight: 1223,
+          process: '压缩'
+        }
+      ],
+      tableData2: [
+        {
+          name: '阿斯蒂芬',
+          code: '1103434',
+          num: 122,
+          productName: '株洲铁',
+          weight: 815,
+          process: '压缩'
+        }
+      ],
+      countdown: {
+        'hours': 5,
+        'minutes': 20,
+        'seconds': 12
+      },
+      countdown1: {
+        'hours': 11,
+        'minutes': 43,
+        'seconds': 56
+      }
+    }
+  },
+  created () {},
+  methods: {}
+}
+</script>
+
+<style lang="scss" scoped>
+.main-body {
+  min-height: 100%;
+  width: 100%;
+  background: url(~@/assets/img/board/1.png) center no-repeat;
+  background-size: cover;
+  overflow: hidden;
+
+  .container-title {
+    width: 100%;
+    height: 80px;
+    background: url(~@/assets/img/board/2.png) no-repeat;
+    background-size: 100% 100%;
+    color: #00fff0;
+    font-size: 28px;
+    line-height: 80px;
+    text-align: center;
+  }
+}
+</style>

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

@@ -34,60 +34,18 @@
         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,14 +34,9 @@
     </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" :offset="3" :span="6">
-          <el-card class="footer-item-box base-container" @click.native="selectPlat(1)">
-            <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-col class="footer-item-container" :span="6" v-for="count in 4" :key="count">
+          <el-card class="footer-item-box base-container" @click.native="selectPlat(count)">
+            <div class="plat" style="font-size: 24px">液压台{{ count }}</div>
           </el-card>
         </el-col>
       </el-row>
@@ -162,8 +157,7 @@ export default {
   .wareBox-button {
     position: absolute;
     bottom: 0;
-    margin-left: -22px;
-    font-size: 18px;
+    right: 0;
   }
 }
 .line {
@@ -174,7 +168,7 @@ export default {
   border-right: 200px solid #ddd;
 }
 .enableBox {
-  background: #aaccFF;
+  background: #EFF3FF;
 }
 .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="YYT004" label="入口液压台4"></el-option>
+            <el-option value="YYT003" label="液压台3"></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="YYT004" label="入口液压台4"></el-option>
+            <el-option value="YYT003" label="液压台3"></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,8 +15,10 @@
       </el-form-item>
       <el-form-item style="margin-left:1%">
         <el-select v-model="startPosition" size="small" placeholder="任务起点位置" clearable>
-          <el-option value="YYT003" label="入口液压台3" />
-          <el-option value="YYT004" label="入口液压台4" />
+          <el-option value="YYT001" label="液压台1" />
+          <el-option value="YYT002" label="液压台2" />
+          <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>
@@ -197,7 +199,7 @@
             message: '请选择窑炉',
             type: 'warning'
           })
-        } else if (!this.processType && this.processType !== 0) {
+        } else if (!this.processType) {
           this.$message.warning('请选择加工类型')
         } else {
           this.$confirm(`确定提交任务?`, '提示', {

src/views/main-sidebar.vue

@@ -11,6 +11,10 @@
           <icon-svg name="shouye" class="site-sidebar__menu-icon"></icon-svg>
           <span slot="title">首页</span>
         </el-menu-item>
+        <el-menu-item index="board" @click="$router.push({ name: 'board' })">
+          <icon-svg name="shanchu" class="site-sidebar__menu-icon"></icon-svg>
+          <span slot="title">车间生产看板</span>
+        </el-menu-item>
         <el-submenu index="task">
           <template slot="title">
             <icon-svg name="config" class="site-sidebar__menu-icon"></icon-svg>

src/views/main.vue

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

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

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

src/views/order/current-task.vue

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

src/views/report/car-alarm.vue

@@ -52,9 +52,6 @@
       <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"
@@ -78,8 +75,6 @@
 </template>
 
 <script>
-  import moment from 'moment'
-
   export default {
     data () {
       return {
@@ -93,8 +88,7 @@
         totalPage: 0,
         dataListLoading: false,
         selectionDataList: [],
-        carList: [],
-        moment
+        carList: []
       }
     },
     created () {

src/views/report/kiln-alarm.vue

@@ -57,9 +57,6 @@
         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"
@@ -86,8 +83,6 @@
 </template>
 
 <script>
-import moment from 'moment'
-
 export default {
   data () {
     return {
@@ -101,8 +96,7 @@ export default {
       totalPage: 0,
       dataListLoading: false,
       selectionDataList: [],
-      kilnList: [],
-      moment
+      kilnList: []
     }
   },
   created () {

src/views/report/order-history.vue

@@ -43,9 +43,6 @@
       <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"
@@ -135,7 +132,6 @@
 </template>
 
 <script>
-  import moment from 'moment'
   import orderDetail from './components/order-history-detail'
   // 任务状态列表
   const statusList = {
@@ -167,8 +163,7 @@
         dataListLoading: false,
         orderDetailVisible: false,
         statusList,
-        orderVoidList,
-        moment
+        orderVoidList
       }
     },
     components: {

src/views/report/task-history.vue

@@ -62,9 +62,6 @@
         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"
@@ -86,7 +83,7 @@
         <template slot-scope="scope">
           <span>{{
             scope.row.taskType === 0
-              ? "炉子加工"
+              ? "缓存到窑炉加工"
               : scope.row.taskType === 1
               ? "出炉到缓存"
               : scope.row.taskType === 2
@@ -148,7 +145,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 // 任务状态列表
 const statusList = {
   0: '等待执行',
@@ -171,8 +167,7 @@ export default {
       totalPage: 0,
       dataListLoading: false,
       orderDetailVisible: false,
-      statusList,
-      moment
+      statusList
     }
   },
   activated () {

static/config/index-prod.js

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