From 65a8aae99713d33a05e11268a745c095cbdbf4a6 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Fri, 9 Aug 2024 14:49:39 +0800
Subject: [PATCH] month

---
 .../src/views/yys/yysdevicedata/index.vue     | 42 +++++++++----------
 .../src/views/yys/yysdevicewarn/index.vue     | 10 ++---
 .../yys/yysdevicewarnstatistics/index.vue     | 10 ++---
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevicedata/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevicedata/index.vue
index ce4f763..371c2a9 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevicedata/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevicedata/index.vue
@@ -23,11 +23,11 @@
                 </el-form>
             </el-row>
             <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
+                <!-- <div class="JNPF-common-head">
+                    <div> -->
                         <!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
                         </el-button> -->
-                    </div>
+                    <!-- </div>
                     <div class="JNPF-common-head-right">
                         <el-tooltip content="高级查询" placement="top" v-if="true">
                             <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@@ -38,72 +38,72 @@
                                 @click="initData()" />
                         </el-tooltip>
                     </div>
-                </div>
+                </div> -->
                 <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
                     :span-method="arraySpanMethod" border>
-                    <el-table-column prop="productionLine" label="产线" align="center">
+                    <el-table-column prop="productionLine" label="产线" align="center"  width="200">
                     </el-table-column>
-                    <el-table-column prop="productionTime" label="生产时间" align="center">
+                    <el-table-column prop="productionTime" label="生产时间" align="center" width="200">
                     </el-table-column>
-                    <el-table-column prop="collectionTtime" label="采集时间时间" align="center">
+                    <el-table-column prop="collectionTtime" label="采集时间时间" align="center" width="200">
                     </el-table-column>
-                    <el-table-column prop="productionModels" label="产品型号" align="center">
+                    <el-table-column prop="productionModels" label="产品型号" align="center" width="200">
                     </el-table-column>
-                    <el-table-column prop="productionName" label="产品名称(含型号)" align="center">
+                    <el-table-column prop="productionName" label="产品名称(含型号)" align="center" width="200">
                     </el-table-column>
-                    <el-table-column prop="productionSpeed" label="生产速度" align="center">
+                    <el-table-column prop="productionSpeed" label="生产速度" align="center" width="200">
                         <template slot-scope="scope" v-if="scope.row.productionSpeed">
                             <JnpfNumber v-model="scope.row.productionSpeed" :thousands="false" />
                         </template>
                     </el-table-column>
-                    <el-table-column prop="productionNum" label="生产数量" align="center">
+                    <el-table-column prop="productionNum" label="生产数量" align="center" width="200">
                         <template slot-scope="scope" v-if="scope.row.productionNum">
                             <JnpfNumber v-model="scope.row.productionNum" :thousands="false" />
                         </template>
                     </el-table-column>
-                    <el-table-column prop="dayNum" label="当日生产数量" align="center">
+                    <el-table-column prop="dayNum" label="当日生产数量" align="center" width="200">
                         <template slot-scope="scope" v-if="scope.row.dayNum">
                             <JnpfNumber v-model="scope.row.dayNum" :thousands="false" />
                         </template>
                     </el-table-column>
-                    <el-table-column prop="dayQualifiedNum" label="当日生产合格数" align="center">
+                    <el-table-column prop="dayQualifiedNum" label="当日生产合格数" align="center" width="200">
                         <template slot-scope="scope" v-if="scope.row.dayQualifiedNum">
                             <JnpfNumber v-model="scope.row.dayQualifiedNum" :thousands="false" />
                         </template>
                     </el-table-column>
-                    <el-table-column prop="dayBadNum" label="当日不良品数" align="center">
+                    <el-table-column prop="dayBadNum" label="当日不良品数" align="center" width="200">
                         <template slot-scope="scope" v-if="scope.row.dayBadNum">
                             <JnpfNumber v-model="scope.row.dayBadNum" :thousands="false" />
                         </template>
                     </el-table-column>
-                    <el-table-column prop="dayPassRate" label="当日合格率" align="center">
+                    <el-table-column prop="dayPassRate" label="当日合格率" align="center" width="200">
                         <template slot-scope="scope" v-if="scope.row.dayPassRate">
                             <JnpfNumber v-model="scope.row.dayPassRate" :thousands="false" />
                         </template>
                     </el-table-column>
-                    <el-table-column prop="dayOnTime" label="当日开机时间（s）" align="center">
+                    <el-table-column prop="dayOnTime" label="当日开机时间（s）" align="center" width="200">
                         <template slot-scope="scope" v-if="scope.row.dayOnTime">
                             <JnpfNumber v-model="scope.row.dayOnTime" :thousands="false" />
                         </template>
                     </el-table-column>
-                    <el-table-column prop="dayLoadingTime" label="当日负荷时间(s)" align="center">
+                    <el-table-column prop="dayLoadingTime" label="当日负荷时间(s)" align="center" width="200">
                         <template slot-scope="scope" v-if="scope.row.dayLoadingTime">
                             <JnpfNumber v-model="scope.row.dayLoadingTime" :thousands="false" />
                         </template>
                     </el-table-column>
-                    <el-table-column prop="dayStopTime" label="当日停机时间（s）" align="center">
+                    <el-table-column prop="dayStopTime" label="当日停机时间（s）" align="center" width="200">
                         <template slot-scope="scope" v-if="scope.row.dayStopTime">
                             <JnpfNumber v-model="scope.row.dayStopTime" :thousands="false" />
                         </template>
                     </el-table-column>
-                    <el-table-column prop="dayStopNum" label="当日停机次数" align="center">
+                    <el-table-column prop="dayStopNum" label="当日停机次数" align="center" width="200">
                         <template slot-scope="scope" v-if="scope.row.dayStopNum">
                             <JnpfNumber v-model="scope.row.dayStopNum" :thousands="false" />
                         </template>
                     </el-table-column>
-                    <el-table-column prop="oee" label="OEE" align="center">
+                    <el-table-column prop="oee" label="OEE" align="center" width="200">
                         <template slot-scope="scope" v-if="scope.row.oee">
-                            <JnpfNumber v-model="scope.row.oee" :thousands="false" />
+                            <JnpfNumber v-model="scope.row.oee" :thousands="false"  />
                         </template>
                     </el-table-column>
                     <!-- <el-table-column label="操作" fixed="right" width="150">
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevicewarn/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevicewarn/index.vue
index 7eddf32..1574b5e 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevicewarn/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevicewarn/index.vue
@@ -23,11 +23,11 @@
                 </el-form>
             </el-row>
             <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
+                <!-- <div class="JNPF-common-head"> -->
+                    <!-- <div> -->
                         <!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
                         </el-button> -->
-                    </div>
+                    <!-- </div>
                     <div class="JNPF-common-head-right">
                         <el-tooltip content="高级查询" placement="top" v-if="true">
                             <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@@ -37,8 +37,8 @@
                             <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
                                 @click="initData()" />
                         </el-tooltip>
-                    </div>
-                </div>
+                    </div> -->
+                <!-- </div> -->
                 <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
                     :span-method="arraySpanMethod" border>
                     <el-table-column prop="productionLine" label="产线" align="center">
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevicewarnstatistics/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevicewarnstatistics/index.vue
index 347b0d2..3cfb5b0 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevicewarnstatistics/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevicewarnstatistics/index.vue
@@ -24,12 +24,12 @@
                 </el-form>
             </el-row>
             <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
+                <!-- <div class="JNPF-common-head"> -->
                     <!-- <div>
                         <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
                         </el-button>
                     </div> -->
-                    <div class="JNPF-common-head-right">
+                    <!-- <div class="JNPF-common-head-right">
                         <el-tooltip content="高级查询" placement="top" v-if="true">
                             <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
                                 @click="openSuperQuery()" />
@@ -37,9 +37,9 @@
                         <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
                             <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
                                 @click="initData()" />
-                        </el-tooltip>
-                    </div>
-                </div>
+                        </el-tooltip> -->
+                    <!-- </div> -->
+                <!-- </div> -->
                 <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
                     :span-method="arraySpanMethod" border>
                     <el-table-column prop="classes" label="班次" align="center">