看板跳转代码暂存

applications/dee-mes/src/privateComponents/components/Sqcdp/components/calendar.vue

@@ -275,12 +275,24 @@ export default {
       default: () => null
     },
     year: {
-      type: String,
+      type: [String, Number],
+      default: () => null
+    },
+    unitNo: {
+      type: [String, Number],
       default: () => null
     },
     activeName: {
       type: String,
       default: () => null
+    },
+    sqcdpParams: {
+      type: Object,
+      default: () => {
+        return {
+          query: {}
+        }
+      }
     }
   },
   data() {
@@ -319,8 +331,8 @@ export default {
           { id: 2, dictKey: 'Red', dictValue: '出勤率小于90%' },
           { id: 3, dictKey: 'null', dictValue: '出勤率大于90%' }
         ]
-      },
-      unitNo: null
+      }
+      // unitNo: null
     }
   },
   computed: { },
@@ -337,12 +349,12 @@ export default {
     // 创建确认调用
     init() {
       this.$nextTick(() => {
-        this.getData(this.year, this.month)
+        // this.getData(this.year, this.month)
       })
     },
     // 初始化日历
     getData(year, month, unitNo) {
-      this.unitNo = unitNo
+      // this.unitNo = unitNo
       this.day = []
       this.enull = 0
       if (year === null || month === null || year === undefined) return
@@ -369,12 +381,8 @@ export default {
       var data = []
       var sorties = ''
       try {
-        data =
-          this.$parent.$parent.$parent.$parent.$parent.$parent.sqcdpParams.query
-            .data
-        sorties =
-          this.$parent.$parent.$parent.$parent.$parent.$parent.sqcdpParams.query
-            .sorties
+        data = this.sqcdpParams.query.data
+        sorties = this.sqcdpParams.query.sorties
       } catch (err) {
         console.info(err)
       }
@@ -388,7 +396,7 @@ export default {
           this.enull = date - 1
         }
         this.loading = false
-        this.$parent.$parent.$parent.$parent.sqcdpParams.query.sorties = false
+        this.sqcdpParams.query.sorties = false
       } else {
         const params = {
           searchItems: {
@@ -418,11 +426,11 @@ export default {
             }
           ]
         }
-        if (unitNo && unitNo !== '工厂') {
+        if (this.unitNo && this.unitNo !== '工厂') {
           params.searchItems.items.push({
             fieldName: 'unitNo',
             operator: 'EQ',
-            value: unitNo
+            value: this.unitNo
           })
         } else {
           params.searchItems.items.push({

applications/dee-mes/src/privateComponents/components/Sqcdp/components/header.vue

@@ -57,8 +57,16 @@ export default {
       default: () => []
     },
     year: {
-      type: String,
+      type: [String, Number],
       default: () => null
+    },
+    sqcdpParams: {
+      type: Object,
+      default: () => {
+        return {
+          query: {}
+        }
+      }
     }
   },
   data() {
@@ -144,18 +152,18 @@ export default {
         })
       }).catch(err => console.log(err)).finally(() => {
       }).finally(() => {
-        this.stance = '工厂'
-        // var serialNumber = false
-        // try {
-        //   serialNumber = this.$parent.$parent.$parent.$parent.sqcdpParams.query.serialNumber
-        // } catch (err) {
-        //   console.info(err)
-        // }
-        // if (serialNumber) {
-        //   this.stance = serialNumber
-        // } else {
         // this.stance = '工厂'
-        // }
+        let serialNumber = false
+        try {
+          serialNumber = this.sqcdpParams.query.serialNumber || '工厂'
+        } catch (err) {
+          console.info(err)
+        }
+        if (serialNumber) {
+          this.stance = serialNumber
+        } else {
+          this.stance = '工厂'
+        }
       })
     },
     // 返回站位名称

applications/dee-mes/src/privateComponents/components/Sqcdp/index.vue

 <!--
  * @Author: ljm
  * @Date: 2021-06-22
- * @LastEditTime:
+ * @LastEditTime: 2024-08-07 16:23:30
  * @Description: sqcdp维护
  * @FilePath: applications/dee-mes/src/views/mes/baseData/sqcdp/index.vue
 -->
@@ -9,6 +9,7 @@
   <section class="wordCalendar">
     <Header
       ref="header"
+      :sqcdp-params="sqcdpParams"
       :year-data="yearData"
       :year="year"
       @getMonth="handleMonth"
@@ -17,19 +18,19 @@
     />
     <el-tabs v-model="activeName" type="card" @tab-click="tabClick">
       <el-tab-pane label="S（安全）" name="S">
-        <Calender ref="calenderS" :active-name="activeName" :month="month" :year="year" />
+        <Calender ref="calenderS" :sqcdp-params="sqcdpParams" :unit-no="unitNo" :active-name="activeName" :month="month" :year="year" />
       </el-tab-pane>
       <el-tab-pane label="Q（质量）" name="Q">
-        <Calender ref="calenderQ" :active-name="activeName" :month="month" :year="year" />
+        <Calender ref="calenderQ" :sqcdp-params="sqcdpParams" :unit-no="unitNo" :active-name="activeName" :month="month" :year="year" />
       </el-tab-pane>
       <el-tab-pane label="C（成本）" name="C">
-        <Calender ref="calenderC" :active-name="activeName" :month="month" :year="year" />
+        <Calender ref="calenderC" :sqcdp-params="sqcdpParams" :unit-no="unitNo" :active-name="activeName" :month="month" :year="year" />
       </el-tab-pane>
       <el-tab-pane label="D（进度）" name="D">
-        <Calender ref="calenderD" :active-name="activeName" :month="month" :year="year" />
+        <Calender ref="calenderD" :sqcdp-params="sqcdpParams" :unit-no="unitNo" :active-name="activeName" :month="month" :year="year" />
       </el-tab-pane>
       <el-tab-pane label="P（人员）" name="P">
-        <Calender ref="calenderP" :active-name="activeName" :month="month" :year="year" />
+        <Calender ref="calenderP" :sqcdp-params="sqcdpParams" :unit-no="unitNo" :active-name="activeName" :month="month" :year="year" />
       </el-tab-pane>
     </el-tabs>
     <!-- <Calender ref="calender" :unit-no="unitNo" :month="month" :year="year" /> -->
@@ -49,6 +50,16 @@ export default {
     Header,
     Calender
   },
+  props: {
+    sqcdpParams: {
+      type: Object,
+      default: () => {
+        return {
+          query: {}
+        }
+      }
+    }
+  },
   data() {
     return {
       activeName: 'S',
@@ -59,7 +70,9 @@ export default {
     }
   },
   mounted() {
+    if (!this.sqcdpParams.name) {
       this.initYear()
+    }
   },
   created() {},
   methods: {
@@ -72,7 +85,9 @@ export default {
       this.selectTab($event.name)
     },
     selectTab(activeName) {
+      this.$nextTick(() => {
         this.$refs['calender' + activeName].getData(this.year, this.month, this.unitNo)
+      })
     },
     // 年份下拉框触发
     handleYear(year) {
@@ -94,26 +109,25 @@ export default {
       post('/FactoryCalendar/getAllFactoryYear')
         .then((res) => {
           this.yearData = res.items.sort()
-          this.year = res.items[0]
+          this.year = new Date().getFullYear()
           this.month = new Date().getMonth() + 1
         })
         .catch((err) => console.log(err))
         .finally(() => {
+          let name = ''
+          let serialNumber = ''
+          try {
+            name = this.sqcdpParams.query.name
+            serialNumber = this.sqcdpParams.query.serialNumber
+          } catch (err) {
+            console.info(err)
+          }
+          if (name) {
+            this.activeName = name
+            this.handleStance(serialNumber)
+          } else {
             this.$refs['calender' + this.activeName].getData(this.year, this.month, this.unitNo)
-
-          // var name = ''
-          // var serialNumber = ''
-          // try {
-          //   name = this.$parent.$parent.$parent.sqcdpParams.query.name
-          //   serialNumber = this.$parent.$parent.$parent.sqcdpParams.query.serialNumber
-          // } catch (err) {
-          //   console.info(err)
-          // }
-          // if (name) {
-          //   this.activeName = name
-          //   this.handleStance(serialNumber)
-          // } else {
-          // }
+          }
         })
     }
 

applications/dee-mes/src/privateComponents/components/Visualization/AssembleKanban.vue

@@ -1901,7 +1901,7 @@
         @click="isFullClick"
       >
     </div>
-    <SQCDPDialog ref="SQCDPDialog" />
+    <SQCDPDialog ref="SQCDPDialog" :sqcdp-params="sqcdpParams" />
     <ExpireWarningDialog ref="ExpireWarningDialog" />
     <SummaryOfStationMissingPartsDialog
       ref="SummaryOfStationMissingPartsDialog"
@@ -2484,7 +2484,8 @@ export default {
       storageExpireWarningParams: {},
       summaryOfStationMissingPartsParams: {},
       siteProblemManagementSummaryParams: {},
-      actionitemsParams: {}
+      actionitemsParams: {},
+      sqcdpParams: {}
     }
   },
   computed: {
@@ -2891,10 +2892,6 @@ export default {
       })
     },
     routerWordCalendar(name) {
-      if (name) {
-        console.log('跳转暂时未做，需要做的时候删除这段代码！')
-        return
-      }
       let data = []
       switch (name) {
         case 'S':
@@ -2943,6 +2940,7 @@ export default {
         query: {
           name: name,
           sorties: this.info.aircraftSorties.defCode,
+          serialNumber: this.$route.query.serialNumber,
           data: data
         }
       }

applications/dee-mes/src/privateComponents/components/Visualization/Dialog/JobPlanExecutionQueryDialog.vue

@@ -10,28 +10,59 @@
     @close="close"
     @opened="opened"
   >
-    JobPlanExecutionQuery <!-- <JobPlanExecutionQuery /> -->
+    <dee-as-com
+      ref="table"
+      class="list-table"
+      :lay-config="cmpOptions"
+    />
   </el-dialog>
 </template>
 <script>
-// import JobPlanExecutionQuery from '@/views/mes/physicalQualityAndConfiguratioCnontrol/jobPlanExecutionSummary'
 export default {
   name: 'JobPlanExecutionQueryDialog',
   components: {
-    // JobPlanExecutionQuery
   },
-  props: {},
+  props: {
+    jobPlanExecutionQueryParams: {
+      type: Object,
+      default: () => {}
+    }
+  },
   data() {
     return {
-      visible: false
+      visible: false,
+      cmpOptions: { typeName: 'JoExecutePlan', layKey: 'JoExecutePlanTable' }
     }
   },
   computed: {},
   created() {},
   methods: {
     opened() {
-      this.$children[0].$children[0].getAirModelList()
-      // this.$parent.JobPlanExecutionQueryParams = {}
+      const extraParams = [
+        {
+          'fieldName': 'joExecutePlan.planState',
+          'operator': 'IN',
+          'value': this.jobPlanExecutionQueryParams.query.planStateCode
+        },
+        {
+          'fieldName': 'planeType',
+          'operator': 'EQ',
+          'value': this.jobPlanExecutionQueryParams.query.model
+        },
+        {
+          'fieldName': 'sorties',
+          'operator': 'EQ',
+          'value': this.jobPlanExecutionQueryParams.query.sorties
+        },
+        {
+          'fieldName': 'positionNumber',
+          'operator': 'LIKE',
+          'value': this.jobPlanExecutionQueryParams.query.serialNumber
+        }
+      ]
+      setTimeout(() => {
+        this.$refs.table.$refs.asCom.getData(extraParams)
+      }, 500)
     },
     close() {
       this.visible = false

applications/dee-mes/src/privateComponents/components/Visualization/Dialog/SQCDPDialog.vue

@@ -11,17 +11,22 @@
     @close="close"
     @opened="opened"
   >
-    <!-- <SQCDP /> -->SQCDP
+    <SQCDP ref="SQCDP" :sqcdp-params="sqcdpParams" />
   </el-dialog>
 </template>
 <script>
-// import SQCDP from '@/views/mes/baseData/sqcdp/index.vue'
+import SQCDP from '../../Sqcdp'
 export default {
   name: 'SQCDPDialog',
   components: {
-    // SQCDP
+    SQCDP
+  },
+  props: {
+    sqcdpParams: {
+      type: Object,
+      default: () => {}
+    }
   },
-  props: { },
   data() {
     return {
       visible: false
@@ -32,10 +37,10 @@ export default {
   created() {},
   methods: {
     opened() {
-      this.$children[0].$children[0].initYear()
+      this.$refs.SQCDP.initYear()
     },
     close() {
-      this.$parent.sqcdpParams = {}
+      // this.$parent.sqcdpParams = {}
       this.visible = false
     }
   }
@@ -46,6 +51,7 @@ export default {
   position: absolute;
   .el-dialog__header{
     text-align: center;
+    // background: linear-gradient(90deg, #2F70A4 0%, #4E85A3 64%, #55A781 100%);
   }
    .el-dialog {
      max-height:100%;

applications/dee-mes/src/privateComponents/components/Visualization/Dialog/SiteProblemManagementSummaryDialog.vue

@@ -11,20 +11,28 @@
     @close="close"
     @opened="opened"
   >
-    SiteProblemManagementSummary<!-- <SiteProblemManagementSummary /> -->
+    <dee-as-com
+      ref="table"
+      class="list-table"
+      :lay-config="cmpOptions"
+    />
   </el-dialog>
 </template>
 <script>
-// import SiteProblemManagementSummary from '@/views/mes/physicalQualityAndConfiguratioCnontrol/siteProblemManagementSummary/index.vue'
 export default {
-  name: 'SQCDPDialog',
+  name: 'SiteProblemManagementSummary',
   components: {
-    // SiteProblemManagementSummary
   },
-  props: { },
+  props: {
+    siteProblemManagementSummaryParams: {
+      type: Object,
+      default: () => {}
+    }
+  },
   data() {
     return {
-      visible: false
+      visible: false,
+      cmpOptions: { typeName: 'SpotProblem', layKey: 'defaultResultCopy' }
     }
   },
   computed: {
@@ -32,11 +40,34 @@ export default {
   created() {},
   methods: {
     opened() {
-      this.$children[0].$children[0].init()
-      this.$parent.siteProblemManagementSummaryParams = {}
+      const extraParams =
+      [
+        {
+          'fieldName': 'standPosition',
+          'operator': 'EQ',
+          'value': this.siteProblemManagementSummaryParams.query.serialNumber
+        },
+        {
+          'fieldName': 'sptype',
+          'operator': 'LIKE',
+          'value': this.siteProblemManagementSummaryParams.query.name
+        },
+        {
+          'fieldName': 'airModel',
+          'operator': 'EQ',
+          'value': this.siteProblemManagementSummaryParams.query.model
+        },
+        {
+          'fieldName': 'sorties',
+          'operator': 'EQ',
+          'value': this.siteProblemManagementSummaryParams.query.sorties
+        }
+      ]
+      setTimeout(() => {
+        this.$refs.table.$refs.asCom.getData(extraParams)
+      }, 500)
     },
     close() {
-      this.$parent.siteProblemManagementSummaryParams = {}
       this.visible = false
     }
   }

applications/dee-mes/src/privateComponents/components/Visualization/ExperimentKanban.vue

@@ -1978,9 +1978,9 @@
       >
     </div>
     <JobPlanExecutionQueryDialog ref="JobPlanExecutionQueryDialog" />
-    <SQCDPDialog ref="SQCDPDialog" />
+    <SQCDPDialog ref="SQCDPDialog" :sqcdp-params="sqcdpParams" />
     <SummaryOfStationMissingPartsDialog ref="SummaryOfStationMissingPartsDialog" />
-    <SiteProblemManagementSummaryDialog ref="SiteProblemManagementSummaryDialog" />
+    <SiteProblemManagementSummaryDialog ref="SiteProblemManagementSummaryDialog" :site-problem-management-summary-params="siteProblemManagementSummaryParams" />
   </div>
 </template>
 
@@ -1988,7 +1988,6 @@
 import * as echarts from 'echarts'
 import $ from 'jquery'
 import elementResizeDetectorMaker from 'element-resize-detector'
-
 import JobPlanExecutionQueryDialog from './Dialog/JobPlanExecutionQueryDialog.vue'
 import SQCDPDialog from './Dialog/SQCDPDialog.vue'
 import SummaryOfStationMissingPartsDialog from './Dialog/SummaryOfStationMissingPartsDialog.vue'
@@ -2630,10 +2629,6 @@ export default {
           const chartDom = document.getElementById('superviseEchart')
           const myChart = echarts.init(chartDom)
           myChart.on('click', function(params) {
-            if (params) {
-              console.log('跳转暂时未做，需要做的时候删除这段代码！')
-              return
-            }
             that.routerSiteProblemManagementSummary(params.name)
           })
           myChart.setOption(superviseOption)
@@ -2723,29 +2718,59 @@ export default {
      * sqcdp维护
      */
     routerWordCalendar(name) {
-      if (name) {
-        console.log('跳转暂时未做，需要做的时候删除这段代码！')
-        return
+      let data = []
+      switch (name) {
+        case 'S':
+          data = this.sqcdpData.S.map((p) => {
+            return {
+              calendar: p.date.substr(5, 5),
+              srisk: p.color === 'Green' ? 'null' : p.color
+            }
+          })
+          break
+        case 'Q':
+          data = this.sqcdpData.Q.map((p) => {
+            return {
+              calendar: p.date.substr(5, 5),
+              qrisk: p.color === 'Green' ? 'null' : p.color
+            }
+          })
+          break
+        case 'C':
+          data = this.sqcdpData.C.map((p) => {
+            return {
+              calendar: p.date.substr(5, 5),
+              crisk: p.color === 'Green' ? 'null' : p.color
+            }
+          })
+          break
+        case 'D':
+          data = this.sqcdpData.D.map((p) => {
+            return {
+              calendar: p.date.substr(5, 5),
+              drisk: p.color === 'Green' ? 'null' : p.color
+            }
+          })
+          break
+        case 'P':
+          data = this.sqcdpData.P.map((p) => {
+            return {
+              calendar: p.date.substr(5, 5),
+              prisk: p.color === 'Green' ? 'null' : p.color
+            }
+          })
+          break
       }
       this.sqcdpParams = {
         name: 'sqcdpMaintain',
         query: {
           name: name,
-          sorties: false,
-          serialNumber: this.info.serialNumber,
-          data: []
+          sorties: this.info.aircraftSorties.defCode,
+          serialNumber: this.$route.query.serialNumber,
+          data: data
         }
       }
       this.$refs.SQCDPDialog.visible = true
-      // this.$router.push({
-      //   name: 'sqcdpMaintain',
-      //   query: {
-      //     name: name,
-      //     sorties: false,
-      //     serialNumber: this.info.serialNumber,
-      //     data: []
-      //   }
-      // })
     },
     /**
      * 路由跳转作业计划执行查询
@@ -2754,7 +2779,7 @@ export default {
       this.JobPlanExecutionQueryParams = {
         name: 'jobPlanExecutionSummary',
         query: {
-          serialNumber: this.$route.query.planId,
+          serialNumber: this.$route.query.serialNumber,
           // planId: this.$route.query.planId,
           model: this.$route.query.model,
           sorties: this.$route.query.sorties,
@@ -2771,9 +2796,11 @@ export default {
       this.siteProblemManagementSummaryParams = {
         name: 'siteProblemManagementSummary',
         query: {
+          serialNumber: this.$route.query.serialNumber,
           name: name,
           planId: this.$route.query.planId,
-          sorties: null// this.$route.query.sorties
+          model: this.$route.query.model,
+          sorties: this.$route.query.sorties
         }
       }
       this.$refs.SiteProblemManagementSummaryDialog.visible = true

applications/dee-mes/src/privateComponents/components/Visualization/ProductionKanban.vue

@@ -103,7 +103,7 @@
         @click="isFullClick"
       >
     </div>
-    <JobPlanExecutionQueryDialog ref="JobPlanExecutionQueryDialog" />
+    <JobPlanExecutionQueryDialog ref="JobPlanExecutionQueryDialog" :job-plan-execution-query-params="JobPlanExecutionQueryParams" />
   </div>
 
 </template>
@@ -332,6 +332,7 @@ export default {
         query: {
           title: '站位看板',
           planId: item.id,
+          serialNumber: item.serialNumber,
           model: this.sortiesRow.aircraftType.defName,
           sorties: this.sortiesRow.aircraftSorties.defCode,
           data: JSON.stringify(item)
@@ -342,14 +343,10 @@ export default {
    * 路由跳转作业计划执行查询
    */
     routerJobPlanExecutionSummary(planStateCode) {
-      if (planStateCode) {
-        console.log('跳转暂时未做，需要做的时候删除这段代码！')
-        return
-      }
       const params = {
         name: 'jobPlanExecutionSummary',
         query: {
-          serialNumber: this.stationRow.id,
+          serialNumber: this.stationRow.serialNumber,
           model: this.sortiesRow.aircraftType.defName,
           sorties: this.sortiesRow.aircraftSorties.defCode,
           planStateCode: false
@@ -357,25 +354,25 @@ export default {
       }
       switch (planStateCode) {
         case '架次总数':
-          params.query.planStateCode = ['执行中', '已派工', '已下发', '已下达', '完工', '未下达']
+          params.query.planStateCode = ['Run', 'Delivery', 'Issued', 'Yes', 'Finish', 'Not', 'Paused', 'Reserved', 'TF_ZF']
           params.query.serialNumber = null
           break
         case '架次已开工':
-          params.query.planStateCode = ['执行中', '已派工', '已下发']
+          params.query.planStateCode = ['Run', 'Delivery', 'Issued']
           params.query.serialNumber = null
           break
         case '架次已完工':
-          params.query.planStateCode = ['完工']
+          params.query.planStateCode = ['Finish']
           params.query.serialNumber = null
           break
         case '站位总数':
-          params.query.planStateCode = ['执行中', '已派工', '已下发', '已下达', '完工', '未下达']
+          params.query.planStateCode = ['Run', 'Delivery', 'Issued', 'Yes', 'Finish', 'Not', 'Paused', 'Reserved', 'TF_ZF']
           break
         case '站位已开工':
-          params.query.planStateCode = ['执行中', '已派工', '已下发']
+          params.query.planStateCode = ['Run', 'Delivery', 'Issued']
           break
         case '站位已完工':
-          params.query.planStateCode = ['完工']
+          params.query.planStateCode = ['Finish']
           break
         default:
           params.query.planStateCode = false
@@ -395,6 +392,7 @@ export default {
         path: '/page/1365d099-837a-4a7d-8e61-5a59eb8d75d4',
         query: {
           title: '飞机组装总体站位看板',
+          serialNumber: this.stationRow.serialNumber,
           model: this.sortiesRow.aircraftType.defName,
           sorties: this.sortiesRow.aircraftSorties.defCode,
           data: JSON.stringify(data)