update

2021-12-10 17:07:29 +08:00 · 2021-12-10 17:07:29 +08:00 · f445045cc4
commit f445045cc4
parent 9f3c13f893
29 changed files with 539 additions and 868 deletions
--- a/config/index.js
+++ b/config/index.js
@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2021-11-19 10:10:51
 * @LastEditors: gtz
- * @LastEditTime: 2021-12-08 16:04:48
+ * @LastEditTime: 2021-12-10 09:04:19
 * @Description: file content
 * @FilePath: \mt-qj-wms-ui\config\index.js
 */
@ -22,7 +22,7 @@ module.exports = {
    // 代理列表, 是否开启代理通过[./dev.env.js]配置
    proxyTable: devEnv.OPEN_PROXY === false ? {} : {
      '/proxyApi': {
-        target: 'http://192.168.0.134:8080/',
+        target: 'http://192.168.0.134:8080',
        changeOrigin: true,
        pathRewrite: {
          '^/proxyApi': '/api'
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -25,7 +25,7 @@
    "gulp-replace": "0.6.1",
    "gulp-shell": "0.6.5",
    "lodash": "4.17.5",
-    "node-sass": "^6.0.1",
+    "node-sass": "^4.14.1",
    "npm": "^6.9.0",
    "sass-loader": "6.0.6",
    "svg-sprite-loader": "3.7.3",
--- a/src/assets/scss/_variables.scss
+++ b/src/assets/scss/_variables.scss
@ -1,6 +1,6 @@
 // 站点主色
 // tips: 要达到整站主题修改效果, 请确保[$--color-primary]站点主色与[/src/element-ui-theme/index.js]文件中[import './element-[#17B3A3]/index.css']当前主题色一致
-$--color-primary: #17B3A3;
+$--color-primary: #3E8EF7;

 // Navbar
 $navbar--background-color: $--color-primary;
--- a/src/element-ui-theme/index.js
+++ b/src/element-ui-theme/index.js
@ -1,3 +1,11 @@
+/*
+ * @Author: gtz
+ * @Date: 2021-11-19 10:10:51
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-09 19:38:26
+ * @Description: file content
+ * @FilePath: \mt-qj-wms-ui\src\element-ui-theme\index.js
+ */
 /**
 * element-ui组件主题
 *
@ -5,7 +13,7 @@
 *  1. 此处只包含element-ui组件主题
 *  2. 要达到整站主题修改效果, 请确保[import './element-[#17B3A3]/index.css']当前主题色与[/src/assets/scss/_variables.scss]文件中[$--color-primary]属性值一致
 */
-import './element-#17B3A3/index.css' // 当前主题色
+import './element-#3E8EF7/index.css' // 当前主题色
 export default {
  list: [
    '#0BB2D4', // 青色
--- a/src/mock/index.js
+++ b/src/mock/index.js
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-15 08:20:28
 * @LastEditors: gtz
- * @LastEditTime: 2021-12-08 16:04:50
+ * @LastEditTime: 2021-12-09 10:08:24
 * @Description:
 */
 import Mock from 'mockjs'
--- a/src/router/index.js
+++ b/src/router/index.js
@ -1,8 +1,8 @@
 /*
 * @Author: zwq
 * @Date: 2021-11-15 08:20:28
- * @LastEditors: zwq
- * @LastEditTime: 2021-12-08 14:18:09
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-09 16:23:55
 * @Description:
 */
 /**
@ -38,39 +38,39 @@ const mainRoutes = {
    // 1. isTab: 是否通过tab展示内容, true: 是, false: 否
    // 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否
    // 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理!
-    { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页' } },
-    { path: '/orderProcess', component: _import('common/order-process'), name: 'orderProcess', meta: { title: '订单加工' } },
-    { path: '/exWarehouse', component: _import('common/ex-warehouse'), name: 'exWarehouse', meta: { title: '货物出库' } },
-    { path: '/addProcess', component: _import('common/add-process'), name: 'addProcess', meta: { title: '追加加工' } },
-    { path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题' } },
+    { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页', isTab: true } },
+    { path: '/orderProcess', component: _import('common/order-process'), name: 'orderProcess', meta: { title: '订单加工', isTab: true } },
+    { path: '/exWarehouse', component: _import('common/ex-warehouse'), name: 'exWarehouse', meta: { title: '货物出库', isTab: true } },
+    { path: '/addProcess', component: _import('common/add-process'), name: 'addProcess', meta: { title: '追加加工', isTab: true } },
+    { path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题', isTab: true } },
    { path: '/demo-echarts', component: _import('demo/echarts'), name: 'demo-echarts', meta: { title: 'demo-echarts', isTab: true } },
    { path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } },
-    { path: '/basic-cache', component: _import('basic/cache'), name: 'basic-cache', meta: { title: '缓存区信息' } },
-    { path: '/basic-processInfo', component: _import('basic/processInfo'), name: 'basic-processInfo', meta: { title: '工艺信息' } },
-    { path: '/basic-cache-location', component: _import('basic/components/location'), name: 'basic-cache-location', meta: { title: '库位信息' } },
-    { path: '/basic-equipmentInfo', component: _import('basic/equipmentInfo'), name: 'basic-equipmentInfo', meta: { title: '设备基础信息' } },
-    { path: '/basic-carInfo', component: _import('basic/carInfo'), name: 'basic-carInfo', meta: { title: '车辆信息' } },
-    { path: '/basic-alarmInfo', component: _import('basic/alarmInfo'), name: 'basic-alarmInfo', meta: { title: '报警基础信息' } },
-    { path: '/order-current-order', component: _import('order/current-order'), name: 'order-current-order', meta: { title: '当前订单列表' } },
-    { path: '/order-current-order-task', component: _import('order/components/current-order-task'), name: 'order-current-order-task', meta: { title: '当前订单任务详情' } },
-    { path: '/order-current-task', component: _import('order/current-task'), name: 'order-current-task', meta: { title: '当前执行任务' } },
-    { path: '/order-current-task-detail', component: _import('order/components/current-task-detail'), name: 'order-current-task-detail', meta: { title: '当前执行任务详情' } },
-    { path: '/report-kiln-alarm', component: _import('report/kiln-alarm'), name: 'report-kiln-alarm', meta: { title: '窑炉报警' } },
-    { path: '/report-car-alarm', component: _import('report/car-alarm'), name: 'report-car-alarm', meta: { title: '车辆运行报警' } },
-    { path: '/report-order-history', component: _import('report/order-history'), name: 'report-order-history', meta: { title: '订单历史列表' } },
-    { path: '/report-order-history-task', component: _import('report/components/order-history-task'), name: 'report-order-history-task', meta: { title: '订单历史任务详情' } },
-    { path: '/report-task-history', component: _import('report/task-history'), name: 'report-task-history', meta: { title: '执行任务历史列表' } },
-    { path: '/report-task-history-detail', component: _import('report/components/task-history-detail'), name: 'report-task-history-detail', meta: { title: '执行任务历史详情' } },
-    { path: '/energy-sulfur-dioxide', component: _import('energy/sulfur-dioxide'), name: 'energy-sulfur-dioxide', meta: { title: '二氧化硫流量分析' } },
+    { path: '/basic-cache', component: _import('basic/cache'), name: 'basic-cache', meta: { title: '缓存区信息', isTab: true } },
+    { path: '/basic-processInfo', component: _import('basic/processInfo'), name: 'basic-processInfo', meta: { title: '工艺信息', isTab: true } },
+    { path: '/basic-cache-location', component: _import('basic/components/location'), name: 'basic-cache-location', meta: { title: '库位信息', isTab: true } },
+    { path: '/basic-equipmentInfo', component: _import('basic/equipmentInfo'), name: 'basic-equipmentInfo', meta: { title: '设备基础信息', isTab: true } },
+    { path: '/basic-carInfo', component: _import('basic/carInfo'), name: 'basic-carInfo', meta: { title: '车辆信息', isTab: true } },
+    { path: '/basic-alarmInfo', component: _import('basic/alarmInfo'), name: 'basic-alarmInfo', meta: { title: '报警基础信息', isTab: true } },
+    { path: '/order-current-order', component: _import('order/current-order'), name: 'order-current-order', meta: { title: '当前订单列表', isTab: true } },
+    { path: '/order-current-order-task', component: _import('order/components/current-order-task'), name: 'order-current-order-task', meta: { title: '当前订单任务详情', isTab: true } },
+    { path: '/order-current-task', component: _import('order/current-task'), name: 'order-current-task', meta: { title: '当前执行任务', isTab: true } },
+    { path: '/order-current-task-detail', component: _import('order/components/current-task-detail'), name: 'order-current-task-detail', meta: { title: '当前执行任务详情', isTab: true } },
+    { path: '/report-kiln-alarm', component: _import('report/kiln-alarm'), name: 'report-kiln-alarm', meta: { title: '窑炉报警', isTab: true } },
+    { path: '/report-car-alarm', component: _import('report/car-alarm'), name: 'report-car-alarm', meta: { title: '车辆运行报警', isTab: true } },
+    { path: '/report-order-history', component: _import('report/order-history'), name: 'report-order-history', meta: { title: '订单历史列表', isTab: true } },
+    { path: '/report-order-history-task', component: _import('report/components/order-history-task'), name: 'report-order-history-task', meta: { title: '订单历史任务详情', isTab: true } },
+    { path: '/report-task-history', component: _import('report/task-history'), name: 'report-task-history', meta: { title: '执行任务历史列表', isTab: true } },
+    { path: '/report-task-history-detail', component: _import('report/components/task-history-detail'), name: 'report-task-history-detail', meta: { title: '执行任务历史详情', isTab: true } },
+    { path: '/energy-sulfur-dioxide', component: _import('energy/sulfur-dioxide'), name: 'energy-sulfur-dioxide', meta: { title: '二氧化硫流量分析', isTab: true } },
    { path: '/energy-electric', component: _import('energy/electric'), name: 'energy-electric', meta: { title: '用电能源分析' } },
-    { path: '/energy-kiln-electric', component: _import('energy/kiln-electric'), name: 'energy-kiln-electric', meta: { title: '窑炉用电分析' } },
-    { path: '/energy-ammonia', component: _import('energy/ammonia'), name: 'energy-ammonia', meta: { title: '氨气流量分析' } },
-    { path: '/energy-nitrogen', component: _import('energy/nitrogen'), name: 'energy-nitrogen', meta: { title: '氮气流量分析' } },
-    { path: '/energy-electric-acquisition', component: _import('energy/electric-acquisition'), name: 'energy-electric-acquisition', meta: { title: '电能采集数据' } },
-    { path: '/energy-process-temperature', component: _import('energy/process-temperature'), name: 'energy-process-temperature', meta: { title: '窑炉加工温度' } },
-    { path: '/energy-sump-temperature', component: _import('energy/sump-temperature'), name: 'energy-sump-temperature', meta: { title: '油槽温度' } },
-    { path: '/energy-ammonia-analysis', component: _import('energy/ammonia-analysis'), name: 'energy-ammonia-analysis', meta: { title: '使用氮气分析' } },
-    { path: '/energy-kiln-speed', component: _import('energy/kiln-speed'), name: 'energy-kiln-speed', meta: { title: '窑炉速度参数' } }
+    { path: '/energy-kiln-electric', component: _import('energy/kiln-electric'), name: 'energy-kiln-electric', meta: { title: '窑炉用电分析', isTab: true } },
+    { path: '/energy-ammonia', component: _import('energy/ammonia'), name: 'energy-ammonia', meta: { title: '氨气流量分析', isTab: true } },
+    { path: '/energy-nitrogen', component: _import('energy/nitrogen'), name: 'energy-nitrogen', meta: { title: '氮气流量分析', isTab: true } },
+    { path: '/energy-electric-acquisition', component: _import('energy/electric-acquisition'), name: 'energy-electric-acquisition', meta: { title: '电能采集数据', isTab: true } },
+    { path: '/energy-process-temperature', component: _import('energy/process-temperature'), name: 'energy-process-temperature', meta: { title: '窑炉加工温度', isTab: true } },
+    { path: '/energy-sump-temperature', component: _import('energy/sump-temperature'), name: 'energy-sump-temperature', meta: { title: '油槽温度', isTab: true } },
+    { path: '/energy-ammonia-analysis', component: _import('energy/ammonia-analysis'), name: 'energy-ammonia-analysis', meta: { title: '使用氮气分析', isTab: true } },
+    { path: '/energy-kiln-speed', component: _import('energy/kiln-speed'), name: 'energy-kiln-speed', meta: { title: '窑炉速度参数', isTab: true } }
  ],
  beforeEnter (to, from, next) {
    let token = Vue.cookie.get('token')
--- a/src/views/basic/alarmInfo.vue
+++ b/src/views/basic/alarmInfo.vue
@ -106,7 +106,7 @@
      getDataList () {
        this.dataListLoading = true
        this.$http({
-          url: this.$http.adornUrl('alarmBase/page'),
+          url: this.$http.adornUrl('/alarmBase/page'),
          method: 'post',
          data: this.$http.adornData({
            'current': this.pageIndex,
@ -150,7 +150,7 @@
          type: 'warning'
        }).then(() => {
          this.$http({
-            url: this.$http.adornUrl('alarmBase/delete'),
+            url: this.$http.adornUrl('/alarmBase/delete'),
            method: 'post',
            data: this.$http.adornData({id})
          }).then(({data}) => {
--- a/src/views/basic/cache.vue
+++ b/src/views/basic/cache.vue
@ -40,11 +40,17 @@
        label="编码">
      </el-table-column>
      <el-table-column
-        prop="ename"
+        prop="englishName"
        header-align="center"
        align="center"
        label="英文名">
      </el-table-column>
+      <el-table-column
+        prop="number"
+        header-align="center"
+        align="center"
+        label="库位数量">
+      </el-table-column>
      <el-table-column
        prop="status"
        header-align="center"
@ -114,7 +120,7 @@
      getDataList () {
        this.dataListLoading = true
        this.$http({
-          url: this.$http.adornUrl('warehouse/page'),
+          url: this.$http.adornUrl('/warehouse/page'),
          method: 'post',
          data: this.$http.adornData({
            'current': this.pageIndex,
@ -161,7 +167,7 @@
          type: 'warning'
        }).then(() => {
          this.$http({
-            url: this.$http.adornUrl('warehouse/delete'),
+            url: this.$http.adornUrl('/warehouse/delete'),
            method: 'post',
            data: this.$http.adornData({id})
          }).then(({data}) => {
--- a/src/views/basic/carInfo.vue
+++ b/src/views/basic/carInfo.vue
@ -106,7 +106,7 @@
      getDataList () {
        this.dataListLoading = true
        this.$http({
-          url: this.$http.adornUrl('vehicle/page'),
+          url: this.$http.adornUrl('/vehicle/page'),
          method: 'post',
          data: this.$http.adornData({
            'current': this.pageIndex,
@ -150,7 +150,7 @@
          type: 'warning'
        }).then(() => {
          this.$http({
-            url: this.$http.adornUrl('vehicle/delete'),
+            url: this.$http.adornUrl('/vehicle/delete'),
            method: 'post',
            data: this.$http.adornData({id})
          }).then(({data}) => {
--- a/src/views/basic/components/alarmInfo-add.vue
+++ b/src/views/basic/components/alarmInfo-add.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2021-12-08 11:15:12
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-09 11:21:14
 * @Description:
 -->
 <template>
@ -57,7 +57,7 @@
          this.$refs['dataForm'].resetFields()
          if (this.dataForm.id) {
            this.$http({
-              url: this.$http.adornUrl(`alarmBase/get`),
+              url: this.$http.adornUrl(`/alarmBase/get`),
              method: 'post',
              data: this.$http.adornData({id})
            }).then(({data}) => {
@ -67,7 +67,7 @@
            })
          } else {
            this.$http({
-              url: this.$http.adornUrl(`alarmBase/codeGenerator`),
+              url: this.$http.adornUrl(`/alarmBase/codeGenerator`),
              method: 'post',
              data: this.$http.adornData()
            }).then((data) => {
@ -81,7 +81,7 @@
        this.$refs['dataForm'].validate((valid) => {
          if (valid) {
            this.$http({
-              url: this.$http.adornUrl(`alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
+              url: this.$http.adornUrl(`/alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
              method: 'post',
              data: this.$http.adornData({
                'id': this.dataForm.id || undefined,
--- a/src/views/basic/components/cache-add.vue
+++ b/src/views/basic/components/cache-add.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2021-12-08 14:03:15
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-10 11:33:59
 * @Description:
 -->
 <template>
@ -16,7 +16,7 @@
      :rules="dataRule"
      ref="dataForm"
      @keyup.enter.native="dataFormSubmit()"
-      label-width="80px"
+      label-width="100px"
    >
      <el-form-item label="缓存区编码" prop="code">
        <el-input v-model="dataForm.code" placeholder="缓存区编码"></el-input>
@ -27,14 +27,14 @@
          placeholder="缓存区名称"
        ></el-input>
      </el-form-item>
-      <el-form-item label="英文名称" prop="alarmInfo">
+      <el-form-item label="英文名称" prop="englishName">
        <el-input
-          v-model="dataForm.alarmInfo"
+          v-model="dataForm.englishName"
          placeholder="英文名称"
        ></el-input>
      </el-form-item>
-      <el-form-item label="缩写" prop="alarmInfo">
-        <el-input v-model="dataForm.alarmInfo" placeholder="缩写"></el-input>
+      <el-form-item label="缩写" prop="aliasName">
+        <el-input v-model="dataForm.aliasName" placeholder="缩写"></el-input>
      </el-form-item>
      <el-form-item label="规格描述" prop="spec">
        <el-input
@ -42,9 +42,9 @@
          placeholder="规格描述"
        ></el-input>
      </el-form-item>
-      <el-form-item label="库位数量" prop="alarmInfo">
+      <el-form-item label="库位数量" prop="number">
        <el-input
-          v-model="dataForm.alarmInfo"
+          v-model="dataForm.number"
          placeholder="库位数量"
        ></el-input>
      </el-form-item>
@ -79,9 +79,18 @@ export default {
        code: '',
        description: '',
        spec: '',
+        number: null,
+        englishName: '',
+        aliasName: '',
        warehouseName: ''
      },
      dataRule: {
+        code: [
+          { required: true, message: '编码不能为空', trigger: 'blur' }
+        ],
+        warehouseName: [
+          { required: true, message: '缓存区名称不能为空', trigger: 'blur' }
+        ]
      }
    }
  },
@ -93,7 +102,7 @@ export default {
        this.$refs['dataForm'].resetFields()
        if (this.dataForm.id) {
          this.$http({
-            url: this.$http.adornUrl(`warehouse/get`),
+            url: this.$http.adornUrl(`/warehouse/get`),
            method: 'post',
            data: this.$http.adornData({ id })
          }).then(({ data }) => {
@ -103,7 +112,7 @@ export default {
          })
        } else {
          this.$http({
-            url: this.$http.adornUrl(`warehouse/codeGenerator`),
+            url: this.$http.adornUrl(`/warehouse/codeGenerator`),
            method: 'post',
            data: this.$http.adornData()
          }).then(data => {
@ -118,7 +127,7 @@ export default {
        if (valid) {
          this.$http({
            url: this.$http.adornUrl(
-              `warehouse/${!this.dataForm.id ? 'add' : 'update'}`
+              `/warehouse/${!this.dataForm.id ? 'add' : 'update'}`
            ),
            method: 'post',
            data: this.$http.adornData({
--- a/src/views/basic/components/carInfo-add.vue
+++ b/src/views/basic/components/carInfo-add.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2021-12-08 11:22:54
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-09 11:21:23
 * @Description:
 -->
 <template>
@ -53,7 +53,7 @@
          this.$refs['dataForm'].resetFields()
          if (this.dataForm.id) {
            this.$http({
-              url: this.$http.adornUrl(`vehicle/get`),
+              url: this.$http.adornUrl(`/vehicle/get`),
              method: 'post',
              data: this.$http.adornData({id})
            }).then(({data}) => {
@ -63,7 +63,7 @@
            })
          } else {
            this.$http({
-              url: this.$http.adornUrl(`vehicle/codeGenerator`),
+              url: this.$http.adornUrl(`/vehicle/codeGenerator`),
              method: 'post',
              data: this.$http.adornData()
            }).then((data) => {
@ -77,7 +77,7 @@
        this.$refs['dataForm'].validate((valid) => {
          if (valid) {
            this.$http({
-              url: this.$http.adornUrl(`vehicle/${!this.dataForm.id ? 'add' : 'update'}`),
+              url: this.$http.adornUrl(`/vehicle/${!this.dataForm.id ? 'add' : 'update'}`),
              method: 'post',
              data: this.$http.adornData({
                'id': this.dataForm.id || undefined,
--- a/src/views/basic/components/equipmentInfo-add.vue
+++ b/src/views/basic/components/equipmentInfo-add.vue
@ -1,17 +1,37 @@
+<!--
+ * @Author: gtz
+ * @Date: 2021-11-19 10:10:52
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-10 16:35:33
+ * @Description: file content
+ * @FilePath: \mt-qj-wms-ui\src\views\basic\components\equipmentInfo-add.vue
+-->
 <template>
  <el-dialog
    :title="!dataForm.id ? '新增' : '修改'"
    :close-on-click-modal="false"
    :visible.sync="visible">
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-      <el-form-item label="参数名" prop="paramKey">
-        <el-input v-model="dataForm.paramKey" placeholder="参数名"></el-input>
+      <el-form-item label="名称" prop="kilnName">
+        <el-input v-model="dataForm.kilnName" placeholder="名称"></el-input>
      </el-form-item>
-      <el-form-item label="参数值" prop="paramValue">
-        <el-input v-model="dataForm.paramValue" placeholder="参数值"></el-input>
+      <el-form-item label="编码" prop="code">
+        <el-input v-model="dataForm.code" placeholder="编码"></el-input>
      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+      <el-form-item label="别名" prop="kilnAlias">
+        <el-input v-model="dataForm.kilnAlias" placeholder="别名"></el-input>
+      </el-form-item>
+      <el-form-item label="英文名" prop="en">
+        <el-input v-model="dataForm.en" placeholder="英文名"></el-input>
+      </el-form-item>
+      <el-form-item label="ip" prop="ip">
+        <el-input v-model="dataForm.ip" placeholder="ip"></el-input>
+      </el-form-item>
+      <el-form-item label="端口号" prop="portNumber">
+        <el-input v-model="dataForm.portNumber" placeholder="端口号"></el-input>
+      </el-form-item>
+      <el-form-item label="备注" prop="note">
+        <el-input v-model="dataForm.note" placeholder="备注"></el-input>
      </el-form-item>
    </el-form>
    <span slot="footer" class="dialog-footer">
@ -28,16 +48,24 @@
        visible: false,
        dataForm: {
          id: 0,
-          paramKey: '',
-          paramValue: '',
-          remark: ''
+          code: null,
+          description: null,
+          en: null,
+          ip: null,
+          kilnAlias: null,
+          kilnName: null,
+          note: null,
+          portNumber: null
        },
        dataRule: {
-          paramKey: [
-            { required: true, message: '参数名不能为空', trigger: 'blur' }
+          kilnName: [
+            { required: true, message: '名称不能为空', trigger: 'blur' }
          ],
-          paramValue: [
-            { required: true, message: '参数值不能为空', trigger: 'blur' }
+          ip: [
+            { required: true, message: 'ip不能为空', trigger: 'blur' }
+          ],
+          portNumber: [
+            { required: true, message: '端口号不能为空', trigger: 'blur' }
          ]
        }
      }
@ -50,16 +78,22 @@
          this.$refs['dataForm'].resetFields()
          if (this.dataForm.id) {
            this.$http({
-              url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
-              method: 'get',
-              params: this.$http.adornParams()
-            }).then(({data}) => {
+              url: this.$http.adornUrl(`/kilnInfo/get`),
+              method: 'post',
+              data: this.$http.adornData({ id })
+            }).then(({ data }) => {
              if (data && data.code === 0) {
-                this.dataForm.paramKey = data.config.paramKey
-                this.dataForm.paramValue = data.config.paramValue
-                this.dataForm.remark = data.config.remark
+                this.dataForm = data.data
              }
            })
+          } else {
+            this.$http({
+              url: this.$http.adornUrl(`/kilnInfo/codeGenerator`),
+              method: 'post',
+              data: this.$http.adornData()
+            }).then(data => {
+              this.dataForm.code = data.data
+            })
          }
        })
      },
@ -68,13 +102,18 @@
        this.$refs['dataForm'].validate((valid) => {
          if (valid) {
            this.$http({
-              url: this.$http.adornUrl(`/sys/config/${!this.dataForm.id ? 'save' : 'update'}`),
+              url: this.$http.adornUrl(`/kilnInfo/${!this.dataForm.id ? 'add' : 'update'}`),
              method: 'post',
              data: this.$http.adornData({
                'id': this.dataForm.id || undefined,
-                'paramKey': this.dataForm.paramKey,
-                'paramValue': this.dataForm.paramValue,
-                'remark': this.dataForm.remark
+                'code': this.dataForm.code,
+                'description': this.dataForm.description,
+                'en': this.dataForm.en,
+                'ip': this.dataForm.ip,
+                'kilnAlias': this.dataForm.kilnAlias,
+                'kilnName': this.dataForm.kilnName,
+                'note': this.dataForm.note,
+                'portNumber': this.dataForm.portNumber
              })
            }).then(({data}) => {
              if (data && data.code === 0) {
--- a/src/views/basic/components/location-add.vue
+++ b/src/views/basic/components/location-add.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2021-12-08 14:11:44
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-10 11:17:20
 * @Description:
 -->
 <template>
@ -17,22 +17,19 @@
      <el-form-item label="库位编码" prop="code">
        <el-input v-model="dataForm.code" placeholder="库位编码"></el-input>
      </el-form-item>
-      <el-form-item label="当前状态" prop="alarmInfo"
-        ><el-switch
-          v-model="dataForm.alarmInfo"
-          active-color="#13ce66"
-          inactive-color="#ff4949"
-          active-value="1"
-          inactive-value="0"
-        >
-        </el-switch>
+      <el-form-item label="当前状态" prop="status">
+        <el-radio-group v-model="dataForm.status">
+          <el-radio :label="0">空闲</el-radio>
+          <el-radio :label="1">使用</el-radio>
+          <el-radio :label="2">不可用</el-radio>
+        </el-radio-group>
      </el-form-item>
      <el-form-item label="库位别名" prop="locationNameAlias">
        <el-input v-model="dataForm.locationNameAlias" placeholder="库位别名"></el-input>
      </el-form-item>
-      <el-form-item label="英文名称" prop="alarmInfo">
-        <el-input v-model="dataForm.alarmInfo" placeholder="英文名称"></el-input>
-      </el-form-item>
+      <!-- <el-form-item label="英文名称" prop="englishName">
+        <el-input v-model="dataForm.englishName" placeholder="英文名称"></el-input>
+      </el-form-item> -->
    </el-form>
    <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">取消</el-button>
@ -49,8 +46,10 @@
        dataForm: {
          id: '',
          code: '',
+          status: 0,
          locationName: '',
          locationNameAlias: '',
+          englishName: '',
          warehouseId: ''
        },
        dataRule: {
@ -69,7 +68,7 @@
          this.$refs['dataForm'].resetFields()
          if (this.dataForm.id) {
            this.$http({
-              url: this.$http.adornUrl(`locationInfo/get`),
+              url: this.$http.adornUrl(`/locationInfo/get`),
              method: 'post',
              data: this.$http.adornData({id})
            }).then(({data}) => {
@ -79,7 +78,7 @@
            })
          } else {
            this.$http({
-              url: this.$http.adornUrl(`locationInfo/codeGenerator`),
+              url: this.$http.adornUrl(`/locationInfo/codeGenerator`),
              method: 'post',
              data: this.$http.adornData()
            }).then((data) => {
@ -93,14 +92,15 @@
        this.$refs['dataForm'].validate((valid) => {
          if (valid) {
            this.$http({
-              url: this.$http.adornUrl(`locationInfo/${!this.dataForm.id ? 'add' : 'update'}`),
+              url: this.$http.adornUrl(`/locationInfo/${!this.dataForm.id ? 'add' : 'update'}`),
              method: 'post',
              data: this.$http.adornData({
                'id': this.dataForm.id || undefined,
                'code': this.dataForm.code,
                'locationName': this.dataForm.locationName,
                'warehouseId': this.dataForm.warehouseId,
-                'locationNameAlias': this.dataForm.locationNameAlias
+                'locationNameAlias': this.dataForm.locationNameAlias,
+                'status': this.dataForm.status
              })
            }).then(({data}) => {
              if (data && data.code === 0) {
--- a/src/views/basic/components/location.vue
+++ b/src/views/basic/components/location.vue
@ -42,12 +42,12 @@
        align="center"
        label="别名">
      </el-table-column>
-      <el-table-column
-        prop="ename"
+      <!-- <el-table-column
+        prop="englishName"
        header-align="center"
        align="center"
        label="英文名称">
-      </el-table-column>
+      </el-table-column> -->
      <el-table-column
        prop="status"
        header-align="center"
@ -112,7 +112,7 @@
      getDataList () {
        this.dataListLoading = true
        this.$http({
-          url: this.$http.adornUrl('locationInfo/page'),
+          url: this.$http.adornUrl('/locationInfo/page'),
          method: 'post',
          data: this.$http.adornData({
            'current': this.pageIndex,
@ -159,7 +159,7 @@
          type: 'warning'
        }).then(() => {
          this.$http({
-            url: this.$http.adornUrl('locationInfo/delete'),
+            url: this.$http.adornUrl('/locationInfo/delete'),
            method: 'post',
            data: this.$http.adornData({id})
          }).then(({data}) => {
--- a/src/views/basic/components/processInfo-add.vue
+++ b/src/views/basic/components/processInfo-add.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2021-12-08 14:21:48
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-09 11:21:56
 * @Description:
 -->
 <template>
@ -71,7 +71,7 @@
          this.$refs['dataForm'].resetFields()
          if (this.dataForm.id) {
            this.$http({
-              url: this.$http.adornUrl(`alarmBase/get`),
+              url: this.$http.adornUrl(`/alarmBase/get`),
              method: 'post',
              data: this.$http.adornData({id})
            }).then(({data}) => {
@ -81,7 +81,7 @@
            })
          } else {
            this.$http({
-              url: this.$http.adornUrl(`alarmBase/codeGenerator`),
+              url: this.$http.adornUrl(`/alarmBase/codeGenerator`),
              method: 'post',
              data: this.$http.adornData()
            }).then((data) => {
@ -95,7 +95,7 @@
        this.$refs['dataForm'].validate((valid) => {
          if (valid) {
            this.$http({
-              url: this.$http.adornUrl(`alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
+              url: this.$http.adornUrl(`/alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
              method: 'post',
              data: this.$http.adornData({
                'id': this.dataForm.id || undefined,
--- a/src/views/basic/equipmentInfo.vue
+++ b/src/views/basic/equipmentInfo.vue
@ -5,7 +5,7 @@
      :model="dataForm"
      @keyup.enter.native="getDataList()"
    >
-      <el-form-item>
+      <!-- <el-form-item>
        <el-select v-model="dataForm.paramKey" filterable placeholder="名称">
          <el-option
            v-for="item in options"
@ -15,7 +15,7 @@
          >
          </el-option>
        </el-select>
-      </el-form-item>
+      </el-form-item> -->
      <el-form-item>
        <el-button @click="getDataList()">查询</el-button>
        <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
@ -36,45 +36,52 @@
      >
      </el-table-column>
      <el-table-column
-        prop="paramKey"
+        prop="kilnName"
        header-align="center"
        align="center"
-        label="添加时间"
+        label="名称"
      >
      </el-table-column>
      <el-table-column
-        prop="paramValue"
-        header-align="center"
-        align="center"
-        label="设备名称"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="remark"
+        prop="code"
        header-align="center"
        align="center"
        label="编码"
      >
      </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
        prop="type"
        header-align="center"
        align="center"
        label="类型"
      >
-      </el-table-column>
+      </el-table-column> -->
      <el-table-column
-        prop="ename"
+        prop="en"
        header-align="center"
        align="center"
        label="英文名"
      >
      </el-table-column>
      <el-table-column
-        prop="suoxie"
+        prop="kilnAlias"
        header-align="center"
        align="center"
-        label="缩写"
+        label="别名"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="ip"
+        header-align="center"
+        align="center"
+        label="ip"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="portNumber"
+        header-align="center"
+        align="center"
+        label="端口号"
      >
      </el-table-column>
      <el-table-column
@ -125,7 +132,7 @@ export default {
  data () {
    return {
      dataForm: {
-        paramKey: ''
+        // paramKey: ''
      },
      dataList: [],
      options: [],
@ -147,17 +154,17 @@ export default {
    getDataList () {
      this.dataListLoading = true
      this.$http({
-        url: this.$http.adornUrl('/sys/config/list'),
-        method: 'get',
-        params: this.$http.adornParams({
-          page: this.pageIndex,
-          limit: this.pageSize,
-          paramKey: this.dataForm.paramKey
+        url: this.$http.adornUrl('/kilnInfo/page'),
+        method: 'post',
+        data: this.$http.adornData({
+          current: this.pageIndex,
+          size: this.pageSize
+          // paramKey: this.dataForm.paramKey
        })
      }).then(({ data }) => {
        if (data && data.code === 0) {
-          this.dataList = data.page.list
-          this.totalPage = data.page.totalCount
+          this.dataList = data.data.records
+          this.totalPage = data.data.total
        } else {
          this.dataList = []
          this.totalPage = 0
--- a/src/views/basic/processInfo.vue
+++ b/src/views/basic/processInfo.vue
@ -118,7 +118,7 @@
      getDataList () {
        this.dataListLoading = true
        this.$http({
-          url: this.$http.adornUrl('alarmBase/page'),
+          url: this.$http.adornUrl('/alarmBase/page'),
          method: 'post',
          data: this.$http.adornData({
            'current': this.pageIndex,
@ -162,7 +162,7 @@
          type: 'warning'
        }).then(() => {
          this.$http({
-            url: this.$http.adornUrl('alarmBase/delete'),
+            url: this.$http.adornUrl('/alarmBase/delete'),
            method: 'post',
            data: this.$http.adornData({id})
          }).then(({data}) => {
--- a/src/views/common/home.vue
+++ b/src/views/common/home.vue
@ -155,7 +155,7 @@ export default {
    getDataList () {
      this.dataListLoading = true
      this.$http({
-        url: this.$http.adornUrl('currTask/mainCurrentTaskNow'),
+        url: this.$http.adornUrl('/currTask/mainCurrentTaskNow'),
        method: 'post',
        data: this.$http.adornData({
          current: this.pageIndex,
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@ -30,8 +30,8 @@
    data () {
      return {
        dataForm: {
-          mobile: '',
-          password: ''
+          mobile: '13588441519',
+          password: '123abc.'
        },
        dataRule: {
          mobile: [
@ -52,7 +52,7 @@
        this.$refs['dataForm'].validate((valid) => {
          if (valid) {
            this.$http({
-              url: this.$http.adornUrl('passport/login'),
+              url: this.$http.adornUrl('/passport/login'),
              method: 'post',
              data: this.$http.adornData({
                'mobile': this.dataForm.mobile,
--- a/src/views/common/order-process-add.vue
+++ b/src/views/common/order-process-add.vue
@ -1,20 +1,32 @@
 <template>
  <el-dialog
-    :title="!dataForm.id ? '新增' : '修改'"
+    :title="!row ? '新增' : '修改'"
    :close-on-click-modal="false"
    :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-      <el-form-item label="标识卡" prop="paramKey">
-        <el-input v-model="dataForm.paramKey" placeholder="标识卡"></el-input>
+    <el-form :model="dataForm" v-loading="formLoading" :rules="dataRule" ref="dataForm" label-width="80px">
+      <el-form-item label="标识卡号" prop="idenCardNum">
+        <el-input v-model="dataForm.idenCardNum" @change="setIdenCardNum" ref="idenCardNum" placeholder="标识卡号"></el-input>
      </el-form-item>
-      <el-form-item label="产品名称" prop="paramValue">
-        <el-input v-model="dataForm.paramValue" placeholder="产品名称"></el-input>
+      <el-form-item label="客户名称" prop="customerName">
+        <el-input v-model="dataForm.customerName" disabled placeholder="客户名称"></el-input>
      </el-form-item>
-      <el-form-item label="数量" prop="number">
-        <el-input v-model="dataForm.remark" placeholder="数量"></el-input>
+      <el-form-item label="材料牌号" prop="materialDes">
+        <el-input v-model="dataForm.materialDes" disabled placeholder="材料牌号"></el-input>
      </el-form-item>
-      <el-form-item label="重量" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="重量"></el-input>
+      <el-form-item label="订单号" prop="orderNo">
+        <el-input v-model="dataForm.orderNo" disabled placeholder="订单号"></el-input>
+      </el-form-item>
+      <el-form-item label="产品名称" prop="productName">
+        <el-input v-model="dataForm.productName" disabled placeholder="产品名称"></el-input>
+      </el-form-item>
+      <el-form-item label="数量" prop="quantity">
+        <el-input v-model="dataForm.quantity" placeholder="数量"></el-input>
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input v-model="dataForm.unit" disabled placeholder="单位"></el-input>
+      </el-form-item>
+      <el-form-item label="重量" prop="weight">
+        <el-input v-model="dataForm.weight" placeholder="重量"></el-input>
      </el-form-item>
    </el-form>
    <span slot="footer" class="dialog-footer">
@ -30,57 +42,86 @@
      return {
        visible: false,
        dataForm: {
-          id: 0,
-          paramKey: '',
-          paramValue: '',
-          remark: ''
+          idenCardNum: null,
+          customerName: null,
+          materialDes: null,
+          orderNo: null,
+          productName: null,
+          quantity: null,
+          unit: null,
+          weight: null
        },
        dataRule: {
-          paramKey: [
-            { required: true, message: '参数名不能为空', trigger: 'blur' }
+          idenCardNum: [
+            { required: true, message: '标识卡号不能为空', trigger: 'blur' }
          ],
-          paramValue: [
-            { required: true, message: '参数值不能为空', trigger: 'blur' }
+          quantity: [
+            { required: true, message: '数量不能为空', trigger: 'blur' }
+          ],
+          weight: [
+            { required: true, message: '重量不能为空', trigger: 'blur' }
          ]
-        }
+        },
+        formLoading: false,
+        row: null,
+        editIndex: null
      }
    },
    methods: {
-      init (id) {
-        this.dataForm.id = id || 0
+      init (row, idx) {
        this.visible = true
        this.$nextTick(() => {
          this.$refs['dataForm'].resetFields()
-          if (this.dataForm.id) {
+          if (row) {
+            this.row = row
+            this.dataForm = row
+            this.editIndex = idx
+          }
+          this.$refs['idenCardNum'].focus()
+        })
+      },
+      setIdenCardNum () {
+        this.formLoading = true
+        if (this.dataForm.idenCardNum) {
          this.$http({
-              url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
+            url: this.$http.adornUrl(`/orderInfo/getTaskInfoByIdenCardNum`),
            method: 'get',
-              params: this.$http.adornParams()
+            params: this.$http.adornParams({
+              'idenCardNum': this.dataForm.idenCardNum
+            })
          }).then(({data}) => {
+            console.log(data)
            if (data && data.code === 0) {
-                this.dataForm.paramKey = data.config.paramKey
-                this.dataForm.paramValue = data.config.paramValue
-                this.dataForm.remark = data.config.remark
+              this.dataForm = data.data
+              this.dataForm.targetQuantity = data.data.quantity
+              this.dataForm.targetWeight = data.data.weight
+              this.dataForm.weight = null
+              this.dataForm.quantity = null
+            } else {
+              this.$message.warning(data.msg)
            }
+            this.formLoading = false
          })
+        } else {
+          this.$message.warning('请输入标识卡号')
        }
-        })
      },
      // 表单提交
      dataFormSubmit () {
        this.$refs['dataForm'].validate((valid) => {
          if (valid) {
-            this.$http({
-              url: this.$http.adornUrl(`/sys/config/${!this.dataForm.id ? 'save' : 'update'}`),
-              method: 'post',
-              data: this.$http.adornData({
-                'id': this.dataForm.id || undefined,
-                'paramKey': this.dataForm.paramKey,
-                'paramValue': this.dataForm.paramValue,
-                'remark': this.dataForm.remark
-              })
-            }).then(({data}) => {
-              if (data && data.code === 0) {
+            if (this.editIndex) {
+              const taskList = JSON.parse(sessionStorage.getItem('taskList'))
+              taskList.splice(this.editIndex, 1, this.dataForm)
+              sessionStorage.setItem('taskList', JSON.stringify(taskList))
+            } else if (sessionStorage.getItem('taskList')) {
+              const taskList = JSON.parse(sessionStorage.getItem('taskList'))
+              taskList.push(this.dataForm)
+              sessionStorage.setItem('taskList', JSON.stringify(taskList))
+            } else {
+              const arr = [this.dataForm]
+              sessionStorage.setItem('taskList', JSON.stringify(arr))
+            }
            this.$message({
              message: '操作成功',
              type: 'success',
@ -90,10 +131,6 @@
                this.$emit('refreshDataList')
              }
            })
-              } else {
-                this.$message.error(data.msg)
-              }
-            })
          }
        })
      }
--- a/src/views/common/order-process.vue
+++ b/src/views/common/order-process.vue
@ -1,19 +1,24 @@
 <template>
  <div class="mod-config">
-    <div style="color:#67c23a;background:#f0f9eb;padding:5px;margin-bottom:5px;text-align:center">录入托盘标识卡信息</div>
    <el-form :inline="true">
      <el-form-item>
        <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
      </el-form-item>
-      <el-form-item style="margin-left:8%">
+      <el-form-item label="加工类型">
+        <el-select v-model="processType" clearable>
+          <el-option :value="0" label="初始加工" />
+          <el-option :value="1" label="复加工" />
+        </el-select>
+      </el-form-item>
+      <el-form-item style="margin-left:2%">
        任务起点位置 :
-        <el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startBtnName}}</el-button>
+        <el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startPosition}}</el-button>
      </el-form-item>
      <el-form-item style="margin-left:2%">
        窑炉 :
-        <el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnBtnName}}</el-button>
+        <el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnId}}</el-button>
      </el-form-item>
-      <el-form-item style="margin-left:10%">
+      <el-form-item style="margin-left:2%">
        <el-button type="primary" @click="submitTask()">提交任务</el-button>
      </el-form-item>
    </el-form>
@ -30,43 +35,46 @@
        width="50">
      </el-table-column>
      <el-table-column
-        prop="id"
+        prop="idenCardNum"
        header-align="center"
        align="center"
        label="标识卡">
      </el-table-column>
      <el-table-column
-        prop="paramKey"
+        prop="customerName"
        header-align="center"
        align="center"
-        label="客户信息">
+        label="客户名称">
      </el-table-column>
      <el-table-column
-        prop="paramValue"
+        prop="orderNo"
        header-align="center"
        align="center"
        label="订单号">
      </el-table-column>
      <el-table-column
-        prop="remark"
+        prop="productName"
        header-align="center"
        align="center"
        label="产品名称">
      </el-table-column>
      <el-table-column
-        prop="card"
+        prop="materialDes"
        header-align="center"
        align="center"
        label="材料号牌">
      </el-table-column>
      <el-table-column
-        prop="num"
+        prop="finishQuantity"
        header-align="center"
        align="center"
        label="已完成数">
+        <template slot-scope="scope">
+          {{ `${scope.row.finishQuantity}/${scope.row.targetQuantity}` }}
+        </template>
      </el-table-column>
      <el-table-column
-        prop="number"
+        prop="quantity"
        header-align="center"
        align="center"
        label="数量">
@ -89,20 +97,11 @@
        align="center"
        label="操作">
        <template slot-scope="scope">
-          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-          <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row, scope.$index)">修改</el-button>
+          <el-button type="text" size="small" @click="deleteHandle(scope.$index)">删除</el-button>
        </template>
      </el-table-column>
    </el-table>
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
-    </el-pagination>
    <!-- 弹窗, 新增 / 修改 -->
    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
    <process-point v-if="processPointVisible" ref="processPoint" @refreshPoint="setPoint"></process-point>
@ -115,12 +114,11 @@
  export default {
    data () {
      return {
-        startBtnName: '选择起点',
-        kilnBtnName: '选择窑炉',
+        startPosition: '选择起点',
+        kilnId: '选择窑炉',
+        targetPosition: '',
        dataList: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
+        processType: null,
        dataListLoading: false,
        addOrUpdateVisible: false,
        processPointVisible: false
@ -136,41 +134,18 @@
    methods: {
      // 获取数据列表
      getDataList () {
-        this.dataListLoading = true
-        this.$http({
-          url: this.$http.adornUrl('/sys/config/list'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize
-          })
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
-          } else {
-            this.dataList = []
-            this.totalPage = 0
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.getDataList()
+        this.dataList = sessionStorage.getItem('taskList') ? JSON.parse(sessionStorage.getItem('taskList')) : []
+        // if (data && data.code === 0) {
+        //   this.dataList = data.data.records
+        // } else {
+        //   this.dataList = []
+        // }
      },
      // 新增 / 修改
-      addOrUpdateHandle (id) {
+      addOrUpdateHandle (row, idx) {
        this.addOrUpdateVisible = true
        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
+          this.$refs.addOrUpdate.init(row, idx)
        })
      },
      // 获取点位
@ -182,9 +157,10 @@
      },
      setPoint (count, pointType) {
        if (!pointType) {
-          this.startBtnName = count
+          this.startPosition = count
        } else {
-          this.kilnBtnName = count
+          this.kilnId = count
+          this.targetPosition = count
        }
      },
      submitTask () {
@ -193,45 +169,63 @@
            message: '任务为空，请新增一条托盘信息',
            type: 'warning'
          })
-        } else if (this.startBtnName === '选择起点') {
+        } else if (this.startPosition === '选择起点') {
          this.$message({
            message: '请选择任务起点',
            type: 'warning'
          })
-        } else if (this.kilnBtnName === '选择窑炉') {
+        } else if (this.kilnId === '选择窑炉') {
          this.$message({
            message: '请选择窑炉',
            type: 'warning'
          })
-        }
-      },
-      // 删除
-      deleteHandle (id) {
-        this.$confirm(`确定对[id=${id}]进行删除]操作?`, '提示', {
+        } else if (!this.processType) {
+          this.$message.warning('请选择加工类型')
+        } else {
+          this.$confirm(`确定提交任务?`, '提示', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
            type: 'warning'
          }).then(() => {
            this.$http({
-            url: this.$http.adornUrl('/sys/config/delete'),
+              url: this.$http.adornUrl(`currTask/createProcessTask`),
              method: 'post',
-            data: this.$http.adornData(id, false)
+              data: this.$http.adornData({
+                craftCode: '',
+                detParams: this.dataList,
+                kilnId: this.kilnId,
+                processType: this.processType,
+                startPosition: this.startPosition,
+                targetPosition: this.targetPosition
+              })
            }).then(({data}) => {
+              console.log(data)
              if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
+                this.$message.success('任务提交成功')
+                this.dataList = []
+                sessionStorage.setItem('taskList', '')
+                this.startPosition = '选择起点'
+                this.kilnId = '选择窑炉'
+                this.targetPosition = null
              } else {
-              this.$message.error(data.msg)
+                this.$message.warning(data.msg)
              }
            })
          }).catch(() => {})
        }
+      },
+      // 删除
+      deleteHandle (idx) {
+        console.log(idx)
+        this.$confirm(`确定对第${idx + 1}项进行删除操作?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.dataList.splice(idx, 1)
+          sessionStorage.setItem('taskList', JSON.stringify(this.dataList))
+        }).catch(() => {})
+      }
    }
  }
 </script>
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@ -96,16 +96,16 @@
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
-          this.$http({
-            url: this.$http.adornUrl('/sys/logout'),
-            method: 'post',
-            data: this.$http.adornData()
-          }).then(({data}) => {
-            if (data && data.code === 0) {
+          // this.$http({
+          //   url: this.$http.adornUrl('/sys/logout'),
+          //   method: 'post',
+          //   data: this.$http.adornData()
+          // }).then(({data}) => {
+          //   if (data && data.code === 0) {
          clearLoginInfo()
          this.$router.push({ name: 'login' })
-            }
-          })
+          //   }
+          // })
        }).catch(() => {})
      }
    }
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@ -32,15 +32,15 @@
            <icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
            <span slot="title">货物出库</span>
          </el-menu-item>
-          <el-menu-item
+          <!-- <el-menu-item
            index="addProcess"
            @click="$router.push({ name: 'addProcess' })"
          >
            <icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
            <span slot="title">追加加工</span>
-          </el-menu-item>
+          </el-menu-item> -->
        </el-submenu>
-        <el-submenu index="demo">
+        <!-- <el-submenu index="demo">
          <template slot="title">
            <icon-svg
              name="shoucang"
@ -62,7 +62,7 @@
            <icon-svg name="editor" class="site-sidebar__menu-icon"></icon-svg>
            <span slot="title">ueditor</span>
          </el-menu-item>
-        </el-submenu>
+        </el-submenu> -->
        <el-submenu index="basic">
          <template slot="title">
            <icon-svg name="bianji" class="site-sidebar__menu-icon"></icon-svg>
--- a/src/views/order/components/current-order-detail.vue
+++ b/src/views/order/components/current-order-detail.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2021-11-19 11:23:44
- * @LastEditors: zwq
- * @LastEditTime: 2021-12-08 14:42:18
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-09 11:22:40
 * @Description:
 -->
 <template>
@ -153,7 +153,7 @@ export default {
      this.$nextTick(() => {
        this.$refs['dataForm'].resetFields()
        this.$http({
-          url: this.$http.adornUrl(`orderInfo/getDet`),
+          url: this.$http.adornUrl(`/orderInfo/getDet`),
          method: 'post',
          data: this.$http.adornData({ id: id })
        }).then(({ data }) => {
--- a/src/views/order/current-order.vue
+++ b/src/views/order/current-order.vue
@ -195,7 +195,7 @@
          if (valid) {
            this.dataListLoading = true
            this.$http({
-              url: this.$http.adornUrl('orderInfo/page'),
+              url: this.$http.adornUrl('/orderInfo/page'),
              method: 'post',
              data: this.$http.adornData({
                'current': this.pageIndex,
@ -229,7 +229,7 @@
      },
      completeOrder (id) { // 完成订单
        this.$http({
-          url: this.$http.adornUrl('orderInfo/completeOrder'),
+          url: this.$http.adornUrl('/orderInfo/completeOrder'),
          method: 'post',
          data: this.$http.adornData({
            'id': id
@ -264,7 +264,7 @@
          type: 'warning'
        }).then(() => {
          this.$http({
-            url: this.$http.adornUrl('orderInfo/voidOrder'),
+            url: this.$http.adornUrl('/orderInfo/voidOrder'),
            method: 'post',
            data: this.$http.adornData(id, false)
          }).then(({data}) => {
--- a/src/views/order/current-task.vue
+++ b/src/views/order/current-task.vue
@ -145,7 +145,7 @@
      getDataList () {
        this.dataListLoading = true
        this.$http({
-          url: this.$http.adornUrl('currTask/currentTaskNow'),
+          url: this.$http.adornUrl('/currTask/currentTaskNow'),
          method: 'post',
          data: this.$http.adornData({
            'current': this.pageIndex,
@ -188,7 +188,7 @@
          type: 'warning'
        }).then(() => {
          this.$http({
-            url: this.$http.adornUrl('currTask/deleteBySheetNo'),
+            url: this.$http.adornUrl('/currTask/deleteBySheetNo'),
            method: 'post',
            data: this.$http.adornData(sheetNo)
          }).then(({data}) => {
--- a/static/config/index-prod.js
+++ b/static/config/index-prod.js
@ -1,3 +1,11 @@
+/*
+ * @Author: gtz
+ * @Date: 2021-11-19 10:10:52
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-09 11:08:41
+ * @Description: file content
+ * @FilePath: \mt-qj-wms-ui\static\config\index-prod.js
+ */
 /**
 * 生产环境
 */
@ -5,7 +13,7 @@
  window.SITE_CONFIG = {};

  // api接口请求地址
-  window.SITE_CONFIG['baseUrl'] = 'http://demo.open.renren.io/renren-fast-server';
+  window.SITE_CONFIG['baseUrl'] = '/api';

  // cdn地址 = 域名 + 版本号
  window.SITE_CONFIG['domain']  = './'; // 域名