config/index.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-11-19 10:10:51
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-17 14:40:57
+ * @LastEditTime: 2021-12-15 17:19:13
  * @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.189:8080',
+        target: 'http://192.168.0.183:8080',
         changeOrigin: true,
         pathRewrite: {
           '^/proxyApi': '/api'

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-17 15:49:18
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-12-17 17:02:25
+ * @LastEditTime: 2021-11-17 15:58:31
  * @Description:
 -->
 <template>
@@ -11,9 +11,7 @@
     :visible.sync="visible">
     <el-table
       :data="dataList"
-      v-loading="formLoading"
+      border
-      :stripe="true"
-      :header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
       style="width: 100%;">
       <el-table-column
         type="index"
@@ -23,19 +21,19 @@
         width="50">
       </el-table-column>
       <el-table-column
-        prop="idenCardNum"
+        prop="id"
         header-align="center"
         align="center"
         label="标识卡">
       </el-table-column>
       <el-table-column
-        prop="customer"
+        prop="id1"
         header-align="center"
         align="center"
         label="客户信息">
       </el-table-column>
       <el-table-column
-        prop="quantity"
+        prop="number"
         header-align="center"
         align="center"
         label="数量">
@@ -58,27 +56,24 @@
     data () {
       return {
         visible: false,
-        dataList: [],
+        dataList: []
-        formLoading: false
       }
     },
     methods: {
       init (id) {
         this.visible = true
-        this.formLoading = true
         this.$nextTick(() => {
           if (id) {
             this.$http({
-              url: this.$http.adornUrl(`/outStock/get`),
+              url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
-              method: 'post',
+              method: 'get',
-              data: this.$http.adornData({ id })
+              params: this.$http.adornParams()
             }).then(({data}) => {
               if (data && data.code === 0) {
-                this.dataForm = data.data
+                this.dataForm.paramKey = data.config.paramKey
-              } else {
+                this.dataForm.paramValue = data.config.paramValue
-                this.$message.error(data.msg)
+                this.dataForm.remark = data.config.remark
               }
-              this.formLoading = false
             })
           }
         })

src/views/common/ex-warehouse.vue

@@ -1,25 +1,41 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-15 15:17:30
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-12-17 17:05:22
+ * @LastEditTime: 2021-11-17 16:07:04
  * @Description:
 -->
 <template>
-  <div v-loading="dataListLoading">
+  <div>
     <div class="mainDiv" style="margin:10px 0 100px">
-      <div
+      <div class="flexDiv">
+        <div
           class="wareBox"
           :class="[
-            item.empty === 1 ? 'enableBox' : 'disableBox',
+            count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox',
-            { active: item.locationId === isActive }
+            { active: count === isActive }
           ]"
-          @click="selectBox(item.locationId)"
+          @click="selectBox(count)"
-          v-for="item in warehouseList"
+          v-for="count in 10"
-          :key="item.locationId"
+          v-bind:key="count"
         >
-          <div class="plat">{{ item.locationName }}</div>
+          <div class="plat">库位{{ count }}</div>
         </div>
+      </div>
+      <div class="flexDiv">
+        <div
+          class="wareBox"
+          :class="[
+            count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox',
+            { active: count + 10 === isActive }
+          ]"
+          @click="selectBox(count + 10)"
+          v-for="count in 10"
+          v-bind:key="count"
+        >
+          <div class="plat">库位{{ count + 10 }}</div>
+        </div>
+      </div>
     </div>
     <div class="line"></div>
     <div class="mainDiv" style="margin:100px 0 10px">
@@ -43,66 +59,31 @@ export default {
   data () {
     return {
       isActive: '',
-      ExWarehouseInfoVisible: false,
+      ExWarehouseInfoVisible: false
-      dataListLoading: false,
-      warehouseList: []
     }
   },
   components: {
     ExWarehouseInfo
   },
-  created () {
+  created () {},
-    this.getWarehouseList()
-  },
   methods: {
-    getWarehouseList () {
+    selectBox (count) {
-      this.dataListLoading = true
+      this.isActive = count
-      this.$http({
-        url: this.$http.adornUrl('/outStock/list'),
-        method: 'post'
-      }).then(({data}) => {
-        if (data && data.code === 0) {
-          this.warehouseList = data.data
-        } else {
-          this.warehouseList = []
-        }
-        this.dataListLoading = false
-      })
-    },
-    selectBox (id) {
-      this.isActive = id
       this.ExWarehouseInfoVisible = true
       this.$nextTick(() => {
-        this.$refs.ExWarehouseInfoRef.init(id)
+        this.$refs.ExWarehouseInfoRef.init()
       })
     },
     selectPlat (count) {
       if (this.isActive) {
-        this.$confirm(`确认从库位id为[${this.isActive}]出库至提升台${count}?`, '提示', {
+        this.$confirm(`确认从库位${this.isActive}出库至提升台${count}?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'info '
         }).then(() => {
-          this.$http({
+          this.$message({
-            url: this.$http.adornUrl('/outStock/runOutTask'),
+            type: 'success',
-            method: 'post',
+            message: '出库成功!'
-            data: this.$http.adornData({
-              code: count,
-              localtionId: this.isActive
-            })
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                type: 'success',
-                message: '出库成功!',
-                onClose: () => {
-                  this.getWarehouseList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-            this.dataListLoading = false
           })
         }).catch(() => {
           this.$message({
@@ -151,7 +132,6 @@ export default {
 .wareBox {
   cursor: pointer;
   margin: 10px;
-  width: 100px;
   height: 100px;
   padding: 10px;
   line-height: 90px;

src/views/report/car-alarm.vue

@@ -1,18 +1,18 @@
 <template>
-  <div class="mod-config">
+  <div class="mod-log">
-    <el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-select size="small" v-model="dataForm.equipmentId" clearable filterable placeholder="车辆名称">
+        <el-select v-model="dataForm.key" filterable placeholder="车辆名称">
           <el-option
-            v-for="item in carList"
+            v-for="item in options"
-            :key="item.id"
+            :key="item.value"
-            :label="item.vehicleName"
+            :label="item.label"
-            :value="item.id"
+            :value="item.value"
           >
           </el-option>
         </el-select>
       </el-form-item>
-      <!-- <el-form-item>
+      <el-form-item>
         <el-date-picker
           v-model="dataForm.time"
           value-format="yyyy-MM-dd"
@@ -22,15 +22,14 @@
           end-placeholder="结束日期"
         >
         </el-date-picker>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
       </el-form-item>
     </el-form>
     <el-table
       :data="dataList"
-      :stripe="true"
+      border
-      :header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
       v-loading="dataListLoading"
       style="width: 100%">
       <el-table-column
@@ -41,19 +40,27 @@
         width="50">
       </el-table-column>
       <el-table-column
-        prop="equipmentName"
+        prop="username"
+        header-align="center"
+        align="center"
         label="车辆名称">
       </el-table-column>
       <el-table-column
-        prop="createTime"
+        prop="operation"
+        header-align="center"
+        align="center"
         label="报警时间">
       </el-table-column>
-      <!-- <el-table-column
-        prop="time"
-        label="报警级别">
-      </el-table-column> -->
       <el-table-column
-        prop="alarmInfo"
+        prop="time"
+        header-align="center"
+        align="center"
+        label="报警级别">
+      </el-table-column>
+      <el-table-column
+        prop="ip"
+        header-align="center"
+        align="center"
         label="报警内容">
       </el-table-column>
     </el-table>
@@ -74,7 +81,8 @@
     data () {
       return {
         dataForm: {
-          equipmentId: null
+          key: '',
+          time: []
         },
         dataList: [],
         options: [],
@@ -82,49 +90,28 @@
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        selectionDataList: [],
+        selectionDataList: []
-        carList: []
       }
     },
     created () {
-      this.getCarList()
+      this.getDataList()
     },
     methods: {
-      // 获取车辆列表
-      getCarList () {
-        this.dataListLoading = true
-        this.$http({
-          url: this.$http.adornUrl('/vehicle/page'),
-          method: 'post',
-          data: this.$http.adornData({
-            current: 1,
-            size: 999
-          })
-        }).then(({ data }) => {
-          if (data && data.code === 0) {
-            this.carList = data.data.records
-            this.getDataList()
-          } else {
-            this.carList = []
-          }
-        })
-      },
       // 获取数据列表
       getDataList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/alarmInfo/page'),
+          url: this.$http.adornUrl('/sys/log/list'),
-          method: 'post',
+          method: 'get',
-          data: this.$http.adornData({
+          params: this.$http.adornParams({
-            current: this.pageIndex,
+            'page': this.pageIndex,
-            size: this.pageSize,
+            'limit': this.pageSize,
-            type: 1,
+            'key': this.dataForm.key
-            equipmentId: this.dataForm.equipmentId
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.data.records
+            this.dataList = data.page.list
-            this.totalPage = data.data.total
+            this.totalPage = data.page.totalCount
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/report/kiln-alarm.vue

@@ -1,20 +1,23 @@
 <template>
-  <div class="mod-config">
+  <div class="mod-log">
-    <el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form
+      :inline="true"
+      :model="dataForm"
+      @keyup.enter.native="getDataList()"
+    >
       <el-form-item>
-        <el-select size="small" v-model="dataForm.equipmentId" clearable filterable placeholder="窑炉名称">
+        <el-select v-model="dataForm.key" filterable placeholder="窑炉名称">
           <el-option
-            v-for="item in kilnList"
+            v-for="item in options"
-            :key="item.id"
+            :key="item.value"
-            :label="item.kilnName"
+            :label="item.label"
-            :value="item.id"
+            :value="item.value"
           >
           </el-option>
         </el-select>
       </el-form-item>
-      <!-- <el-form-item>
+      <el-form-item>
         <el-date-picker
-          size="small"
           v-model="dataForm.time"
           value-format="yyyy-MM-dd"
           type="daterange"
@@ -23,15 +26,14 @@
           end-placeholder="结束日期"
         >
         </el-date-picker>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
       </el-form-item>
     </el-form>
     <el-table
       :data="dataList"
-      :stripe="true"
+      border
-      :header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
       v-loading="dataListLoading"
       style="width: 100%"
     >
@@ -44,22 +46,30 @@
       >
       </el-table-column>
       <el-table-column
-        prop="equipmentName"
+        prop="username"
+        header-align="center"
+        align="center"
         label="窑炉名称"
       >
       </el-table-column>
       <el-table-column
-        prop="createTime"
+        prop="operation"
+        header-align="center"
+        align="center"
         label="报警时间"
       >
       </el-table-column>
-      <!-- <el-table-column
+      <el-table-column
         prop="time"
+        header-align="center"
+        align="center"
         label="报警级别"
-      > -->
+      >
       </el-table-column>
       <el-table-column
-        prop="alarmInfo"
+        prop="ip"
+        header-align="center"
+        align="center"
         label="报警内容"
       >
       </el-table-column>
@@ -82,7 +92,8 @@ export default {
   data () {
     return {
       dataForm: {
-        equipmentId: null
+        key: '',
+        time: []
       },
       dataList: [],
       options: [],
@@ -90,49 +101,28 @@ export default {
       pageSize: 10,
       totalPage: 0,
       dataListLoading: false,
-      selectionDataList: [],
+      selectionDataList: []
-      kilnList: []
     }
   },
   created () {
-    this.getKilnList()
+    this.getDataList()
   },
   methods: {
-    // 获取窑炉列表
-    getKilnList () {
-      this.dataListLoading = true
-      this.$http({
-        url: this.$http.adornUrl('/kilnInfo/page'),
-        method: 'post',
-        data: this.$http.adornData({
-          current: 1,
-          size: 999
-        })
-      }).then(({ data }) => {
-        if (data && data.code === 0) {
-          this.kilnList = data.data.records
-          this.getDataList()
-        } else {
-          this.kilnList = []
-        }
-      })
-    },
     // 获取数据列表
     getDataList () {
       this.dataListLoading = true
       this.$http({
-        url: this.$http.adornUrl('/alarmInfo/page'),
+        url: this.$http.adornUrl('/sys/log/list'),
-        method: 'post',
+        method: 'get',
-        data: this.$http.adornData({
+        params: this.$http.adornParams({
-          current: this.pageIndex,
+          page: this.pageIndex,
-          size: this.pageSize,
+          limit: this.pageSize,
-          type: 0,
+          key: this.dataForm.key
-          equipmentId: this.dataForm.equipmentId
         })
       }).then(({ data }) => {
         if (data && data.code === 0) {
-          this.dataList = data.data.records
+          this.dataList = data.page.list
-          this.totalPage = data.data.total
+          this.totalPage = data.page.totalCount
         } else {
           this.dataList = []
           this.totalPage = 0