update

Lius

2024-09-26 5a9630b08ae608e2248c44271d8c08e140a4487b

update

 src/views/dashboard/BranchFactorySignage.vue

@@ -546,7 +546,7 @@
            data: data
          }],
          series: [{
            name: '利用率',
            name: 'TEEP',
            type: 'bar',
            zlevel: 1,
            itemStyle: {
@@ -608,7 +608,7 @@
            }
          ]
        }
        option.title.text = `${moment().subtract(1, 'days').format('M月D日')}利用率`
        option.title.text = `${moment().subtract(1, 'days').format('M月D日')}TEEP`
        this.efficiencyChart.setOption(option, true)
        this.efficiencyChart.hideLoading()

@@ -1018,7 +1018,7 @@
                }
              }
            },
            data: ['OEE', '利用率']
            data: ['OEE', 'TEEP']
          },
          xAxis: {
            type: 'category',
@@ -1108,7 +1108,7 @@
            type: 'bar',
            barWidth: 15,
            itemStyle: { barBorderRadius: 100 },
            name: '利用率',
            name: 'TEEP',
            data: this.doubleBarChartData.utilizationList,
            label: {
              show: false,

 src/views/dashboard/EquipmentSignage.vue

@@ -623,8 +623,8 @@
            }
          })
          .finally(() => {
            option.title.text = moment().subtract(1, 'days').format('M月D日') + '利用率'
            option.series[0].name = '利用率'
            option.title.text = moment().subtract(1, 'days').format('M月D日') + 'TEEP'
            option.series[0].name = 'TEEP'
            option.series[0].data = [this.gaugeChartData.utilizationRate]
            this.gaugeChart1.setOption(option, true)
            setTimeout(() => this.gaugeChart1.hideLoading(), this.hideLoadingDelayTime)
@@ -749,7 +749,7 @@
          xAxis: this.lineChartData.dateList,
          yAxis: [
            {
              name: '利用率',
              name: 'TEEP',
              value: this.lineChartData.dataList.map(item => item.utilizationRate)
            },
            {
@@ -761,7 +761,7 @@
              value: this.lineChartData.dataList.map(item => item.overallEquipmentEfficiency)
            }
          ],
          yAxisName: '整年度利用率(%)'
          yAxisName: '整年度TEEP(%)'
        }
        let legendData = []
        let seriesData = []

 src/views/dashboard/IndexSignage.vue

@@ -536,7 +536,7 @@
            data: data
          }],
          series: [{
            name: '利用率',
            name: 'TEEP',
            type: 'bar',
            zlevel: 1,
            itemStyle: {
@@ -598,7 +598,7 @@
            }
          ]
        }
        option.title.text = `${moment().subtract(1, 'days').format('M月D日')}利用率`
        option.title.text = `${moment().subtract(1, 'days').format('M月D日')}TEEP`
        this.efficiencyChart.setOption(option, true)
        this.efficiencyChart.hideLoading()
        this.efficiencyChart.on('click', params => {
@@ -1002,7 +1002,7 @@
                }
              }
            },
            data: ['OEE', '利用率']
            data: ['OEE', 'TEEP']
          },
          xAxis: {
            type: 'category',
@@ -1092,7 +1092,7 @@
            type: 'bar',
            barWidth: 15,
            itemStyle: { barBorderRadius: 100 },
            name: '利用率',
            name: 'TEEP',
            data: this.doubleBarChartData.utilizationList,
            label: {
              show: false,

 src/views/dashboard/WorkshopSectionSignage.vue

@@ -660,7 +660,7 @@
          xAxis: equipmentIdList,
          yAxis: [
            {
              name: '利用率',
              name: 'TEEP',
              value: this.first7DaysEfficiencyData.dataList.map(item => item.utilizationRate)
            },
            {
@@ -672,7 +672,7 @@
              value: this.first7DaysEfficiencyData.dataList.map(item => item.openRate)
            }
          ],
          yAxisName: '前7天利用率(%)'
          yAxisName: '前7天TEEP(%)'
        }
        let legendData = []
        let seriesData = []
@@ -953,8 +953,8 @@
            }
          })
          .finally(() => {
            option.title.text = moment().subtract(1, 'days').format('M月D日') + `利用率`
            option.series[0].name = '利用率'
            option.title.text = moment().subtract(1, 'days').format('M月D日') + `TEEP`
            option.series[0].name = 'TEEP'
            option.series[0].data = [this.gaugeChartData.utilizationRate]
            this.gaugeChart1.setOption(option, true)
            this.gaugeChart1.hideLoading()

 src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue

@@ -49,17 +49,33 @@
                />
              </a-form-item>
            </a-col>
<!--            <a-col :md="5" :sm="5" :xs="5">-->
<!--              <a-form-item label="设备种类">-->
<!--                <a-select-->
<!--                  :value="queryParams.deviceCategory"-->
<!--                  mode="multiple"-->
<!--                  placeholder="请选择设备种类"-->
<!--                  allow-clear-->
<!--                  :maxTagCount="1"-->
<!--                  @change="selectChange($event,'deviceCategory')"-->
<!--                >-->
<!--                  <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">-->
<!--                    {{item.label}}-->
<!--                  </a-select-option>-->
<!--                </a-select>-->
<!--              </a-form-item>-->
<!--            </a-col>-->
            <a-col :md="5" :sm="5" :xs="5">
              <a-form-item label="设备种类">
              <a-form-item label="设备级别">
                <a-select
                  :value="queryParams.deviceCategory"
                  :value="queryParams.deviceLevel"
                  mode="multiple"
                  placeholder="请选择设备种类"
                  placeholder="请选择设备级别"
                  allow-clear
                  :maxTagCount="1"
                  @change="selectChange($event,'deviceCategory')"
                  @change="selectChange($event,'deviceLevel')"
                >
                  <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
                  <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
                    {{item.label}}
                  </a-select-option>
                </a-select>
@@ -78,22 +94,7 @@
          </a-row>

          <a-row :gutter="24" v-if="toggleSearchStatus">
            <a-col :md="5" :sm="5" :xs="5">
              <a-form-item label="设备级别">
                <a-select
                  :value="queryParams.deviceLevel"
                  mode="multiple"
                  placeholder="请选择设备级别"
                  allow-clear
                  :maxTagCount="1"
                  @change="selectChange($event,'deviceLevel')"
                >
                  <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
                    {{item.label}}
                  </a-select-option>
                </a-select>
              </a-form-item>
            </a-col>

            <!--<a-col :md="5" :sm="5" :xs="5">-->
              <!--<a-form-item label="数据分布">-->
                <!--<a-select-->

 src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue

@@ -43,17 +43,33 @@
                                :allowClear="false"/>
              </a-form-item>
            </a-col>
<!--            <a-col :md="5" :sm="5" :xs="5">-->
<!--              <a-form-item label="设备种类">-->
<!--                <a-select-->
<!--                  :value="queryParams.deviceCategory"-->
<!--                  mode="multiple"-->
<!--                  placeholder="请选择设备种类"-->
<!--                  allow-clear-->
<!--                  :maxTagCount="1"-->
<!--                  @change="selectChange($event,'deviceCategory')"-->
<!--                >-->
<!--                  <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">-->
<!--                    {{item.label}}-->
<!--                  </a-select-option>-->
<!--                </a-select>-->
<!--              </a-form-item>-->
<!--            </a-col>-->
            <a-col :md="5" :sm="5" :xs="5">
              <a-form-item label="设备种类">
              <a-form-item label="设备级别">
                <a-select
                  :value="queryParams.deviceCategory"
                  :value="queryParams.deviceLevel"
                  mode="multiple"
                  placeholder="请选择设备种类"
                  placeholder="请选择设备级别"
                  allow-clear
                  :maxTagCount="1"
                  @change="selectChange($event,'deviceCategory')"
                  @change="selectChange($event,'deviceLevel')"
                >
                  <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
                  <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
                    {{item.label}}
                  </a-select-option>
                </a-select>
@@ -72,22 +88,7 @@
          </a-row>

          <a-row :gutter="24" v-if="toggleSearchStatus">
            <a-col :md="5" :sm="5" :xs="5">
              <a-form-item label="设备级别">
                <a-select
                  :value="queryParams.deviceLevel"
                  mode="multiple"
                  placeholder="请选择设备级别"
                  allow-clear
                  :maxTagCount="1"
                  @change="selectChange($event,'deviceLevel')"
                >
                  <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
                    {{item.label}}
                  </a-select-option>
                </a-select>
              </a-form-item>
            </a-col>

            <a-col :md="5" :sm="5" :xs="5">
              <a-form-item label="重要程度">
                <a-select
@@ -155,6 +156,8 @@
                </th>
                <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备类型
                </th>
                <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备型号
                </th>
                <!--<th rowspan="2">组别</th>-->
                <template v-for="(tableHead, index) in tableHeads">
                  <th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -197,6 +200,7 @@
                    {{item.equipmentName}}
                  </td>
                  <td class="tdgu5 kaitou">{{item.equipmentType}}</td>
                  <td class="tdgu5 kaitou">{{item.equipmentModel}}</td>
                </template>

                <template v-else>

 src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue

@@ -45,16 +45,16 @@
                </a-form-item>
              </a-col>
              <a-col :md="5" :sm="5" :xs="5">
                <a-form-item label="设备种类">
                <a-form-item label="设备级别">
                  <a-select
                    :value="queryParams.deviceCategory"
                    :value="queryParams.deviceLevel"
                    mode="multiple"
                    placeholder="请选择设备种类"
                    placeholder="请选择设备级别"
                    allow-clear
                    :maxTagCount="1"
                    @change="selectChange($event,'deviceCategory')"
                    @change="selectChange($event,'deviceLevel')"
                  >
                    <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
                    <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
                      {{item.label}}
                    </a-select-option>
                  </a-select>
@@ -73,22 +73,7 @@
            </a-row>

            <a-row :gutter="24" v-if="toggleSearchStatus">
              <a-col :md="5" :sm="5" :xs="5">
                <a-form-item label="设备级别">
                  <a-select
                    :value="queryParams.deviceLevel"
                    mode="multiple"
                    placeholder="请选择设备级别"
                    allow-clear
                    :maxTagCount="1"
                    @change="selectChange($event,'deviceLevel')"
                  >
                    <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
                      {{item.label}}
                    </a-select-option>
                  </a-select>
                </a-form-item>
              </a-col>

              <a-col :md="5" :sm="5" :xs="5">
                <a-form-item label="重要程度">
                  <a-select
@@ -168,7 +153,7 @@
              </tr>
              <tr class="thead notfixed gudingth">
                <template v-for="(tableHead, index) in tableHeads">
                  <th v-if="checkedList.indexOf('lyl') > -1">利用率(%)</th>
                  <th v-if="checkedList.indexOf('lyl') > -1">TEEP(%)</th>
                  <th v-if="checkedList.indexOf('kjl') > -1">开机率(%)</th>
                  <th v-if="checkedList.indexOf('kjsj') > -1">开机时间(小时)</th>
                  <th v-if="checkedList.indexOf('jgsj') > -1">加工时间(小时)</th>
@@ -218,7 +203,7 @@
                    {{tableHead.utilizationRate | numFilter}}
                  </td>
                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjl') > -1">
                    {{tableHead.openRate | n umFilter}}
                    {{tableHead.openRate | numFilter}}
                  </td>
                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjsj') > -1">
                    {{tableHead.openLong | getFormattedTime}}
@@ -282,7 +267,7 @@
        queryParamEquip: {},
        queryParamPeople: {},
        efficiencyOptions: [
          { label: '利用率', value: 'lyl' },
          { label: 'TEEP', value: 'lyl' },
          { label: '开机率', value: 'kjl' },
          { label: '开机时间', value: 'kjsj' },
          { label: '加工时间', value: 'jgsj' },
@@ -519,7 +504,7 @@
        $('#Efficiency').table2excel({
          exclude: '.noExl',
          name: 'Excel Document Name',
          filename: '设备利用率',
          filename: '设备TEEP',
          exclude_img: true,
          fileext: '.xls',
          exclude_links: true,

 src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue

@@ -77,22 +77,22 @@
            </a-row>

            <a-row :gutter="24" v-if="toggleSearchStatus">
              <a-col :md="5" :sm="5" :xs="5">
                <a-form-item label="设备种类">
                  <a-select
                    :value="queryParams.deviceCategory"
                    mode="multiple"
                    placeholder="请选择设备种类"
                    allow-clear
                    :maxTagCount="1"
                    @change="selectChange($event,'deviceCategory')"
                  >
                    <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
                      {{item.label}}
                    </a-select-option>
                  </a-select>
                </a-form-item>
              </a-col>
<!--              <a-col :md="5" :sm="5" :xs="5">-->
<!--                <a-form-item label="设备种类">-->
<!--                  <a-select-->
<!--                    :value="queryParams.deviceCategory"-->
<!--                    mode="multiple"-->
<!--                    placeholder="请选择设备种类"-->
<!--                    allow-clear-->
<!--                    :maxTagCount="1"-->
<!--                    @change="selectChange($event,'deviceCategory')"-->
<!--                  >-->
<!--                    <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">-->
<!--                      {{item.label}}-->
<!--                    </a-select-option>-->
<!--                  </a-select>-->
<!--                </a-form-item>-->
<!--              </a-col>-->
              <a-col :md="5" :sm="5" :xs="5">
                <a-form-item label="设备级别">
                  <a-select
@@ -177,6 +177,8 @@
                </th>
                <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备类型
                </th>
                <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备型号
                </th>
                <th class="thgu dong7 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">班次</th>
                <template v-for="(tableHead, index) in tableHeads">
                  <th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -219,6 +221,7 @@
                    {{item.equipmentName}}
                  </td>
                  <td class="tdgu5  kaitou">{{item.equipmentType}}</td>
                  <td class="tdgu5 kaitou">{{item.equipmentModel}}</td>
                  <td class="tdgu6  kaitou">{{item.shiftSubName}}</td>
                </template>