修改bug

2024-03-01 15:27:01 +08:00 · 2024-03-01 15:27:01 +08:00 · d8c126fccf
commit d8c126fccf
parent bf90cc453d
9 changed files with 79 additions and 80 deletions
--- a/.env.dev
+++ b/.env.dev
@ -1,8 +1,8 @@
 ###
 # @Author: Do not edit
 # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-02-26 08:45:43
- # @LastEditors: DY
+ # @LastEditTime: 2024-02-29 08:34:48
+ # @LastEditors: zhp
 # @Description:
 ###
 # 开发环境配置
@ -20,10 +20,10 @@ VUE_APP_TITLE = MES系统
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
-VUE_APP_BASE_API = 'http://192.168.1.47:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
 # socket地址
 VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
 VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
--- a/src/views/OperationalOverview/AGVBoard.vue
+++ b/src/views/OperationalOverview/AGVBoard.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-07-19 15:18:30
 * @LastEditors: zhp
- * @LastEditTime: 2024-02-23 16:11:33
+ * @LastEditTime: 2024-02-29 15:48:47
 * @Description:
 -->
 <template>
@ -715,6 +715,7 @@ export default {
      qualityMonthTableProps,
      modelMonth: '',
      qualityList1,
+      // logoutTime: 43200000,
      qualityTableProps2,
      qualityList2,
      dateType: '0',
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-02-23 16:11:40
+ * @LastEditTime: 2024-02-29 15:48:11
 * @LastEditors: zhp
 * @Description:
 -->
@ -341,7 +341,9 @@ export default {
      // offsetWidth: null,
      cxNameList,
      cxDataList,
+      // time:12,
      cutProps,
+      // logoutTime: 43200000,
      cutTableDataList:[],
      clientWidth: 0,
      containerWidth: 111111,
@ -432,36 +434,15 @@ export default {
        this.beilv2 = _this.clientWidth / 1920
      })()
    }
-    // let obj = {
-    //   'a': 11111,
-    //   'b': 22222,
-    //   'c': 33333,
-    //   'd': 44444,
-    //   'e': 55555,
+    // logoutInterval = setInterval(() => {
+    //   this.logoutTime -= 1000
+    // }, 1000)
+    // if (this.logoutTime === 0) {
+    //   this.SJGInitWebSocket()
+    //   this.CutInitWebSocket()
+    //   this.funInitWebSocket()
+    //   this.logoutTimeReset()
    // }
-    // let index = 0
-    // for (let i in obj) {
-    //   index++,
-    //   console.log(index);
-    // }
-    // this.getList()
-    // const _this = this;
-    // window.onresize = () => {
-    //   return (() => {
-    //     _this.clientWidth = `${document.documentElement.clientWidth}`
-    //     this.beilv2 = _this.clientWidth / 1920
-    //   })()
-    // }
-    // this.beilv2 = window.innerWidth / 1920
-    // addEventListener('resize', resizeFun = () => {
-    //   this.beilv2 = window.innerWidth / 1920
-    // })
-    // erd.listenTo(document, (element) => {
-    //   this.beilv2 = element.offsetWidth / 1920
-
-    //   // var width = element.offsetWidth;
-    //   // var height = element.offsetHeight;
-    // });
  },
  // beforeDestroy() {
  //   //离开页面删除检测器和所有侦听器
@ -469,13 +450,16 @@ export default {
  //   removeEventListener('resize', resizeFun)
  // },
  methods: {
+    // logoutTimeReset() {
+    //   this.logoutTime = this.time * 60 * 60 * 1000
+    // },
    CutWebsocketClose(e) {
      console.log('WebSocket 断开连接', e)
    },
    SJGWebsocketClose(e) {
      console.log('WebSocket 断开连接', e)
    },
-    funInitWebSocket(e) {
+    funWebSocketClose(e) {
      console.log('WebSocket 断开连接', e)
    },
    formatTime(time, option) {
--- a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
@ -51,8 +51,16 @@ export default {
          label: '用户名称',
          selectOptions: [],
          labelField: 'name',
-          valueField: 'id',
+          valueField: 'name',
          param: 'userName',
+        },
+        {
+          type: 'select',
+          label: '用户昵称',
+          selectOptions: [],
+          labelField: 'name',
+          valueField: 'name',
+          param: 'nickName',
        },
 				{
 					type: 'button',
@ -143,10 +151,16 @@ export default {
      }).then((res) => {
        this.searchBarFormConfig[0].selectOptions = res.data.map((item) => {
          return {
-            id: item.id,
+            id: item.username,
            name:item.username
          }
        })
+        this.searchBarFormConfig[1].selectOptions = res.data.map((item) => {
+          return {
+            id: item.nickname,
+            name: item.nickname
+          }
+        })
      })
    },
    getDataList() {
@ -206,7 +220,9 @@ export default {
        case 'search':
          this.listQuery.pageNo = 1;
          this.listQuery.pageSize = 10;
-          this.listQuery.inspectionDetContent = val.inspectionDetContent ? val.inspectionDetContent : undefined;
+          this.listQuery.userName = val.userName ? val.userName : undefined;
+          this.listQuery.nickName = val.nickName ? val.nickName : undefined;
+
          // this.listQuery.teamId = val.teamId ? val.teamId : undefined;
          this.getDataList()
          break;
--- a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
+++ b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-08 13:46:17
- * @LastEditTime: 2024-01-22 15:29:53
+ * @LastEditTime: 2024-03-01 15:22:06
 * @LastEditors: zhp
 * @Description:
 -->
@ -80,8 +80,9 @@
          <el-col :span="8">
            <el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量"
              :rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
-              <el-input :disabled="isdetail" style="width: 90%;margin-right: 10px;" :max="item.maxValue"
-                :min='item.minValue' v-model="dataForm.checkValueList[index].checkValue"
+              <el-input  oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
+                style="width: 90%;margin-right: 10px;" :max="item.maxValue" :min='item.minValue'
+                v-model.number="dataForm.checkValueList[index].checkValue"
                @change="judgeValue(arguments[0],item.minValue,item.maxValue,index)"></el-input>
              <span v-if="dataForm.checkValueList[index].showIcon">
                <!-- <i class="el-icon-success"></i> -->
@ -91,14 +92,12 @@
            </el-form-item>
          </el-col>
          <el-col :span="4">
-            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值"
-             >
+            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值">
              <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.minValue"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="4">
-            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值"
-              >
+            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值">
              <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.maxValue"></el-input>
            </el-form-item>
          </el-col>
--- a/src/views/quality/base/qualityScrapLog/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-02-28 09:58:34
+ * @LastEditTime: 2024-03-01 10:33:48
 * @LastEditors: zhp
 * @Description:
 -->
@ -130,7 +130,7 @@ export default {
 	mounted() {
 		this.getDict()
    console.log('我看看', this.dataForm)
-    this.getCurrentTime()
+    // this.getCurrentTime()
    this.getWorksectionById()
 	},
  methods: {
--- a/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-02-28 10:13:10
+ * @LastEditTime: 2024-03-01 10:18:39
 * @LastEditors: zhp
 * @Description:
 -->
@ -75,7 +75,7 @@
 </template>

 <script>
-import basicAdd from '../../../core/mixins/basic-add';
+import basicAdd from './basic-add';
 import {
  createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
  getTeamList, getDetList,getLineList } from "@/api/base/qualityScrapLog";
@ -151,8 +151,8 @@ export default {
      // this.dataForm.logTime = year + "-" + month + "-" + day;
      console.log(this.dataForm.logTime);
    },
-		async getDict() {
-			// 物料列表
+    async getDict() {
+      // 物料列表
      const res = await getList()
      this.typeList = res.data
      getWorkOrderList().then((res) => {
@ -182,16 +182,15 @@ export default {
      getDetList().then((res) => {
        console.log(res);
        // console.log(response);
-        this.workOrderList = res.data.map((item) => {
+        this.detList = res.data.map((item) => {
          return {
-            name: item.name,
+            name: item.content,
            id: item.id
          }
        })
        // console.log(this.formConfig[0].selectOptions);
        // this.listQuery.total = response.data.total;
      })
-
      getTeamList().then((res) => {
        console.log(res);
        // console.log(response);
@ -201,29 +200,12 @@ export default {
            id: item.id
          }
        })
-        this.$axios({
-          url: '/base/core-workshop-section/listAll',
-          method: 'get',
-          // params: {
-          //   id: lineId,
-          // },
-        }).then((res) => {
-          // console.log(data)
-          this.sectionList = res.data.map((item) => {
-            return {
-              name: item.name,
-              id: item.id,
-            };
-          });
-        })
-        // if (code == 0) {
-
-        // }
        // console.log(this.formConfig[0].selectOptions);
        // this.listQuery.total = response.data.total;
      })
    },
    async getWorksectionById(lineId) {
+      if (lineId) {
        const { code, data } = await this.$axios({
          url: '/base/core-workshop-section/listByParentId',
          method: 'get',
@ -240,7 +222,24 @@ export default {
            };
          });
        }
-    }
+      } else {
+        this.$axios({
+          url: '/base/core-workshop-section/listAll',
+          method: 'get',
+          // params: {
+          //   id: lineId,
+          // },
+        }).then((res) => {
+          // console.log(data)
+          this.sectionList = res.data.map((item) => {
+            return {
+              name: item.name,
+              id: item.id,
+            };
+          });
+        })
+      }
+    },
 	},
 };
 </script>
--- a/src/views/quality/monitoring/originalGlassRetrace/index.vue
+++ b/src/views/quality/monitoring/originalGlassRetrace/index.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-08-01 14:55:51
 * @LastEditors: zhp
- * @LastEditTime: 2024-02-23 09:16:24
+ * @LastEditTime: 2024-03-01 10:27:29
 * @Description:
 -->
 <template>
@ -124,8 +124,8 @@ export default {
          label: '工单',
          selectOptions: [],
          labelField: 'name',
-          valueField: 'id',
-          param: 'workOrderId'
+          valueField: 'name',
+          param: 'workOrderName'
        },
        // {
        //   type: 'datePicker',
@ -233,7 +233,7 @@ export default {
    buttonClick(val) {
      console.log(val)
      if (val.btnName === 'search') {
-        this.listQuery.workOrderId = val.workOrderId ? val.workOrderId :undefined
+        this.listQuery.workOrderName = val.workOrderName ? val.workOrderName :undefined
        // this.queryParams.status = val.status
        // if (val.timeVal && val.timeVal.length != 0 ) {
        // this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
--- a/src/views/report/productionDayReport/index.vue
+++ b/src/views/report/productionDayReport/index.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-01-24 16:53:41
+ * @LastEditTime: 2024-03-01 15:26:38
 * @LastEditors: zhp
 * @Description:
 -->
@ -9,7 +9,7 @@
  <div class="app-container">
    <el-form :inline="true" :model="dataForm" class="demo-form-inline">
      <el-form-item label="日" prop="reportTime">
-        <el-date-picker v-model="reportTime" @change="changeTime" type="date" placeholder="选择日期">
+        <el-date-picker v-model="dataForm.reportTime" @change="changeTime" type="date" placeholder="选择日期">
        </el-date-picker>
      </el-form-item>
      <el-button type="primary" @click="getDataList()">查询</el-button>