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-01-08 16:07:58
  * @Description:
 -->
 <template>
@@ -14,7 +14,7 @@
     }">
       <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.22em" alt="">
       许昌安彩AGV原片周转看板
-      <h3 class="unit">单位：河南汇融数字科技有限公司</h3>
+      <h3 class="unit">单位：河南汇融科技服务有限公司</h3>
       <h3 class="time">{{ times }}</h3>
       <!-- <el-button
         type="text"
@@ -46,15 +46,13 @@
               <!-- <el-row style="margin-bottom: 1em">
                     <p class="now-team-title">加工工单进度</p>
                   </el-row> -->
-
               <el-row v-for="op in orderProcessList" :key="op.id" style="margin-bottom: 1em">
+                <el-progress :percentage="op.outRate * 100" class="custom-progress-bar" />
                 <p v-if="op.outRate === 1" class="now-secondary-title" style="color:#4679FD">
                   <i class="el-icon-check" />
                   {{ op.name }}
                 </p>
                 <p v-else class="now-secondary-title">{{ op.name }}</p>
-                <el-progress define-back-color="rgba(32, 57, 96, 1)" text-color="white" :percentage="op.outRate * 100"
-                  class="custom-progress-bar" />
               </el-row>
               <!-- <el-row>
                     <el-progress :percentage="100" class="custom-progress-bar" />
@@ -405,13 +403,13 @@ const locationTableProps = [
     prop: 'level',
     label: '存放位置',
     // subcomponent: alarmLevel,
-    // align: 'center'
+    align: 'center'
   },
   {
     prop: 'unit',
     label: '单位',
     // subcomponent: alarmLevel,
-    // align: 'center'
+    align: 'center'
   },
   {
     prop: 'product',
@@ -467,13 +465,13 @@ const inventoryTableProps = [
     prop: 'level',
     label: '规格',
     // subcomponent: alarmLevel,
-    // align: 'center'
+    align: 'center'
   },
   {
     prop: 'unit',
     label: '单位',
     // subcomponent: alarmLevel,
-    // align: 'center'
+    align: 'center'
   },
   {
     prop: 'product',
@@ -519,7 +517,7 @@ const qualityYearTableProps = [
     prop: 'level',
     label: '库位',
     // subcomponent: alarmLevel,
-    // align: 'center'
+    align: 'center'
   },
   {
     prop: 'product',

src/views/OperationalOverview/coldBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-01-22 16:04:14
+ * @LastEditTime: 2024-01-17 14:00:15
  * @Description:
 -->
 <template>
@@ -14,7 +14,7 @@
     }">
       <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt="">
       许昌安彩冷端看板
-      <h3 class="unit">单位：河南汇融数字科技有限公司</h3>
+      <h3 class="unit">单位：河南汇融科技服务有限公司</h3>
       <h3 class="time">{{ times }}</h3>
       <!-- <el-button
         type="text"
@@ -37,8 +37,7 @@
         </el-col>
 
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8">
-          <base-container :no-content-padding="true" :title="'产量及良率统计'" :size="'small'"
-            :title-icon="'energyMonitoring'">
+          <base-container :title="'产量及良率统计'" :size="'small'" :title-icon="'energyMonitoring'">
             <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
             </div> -->
@@ -59,8 +58,7 @@
 
       <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="10" type="flex" class="flex-1">
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
-          <base-container :no-content-padding="true" :height="256" :title="'废片 缺陷数据'" :size="'middle'"
-            :title-icon="'scrap'">
+          <base-container :height="256" :title="'废片 缺陷数据'" :size="'middle'" :title-icon="'scrap'">
             <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
             </div> -->
@@ -82,8 +80,8 @@
           </base-container>
         </el-col>
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="14">
-          <base-container :no-content-padding="true" :no-padding="true" :height="318 + 338 + 16" :size="'eqStatus'"
-            :title="'设备状态监控'" :title-icon="'eqMonitoring'">
+          <base-container :no-padding="true" :height="318 + 338 + 16" :size="'eqStatus'" :title="'设备状态监控'"
+            :title-icon="'eqMonitoring'">
             <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
             </div> -->
@@ -403,18 +401,6 @@ export default {
         this.beilv2 = _this.clientWidth / 1920
       })()
     }
-    // let obj = {
-    //   'a': 11111,
-    //   'b': 22222,
-    //   'c': 33333,
-    //   'd': 44444,
-    //   'e': 55555,
-    // }
-    // let index = 0
-    // for (let i in obj) {
-    //   index++,
-    //   console.log(index);
-    // }
     // this.getList()
     // const _this = this;
     // window.onresize = () => {
@@ -560,11 +546,7 @@ export default {
       // FanInfo
       if (this.funWsData.type === 'AnnealFanInfo') {
         let arr = []
-        let index = 0
         for (let i in this.funWsData.data.annealFanInfo) {
-          index++,
-          // let index = 1,
-          // index++
           // arr.push({
           //   equipmentName: i,
           //   status: this.funWsData.data.annealFanInfo[i]
@@ -586,9 +568,7 @@ export default {
       }
       if (this.funWsData.type === 'FanInfo') {
         let arr = []
-        let index = 0
         for (let i in this.funWsData.data.fanInfo) {
-          index++,
           // arr.push({
           //   equipmentName: i,
           //   status: this.funWsData.data.fanInfo[i]
@@ -596,10 +576,12 @@ export default {
           arr.push([
             // console.log(item)
             `
-          <span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}</span>`,
+          <span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
+            </span>`,
             // formatDate(item.planStartTime) || '',
             `
-          <span style="color:rgba(255,255,255,0.5)" >${i || ''}</span>`,
+          <span style="color:rgba(255,255,255,0.5)" >${i || ''}
+            </span>`,
             `<span style="color:rgba(255,255,255,0.5)">${this.funWsData.data.fanInfo[i] || ''}</span>`,
           ])
         }
@@ -659,6 +641,7 @@ export default {
         ])
         this.cutConfig.data = cutArr
         this.$refs['cutScrollBoard'].updateRows(cutArr)
+
       } else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') {
         let nameList = []
         let nameWasteList = []
@@ -719,7 +702,7 @@ export default {
           `<span style="color:rgba(255,255,255,0.5)">${item.time || ''}</span>`,
           `<span style="color:rgba(255,255,255,0.5)">${item.type || ''}</span>`,
           `<span style="color:rgba(255,255,255,0.5)">${item.num || ''}</span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${(item.percent * 100).toFixed(2) || ''}</span>`,
+          `<span style="color:rgba(255,255,255,0.5)">${item.percent|| ''}</span>`,
         ])
         this.ISRAConfig.data = ISRAArr
         this.$refs['ISRAScrollBoard'].updateRows(ISRAArr)

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-18 13:59:40
+ * @LastEditTime: 2024-01-17 14:57:00
  * @Description: file content
  * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
 -->
@@ -229,7 +229,7 @@ export default {
   }
 
   .bar-content {
-    padding: 1em;
+    // padding: 1em;
     flex: 1 auto;
     position: relative;
   }

src/views/OperationalOverview/components/pileBarChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-27 13:54:52
- * @LastEditTime: 2024-01-22 16:04:18
+ * @LastEditTime: 2024-01-17 10:09:36
  * @LastEditors: zhp
  * @Description:
 -->

src/views/OperationalOverview/processingBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-01-22 14:37:50
+ * @LastEditTime: 2024-01-17 13:52:44
  * @Description:
 -->
 <template>
@@ -14,7 +14,7 @@
     }">
       <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.22em" alt="">
       许昌安彩深加工看板
-      <h3 class="unit">单位：河南汇融数字科技有限公司</h3>
+      <h3 class="unit">单位：河南汇融科技服务有限公司</h3>
       <h3 class="time">{{ times }}</h3>
       <!-- <el-button
         type="text"
@@ -34,7 +34,7 @@
               :table-data="equipmentList" /> -->
             <!-- <base-table1 :page="1" :limit="999" :show-index="false" :table-config="qualityYearTableProps"
               :table-data="qualityYearList" /> -->
-            <dv-scroll-board class="eqTable" :config="eqConfig" style="width:100%;height:350px" ref='eqScrollBoard' />
+            <dv-scroll-board :config="eqConfig" style="width:100%;height:350px" ref='eqScrollBoard' />
 
           </base-container>
         </el-col>
@@ -63,15 +63,37 @@
                   </el-row> -->
               <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: 1em">
                 <!-- <el-col :span="12"> -->
-                <p class="now-secondary-title">{{ op.name }}</p>
-                <el-progress define-back-color="rgba(32, 57, 96, 1)" text-color="white"
-                  :percentage="op.progressRate * 100" class="custom-progress-bar" />
+                <el-progress :percentage="op.progressRate * 100" class="custom-progress-bar" />
                 <!-- <p v-if="op.progressRate === 1" class="now-secondary-title" style="color:#4679FD">
                   <i class="el-icon-check" />
                   {{ op.name }}
                 </p> -->
+                <p class="now-secondary-title">{{ op.name }}</p>
                 <!-- </el-col> -->
               </el-row>
+              <!-- <el-row>
+                    <el-progress :percentage="100" class="custom-progress-bar" />
+                    <p class="now-secondary-title" style="color:#4679FD">
+                      <i class="el-icon-check" />
+                      成都碲化镉5000一期订单
+                    </p>
+                  </el-row>
+                  <el-row>
+                    <el-progress :percentage="85" class="custom-progress-bar" />
+                    <p class="now-secondary-title">成都碲化镉二订单</p>
+                  </el-row>
+                  <el-row>
+                    <el-progress :percentage="85" class="custom-progress-bar" />
+                    <p class="now-secondary-title">长利订单1000</p>
+                  </el-row>
+                  <el-row>
+                    <el-progress :percentage="85" class="custom-progress-bar" />
+                    <p class="now-secondary-title">国际工程20号订单</p>
+                  </el-row>
+                  <el-row>
+                    <el-progress :percentage="85" class="custom-progress-bar" />
+                    <p class="now-secondary-title">铜铟镓硒眉山10万订单</p>
+                  </el-row> -->
             </div>
             <!-- </div> -->
           </base-container>
@@ -80,8 +102,7 @@
 
       <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="12" type="flex" class="flex-1">
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
-          <base-container :no-content-padding="true" :height="256" :size="'middle'" :title="'能源监控'"
-            :title-icon="'energyMonitoring'">
+          <base-container :height="256" :size="'middle'" :title="'能源监控'" :title-icon="'energyMonitoring'">
             <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
             </div> -->
@@ -103,8 +124,7 @@
           </base-container>
         </el-col>
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
-          <base-container :no-content-padding="true" :height="318 + 338 + 16" :size="'middle'" :title="'产线产量及良品率'"
-            :title-icon="'productLine'">
+          <base-container :height="318 + 338 + 16" :size="'middle'" :title="'产线产量及良品率'" :title-icon="'productLine'">
             <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
             </div> -->
@@ -404,26 +424,21 @@ const qualityYearTableProps = [
 ]
 
 const qualityYearList = [
+  { name: '钢化炉', code: '21321312', status: '运行', error: '否' },
+  { name: '磨边机', code: '32323232', status: '运行', error: '否' },
+  { name: '镀膜机', code: '32213213', status: '运行', error: '否' },
+  { name: '钢化清洗机', code: '21321323', status: '运行', error: '否' },
+  { name: '固化机', code: '21321321', status: '运行', error: '否' },
+  { name: '磨边清洗机', code: '21321321', status: '运行', error: '否' },
+  { name: '预热机', code: '21321321', status: '故障', error: '是' },
+  { name: '下片机', code: '21321321', status: '运行', error: '否' },
   {
-    name: '翻转机', code: 'EQ20240110112358000235', status: '运行', error: '否' },
+    name: '冷却机', code: '21321321', status: '运行', error: '否' },
   {
-    name: '烘干炉', code: 'EQ20240110112537000241', status: '运行', error: '否' },
-  {
-    name: '清洗机', code: '	EQ20240110112310000232', status: '运行', error: '否' },
-  { name: '钢化清洗机', code: 'EQ20240110111700000208', status: '运行', error: '否' },
-  { name: '固化机', code: 'EQ20240110111700000201', status: '运行', error: '否' },
-  {
-    name: '磨边清洗机', code: '	EQ20240110111700000208', status: '运行', error: '否' },
-  { name: '预热机', code: 'EQ20240110111700000205', status: '故障', error: '是' },
-  { name: '下片机', code: 'EQ20240115151435000279', status: '运行', error: '否' },
-  {
-    name: '冷却机', code: 'EQ20240110111700000203', status: '运行', error: '否' },
-  {
-    name: 'A储片机106', code: 'EQ20240110111700000202', status: '运行', error: '否' },
-  { name: '二次清洗机', code: 'EQ20240110111700000209', status: '运行', error: '否' },
-  {
-    name: '二次磨边机', code: '	EQ20240110110927000181', status: '故障', error: '是' },
-  { name: '测试设备', code: 'EQ20240110111700000201', status: '运行', error: '否' }
+    name: 'A储片机106', code: '21321321', status: '运行', error: '否' },
+  { name: '二次清洗机', code: '21321321', status: '运行', error: '否' },
+  { name: '二次磨边机', code: '21321321', status: '故障', error: '是' },
+  { name: '测试设备', code: '21321321', status: '运行', error: '否' }
 
 ]
 const qualityMonthTableProps = [
@@ -446,45 +461,45 @@ const qualityMonthTableProps = [
 ]
 const qualityMonthList = [
   {
-    productionLineName: 'D61',
+    productionLineName: 'Y61',
     sectionName: '成型',
-    count: '3片',
+    count: '199片',
     inspectionTypeName: '细长泡'
   },
   {
-    productionLineName: 'D62',
+    productionLineName: 'Y62',
     sectionName: '组合落板',
-    count: '4片',
+    count: '123片',
     inspectionTypeName: '细长泡'
   },
   {
-    productionLineName: 'D61',
+    productionLineName: 'Y61',
     sectionName: '磨边',
-    count: '6片',
+    count: '212片',
     inspectionTypeName: '开口泡'
   },
   {
-    productionLineName: 'D63',
+    productionLineName: 'Y63',
     sectionName: '清洗',
-    count: '5片',
+    count: '33片',
     inspectionTypeName: '结石'
   },
   {
-    productionLineName: 'D64',
+    productionLineName: 'Y64',
     sectionName: '打孔',
-    count: '2片',
+    count: '332片',
     inspectionTypeName: '结石'
   },
   {
-    productionLineName: 'D63',
+    productionLineName: 'Y63',
     sectionName: '成型',
-    count: '7片',
+    count: '432片',
     inspectionTypeName: '开口泡'
   },
   {
-    productionLineName: 'D61',
+    productionLineName: 'Y61',
     sectionName: '上片',
-    count: '8片',
+    count: '200片',
     inspectionTypeName: '结石'
   }
 ]
@@ -535,22 +550,22 @@ export default {
       qualityYearTableProps,
       cxNameList,
       eqConfig: {
-        header: ['序号', '设备名称', '设备编码', '设备状态', '是否故障'],
+        header: ['序号', '设备名称', '工序', '损耗片数', '缺陷类型'],
         headerBGC: 'rgba(32, 55, 96, 0.8)',
         oddRowBGC: 'rgba(32, 55, 96, 0.8)',
         evenRowBGC: 'rgba(14, 32, 62, 0.8)',
-        columnWidth: [70, 100, 200, 90, 90,],
+        columnWidth: [70, 130, 100, 120, 110,],
         align: ['center'],
         data: [],
         // index:true,
         rowNum: 10
       },
       processConfig: {
-        header: ['序号', '产线名称', '工序', '损耗片数', '缺陷类型'],
+        header: ['序号', '产线名', '设备编码', '设备状态', '是否故障'],
         headerBGC: 'rgba(32, 55, 96, 0.8)',
         oddRowBGC: 'rgba(32, 55, 96, 0.8)',
         evenRowBGC: 'rgba(14, 32, 62, 0.8)',
-        columnWidth: [70, 130, 100, 120, 110,],
+        columnWidth: [70, 70, 130, 150, 110,],
         align: ['center'],
         data: [],
         // index:true,
@@ -615,8 +630,8 @@ export default {
     this.initWebSocket()
     this.SJGInitWebSocket()
     this.getTimes()
-    // this.$refs.EnergyMonitoringChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [3134, 2323, 3232, 3233, 2321])
-    // this.$refs.productLineChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [98, 97, 98.7, 98.5, 98.3,], [3134, 2323, 3232, 3233, 2321])
+    this.$refs.EnergyMonitoringChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [3134, 2323, 3232, 3233, 2321])
+    this.$refs.productLineChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [98, 97, 98.7, 98.5, 98.3,], [3134, 2323, 3232, 3233, 2321])
     const _this = this;
     _this.beilv2 = document.documentElement.clientWidth / 1920
     window.onresize = () => {
@@ -664,7 +679,7 @@ export default {
         'get',
       ).then((res) => {
         // console.log('11111', res);
-        if (res.data.length !==0) {
+        if (res.data) {
           let processArr = res.data.map((item, index) => [
             // console.log(item)
             `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
@@ -679,21 +694,6 @@ export default {
           ])
           this.processConfig.data = processArr
           this.$refs['processScrollBoard'].updateRows(processArr)
-        } else {
-          let processArr = qualityMonthList.map((item, index) => [
-            // console.log(item)
-            `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
-            </span>`,
-            // formatDate(item.planStartTime) || '',
-            `
-          <span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
-            </span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
-          ])
-          this.processConfig.data = processArr
-          this.$refs['processScrollBoard'].updateRows(processArr)
         }
       })
     },
@@ -843,23 +843,7 @@ export default {
         // console.log(this.EnergyMonitoringNameList)
         // console.log(this.EnergyMonitoringList)
         // this.$nextTick(() => {
-        this.$refs.productLineChart.initChart(Array.from(new Set(nameList)), passRateList, outputNumList)
-      } else {
-        console.log(this.qualityYearList);
-
-        let eqArr = this.qualityYearList.map((item,index) => [
-          `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
-            </span>`,
-          // formatDate(item.planStartTime) || '',
-          `
-          <span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
-            </span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.status || ''}</span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.error || ''}</span>`,
-        ])
-        this.eqConfig.data = eqArr
-        this.$refs['eqScrollBoard'].updateRows(eqArr)
+        // this.$refs.productLineChart.initChart(Array.from(new Set(nameList)), passRateList, outputNumList)
       }
     },
     // 数据发送
@@ -907,7 +891,7 @@ export default {
         // console.log(this.EnergyMonitoringNameList)
         // console.log(this.EnergyMonitoringList)
         // this.$nextTick(() => {
-        this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList, this.EnergyMonitoringList)
+        // this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList, this.EnergyMonitoringList)
         // })
       }
     },
@@ -1044,6 +1028,10 @@ export default {
   background-color: unset;
   background-image: linear-gradient(to right, #4573fe, #47f8dc);
 }
+// ::v-deep .el-progress-bar__outer {
+//   background-color:rgba(71, 248, 220, 1);
+//   // background-image: rgba(71, 248, 220, 1))
+// }
  .visual-select {
    position: absolute;
    right: 1em;
@@ -1113,6 +1101,7 @@ export default {
       margin-left: 3em;
     }
 }
+
 </style>
 
 <style scoped>
@@ -1129,7 +1118,4 @@ export default {
 /* .container-main {
   min-height: calc(100vh - 10em);
 } */
-.eqTable{
-  overflow: hidden;
-}
 </style>

src/views/base/packagingPrintModel/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-10-17 16:50:19
- * @LastEditTime: 2024-01-22 09:55:32
+ * @LastEditTime: 2023-12-04 13:43:19
  * @LastEditors: zhp
  * @Description:
 -->
@@ -282,6 +282,7 @@ export default {
 
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
+
 				if (this.dataForm.id) {
 					// 获取产品详情
           getPackingModel(id).then((response) => {

src/views/equipment/timing-diagram/status/index.vue

@@ -1,4 +1,4 @@
-<!--
+<!-- 
     filename: index.vue
     author: liubin
     date: 2023-09-04 09:34:52

src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue

@@ -140,10 +140,10 @@ export default {
     init(obj) {
       // console.log(productionLineId);
       console.log(obj);
-      this.visible = true
+      this.visible = true;
       // if(obj.id)
       if (obj) {
-        this.dataForm.id = obj.id || null;
+        this.dataForm.id = obj.id ? obj.id : ""
       }
       this.$nextTick(() => {
         this.$refs["dataForm"].resetFields()
@@ -154,16 +154,13 @@ export default {
           }).then((res) => {
             console.log(res);
             this.dataForm.inspectionDetIdList = res.data
-            this.dataForm.productionLineId = obj.productionLineId
-            this.getWorksectionList(obj.productionLineId)
-            this.dataForm.sectionId = obj.sectionId
           })
         }
         if (this.dataForm.id) {
-          console.log(1111);
           this.urlOptions.infoURL(obj.id).then(response => {
             this.dataForm.id = response.data.id
-
+            this.dataForm.productionLineId = response.data.productionLineId
+            this.dataForm.sectionId = response.data.sectionId
             // if (this.setData) {
             //   this.setDataForm()
             // }
@@ -264,10 +261,10 @@ export default {
 			this.$emit('update', this.dataForm);
 		},
 
-		// async getCode(url) {
-		// 	const response = await this.$axios(url);
-		// 	return response.data;
-		// },
+		async getCode(url) {
+			const response = await this.$axios(url);
+			return response.data;
+		},
 	},
 };
 </script>

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

@@ -104,7 +104,7 @@ export default {
 					label: '工段',
 				},
 				{
-          prop: 'inspectionInfoList',
+					prop: 'inspectionDetContent',
 					label: '检测内容',
 				}
 			],
@@ -133,23 +133,17 @@ export default {
 		// this.getList();
 	},
 	methods: {
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.map((item) => {
-          // console.log(item);
-          return {
-            inspectionInfoList: item.inspectionInfoList.toString(),
-            productionLineId:item.productionLineId,
-            productionLineName:item.productionLineName,
-            sectionId: item.sectionId,
-            sectionName: item.sectionName
-         }
-        })
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-      });
-    },
+		/** 查询列表 */
+		// getList() {
+		// 	this.loading = true;
+		// 	// 执行查询
+		// 	getQualityInspectionBoxBtnPage(this.listQuery).then((response) => {
+		// 		this.list = response.data.list;
+		// 		this.total = response.data.total;
+		// 		this.loading = false;
+		// 	});
+		// },
+		/** 表单重置 */
 		reset() {
 			this.form = {
 				id: null,

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-01-16 14:59:33
  * @LastEditors: zhp
  * @Description:
 -->
@@ -92,13 +92,13 @@
           </el-col>
           <el-col :span="4">
             <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值"
-             >
+              :rules="[{ required: true, message: '最小值', trigger: 'blur' }]">
               <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="最大值"
-              >
+              :rules="[{ required: true, message: '最大值', trigger: 'blur' }]">
               <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.maxValue"></el-input>
             </el-form-item>
           </el-col>
@@ -257,7 +257,6 @@ export default {
   methods: {
     judgeValue(val, minValue, maxValue, index) {
       if (val >= minValue && val <= maxValue) {
-        console.log(val)
         this.dataForm.checkValueList[index].showIcon = true
         this.dataForm.checkValueList[index].isStandard = true
       } else {
@@ -484,7 +483,6 @@ export default {
                   minValue: ele.minValue
                 }
               })
-              console.log(valueList);
               getQualityHotMaterialDetList({
                 mainId: response.data.id
               }).then((result) => {
@@ -492,7 +490,7 @@ export default {
                   return {
                     name: ele.checkName,
                     id: ele.id,
-                    checkDetId: ele.checkDetId,
+                    checkDetId: ele.id,
                     checkValue: ele.checkValue,
                     maxValue:null,
                     minValue: null
@@ -503,31 +501,28 @@ export default {
                   return {
                     mainId: ele.mainId,
                     id: ele.id,
-                    checkDetId: ele.checkDetId,
+                    checkDetId: ele.id,
                     checkValue: ele.checkValue,
                     isStandard: true,
                     showIcon: false,
                   }
                 })
-                this.ingredientList.forEach((ele, i) => {
-                  valueList.forEach((item, index) => {
-                    if (ele.checkDetId == item.checkDetId) {
-                      this.ingredientList[i].minValue = item.minValue
-                      this.ingredientList[i].maxValue = item.maxValue
-                    }
-                  })
-                })
                 valueList.forEach((ele, index) => {
-                 this.dataForm.checkValueList.forEach((item, i) => {
-                   if (ele.checkDetId == item.checkDetId && item.checkValue >= ele.minValue && item.checkValue <= ele.maxValue) {
-                     console.log(1111)
-                     item.showIcon = true
-                     item.isStandard = true
-                   } else {
-                     item.showIcon = true
-                     item.isStandard = false
-                   }
-                  })
+                  if (this.ingredientList[index].checkDetId >= ele.checkDetId) {
+                    this.ingredientList[index].minValue = ele.minValue
+                    this.ingredientList[index].maxValue = ele.maxValue
+                  }
+                })
+                valueList.forEach((ele,index) => {
+                  console.log(ele);
+                  if (this.dataForm.checkValueList[index].checkDetId >= ele.checkDetId && this.dataForm.checkValueList[index].checkValue >= ele.minValue && this.dataForm.checkValueList[index].checkValue <= ele.maxValue) {
+                      this.dataForm.checkValueList[index].showIcon = true
+                      this.dataForm.checkValueList[index].isStandard = true
+                    } else {
+                      this.dataForm.checkValueList[index].showIcon = true
+                      this.dataForm.checkValueList[index].isStandard = false
+                    }
+                  // })
                 })
               })
             });

src/views/quality/base/qualityHotMaterial/index.vue

@@ -53,9 +53,8 @@ const tableProps = [
 		label: '取样人'
   },
   {
-    prop: 'checkResult',
-    label: '是否合格',
-    filter: (val) => val == false ? '不合格' : '合格' ,
+    prop: 'appearance',
+    label: '是否合格'
   },
   {
     prop: 'materialGrade',

src/views/quality/base/qualityScrapLog/basic-page.js

@@ -1,175 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2024-01-17 16:59:30
- * @LastEditTime: 2024-01-17 16:59:30
- * @LastEditors: zhp
- * @Description:
- */
-/*
- * @Author: zwq
- * @Date: 2022-08-24 11:19:43
- * @LastEditors: zhp
- * @LastEditTime: 2024-01-10 10:29:29
- * @Description:
- */
-export default {
-  data() {
-    /* eslint-disable */
-    return {
-      urlOptions: {
-        getDataListURL: '',
-        deleteURL: '',
-        statusUrl: '',
-        exportURL: ''
-      },
-      tableData: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-      },
-      exportLoading: false,
-      dataListLoading: false,
-      addOrEditTitle: '',
-      addOrUpdateVisible: false,
-    }
-  },
-  created() {
-  },
-  mounted() {
-    // this.getDataList()
-  },
-  methods: {
-    // 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list;
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-      });
-    },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-    // 新增 / 修改
-    addOrUpdateHandle(id) {
-      this.addOrUpdateVisible = true;
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id);
-      });
-    },
-    cancel(id) {
-      this.$refs["popover-" + id].showPopper = false;
-    },
-    //改变状态
-    changeStatus(id) {
-      this.$http
-        .post(this.urlOptions.statusUrl, { id })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          }
-          this.$refs["popover-" + id].showPopper = false;
-          this.$message({
-            message: this.$t("prompt.success"),
-            type: "success",
-            duration: 500,
-            onClose: () => {
-              this.getDataList();
-            },
-          });
-        })
-        .catch(() => { });
-    },
-    //tableBtn点击
-    handleClick(val) {
-      if (val.type === "edit") {
-        this.addOrUpdateVisible = true;
-        this.addOrEditTitle = "编辑";
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(val.data.id);
-        });
-      } else if (val.type === "delete") {
-        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data)
-      } else if (val.type === "change") {
-        this.changeStatus(val.data.id)
-      } else {
-        this.otherMethods(val)
-      }
-    },
-    // 删除
-    deleteHandle(id, name, index) {
-      this.$confirm(`确定对${name ? '[名称=' + name + ']' : '[序号=' + index + ']'}进行删除操作?`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.urlOptions.deleteURL(id).then(({ data }) => {
-            this.$message({
-              message: "操作成功",
-              type: "success",
-              duration: 1500,
-              onClose: () => {
-                this.getDataList();
-              },
-            });
-          });
-        })
-        .catch(() => { });
-    },
-    //search-bar点击
-    buttonClick(val) {
-      switch (val.btnName) {
-        case "search":
-          this.listQuery.xm1 = val.xm1;
-          this.listQuery.xm2 = val.xm2;
-          this.listQuery.pageNo = 1;
-          this.getDataList();
-          break;
-        case "add":
-          this.addOrEditTitle = '新增'
-          this.addOrUpdateVisible = true;
-          this.addOrUpdateHandle()
-          break;
-        default:
-          console.log(val)
-      }
-    },
-    handleCancel() {
-      this.$refs.addOrUpdate.formClear()
-      this.addOrUpdateVisible = false
-      this.addOrEditTitle = ''
-    },
-    handleConfirm() {
-      this.$refs.addOrUpdate.dataFormSubmit()
-    },
-    successSubmit() {
-      this.handleCancel()
-      this.getDataList()
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = { ...this.queryParams };
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
-        this.exportLoading = true;
-        return this.urlOptions.exportURL(params);
-      }).then(response => {
-        this.$download.excel(response, '工厂.xls');
-        this.exportLoading = false;
-      }).catch(() => { });
-    }
-  }
-}

src/views/quality/base/qualityScrapLog/index.vue

@@ -20,7 +20,7 @@
 import AddOrUpdate from './add-or-updata';
 import DetailOrUpdate from './detail-or-updata';
 
-import basicPage from './basic-page';
+import basicPage from '../../../core/mixins/basic-page';
 import { parseTime } from '../../../core/mixins/code-filter';
 import {
   getQualityScrapLogPage,