合并冲突

Reviewed-on: #196

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-01-30 16:17:03
+ # @LastEditTime: 2024-02-01 16:49:38
  # @LastEditors: zhp
  # @Description:
 ###
@@ -14,7 +14,7 @@ VUE_APP_TITLE = MES系统
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
 # VUE_APP_BASE_API = 'http://10.70.2.2:8080'
-# 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.20:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.20:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
@@ -22,7 +22,7 @@ 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'
 

src/api/base/groupTeam.js

@@ -59,6 +59,15 @@ export function listEnabled() {
   })
 }
 
+// 获得可用的排班列表(根据车间筛选)
+export function listEnabledByRoom(query) {
+  return request({
+    url: '/base/group-team/listEnabledByRoom',
+    method: 'get',
+    params: query
+  })
+}
+
 // 获得班组组员信息分页
 export function groupTeamPage(query) {
   return request({

src/api/base/qualityInspectionBoxPermissions.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-12-04 14:10:37
- * @LastEditTime: 2024-01-30 18:06:48
+ * @LastEditTime: 2024-01-31 09:56:09
  * @LastEditors: zhp
  * @Description:
  */
@@ -28,7 +28,7 @@ export function updateQualityInspectionBoxBtn(data) {
 // 删除安灯按钮16键对应
 export function deleteQualityInspectionBoxBtn(id) {
   return request({
-    url: 'base/quality-inspection-box-btn-auth/delete?id=' + id,
+    url: 'base/quality-inspection-box-btn-auth/delete?userId=' + id,
     method: 'delete'
   })
 }
@@ -36,7 +36,7 @@ export function deleteQualityInspectionBoxBtn(id) {
 // 获得安灯按钮16键对应
 export function getQualityInspectionBoxBtn(id) {
   return request({
-    url: 'base/quality-inspection-box-btn-auth/get?id=' + id,
+    url: 'base/quality-inspection-box-btn-auth/get?userId=' + id,
     method: 'get'
   })
 }

src/utils/dict.js

@@ -96,6 +96,7 @@ export const DICT_TYPE = {
   TIME_DIM: 'time_dim',
   TABLE_NAME: 'table_name',
   METHOD: 'method',
+  PUSH: 'push',
 
   // ============== ORDER - 订单模块 =============
   ORDER_STATUS: 'order_status',
@@ -109,7 +110,10 @@ export const DICT_TYPE = {
   FAULT_LEVEL: 'fault-level',
 
   // ============== ENVIRONMENTAL - 环保模块 =============
-  ENVIRONMENT_CHECK_UNIT: 'environment_check_unit'
+  ENVIRONMENT_CHECK_UNIT: 'environment_check_unit',
+
+  // ============== GROUP - 班组模块 =============
+  WORK_SHOP: 'workshop'
 }
 
 /**

src/views/OperationalOverview/AGVBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-01-19 16:31:53
+ * @LastEditTime: 2024-02-01 15:35:10
  * @Description:
 -->
 <template>
@@ -878,6 +878,7 @@ export default {
     background-size: 100% 100%;
     color: #00fff0;
     text-align: center;
+    word-spacing:8px;
     position: relative;
     .unit{
       position: absolute;

src/views/OperationalOverview/coldBoard.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-01-29 17:06:50
+ * @LastEditTime: 2024-02-01 15:35:43
  * @LastEditors: zhp
  * @Description:
 -->
@@ -879,6 +879,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
 .visual-container {
   width: 1920px;
   height: 1080px;
@@ -892,7 +893,7 @@ export default {
     background-size: 100% 100%;
     color: rgba(0, 255, 247, 1);
     text-align: center;
-
+    word-spacing: 8px;
     .unit {
       position: absolute;
       left: 260px;

src/views/OperationalOverview/components/baseContainer/index.vue

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-01-19 15:58:17
  * @LastEditors: zhp
- * @LastEditTime: 2024-01-29 15:35:37
+ * @LastEditTime: 2024-02-01 15:25:14
  * @Description: file content
  * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
 -->
@@ -250,12 +250,12 @@ export default {
     width: 100%;
     color: #ffffff;
     font-size: 24px;
-    padding: 0.67em;
+    padding: 0.67em 0.67em 0.3em 0.67em;
     display: flex;
   }
 
   .bar-content {
-    padding: 1em;
+    padding: .5em 1em 1em 1em;
     flex: 1 auto;
     position: relative;
   }

src/views/OperationalOverview/components/doubleYChart .vue

@@ -1,13 +1,13 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-01-29 15:14:40
+ * @LastEditTime: 2024-02-01 15:52:41
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
-  <div>
+  <div style="height: 400px;">
-    <div :id="id" class="productChart" :style="{ height:   '390px', width: width }" />
+    <div :id="id" class="productChart" :style="{ height:   '420px', width: width }" />
   </div>
 </template>
 
@@ -15,7 +15,7 @@
 import * as echarts from 'echarts';
 import 'echarts/theme/macarons' // echarts theme
 import resize from './mixins/resize'
-
+// import resize from './../mixins/resize'
 export default {
   name: 'OverviewBar',
   mixins: [resize],
@@ -67,12 +67,18 @@ export default {
       }]
     }
   },
+  // mounted() {
+  //   console.log('mounted')
+  //   console.log('borderRadius: ', this.borderRadius)
+  //   // this.$nextTick(() => {
+  //   //   this.initChart()
+  //   // })
+  // },
   mounted() {
-    console.log('mounted')
+    this.$el.addEventListener('resize', () => {
-    console.log('borderRadius: ', this.borderRadius)
+      console.log('resziing.....');
-    // this.$nextTick(() => {
+    });
-    //   this.initChart()
+    this.initChart()
-    // })
   },
   beforeDestroy() {
     if (!this.chart) {
@@ -148,15 +154,11 @@ export default {
             type: 'cross'
           }
         },
-        grid: {
+        grid: { top: 90, right: 60, bottom: 20, left: 90 },
-          left: "6%",
-          right: "6%",
-          bottom: "3%",
-          containLabel: true
-        },
         legend: {
           itemWidth: 10,
           itemHeight: 10,
+          top: '0%',
           right: '20px',
           data: ['产线产量', '产线良品率'],
           textStyle: {
@@ -174,9 +176,12 @@ export default {
             }
           },
           axisLabel: {
-            textStyle: {
+            color: "#fff",
-              color: 'rgba(255,255,255,0.5)' // 坐标值得具体的颜色
+            fontSize: 12,
-            }
+            // formatter: '{value}'
+            // textStyle: {
+            //   color: 'rgba(255,255,255,0.5)' // 坐标值得具体的颜色
+            // }
           },
           splitLine: {
             lineStyle: {
@@ -214,10 +219,11 @@ export default {
               }
             },
             axisLabel: {
-              textStyle: {
+              color: "#fff",
-                color: '#ced1d5', // 坐标值得具体的颜色
+              fontSize: 12,
-                formatter: '{value}%'
+              // formatter: '{value}'
-              }
+              formatter: '{value}%'
+              // }
             },
             splitLine: {
               lineStyle: {
@@ -241,7 +247,7 @@ export default {
             // },
             scale: true,
             type: 'value',
-            name: '产量/㎡', // y轴上方的单位
+            name: '产量/片', // y轴上方的单位
             nameTextStyle: {
               color: "#fff",
               // fontSize: 10,
@@ -258,10 +264,13 @@ export default {
               }
             },
             axisLabel: {
-              textStyle: {
+              // textStyle: {
-                color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+              // color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
-                formatter: '{value} 片'
+              color: "#fff",
-              }
+              fontSize: 12,
+              // formatter: '{value}'
+              formatter: '{value} 片'
+              // }
             },
             splitLine: {
               lineStyle: {
@@ -285,6 +294,9 @@ export default {
 </script>
 <style>
 .productChart{
-  top: -40px;
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  top: -30px;
 }
 </style>

src/views/OperationalOverview/components/linearBarChart.vue

@@ -150,9 +150,9 @@ export default {
             }
           },
           axisLabel: {
-            textStyle: {
+            color: "#fff",
-              color: 'rgba(255,255,255,0.5)' // 坐标值得具体的颜色
+            fontSize: 12,
-            }
+            // formatter: '{value}'
           },
           splitLine: {
             lineStyle: {
@@ -162,25 +162,29 @@ export default {
           data: this.nameList
         },
         yAxis: {
-          axisLine: {
+          name: '单位kwh',
-            lineStyle: {
+          nameTextStyle: {
-              type: 'solid',
+            color: '#fff',
-              color: '#213259', // 左边线的颜色
+            fontSize: 10,
-              width: '1' // 坐标线的宽度
+            align: 'right',
-            }
           },
+          type: 'value',
           axisLabel: {
-            show: true,    // 是否显示 y 轴
+            color: "#fff",
-            textStyle: {
+            fontSize: 12,
-              color: 'rgba(255,255,255,0.5)' // 坐标值得具体的颜色
+            formatter: '{value}/kwh'
-            }
+          },
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: "#213259",
+            },
           },
           splitLine: {
             lineStyle: {
-              color: '#213259'
+              color: "#213259a0",
-            }
+            },
-          },
+          }
-          type: 'value'
         },
         // legend: {
         //   itemHeight: 10,

src/views/OperationalOverview/components/resize.js

@@ -0,0 +1,62 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-02-01 15:39:22
+ * @LastEditTime: 2024-02-01 15:39:23
+ * @LastEditors: zhp
+ * @Description:
+ */
+import { debounce } from '@/utils'
+
+export default {
+  data() {
+    return {
+      $_sidebarElm: null,
+      $_resizeHandler: null
+    }
+  },
+  mounted() {
+    this.$_resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    this.$_initResizeEvent()
+    this.$_initSidebarResizeEvent()
+  },
+  beforeDestroy() {
+    this.$_destroyResizeEvent()
+    this.$_destroySidebarResizeEvent()
+  },
+  // to fixed bug when cached by keep-alive
+  // https://github.com/PanJiaChen/vue-element-admin/issues/2116
+  activated() {
+    this.$_initResizeEvent()
+    this.$_initSidebarResizeEvent()
+  },
+  deactivated() {
+    this.$_destroyResizeEvent()
+    this.$_destroySidebarResizeEvent()
+  },
+  methods: {
+    // use $_ for mixins properties
+    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
+    $_initResizeEvent() {
+      window.addEventListener('resize', this.$_resizeHandler)
+    },
+    $_destroyResizeEvent() {
+      window.removeEventListener('resize', this.$_resizeHandler)
+    },
+    $_sidebarResizeHandler(e) {
+      if (e.propertyName === 'width') {
+        this.$_resizeHandler()
+      }
+    },
+    $_initSidebarResizeEvent() {
+      this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0]
+      this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler)
+    },
+    $_destroySidebarResizeEvent() {
+      this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler)
+    }
+  }
+}

src/views/OperationalOverview/processingBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-01-30 17:19:32
+ * @LastEditTime: 2024-02-01 15:35:29
  * @Description:
 -->
 <template>
@@ -103,13 +103,13 @@
           </base-container>
         </el-col>
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
-          <base-container :show-time="true" :no-content-padding="true" :height="318 + 338 + 16" :size="'middle'"
+          <base-container :show-time="true"   :no-content-padding="true" :height="318 + 338 + 16" :size="'middle'"
             :title="'产线产量及良品率'" :title-icon="'productLine'">
             <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
             </div> -->
             <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
-            <double-y-chart ref="productLineChart" :id=" 'doubleYChart' " :height="359" :show-legend="true" />
+            <double-y-chart ref="productLineChart" :id=" 'doubleYChart' " :height="390" :show-legend="true" />
           </base-container>
         </el-col>
       </el-row>
@@ -990,6 +990,7 @@ export default {
     background: url('../../assets/img/OperationalOverview/title.png') no-repeat;
     background-size: 100% 100%;
     color: #00fff0;
+    word-spacing: 8px;
     text-align: center;
       .unit {
           position: absolute;

src/views/energy/base/energyType/components/energyTypeAdd.vue

@@ -93,7 +93,12 @@
       </el-col>
     </el-row>
     <el-row>
-      <el-col :span="24">
+      <el-col :span="12">
+        <el-form-item label="是否推送" prop="push">
+          <el-switch v-model="form.push"></el-switch>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
         <el-form-item label="描述" prop="description">
           <el-input v-model="form.description"></el-input>
         </el-form-item>
@@ -149,7 +154,8 @@ export default {
         code: '',
         nuit: '',
         pricingMethod: 2,
-        leaderName: ''
+        leaderName: '',
+        push: false
       },
       isEdit: false, //是否是编辑
       rules: {
@@ -178,18 +184,24 @@ export default {
         this.form.id = id
         getEnergyType( id ).then((res) => {
           if (res.code === 0) {
-            this.form = res.data
+            this.form.name = res.data.name
+            this.form.code = res.data.code
+            this.form.nuit = res.data.nuit
+            this.form.pricingMethod = res.data.pricingMethod
+            this.form.leaderName = res.data.leaderName
+            this.form.push =  res.data.push ? true : false
             switch(this.form.pricingMethod) {
               case 0:
-                this.tableData1 = this.form.segPriceList
+                this.tableData1 = this.form.segPriceList || []
                 break;
               case 1:
-                this.tableData2 = this.form.usedPriceList
+                this.tableData2 = this.form.usedPriceList || []
                 break;
               default:
             }
           }
         })
+        console.log(this.form)
       } else {
         this.isEdit = false
         this.form.id = ''
@@ -288,6 +300,7 @@ export default {
                   return false
               }
           }
+          console.log(this.form)
           if (this.isEdit) {
             // 编辑
             updateEnergyType({
@@ -300,7 +313,8 @@ export default {
               dim: this.form.pricingMethod === 1 ? this.form.dim: '',
               singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
               segPriceList: this.form.pricingMethod === 0 ? this.tableData1: [],
-              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2: []
+              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2: [],
+              push:this.form.push ? 1 : 0
             }).then((res) => {
               if (res.code === 0) {
                 this.$modal.msgSuccess("操作成功");
@@ -317,7 +331,8 @@ export default {
               dim: this.form.pricingMethod === 1 ? this.form.dim: '',
               singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
               segPriceList: this.form.pricingMethod === 0 ? this.tableData1: [],
-              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2: []
+              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2: [],
+              push:this.form.push ? 1 : 0
             }).then((res) => {
               if (res.code === 0) {
                 this.$modal.msgSuccess("操作成功");

src/views/energy/base/energyType/index.vue

@@ -52,7 +52,8 @@ const tableProps = [
   {
     prop: 'code',
     label: '类型编码',
-    showOverflowtooltip: true
+    showOverflowtooltip: true,
+    minWidth: 150
   },
   {
     prop: 'name',
@@ -67,6 +68,11 @@ const tableProps = [
     prop: 'pricingMethod',
     label: '计价方式'
   },
+  {
+    prop: 'push',
+    label: '是否推送',
+    filter: publicFormatter('push')
+  },
   {
     prop: 'price',
     label: '价格(元)',

src/views/extend/processFlowView/components/BomSelection.vue

@@ -51,7 +51,7 @@ export default {
 		list: {
 			handler(val) {
         if (val) {
-          console.log(val);
+          // console.log(val);
 					this.list__inner = val.map((item) => ({ ...item, disabled: false }));
 				}
 			},
@@ -60,7 +60,8 @@ export default {
 		},
 		currentSelect: {
 			handler(val) {
-				// val: string
+        // val: string
+        console.log(val)
 				this.selected = val;
 				this.randomKey = Math.random();
 				// 更新选中状态

src/views/extend/processFlowView/components/BomSelector.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: BomSelector.vue
     author: liubin
     date: 2023-11-17 16:23:28
-    description: 
+    description:
 -->
 
 <template>
@@ -119,7 +119,9 @@ export default {
 				console.log('value', val);
 				if (val) {
 					this.selectedEquipments = val.map((item) => item.equipmentId);
-					this.selected = val;
+          this.selected = val
+          console.log(this.materialsBomList)
+          // console.log(this.selectedEquipments)
 				}
 			},
 			deep: true,

src/views/extend/processFlowView/components/ProcessBomList.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: ProcessBomList.vue
     author: liubin
     date: 2023-10-20 15:00:58
-    description: 
+    description:
 -->
 
 <template>
@@ -261,7 +261,8 @@ export default {
 							}
 							// 设置设备id
 							eq.materialsBom.equipmentId = eq.id;
-							eq.valuesBom.equipmentId = eq.id;
+              eq.valuesBom.equipmentId = eq.id;
+              console.log(this.selectedBoms)
 							return eq;
 						});
 					} else {

src/views/group/base/groupClasses/components/groupClassAdd.vue

@@ -1,18 +1,30 @@
 <template>
   <el-form ref="form" :rules="rules" label-width="110px" :model="form">
     <el-row>
+      <el-col :span="12">
+        <el-form-item label="车间名称" prop="roomNameDict">
+          <el-select v-model="form.roomNameDict" placeholder="请选择" style="width: 100%;" filterable>
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.WORK_SHOP)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
       <el-col :span="12">
         <el-form-item label="班次名称" prop="name">
           <el-input v-model="form.name"></el-input>
         </el-form-item>
       </el-col>
+    </el-row>
+    <el-row>
       <el-col :span="12">
         <el-form-item label="编码" prop="code">
           <el-input v-model="form.code" disabled></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row>
       <el-col :span="12">
         <el-form-item label="生效时间" prop="enableTime">
           <el-date-picker
@@ -25,6 +37,8 @@
         </el-date-picker>
         </el-form-item>
       </el-col>
+    </el-row>
+    <el-row>
       <el-col :span="12">
         <el-form-item label="失效时间" prop="disableTime">
           <el-date-picker
@@ -37,8 +51,6 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row>
       <el-col :span="12">
         <el-form-item label="班次开始时间" prop="startTime">
           <el-time-picker
@@ -51,6 +63,8 @@
           </el-time-picker>
         </el-form-item>
       </el-col>
+    </el-row>
+    <el-row>
       <el-col :span="12">
         <el-form-item label="班次结束时间" prop="endTime">
           <el-time-picker
@@ -63,13 +77,6 @@
           </el-time-picker>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark"></el-input>
-        </el-form-item>
-      </el-col>
       <el-col :span="12">
         <el-form-item label="是否跨天" prop="daySpan">
           <el-select v-model="form.daySpan" placeholder="请选择" disabled style="width: 100%;">
@@ -79,6 +86,13 @@
         </el-form-item>
       </el-col>
     </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
   </el-form>
 </template>
 <script>
@@ -89,6 +103,7 @@ export default {
     return {
       form: {
         id: '',
+        roomNameDict: '',
         name: '',
         code: '',
         enableTime: '',
@@ -100,6 +115,7 @@ export default {
       },
       isEdit: false, //是否是编辑
       rules: {
+        roomNameDict:[{ required: true, message: '请选择车间名称', trigger: 'select' }],
         name: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
         enableTime: [{ required: true, message: '请选择班次开始时间', trigger: 'change' }],
         code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
@@ -118,6 +134,8 @@ export default {
             this.form = res.data
             this.form.name = res.data.name
             this.form.code = res.data.code
+            // this.form.roomNameDict = (res.data.roomNameDict || res.data.roomNameDict===0) ? String(res.data.roomNameDict) : ''
+            this.$set(this.form, 'roomNameDict',(res.data.roomNameDict || res.data.roomNameDict===0) ? String(res.data.roomNameDict) : '')
             this.form.enableTime = res.data.enableTime
             // this.form.disableTime = res.data.disableTime || null
             this.$set(this.form, 'disableTime', res.data.disableTime || null)

src/views/group/base/groupClasses/index.vue

@@ -46,14 +46,21 @@
 
 <script>
 import { getGroupClassesPage, deleteGroupClasses, updateGroupClasses } from "@/api/base/groupClasses";
-import GroupClassAdd from './components/groupClassAdd.vue'
+import GroupClassAdd from './components/groupClassAdd'
 import { formatDate } from '@/utils'
+import { publicFormatter } from '@/utils/dict'
 const tableProps = [
   {
     prop: 'enableTimeStr',
     label: '生效时段',
     minWidth: 300
   },
+  {
+    prop: 'roomNameDict',
+    label: '车间名称',
+    filter: publicFormatter('workshop'),
+    minWidth: 100
+  },
   {
     prop: 'name',
     label: '班次名称'

src/views/group/base/groupTeam/components/groupTeamAdd.vue

@@ -1,18 +1,30 @@
 <template>
   <el-form ref="form" :rules="rules" label-width="100px" :model="form">
     <el-row>
+      <el-col :span="12">
+        <el-form-item label="车间名称" prop="roomNameDict">
+          <el-select v-model="form.roomNameDict" placeholder="请选择" style="width: 100%;" filterable>
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.WORK_SHOP)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
       <el-col :span="12">
         <el-form-item label="班组名称" prop="name">
           <el-input v-model="form.name"></el-input>
         </el-form-item>
       </el-col>
+    </el-row>
+    <el-row>
       <el-col :span="12">
         <el-form-item label="班组编码" prop="code">
           <el-input v-model="form.code" disabled></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row>
       <el-col :span="12">
         <el-form-item label="班组组长" prop="leaderId">
           <el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" filterable @change="selectLeader">
@@ -25,6 +37,8 @@
           </el-select>
         </el-form-item>
       </el-col>
+    </el-row>
+    <el-row>
       <el-col :span="12">
         <el-form-item label="手机号" prop="telephone">
           <el-input v-model="form.telephone" disabled></el-input>
@@ -45,10 +59,12 @@ export default {
         name: '',
         code: '',
         leaderId: '',
-        telephone: ''
+        telephone: '',
+        roomNameDict: ''
       },
       isEdit: false, //是否是编辑
       rules: {
+        roomNameDict: [{ required: true, message: '请选择车间名称', trigger: 'select' }],
         name: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
         code: [{ required: true, message: '请输入班组编码', trigger: 'blur' }],
         leaderId: [{ required: true, message: '请选择组长', trigger: 'select' }]
@@ -64,7 +80,11 @@ export default {
         this.form.id = id
         getGroupTeam( id ).then((res) => {
           if (res.code === 0) {
-            this.form = res.data
+            this.form.name = res.data.name
+            this.form.code = res.data.code
+            this.form.leaderId = res.data.leaderId
+            this.form.telephone = res.data.telephone
+            this.form.roomNameDict = (res.data.roomNameDict || res.data.roomNameDict===0) ? String(res.data.roomNameDict) : ''
             this.selectLeader()
           }
         })

src/views/group/base/groupTeam/index.vue

@@ -54,6 +54,7 @@ import GroupTeamAdd from './components/groupTeamAdd'
 import StatusBtn from './components/statusBtn'
 import WorkerOperate from './components/workerOperate'
 import WorkerEdit from './components/workerEdit'
+import { publicFormatter } from '@/utils/dict'
 const tableProps = [
   {
     prop: 'createTime',
@@ -61,6 +62,11 @@ const tableProps = [
     filter: parseTime,
     minWidth: 160
   },
+  {
+    prop: 'roomNameDict',
+    label: '车间名称',
+    filter: publicFormatter('workshop')
+  },
   {
     prop: 'name',
     label: '班组名称'

src/views/group/base/groupTeamScheduling/components/topTab.vue

@@ -0,0 +1,108 @@
+<template>
+  <div class="topTab">
+    <div class="arr leftArr" @click='toLeft'></div>
+    <div class="arr rightArr" @click='toRight'></div>
+    <el-scrollbar ref="groupTeamScroll" :vertical="false"  class="scrollTab">
+      <ul class="tabBox">
+        <li :class="{'active':roomNameDict===item.value}" v-for="(item, index) in getDictDatas('workshop')" :key='index' @click='toggleName(item.value)'>{{item.label}}</li>
+      </ul>
+    </el-scrollbar>
+  </div>
+</template>
+<script>
+export default {
+  name: 'TopTab',
+  data() {
+    return {
+      
+    }
+  },
+  props:['roomNameDict'],
+  computed: {
+    scrollWrapper() {
+      return this.$refs.groupTeamScroll.$refs.wrap
+    }
+  },
+  methods:{
+    toLeft() {
+      const container = this.scrollWrapper
+      container.scrollLeft-=100
+    },
+    toRight() {
+      const container = this.scrollWrapper
+      container.scrollLeft+=100
+    },
+    toggleName(val) {
+      this.$emit('emitFun',val)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.topTab {
+  height: 56px;
+  padding: 0px 48px 0px 56px;
+  position: relative;
+  .arr {
+    position: absolute;
+    width: 48px;
+    height: 48px;
+    line-height: 48px;
+    background-color: #fff;
+    border-radius: 8px;
+    cursor: pointer;
+  }
+  .leftArr{
+    left: 0;
+    padding-left: 10px;
+  }
+  .leftArr::before{
+    display: inline-block;
+    content: '';
+    width: 0;
+    height: 0;
+    border-width: 8px;
+    border-style: solid;
+    border-color: transparent #0B58FF transparent transparent;
+  }
+  .rightArr{
+    right: 0;
+    top:0;
+    padding-left: 22px;
+  }
+  .rightArr::before{
+    display: inline-block;
+    content: '';
+    width: 0;
+    height: 0;
+    border-width: 8px;
+    border-style: solid;
+    border-color: transparent transparent transparent #0B58FF;
+  }
+  .scrollTab{
+    white-space: nowrap;
+    overflow: hidden;
+    font-size: 16px;
+    width: 100%;
+    height: 100%;
+    ul,li{
+      list-style: none;
+      margin: 0;
+      padding: 0;
+    }
+    .tabBox >.active {
+      border-bottom: 4px solid #0B58FF;
+    }
+    .tabBox>li {
+      display: inline-block;
+      height: 48px;
+      line-height: 48px;
+      background: #FFFFFF;
+      border-radius: 8px;
+      padding: 0px 10px;
+      margin-right: 8px;
+      cursor: pointer;
+    }
+  }
+}
+</style>

src/views/group/base/groupTeamScheduling/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="groupTeamScheduling">
+    <TopTab :roomNameDict='roomNameDict' @emitFun='toggleName'/>
     <div class="operationArea">
       <el-form :inline="true" class="demo-form-inline">
         <span class="blue-block"></span>
@@ -87,13 +88,15 @@
 
 <script>
 import { getPreset, createOrUpdateList, autoSet } from "@/api/base/groupTeamScheduling";
-import { listEnabled } from "@/api/base/groupTeam";
+import { listEnabledByRoom } from "@/api/base/groupTeam";
 import moment from 'moment';
+import TopTab from './components/topTab'
 
 export default {
   name: "GroupTeamScheduling",
   data() {
     return {
+      roomNameDict:null,
       startDay: '',// 查询参数
       year: '',// 2023
       month: '',// 九月
@@ -108,7 +111,9 @@ export default {
       autoScheduling: false // 只有在当前日期后的月份才生效
     };
   },
+  components:{ TopTab },
   created() {
+    this.roomNameDict = this.getDictDatas('workshop')[0].value
     this.startDay = new Date()
     // 设置按钮是否置灰
     this.settingBtn()
@@ -117,6 +122,22 @@ export default {
     this.getList()
   },
   methods: {
+    // 切换车间
+    toggleName(val) {
+      this.roomNameDict = val
+      // 如果当前在设置，则取消设置
+      if (this.showSetting) {
+        this.showSetting = !this.showSetting
+      }
+      // 如果红框选中，清除红框选中
+      if (!this.jumpDisabled) {
+        this.clearChoose()
+      }
+      // 获取班组列表
+      this.getTeamList()
+      // 重新获取日历数据
+      this.getList()
+    },
     // 切换月份
     selectMonth() {
       if (this.startDay) {
@@ -133,7 +154,10 @@ export default {
     },
     // 获取班组列表
     getTeamList() {
-      listEnabled().then(res => {
+      console.log(this.roomNameDict)
+      listEnabledByRoom({
+        room: this.roomNameDict
+      }).then(res => {
         this.teamList = res.data || []
       })
     },
@@ -143,7 +167,8 @@ export default {
       let month = moment(this.startDay).format('M')
       getPreset({
         year: year,
-        month: month
+        month: month,
+        roomNameDict: this.roomNameDict
       }).then(res => {
         let obj = res.data || {}
         if (obj) {
@@ -156,6 +181,7 @@ export default {
           }
         }
         this.list = obj
+        this.settingBtnDis = false
       }).catch(() => {
         this.list = {}
         this.settingBtnDis = true // 禁用设置按钮
@@ -246,7 +272,8 @@ export default {
         // console.log(moment(this.startDay).format("YYYY-MM-DD"))
         autoSet({
           year: this.year,
-          month: moment(this.startDay).month() + 1
+          month: moment(this.startDay).month() + 1,
+          roomNameDict: this.roomNameDict
         }).then(res => {
           this.list = res.data || {}
         })
@@ -350,6 +377,8 @@ export default {
     padding: 14px 10px 0 20px;
     background-color: #fff;
     border-radius: 8px;
+    height: calc(100vh - 255px);
+    overflow-y: auto;
     .el-calendar__body {
       padding: 10px 16px 16px 0;
     }

src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue

@@ -7,6 +7,10 @@
             <p class="boldTitle">工单名称</p>
             <p class="lightText">{{ queryParams.workOrderName ? queryParams.workOrderName : '-' }}</p>
           </el-col>
+          <el-col :span="6">
+            <p class="boldTitle">车间名称</p>
+            <p class="lightText">{{ (queryParams.roomNameDict || queryParams.roomNameDict === 0) ? getDictDataLabel('workshop',queryParams.roomNameDict) : '-' }}</p>
+          </el-col>
           <el-col :span="6">
             <p class="boldTitle">班组名称</p>
             <p class="lightText">{{ queryParams.teamName ? queryParams.teamName : '-' }}</p>

src/views/group/monitoring/groupTeamView/index.vue

@@ -31,7 +31,15 @@
 import { getByWorkOrder } from '@/api/monitoring/groupTeamView'
 import { workOrderList } from '@/api/base/workOrder'
 import GroupTeamViewDetail from './components/groupTeamViewDetail.vue'
+import { publicFormatter } from '@/utils/dict'
 const tableProps = [
+  {
+    prop: 'roomNameDict',
+    label: '车间名称',
+    filter: publicFormatter('workshop'),
+    showOverflowtooltip: true,
+    minWidth: 100
+  },
   {
     prop: 'name',
     label: '班组名称'
@@ -134,6 +142,7 @@ export default {
       })
       params.workOrderId = this.queryParams.workOrderId
       params.workOrderName = this.workOrderName
+      params.roomNameDict = val.data.roomNameDict
       this.$nextTick(() => {
         this.$refs.groupTeamViewDetail.init(params)
       })

src/views/group/monitoring/teamProduction/index.vue

@@ -37,13 +37,21 @@
 import { groupTeamSchedulingPage, groupClassesListAll } from '@/api/monitoring/teamProduction'
 import { parseTime } from '@/utils/ruoyi'
 import TeamProductionDetail from './components/teamProductionDetail'
+import { publicFormatter } from '@/utils/dict'
 const tableProps = [
   {
-    prop: 'createTime',
+    prop: 'roomNameDict',
-    label: '排班创建时间',
+    label: '车间名称',
-    filter: parseTime,
+    filter: publicFormatter('workshop'),
-    minWidth: 160
+    showOverflowtooltip: true,
+    minWidth: 100
   },
+  // {
+  //   prop: 'createTime',
+  //   label: '排班创建时间',
+  //   filter: parseTime,
+  //   minWidth: 160
+  // },
   {
     prop: 'startDay',
     label: '上班日期',

src/views/quality/base/basicData/qualityInspectionBoxPermissions/BomSelection.vue

@@ -1,14 +1,14 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-30 10:54:51
- * @LastEditTime: 2024-01-30 16:53:35
+ * @LastEditTime: 2024-02-01 14:46:19
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div>
     <div class="bom-selection" v-for="item in list__inner" :key="item.id + randomKey">
-      <el-checkbox :label="item.name" :checked="item.id === selected" @change="(e) => handleChange(item, e)"
+      <el-checkbox :label="item.name" :checked="item.choose" @change="(e) => handleChange(item, e)"
         class="sl__body-item"></el-checkbox>
     </div>
   </div>
@@ -25,8 +25,8 @@ export default {
 	// },
 	props: {
 		currentSelect: {
-			type: String | Number,
+			type: Array,
-			default: null,
+			default: ()=>[],
 		},
 		list: {
 			type: Array,
@@ -46,24 +46,29 @@ export default {
 	},
 	watch: {
 		list: {
-			handler(val) {
+      handler(val) {
+        console.log(val)
 				if (val) {
-					this.list__inner = val.map((item) => ({ ...item, disabled: false }));
+					this.list__inner = val.map((item) => ({ ...item, choose: false }));
 				}
 			},
 			deep: true,
 			immediate: true,
 		},
 		currentSelect: {
-			handler(val) {
+      handler(val) {
+        console.log(val)
 				// val: string
 				this.selected = val;
 				this.randomKey = Math.random();
 				// 更新选中状态
 				if (val) {
-					this.list__inner.forEach((item) => {
+          this.list__inner.forEach((item,index) => {
-						if (item.id == val) item.disabled = false;
+            val.forEach((ele) => {
-						else item.disabled = true;
+              console.log(ele)
+              if (item.id == ele.id) item.choose = true;console.log(ele.id)
+              // else item.choose = false;
+            })
 					});
 				}
 			},

src/views/quality/base/basicData/qualityInspectionBoxPermissions/BomSelector.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-30 10:53:32
- * @LastEditTime: 2024-01-30 17:51:13
+ * @LastEditTime: 2024-02-01 14:47:03
  * @LastEditors: zhp
  * @Description:
 -->
@@ -36,7 +36,7 @@
 
           <BomSelection ref="materialsBomList" :key="materialsBomList.equipmentId + 'materialsBomList'"
             :list="materialsBomList" :equipment-id="materialsBomList.equipmentId"
-            :current-select="currentSelectedMaterialBomId" @change="handleMaterialBomChange" />
+            :current-select="currentSelectedIdList" @change="handleMaterialBomChange" />
         </div>
       </el-col>
       <!-- <el-col :span="8" style="border-left: 1px solid #ccc">
@@ -78,7 +78,11 @@ export default {
 		value: {
 			type: Array,
 			default: () => [],
-		},
+    },
+    chooseList: {
+      type: Array,
+      default:() => []
+    }
 	},
 	data() {
 		return {
@@ -87,19 +91,20 @@ export default {
       selected: [],
       bomArr:[],
 			materialsBomList: [],
-      valuesBomList: [],
+      // valuesBomList: [],
 
 			refreshKey: Math.random(),
-			currentSelectedMaterialBomId: null,
+			currentSelectedIdList: [],
 			currentSelectedValueBomId: null,
 		};
 	},
 	watch: {
 		value: {
-			handler(val) {
+      handler(val) {
 				console.log('value', val);
 				if (val) {
-					this.selectedEquipments = val.map((item) => item.equipmentId);
+          this.selectedEquipments = val.map((item) => item.equipmentId)
+          console.log(this.selectedEquipments)
           this.selected = val;
 				}
 			},
@@ -109,35 +114,55 @@ export default {
 	},
 	computed: {
 		filteredBomList() {
-			return this.bomList.filter((item) => {
+      return this.bomList.filter((item) => {
+        // console.log(item)
 				return item.name.includes(this.searchText);
 			});
 		},
   },
+  mounted () {
+    // this.getList()
+  },
   methods: {
 		commit() {
 			this.$emit('update', this.selected);
-		},
+    },
-
+    // getList() {
+    //   this.selectedEquipments = this.chooseList
+    //   console.log(this.selectedEquipments)
+    //   console.log(this.chooseList);
+    // },
 		handleLoadDom(eq) {
 			// 只显示 dom 列表
 			this.currentEquipment = eq.id;
-			this.materialsBomList = eq.materialsBom;
+      this.materialsBomList = eq.materialsBom;
-			this.valuesBomList = eq.valuesBom;
+      console.log(this.materialsBomList)
+			// this.valuesBomList = eq.valuesBom;
 			// 回复选中的bom信息
 			if (this.selectedEquipments.includes(eq.id)) {
 				const selectedItem = this.selected.find(
 					(item) => item.equipmentId == eq.id
-				);
+        )
-				this.currentSelectedMaterialBomId =
+        // console.log(selectedItem)
-					selectedItem.equMaterialBomId ?? null;
+
-				this.currentSelectedValueBomId = selectedItem.equValueBomId ?? null;
+        let arr = []
+        console.log(selectedItem.children);
+        selectedItem.children.forEach((ele) => {
+          console.log(ele)
+          arr.push({ id: ele.id })
+        })
+        // console.log(arr)
+        this.currentSelectedIdList = arr
+        console.log(this.currentSelectedIdList);
+					// selectedItem.equMaterialBomId ?? null;
+				// this.currentSelectedValueBomId = selectedItem.equValueBomId ?? null;
 			}
 		},
 
 		handleEquipmentChange(eq, selected) {
 			this.currentEquipment = eq.id;
-			this.materialsBomList = eq.materialsBom;
+      this.materialsBomList = eq.materialsBom
+      console.log(this.value)
 			this.valuesBomList = eq.valuesBom;
       if (selected) {
         console.log(selected)
@@ -165,6 +190,7 @@ export default {
 		},
 
     handleMaterialBomChange(equipmentId, bomId, selected) {
+      // console.log(this.chooseList)
 			const selectedItem = this.selected.find(
 				(item) => item.equipmentId == equipmentId
       );
@@ -178,7 +204,7 @@ export default {
         this.selectedEquipments.push(equipmentId);
         console.log(this.selected.indexOf(equipmentId))
         this.selected.forEach((ele,index) => {
-          if (ele.equipmentId === equipmentId) {
+          if (ele.equipmentId === equipmentId ) {
             this.selected[index].children.push({ id: bomId })
           }
         })
@@ -192,8 +218,10 @@ export default {
 				// this.$emit('update', this.selected);
 				return;
       } else {
+        console.log(selected);
         this.selected.forEach((ele, index) => {
           ele.children.forEach((e, i) => {
+            console.log(e)
             if (ele.equipmentId === equipmentId && e.id == bomId) {
               this.selected[index].children.splice(i,1)
             }
@@ -201,8 +229,8 @@ export default {
         })
       }
       // this.$emit('getData', this.dataForm)
-			selectedItem && (selectedItem.equMaterialBomId = selected ? bomId : null);
+			// selectedItem && (selectedItem.equMaterialBomId = selected ? bomId : null);
-      this.currentSelectedMaterialBomId = selected ? bomId : null;
+      // this.currentSelectedMaterialBomId = selected ? bomId : null;
       console.log(this.selected)
 		},
 

src/views/quality/base/basicData/qualityInspectionBoxPermissions/ProcessBomList.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-30 10:52:01
- * @LastEditTime: 2024-01-30 18:03:08
+ * @LastEditTime: 2024-02-01 14:43:53
  * @LastEditors: zhp
  * @Description:
 -->
@@ -84,8 +84,8 @@
           </el-col>
         </el-form>
       </el-row>
-      <BomSelector ref="bomSelector" v-if="open" :bom-list="bomList"  :value="selectedBoms"
+      <BomSelector ref="bomSelector" v-if="open" :bom-list="bomList" :value="selectedBoms"
-        @update="selectedBoms = $event" />
+        @update="selectedBoms = $event"  />
 
       <el-row slot="footer">
         <el-button size="small" @click="cancel">取消</el-button>
@@ -100,8 +100,18 @@
 <script>
 import BomSelector from './BomSelector.vue';
 import {
-  getUserList
+  getUserList,
+  getQualityInspectionBoxBtn,
 } from '@/api/base/qualityInspectionBoxPermissions';
+// import {
+//   createQualityInspectionBoxBtn,
+//   updateQualityInspectionBoxBtn,
+//   deleteQualityInspectionBoxBtn,
+
+//   getPage,
+//   exportQualityInspectionBoxBtnExcel,
+//   getUserList
+// } from '@/api/base/qualityInspectionBoxPermissions';
 export default {
 	name: 'ProcessBom',
 	components: { BomSelector },
@@ -127,7 +137,8 @@ export default {
 			],
 			list: [],
 			total: 0,
-			tableBtn: [],
+      tableBtn: [],
+      chooseList:[],
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
@@ -159,10 +170,6 @@ export default {
 	// 		deep: true,
 	// 	},
   // },
-  mounted () {
-    this.getData()
-    this.getDict()
-  },
   methods: {
     getDict() {
       getUserList({
@@ -209,11 +216,11 @@ export default {
                 eq.materialsBom.chosen
                 // eq.valuesBom.chosen
               ) {
-                this.selectedBoms.push({
+                // this.selectedBoms.push({
-                  equipmentId: eq.id,
+                //   equipmentId: eq.id,
-                  equMaterialBomId: eq.materialsBom.chosen,
+                //   equMaterialBomId: eq.materialsBom.chosen,
-                  // equValueBomId: eq.valuesBom.chosen,
+                //   // equValueBomId: eq.valuesBom.chosen,
-                });
+                // });
               }
               // 设置设备id
               eq.materialsBom.equipmentId = eq.id;
@@ -222,7 +229,6 @@ export default {
             });
           } else {
             this.bomList.splice(0);
-            this.selectedBoms = [];
           }
         })
         .catch((err) => {
@@ -278,7 +284,7 @@ export default {
           }
         })
         console.log(this.dataForm);
-				if (this.selectedBoms.length) {
+				if (!this.dataForm.userId) {
 					const { code, data } = await this.http(
 						'base/quality-inspection-box-btn-auth/create',
 						'post',
@@ -294,7 +300,23 @@ export default {
 						this.btnLoading = false;
 						this.$message.error('操作失败');
 					}
-				}
+        } else {
+          const { code, data } = await this.http(
+            'base/quality-inspection-box-btn-auth/update',
+            'put',
+            this.dataForm
+          );
+          if (code == 0) {
+            this.$message.success('操作成功');
+            // this.getList(this.currentDet);
+            this.btnLoading = false;
+            this.$emit('getList')
+            this.cancel();
+          } else {
+            this.btnLoading = false;
+            this.$message.error('操作失败');
+          }
+        }
 			});
 		},
 		// async getList({
@@ -362,11 +384,46 @@ export default {
 		// 	// 		this.selectedBoms = [];
 		// 	// 	});
 		// },
-		async handleAddEquipment() {
+		async handleAddEquipment(userId) {
-			this.open = true;
+      this.open = true
+      this.selectedBoms = []
+      this.getData()
+      this.getDict()
+      if (userId) {
+        getQualityInspectionBoxBtn(userId).then((res) => {
+          // console.log(res)
+          this.$nextTick(() => {
+            this.dataForm.userId = userId
+            this.dataForm.nickname = res.data.nickName
+            this.dataList = res.data.datas
+            let arr = []
+            res.data.datas.forEach((item) => {
+              // console.log(item.children);
+              // item.children.forEach((ele) => {
+              // console.log(ele)
+              this.selectedBoms.push({
+                equipmentId: item.id,
+                children: Object.keys(item).length > 0 ? item.children.map((ele) => {
+                  console.log(ele)
+                  return {
+                    id: ele.id
+                  }
+                }) : []
+              })
+              //  })
+            })
+          })
+          // console.log(arr)
+          // this.chooseList = arr
+          // console.log(this.chooseList)
+        })
+      }
 		},
 		cancel() {
-			this.open = false;
+      this.open = false
+      this.bomList = []
+      this.selectedBoms = []
+      this.$refs.dataForm.resetFields();
 		},
 		clearList() {
 			this.list = [];

src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue

@@ -25,10 +25,7 @@
 
 <script>
 import {
-	createQualityInspectionBoxBtn,
-	updateQualityInspectionBoxBtn,
 	deleteQualityInspectionBoxBtn,
-	getQualityInspectionBoxBtn,
   getPage,
   exportQualityInspectionBoxBtnExcel,
   getUserList
@@ -157,9 +154,10 @@ export default {
       this.urlOptions.getDataListURL(this.listQuery).then(res => {
         this.tableData = res.data.list.map((item) => {
           return {
-            // datas: item.strList.toString(),
+            datas: item.strList.toString(),
             nickName: item.nickName,
             userName: item.userName,
+            userId: item.userId
             // sectionId: item.sectionId,
             // sectionName: item.sectionName
          }
@@ -182,6 +180,7 @@ export default {
 			this.resetForm('form');
     },
     deleteHandle(id, name, index, data) {
+      console.log(data)
       // console.log(data)
       this.$confirm(`确认要删除产线名为${data.userName}的数据项?`, "提示", {
         confirmButtonText: "确定",