update

2022-03-21 01:10:08 +08:00 · 2022-03-20 11:24:39 +08:00 · 2022-03-19 11:48:15 +08:00 · 2022-03-18 15:18:10 +08:00 · 2022-03-18 15:17:46 +08:00
36 changed files with 272 additions and 85 deletions
--- a/config/index.js
+++ b/config/index.js
@@ -22,7 +22,7 @@ module.exports = {
    // 代理列表, 是否开启代理通过[./dev.env.js]配置
    proxyTable: devEnv.OPEN_PROXY === false ? {} : {
      '/proxyApi': {
-        target: 'http://192.168.1.66:8080',
+        target: 'http://192.168.1.7:8080',
        changeOrigin: true,
        pathRewrite: {
          '^/proxyApi': '/api'
--- a/package-lock.json
+++ b/package-lock.json
@@ -5593,12 +5593,14 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@@ -5613,17 +5615,20 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "core-util-is": {
          "version": "1.0.2",
@@ -5740,7 +5745,8 @@
        "inherits": {
          "version": "2.0.3",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "ini": {
          "version": "1.3.5",
@@ -5752,6 +5758,7 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@@ -5766,6 +5773,7 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@@ -5773,12 +5781,14 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "minipass": {
          "version": "2.3.5",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.2",
            "yallist": "^3.0.0"
@@ -5797,6 +5807,7 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@@ -5877,7 +5888,8 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "object-assign": {
          "version": "4.1.1",
@@ -5889,6 +5901,7 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@@ -6010,6 +6023,7 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
--- a/src/assets/scss/_base.scss
+++ b/src/assets/scss/_base.scss
@@ -23,6 +23,13 @@ img {
  vertical-align: middle;
 }

+/* El-Message
+------------------------------ */
+.el-message {
+  .el-message__content {
+    font-size: 24px;
+  }
+}

 /* Utils
 ------------------------------ */
--- a/src/icons/svg/icon-侧边收纳.svg
+++ b/src/icons/svg/icon-侧边收纳.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="20px" height="18px" viewBox="0 0 20 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>outdent</title>
+    <title></title>
    <desc>Created with Sketch.</desc>
    <g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.649999976">
        <g id="进工业炉加工_录入托盘标识卡信息" transform="translate(-370.000000, -23.000000)" fill="#000000" fill-rule="nonzero">
--- a/src/icons/svg/icon-出库.svg
+++ b/src/icons/svg/icon-出库.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>出库on</title>
+    <title>出库</title>
    <desc>Created with Sketch.</desc>
    <defs>
        <linearGradient x1="50%" y1="-35.9917859%" x2="50%" y2="100%" id="linearGradient-1">
--- a/src/icons/svg/icon-总电流.svg
+++ b/src/icons/svg/icon-总电流.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>编组 13</title>
+    <title>总电流</title>
    <desc>Created with Sketch.</desc>
    <g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="能源管理/用能源分析" transform="translate(-385.000000, -370.000000)" fill-rule="nonzero">
--- a/src/icons/svg/icon-总电量.svg
+++ b/src/icons/svg/icon-总电量.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>编组 7</title>
+    <title>总电量</title>
    <desc>Created with Sketch.</desc>
    <g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="能源管理/用能源分析" transform="translate(-385.000000, -239.000000)">
--- a/src/icons/svg/icon-新建.svg
+++ b/src/icons/svg/icon-新建.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>Shape</title>
+    <title>新建</title>
    <desc>Created with Sketch.</desc>
    <g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="进工业炉加工_录入托盘标识卡信息" transform="translate(-1840.000000, -90.000000)" fill="#FFFFFF">
--- a/src/icons/svg/icon-日历.svg
+++ b/src/icons/svg/icon-日历.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="14px" height="12px" viewBox="0 0 14 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>编组</title>
+    <title>日历</title>
    <desc>Created with Sketch.</desc>
    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.5">
        <g id="select/时间_开始" transform="translate(-194.000000, -9.000000)" fill="#000000">
--- a/src/icons/svg/icon-用户名更多.svg
+++ b/src/icons/svg/icon-用户名更多.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="11px" height="6px" viewBox="0 0 11 6" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>箭头 右</title>
+    <title>更多</title>
    <desc>Created with Sketch.</desc>
    <g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="进工业炉加工_录入托盘标识卡信息" transform="translate(-1882.000000, -29.000000)" fill="#000000" fill-rule="nonzero">
--- a/src/icons/svg/icon-维护开始.svg
+++ b/src/icons/svg/icon-维护开始.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="15px" height="14px" viewBox="0 0 15 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>编组 33</title>
+    <title>维护开始</title>
    <desc>Created with Sketch.</desc>
    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="icon/界面内/维护开始" transform="translate(-1.000000, -1.000000)">
--- a/src/icons/svg/icon-维护结束.svg
+++ b/src/icons/svg/icon-维护结束.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="15px" height="14px" viewBox="0 0 15 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>编组 32</title>
+    <title>维护结束</title>
    <desc>Created with Sketch.</desc>
    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="icon/界面内/维护结束" transform="translate(-1.000000, -1.000000)">
--- a/src/icons/svg/icon-编辑.svg
+++ b/src/icons/svg/icon-编辑.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>常用购票人／编辑32</title>
+    <title>修改</title>
    <desc>Created with Sketch.</desc>
    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="icon/界面内/编辑" transform="translate(-1.000000, -1.000000)" fill-rule="nonzero">
--- a/src/icons/svg/icon-设置.svg
+++ b/src/icons/svg/icon-设置.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>3.1 设置</title>
+    <title>设置</title>
    <desc>Created with Sketch.</desc>
    <g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="进工业炉加工_录入托盘标识卡信息" transform="translate(-1744.000000, -22.000000)" fill="#000000" fill-rule="nonzero">
--- a/src/icons/svg/icon-详情.svg
+++ b/src/icons/svg/icon-详情.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="14px" height="12px" viewBox="0 0 14 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>详情备份</title>
+    <title>详情</title>
    <desc>Created with Sketch.</desc>
    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="icon/界面内/详情" transform="translate(-1.000000, -2.000000)" fill-rule="nonzero">
--- a/src/icons/svg/icon-进工业炉加工.svg
+++ b/src/icons/svg/icon-进工业炉加工.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>生产和加工情况</title>
+    <title>进工业炉加工</title>
    <desc>Created with Sketch.</desc>
    <defs>
        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
--- a/src/icons/svg/icon-追加加工.svg
+++ b/src/icons/svg/icon-追加加工.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>编组 15</title>
+    <title>追加加工</title>
    <desc>Created with Sketch.</desc>
    <defs>
        <linearGradient x1="50%" y1="0.100295608%" x2="50%" y2="100%" id="linearGradient-1">
--- a/src/views/basic/carInfo.vue
+++ b/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}]进行删除操作?`, '提示', {
--- a/src/views/common/ex-warehouse-info.vue
+++ b/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>
--- a/src/views/common/ex-warehouse.vue
+++ b/src/views/common/ex-warehouse.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2021-11-15 15:17:30
- * @LastEditors: gtz
- * @LastEditTime: 2021-12-21 15:33:40
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-18 15:00:32
 * @Description:
 -->
 <template>
@@ -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-card class="footer-item-box base-container" @click.native="selectPlat(count)">
-            <div class="plat" style="font-size: 24px">提升台{{ count }}</div>
+        <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-card>
        </el-col>
      </el-row>
@@ -105,7 +110,7 @@ export default {
            url: this.$http.adornUrl('/outStock/runOutTask'),
            method: 'post',
            data: this.$http.adornData({
-              code: count,
+              code: 'YYT00' + count,
              localtionId: this.isActive
            })
          }).then(({data}) => {
@@ -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;
--- a/src/views/common/home.vue
+++ b/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
--- a/src/views/common/order-auto-submit.vue
+++ b/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">
@@ -246,7 +246,7 @@
              })
            }
            this.$http({
-              url: this.$http.adornUrl(`currTask/createAutoTask`),
+              url: this.$http.adornUrl(`/currTask/createAutoTask`),
              method: 'post',
              data: this.$http.adornData(requestData)
            }).then(({data}) => {
--- a/src/views/common/order-auto.vue
+++ b/src/views/common/order-auto.vue
@@ -289,10 +289,14 @@
      },
      // 弹出提交任务弹窗
      handleSubmit () {
-        this.submitFormVisible = true
-        this.$nextTick(() => {
-          this.$refs.submitForm.init(this.dataList)
-        })
+        if (this.dataList.length) {
+          this.submitFormVisible = true
+          this.$nextTick(() => {
+            this.$refs.submitForm.init(this.dataList)
+          })
+        } else {
+          this.$message.warning('请至少添加一条任务！')
+        }
      },
      handleAutoDetail (id) {
        this.autoDetailVisible = true
--- a/src/views/common/order-process-point.vue
+++ b/src/views/common/order-process-point.vue
@@ -12,7 +12,7 @@
    :visible.sync="visible"
  >
    <div class="wareBox" v-for="count in 4" v-bind:key="count" @click="setPoint(count)">
-      <div class="plat">提升平台{{count}}</div>
+      <div class="plat">液压台{{count}}</div>
    </div>
    <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">取消</el-button>
@@ -39,7 +39,7 @@ export default {
    setPoint (count) {
      console.log(count, this.pointType)
      this.visible = false
-      this.$emit('refreshPoint', count, this.pointType)
+      this.$emit('refreshPoint', 'YYT00' + count, this.pointType)
    }
  }
 }
--- a/src/views/common/order-process.vue
+++ b/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="1" label="提升平台1" />
-          <el-option :value="2" label="提升平台2" />
-          <el-option :value="3" label="提升平台3" />
-          <el-option :value="4" 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(`确定提交任务?`, '提示', {
@@ -208,7 +206,7 @@
            type: 'warning'
          }).then(() => {
            this.$http({
-              url: this.$http.adornUrl(`currTask/createProcessTask`),
+              url: this.$http.adornUrl(`/currTask/createProcessTask`),
              method: 'post',
              data: this.$http.adornData({
                craftCode: '',
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-15 08:20:28
 * @LastEditors: zwq
- * @LastEditTime: 2021-12-06 16:47:31
+ * @LastEditTime: 2022-03-18 14:48:46
 * @Description:
 -->
 <template>
@@ -39,7 +39,11 @@
    },
    data () {
      return {
-        loading: false
+        loading: false,
+        websock: '',
+        url: '',
+        id: 1,
+        heart: null
      }
    },
    components: {
@@ -65,11 +69,16 @@
      }
    },
    created () {
+      this.url = window.SITE_CONFIG.baseWsUrl
      this.getUserInfo()
+      this.initWebSocket()
    },
    mounted () {
      this.resetDocumentClientHeight()
    },
+    destroyed () {
+      clearInterval(this.heart)
+    },
    methods: {
      // 重置窗口可视高度
      resetDocumentClientHeight () {
@@ -91,6 +100,38 @@
        //     this.userName = data.user.username
        //   }
        // })
+      },
+      initWebSocket () { // 初始化weosocket
+        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 () { // 连接建立之后建立心跳
+        this.heartFun()
+      },
+      heartFun () { // 心跳函数
+        this.heart = setInterval(() => {
+          this.websocketsend('1')
+        }, 30000)
+      },
+      websocketonerror () { // 连接建立失败重连
+        this.initWebSocket()
+      },
+      websocketonmessage (e) { // 数据接收
+        this.$notify.info({
+          title: '提示',
+          message: e.data,
+          duration: 15000
+        })
+      },
+      websocketsend (msg) { // 数据发送
+        this.websock.send(msg)
+      },
+      websocketclose (e) {  // 关闭
+        console.log('断开连接', e)
      }
    }
  }
--- a/src/views/order/components/current-order-task.vue
+++ b/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 () {
--- a/src/views/order/current-task.vue
+++ b/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 () {
@@ -186,31 +191,25 @@
      },
      // 执行
      addOrUpdateHandle (id) {
-        this.$confirm(`确定对[任务id=${id}]进行删除操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: this.$http.adornUrl('/currTask/runTask'),
-            method: 'post',
-            data: this.$http.adornData({ id })
+        this.$http({
+          url: this.$http.adornUrl('/currTask/runTask'),
+          method: 'post',
+          data: this.$http.adornData({ id })
            // params: this.$http.adornParams({ id }, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {})
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.getDataList()
+              }
+            })
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
      },
      // 删除
      deleteHandle (sheetNo) {
--- a/src/views/report/car-alarm.vue
+++ b/src/views/report/car-alarm.vue
@@ -44,9 +44,17 @@
        prop="equipmentName"
        label="车辆名称">
      </el-table-column>
+      <el-table-column
+        prop="taskCode"
+        label="任务编码"
+      >
+      </el-table-column>
      <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"
@@ -70,6 +78,8 @@
 </template>

 <script>
+  import moment from 'moment'
+
  export default {
    data () {
      return {
@@ -83,7 +93,8 @@
        totalPage: 0,
        dataListLoading: false,
        selectionDataList: [],
-        carList: []
+        carList: [],
+        moment
      }
    },
    created () {
--- a/src/views/report/kiln-alarm.vue
+++ b/src/views/report/kiln-alarm.vue
@@ -48,16 +48,24 @@
        label="窑炉名称"
      >
      </el-table-column>
+      <el-table-column
+        prop="taskCode"
+        label="任务编码"
+      >
+      </el-table-column>
      <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"
        label="报警级别"
      > -->
-      </el-table-column>
+      <!-- </el-table-column> -->
      <el-table-column
        prop="alarmInfo"
        label="报警内容"
@@ -78,6 +86,8 @@
 </template>

 <script>
+import moment from 'moment'
+
 export default {
  data () {
    return {
@@ -91,7 +101,8 @@ export default {
      totalPage: 0,
      dataListLoading: false,
      selectionDataList: [],
-      kilnList: []
+      kilnList: [],
+      moment
    }
  },
  created () {
--- a/src/views/report/order-history.vue
+++ b/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: {
--- a/src/views/report/task-history.vue
+++ b/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 () {
--- a/static/config/index-prod.js
+++ b/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']  = './'; // 域名
--- a/static/config/index-qa.js
+++ b/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']  = './'; // 域名
--- a/static/config/index-uat.js
+++ b/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']  = './'; // 域名
--- a/static/config/index.js
+++ b/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'] = './' // 域名
Author	SHA1	Message	Date
gtz217	ec506645a7	update	2022-03-21 01:10:08 +08:00
gtz217	21b2eac76e	update	2022-03-20 11:24:39 +08:00
gtz217	34311763b1	update	2022-03-19 11:48:15 +08:00
朱文强	4a5d2824d1	Merge pull request '修改bug' (#12 ) from zwq into master Reviewed-on: #12	2022-03-18 15:18:10 +08:00
zwq	f4f26474d4	修改bug	2022-03-18 15:17:46 +08:00