From 79da5e8ca14de46c94ac0e530356a8b0d5ba0e20 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 2 Aug 2024 17:07:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E6=BA=90=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=8F=8A=E5=A4=A7=E5=B1=8F=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-echarts/src/views/bottomRight.vue  | 280 +++++++++++------
 .../src/views/biz/energy/EnergyForm.vue       |   4 +-
 .../src/views/biz/energy/index.vue            | 291 ++++++++++--------
 .../src/views/majoys/screen/index.vue         | 202 ++++++------
 4 files changed, 447 insertions(+), 330 deletions(-)

diff --git a/mes-ui/mes-echarts/src/views/bottomRight.vue b/mes-ui/mes-echarts/src/views/bottomRight.vue
index 2b589d4b..7cf24ed6 100644
--- a/mes-ui/mes-echarts/src/views/bottomRight.vue
+++ b/mes-ui/mes-echarts/src/views/bottomRight.vue
@@ -8,159 +8,238 @@
         </div>
       </div>
       <div class="ranking bg-color-black">
-        <span class="ranking_span">各产品合格率(%)</span>
-        <div class="item">
+        <span class="ranking_span"> 能源管理</span>
+        <div id="chart" ref="chart" style="width: 500px; height: 200px"></div>
+
+        <!-- <div class="item">
           <div v-for="item in productOKRateList" :key="item.ProductName" class="ranking1">
             <dv-water-level-pond :config="item.config" style="width:105px;height:60px" />
             <span class="item_span">{{ item.ProductName }}</span>
           </div>
-        </div>
+        </div> -->
       </div>
-
     </div>
   </div>
 </template>
 
 <script>
-import bottomRightChart from "@/components/echart/bottom/bottomRightChart";
+import bottomRightChart from '@/components/echart/bottom/bottomRightChart'
 // import CenterChart from '@/components/echart/center/centerChartRate'
-import { request } from "@/utils/request.js";
+import { request } from '@/utils/request.js'
+import * as echarts from 'echarts'
 export default {
   components: {
     // CenterChart,
-    bottomRightChart,
+    bottomRightChart
   },
 
   data() {
     return {
       water: {
         data: [24, 45],
-        shape: "roundRect",
-        formatter: "{value}%",
-        waveNum: 3,
+        shape: 'roundRect',
+        formatter: '{value}%',
+        waveNum: 3
       },
       productOKRateList: [],
       config: {
         data: [10],
-        shape: "round",
+        shape: 'round',
         waveHeight: 10,
         waveNum: 2,
-        colors: ["#00FFFF", "#00B2EE"],
+        colors: ['#00FFFF', '#00B2EE']
       },
       // 通过率和达标率的组件复用数据
       rate: [
         {
-          id: "centerRate1",
+          id: 'centerRate1',
           tips: 60,
           colorData: {
-            textStyle: "#3fc0fb",
+            textStyle: '#3fc0fb',
             series: {
-              color: ["#00bcd44a", "transparent"],
+              color: ['#00bcd44a', 'transparent'],
               dataColor: {
-                normal: "#03a9f4",
-                shadowColor: "#97e2f5",
-              },
-            },
-          },
+                normal: '#03a9f4',
+                shadowColor: '#97e2f5'
+              }
+            }
+          }
         },
         {
-          id: "centerRate2",
+          id: 'centerRate2',
           tips: 40,
           colorData: {
-            textStyle: "#67e0e3",
+            textStyle: '#67e0e3',
             series: {
-              color: ["#faf3a378", "transparent"],
+              color: ['#faf3a378', 'transparent'],
               dataColor: {
-                normal: "#ff9800",
-                shadowColor: "#fcebad",
-              },
-            },
-          },
-        },
+                normal: '#ff9800',
+                shadowColor: '#fcebad'
+              }
+            }
+          }
+        }
       ],
-    };
+      dates: [],
+      waters: [],
+      electricals: [],
+      gas: []
+    }
   },
   created() {
     // 使用 localStorage.getItem 通过键名获取存储的值
-    const storedString = localStorage.getItem("myStoredArray");
+    const storedString = localStorage.getItem('myStoredArray')
     // 检查存储的值是否存在
     if (storedString !== null) {
       // 使用 JSON.parse 将字符串反序列化回数组
-      this.retrievedArray = JSON.parse(storedString);
+      this.retrievedArray = JSON.parse(storedString)
       this.retrievedArray.filter((item) => {
-        if (item.type == "QualifiedRateOfEachProduct") {
-          if (item.openMock == 1) {
-            var datalist = JSON.parse(item.mockData);
-            // this.productOKRateList = datalist[0];
-            const EachProductmock=[]
-            for (let i = 0; i < datalist[0].length; i++) {
-              const newRowmk = [];
-              for (let j = 0; j < datalist.length; j++) {
-                newRowmk.push(datalist[j][i]);
-              }
-              EachProductmock.push(newRowmk);
-            }
-            this.productOKRateList = [];
-            for (const item of EachProductmock) {
-              var n = {
-                data: [item[1]*1],
-                shape: "roundRect",
-                formatter: "{value}%",
-                waveNum: 2,
-                waveHeight: 10,
-                // 判断合格率低于95显示红色
-                colors:
-                  item[1] > 95
-                    ? ["#00FFFF", "#00B2EE"]
-                    : ["#ff6600", "#cc0000"],
-              };
-              this.productOKRateList.push({
-                ProductName: item[0],
-                config: n,
-              });
-            }
-          } else {
-            var datalist = JSON.parse(item.data);
-            // this.productOKRateList = datalist[0];
-            const EachProductmock=[]
-            for (let i = 0; i < datalist[0].length; i++) {
-              const newRowmk = [];
-              for (let j = 0; j < datalist.length; j++) {
-                newRowmk.push(datalist[j][i]);
-              }
-              EachProductmock.push(newRowmk);
-            }
-            this.productOKRateList = [];
-            for (const item of EachProductmock) {
-              var n = {
-                data: [item[1]*1],
-                shape: "roundRect",
-                formatter: "{value}%",
-                waveNum: 2,
-                waveHeight: 10,
-                // 判断合格率低于95显示红色
-                colors:
-                  item[1] > 95
-                    ? ["#00FFFF", "#00B2EE"]
-                    : ["#ff6600", "#cc0000"],
-              };
-              this.productOKRateList.push({
-                ProductName: item[0],
-                config: n,
-              });
-            }
-          }
+        if (item.type == 'QualifiedRateOfEachProduct') {
+          var datalist = JSON.parse(item.data)
+
+          datalist[0].forEach((item) => {
+            item = item.substring(5)
+            this.dates.push(item)
+          })
+          this.waters = datalist[1]
+          this.electricals = datalist[2]
+          this.gas = datalist[3]
         }
-      });
+      })
     }
   },
   mounted() {
-  
+    this.initChart()
   },
   methods: {
-  
-  },
-};
+    initChart() {
+      // 初始化 ECharts 实例
+      const chartInstance = echarts.init(this.$refs.chart)
+
+      // 指定图表的配置项和数据
+      const option = {
+        color: ['#5b9bd5', '#ed7d31'],
+        grid: {
+          top: 20,
+          bottom: 70,
+          left: '12%',
+          right: '2%',
+          show: false,
+          axisLine: { lineStyle: { color: 'transparent' } },
+          axisTick: { show: false },
+          splitLine: { show: false }
+        },
+        legend: {
+          bottom: '10',
+          itemWidth: 30,
+          itemHeight: 6,
+          data: ['水(吨)', '电(度)', '气(立方米)'],
+          textStyle: {
+            color: '#fff'
+          }
+        },
+        xAxis: [
+          {
+            // name: '日期',
+            nameLocation: 'center',
+            nameTextStyle: {
+              color: '#fff'
+            },
+            nameGap: 50,
+            axisLine: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            },
+            axisLabel: {
+              rotate: 50,
+              color: '#fff',
+              interval: 0
+            },
+            splitLine: {
+              show: false,
+              lineStyle: {
+                color: '#fff'
+              }
+            },
+            data: this.dates
+          }
+        ],
+        yAxis: [
+          {
+            name: '能源消耗',
+            nameLocation: 'center',
+            nameGap: 40,
+            nameTextStyle: {
+              color: '#fff'
+            },
+            axisLine: {
+              lineStyle: {
+                color: '#fff'
+              }
+            },
+            axisTick: {
+              show: false
+            },
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: '#CCC'
+              }
+            },
+            axisLabel: {
+              color: '#fff'
+            }
+          }
+        ],
+        series: [
+          {
+            name: '水(吨)',
+            type: 'line',
+            itemStyle: {
+              color: '#5b9bd5',
+              borderColor: '#5b9bd5',
+              borderWidth: 4
+            },
+            lineStyle: {
+              width: 4
+            },
+            data: this.waters
+          },
+          {
+            name: '电(度)',
+            type: 'line',
+            itemStyle: {
+              color: '#ed7d31',
+              borderColor: '#ed7d31',
+              borderWidth: 4
+            },
+            lineStyle: {
+              width: 4
+            },
+            data: this.electricals
+          },
+          {
+            name: '气(立方米)',
+            type: 'line',
+            itemStyle: {
+              color: 'rgb(25 190 107)',
+              borderColor: 'rgb(25 190 107)',
+              borderWidth: 4
+            },
+            lineStyle: {
+              width: 4
+            },
+            data: this.gas
+          }
+        ]
+      }
+      // 使用刚指定的配置项和数据显示图表。
+      chartInstance.setOption(option)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -214,7 +293,7 @@ export default {
         display: inline-block;
         padding: 5px 0;
         text-align: center;
-        width:100px;
+        width: 100px;
         overflow: hidden; /* 隐藏超出的内容 */
         text-overflow: ellipsis; /* 添加省略号 */
         white-space: nowrap; /* 防止内容换行 */
@@ -249,4 +328,3 @@ export default {
   }
 }
 </style>
-
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/energy/EnergyForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/energy/EnergyForm.vue
index c8cdd10d..1897cdac 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/energy/EnergyForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/energy/EnergyForm.vue
@@ -4,7 +4,7 @@
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="130px"
       v-loading="formLoading"
     >
       <el-form-item label="能源所属日期" prop="energyDate">
@@ -105,4 +105,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/energy/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/energy/index.vue
index 4a12bd16..27f89c02 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/energy/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/energy/index.vue
@@ -1,139 +1,142 @@
 <template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="编号" prop="id">
-        <el-input
-          v-model="queryParams.id"
-          placeholder="请输入编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="能源所属日期" prop="energyDate">
-        <el-date-picker
-          v-model="queryParams.energyDate"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="水(吨)" prop="waterNum">
-        <el-input
-          v-model="queryParams.waterNum"
-          placeholder="请输入水(吨)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="电(度)" prop="electricalNum">
-        <el-input
-          v-model="queryParams.electricalNum"
-          placeholder="请输入电(度)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="气(立方米)" prop="gasNum">
-        <el-input
-          v-model="queryParams.gasNum"
-          placeholder="请输入气(立方米)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['biz:energy:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['biz:energy:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="能源所属日期" align="center" prop="energyDate" />
-      <el-table-column label="水(吨)" align="center" prop="waterNum" />
-      <el-table-column label="电(度)" align="center" prop="electricalNum" />
-      <el-table-column label="气(立方米)" align="center" prop="gasNum" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
+  <el-card class="hl-card">
+    <template #header>
+      <span>能源管理</span>
+    </template>
+    <ContentWrap>
+      <!-- 搜索工作栏 -->
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="120px"
+      >
+        <!-- <el-form-item label="编号" prop="id">
+          <el-input
+            v-model="queryParams.id"
+            placeholder="请输入编号"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item> -->
+        <el-form-item label="能源所属日期" prop="energyDate">
+          <el-date-picker
+            v-model="getDateRangevalue"
+            type="date"
+            placeholder="发生时间"
+            class="!w-240px"
+            @change="getDateRange"
+          />
+        </el-form-item>
+        <!-- <el-form-item label="水(吨)" prop="waterNum">
+          <el-input
+            v-model="queryParams.waterNum"
+            placeholder="请输入水(吨)"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="电(度)" prop="electricalNum">
+          <el-input
+            v-model="queryParams.electricalNum"
+            placeholder="请输入电(度)"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="气(立方米)" prop="gasNum">
+          <el-input
+            v-model="queryParams.gasNum"
+            placeholder="请输入气(立方米)"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-date-picker
+            v-model="queryParams.createTime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            type="daterange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+            class="!w-240px"
+          />
+        </el-form-item> -->
+        <el-form-item style="margin-left: 40px;">
+          <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
           <el-button
-            link
             type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['biz:energy:update']"
+            plain
+            @click="openForm('create')"
+            v-hasPermi="['biz:energy:create']"
           >
-            编辑
+            <Icon icon="ep:plus" class="mr-5px" /> 新增
           </el-button>
           <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['biz:energy:delete']"
+            type="success"
+            plain
+            @click="handleExport"
+            :loading="exportLoading"
+            v-hasPermi="['biz:energy:export']"
           >
-            删除
+            <Icon icon="ep:download" class="mr-5px" /> 导出
           </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+
+    <!-- 列表 -->
+    <ContentWrap>
+      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table" >
+        <el-table-column label="编号" align="center" prop="id" min-width="100"/>
+        <el-table-column label="能源所属日期" align="center" prop="energyDate"  min-width="220"/>
+        <el-table-column label="水(吨)" align="center" prop="waterNum"  min-width="100"/>
+        <el-table-column label="电(度)" align="center" prop="electricalNum"  min-width="100"/>
+        <el-table-column label="气(立方米)" align="center" prop="gasNum"  min-width="100"/>
+        <el-table-column
+          label="创建时间"
+          align="center"
+          prop="createTime"
+          :formatter="dateFormatter"
+          min-width="220px"
+        />
+        <el-table-column label="操作" align="center"  min-width="100">
+          <template #default="scope">
+            <el-button
+              link
+              type="primary"
+              @click="openForm('update', scope.row.id)"
+              v-hasPermi="['biz:energy:update']"
+            >
+              编辑
+            </el-button>
+            <el-button
+              link
+              type="danger"
+              @click="handleDelete(scope.row.id)"
+              v-hasPermi="['biz:energy:delete']"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <Pagination
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </ContentWrap>
+  </el-card>
 
   <!-- 表单弹窗：添加/修改 -->
   <EnergyForm ref="formRef" @success="getList" />
@@ -162,15 +165,45 @@ const queryParams = reactive({
   electricalNum: undefined,
   gasNum: undefined,
   createTime: [],
+  sDate:undefined,
+  eDate:undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
+const getDateRangevalue = ref() // 日期范围
+//处理日期
+const getDateRange = (getDateRangevalue) => {
+  if (getDateRangevalue == null) {
+    queryParams.sDate = undefined
+    queryParams.eDate = undefined
+  } else {
+    queryParams.sDate =
+      getDateRangevalue.toLocaleDateString('en-CA', {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit'
+      }) +
+      ' ' +
+      '00:00:00'
+    queryParams.eDate =
+      getDateRangevalue.toLocaleDateString('en-CA', {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit'
+      }) +
+      ' ' +
+      '23:59:59'
+  }
+}
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {
     const data = await EnergyApi.getEnergyPage(queryParams)
+    data.list.forEach((item: any) => {
+      item.energyDate = item.energyDate.join('-')
+    })
     list.value = data.list
     total.value = data.total
   } finally {
@@ -228,4 +261,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/majoys/screen/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/majoys/screen/index.vue
index ff0ab759..c47d1798 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/majoys/screen/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/majoys/screen/index.vue
@@ -241,7 +241,7 @@
           </el-table-column>
         </el-table>
       </el-card>
-      <el-card class="hl-card-info">
+      <!-- <el-card class="hl-card-info">
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">各产品合格率(%)</span>
         </template>
@@ -276,7 +276,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </el-card>
+      </el-card> -->
       <el-card class="hl-card-info">
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">设备状态</span>
@@ -403,21 +403,21 @@ const mockDataSwitchChange = async () => {
     formData.value.ProductionOrderState.openMock = 0
     formData.value.QuantityOfEachProductProduced.openMock = 0
     formData.value.UtilizationRateOfEquipment.openMock = 0
-    formData.value.QualifiedRateOfEachProduct.openMock = 0
+    // formData.value.QualifiedRateOfEachProduct.openMock = 0
     formData.value.EquipmentOperationState.openMock = 0
 
     formData.value.ProductionStateList.data = oldProductionStateListdata.value
     formData.value.ProductionOrderState.data = oldProductionOrderStatedata.value
     formData.value.QuantityOfEachProductProduced.data = oldQuantityOfEachProductProduceddata.value
     formData.value.UtilizationRateOfEquipment.data = oldUtilizationRateOfEquipmentdata.value
-    debugger
-    formData.value.QualifiedRateOfEachProduct.data = oldQualifiedRateOfEachProductdata.value
+    // debugger
+    // formData.value.QualifiedRateOfEachProduct.data = oldQualifiedRateOfEachProductdata.value
     formData.value.EquipmentOperationState.data = oldEquipmentOperationStatedata.value
     await ScreenApi.updateScreen(formData.value.ProductionStateList)
     await ScreenApi.updateScreen(formData.value.ProductionOrderState)
     await ScreenApi.updateScreen(formData.value.QuantityOfEachProductProduced)
     await ScreenApi.updateScreen(formData.value.UtilizationRateOfEquipment)
-    await ScreenApi.updateScreen(formData.value.QualifiedRateOfEachProduct)
+    // await ScreenApi.updateScreen(formData.value.QualifiedRateOfEachProduct)
     await ScreenApi.updateScreen(formData.value.EquipmentOperationState)
     reload()
   } else {
@@ -426,7 +426,7 @@ const mockDataSwitchChange = async () => {
     formData.value.ProductionOrderState.openMock = 1
     formData.value.QuantityOfEachProductProduced.openMock = 1
     formData.value.UtilizationRateOfEquipment.openMock = 1
-    formData.value.QualifiedRateOfEachProduct.openMock = 1
+    // formData.value.QualifiedRateOfEachProduct.openMock = 1
     formData.value.EquipmentOperationState.openMock = 1
     //如果mockdata里有值 页面显示模拟数据
     //把mockData字符chuan串转成数组
@@ -442,9 +442,9 @@ const mockDataSwitchChange = async () => {
     formData.value.UtilizationRateOfEquipment.mockData = JSON.parse(
       formData.value.UtilizationRateOfEquipment.mockData
     )
-    formData.value.QualifiedRateOfEachProduct.mockData = JSON.parse(
-      formData.value.QualifiedRateOfEachProduct.mockData
-    )
+    // formData.value.QualifiedRateOfEachProduct.mockData = JSON.parse(
+    //   formData.value.QualifiedRateOfEachProduct.mockData
+    // )
     formData.value.EquipmentOperationState.mockData = JSON.parse(
       formData.value.EquipmentOperationState.mockData
     )
@@ -477,17 +477,17 @@ const mockDataSwitchChange = async () => {
       }
       formData.value.UtilizationRateOfEquipment.data = Equipmentmock
     }
-    if (formData.value.QualifiedRateOfEachProduct.mockData[0]?.length > 0) {
-      const EachProductmock = []
-      for (let i = 0; i < formData.value.QualifiedRateOfEachProduct.mockData[0].length; i++) {
-        const newRowmk = []
-        for (let j = 0; j < formData.value.QualifiedRateOfEachProduct.mockData.length; j++) {
-          newRowmk.push(formData.value.QualifiedRateOfEachProduct.mockData[j][i])
-        }
-        EachProductmock.push(newRowmk)
-      }
-      formData.value.QualifiedRateOfEachProduct.data = EachProductmock
-    }
+    // if (formData.value.QualifiedRateOfEachProduct.mockData[0]?.length > 0) {
+    //   const EachProductmock = []
+    //   for (let i = 0; i < formData.value.QualifiedRateOfEachProduct.mockData[0].length; i++) {
+    //     const newRowmk = []
+    //     for (let j = 0; j < formData.value.QualifiedRateOfEachProduct.mockData.length; j++) {
+    //       newRowmk.push(formData.value.QualifiedRateOfEachProduct.mockData[j][i])
+    //     }
+    //     EachProductmock.push(newRowmk)
+    //   }
+    //   formData.value.QualifiedRateOfEachProduct.data = EachProductmock
+    // }
     if (formData.value.EquipmentOperationState.mockData[0]?.length > 0) {
       formData.value.EquipmentOperationState.data = formData.value.EquipmentOperationState.mockData
     }
@@ -550,16 +550,16 @@ const formData: any = ref({
     openMock: 0,
     mockData: [[], []]
   },
-  QualifiedRateOfEachProduct: {
-    date: '20240328',
-    type: 'QualifiedRateOfEachProduct',
-    definition: {
-      '1D': ['product', 'qualifiedRate']
-    },
-    data: [[], []],
-    openMock: 0,
-    mockData: [[], []]
-  },
+  // QualifiedRateOfEachProduct: {
+  //   date: '20240328',
+  //   type: 'QualifiedRateOfEachProduct',
+  //   definition: {
+  //     '1D': ['product', 'qualifiedRate']
+  //   },
+  //   data: [[], []],
+  //   openMock: 0,
+  //   mockData: [[], []]
+  // },
   EquipmentOperationState: {
     date: '20240328',
     type: 'EquipmentOperationState',
@@ -597,7 +597,7 @@ const oldProductionStateListdata = ref([])
 const oldProductionOrderStatedata = ref([])
 const oldQuantityOfEachProductProduceddata = ref([])
 const oldUtilizationRateOfEquipmentdata = ref([])
-const oldQualifiedRateOfEachProductdata = ref([])
+// const oldQualifiedRateOfEachProductdata = ref([])
 const oldEquipmentOperationStatedata = ref([])
 const getlist = async () => {
   const datalist = await ScreenApi.getScreenAll()
@@ -648,21 +648,23 @@ const getlist = async () => {
           Equipmentmock.push(newRowmk)
         }
         formData.value.UtilizationRateOfEquipment.data = Equipmentmock
-      } else if (datalistitem.type == 'QualifiedRateOfEachProduct') {
-        oldQualifiedRateOfEachProductdata.value = datalistitem.data
+      } else
+      //  if (datalistitem.type == 'QualifiedRateOfEachProduct') {
+      //   oldQualifiedRateOfEachProductdata.value = datalistitem.data
 
-        formData.value.QualifiedRateOfEachProduct = datalistitem
-        datalistitem.mockData = JSON.parse(datalistitem.mockData)
-        const EachProductmock = []
-        for (let i = 0; i < datalistitem.mockData[0].length; i++) {
-          const newRowmk = []
-          for (let j = 0; j < datalistitem.mockData.length; j++) {
-            newRowmk.push(datalistitem.mockData[j][i])
-          }
-          EachProductmock.push(newRowmk)
-        }
-        formData.value.QualifiedRateOfEachProduct.data = EachProductmock
-      } else if (datalistitem.type == 'EquipmentOperationState') {
+      //   formData.value.QualifiedRateOfEachProduct = datalistitem
+      //   datalistitem.mockData = JSON.parse(datalistitem.mockData)
+      //   const EachProductmock = []
+      //   for (let i = 0; i < datalistitem.mockData[0].length; i++) {
+      //     const newRowmk = []
+      //     for (let j = 0; j < datalistitem.mockData.length; j++) {
+      //       newRowmk.push(datalistitem.mockData[j][i])
+      //     }
+      //     EachProductmock.push(newRowmk)
+      //   }
+      //   formData.value.QualifiedRateOfEachProduct.data = EachProductmock
+      // } else 
+      if (datalistitem.type == 'EquipmentOperationState') {
         oldEquipmentOperationStatedata.value = datalistitem.data
 
         formData.value.EquipmentOperationState = datalistitem
@@ -728,28 +730,30 @@ const getlist = async () => {
         } else {
           formData.value.UtilizationRateOfEquipment.data = null
         }
-      } else if (datalistitem.type == 'QualifiedRateOfEachProduct') {
-        oldQualifiedRateOfEachProductdata.value = datalistitem.data
-        // 进度追踪项目明细
-        formData.value.QualifiedRateOfEachProduct = datalistitem
-        // 遍历原始数据的第二维及后续元素，将它们按列添加到新的数组中
-        datalistitem.data = JSON.parse(datalistitem.data)
-        if (datalistitem.data != null && datalistitem.data.length > 0) {
-          const transposedData = []
-          for (let i = 0; i < datalistitem.data[0].length; i++) {
-            const newRow = []
-            for (let j = 0; j < datalistitem.data.length; j++) {
-              newRow.push(datalistitem.data[j][i])
-            }
-            transposedData.push(newRow)
-          }
-          // 更新formData
-          formData.value.QualifiedRateOfEachProduct.data = transposedData
-        } else {
-          formData.value.QualifiedRateOfEachProduct.data = null
-        }
-        // console.log(formData.value.ProgressTrackingOfProduction.data)
-      } else if (datalistitem.type == 'EquipmentOperationState') {
+      } else 
+      // if (datalistitem.type == 'QualifiedRateOfEachProduct') {
+      //   oldQualifiedRateOfEachProductdata.value = datalistitem.data
+      //   // 进度追踪项目明细
+      //   formData.value.QualifiedRateOfEachProduct = datalistitem
+      //   // 遍历原始数据的第二维及后续元素，将它们按列添加到新的数组中
+      //   datalistitem.data = JSON.parse(datalistitem.data)
+      //   if (datalistitem.data != null && datalistitem.data.length > 0) {
+      //     const transposedData = []
+      //     for (let i = 0; i < datalistitem.data[0].length; i++) {
+      //       const newRow = []
+      //       for (let j = 0; j < datalistitem.data.length; j++) {
+      //         newRow.push(datalistitem.data[j][i])
+      //       }
+      //       transposedData.push(newRow)
+      //     }
+      //     // 更新formData
+      //     formData.value.QualifiedRateOfEachProduct.data = transposedData
+      //   } else {
+      //     formData.value.QualifiedRateOfEachProduct.data = null
+      //   }
+      //   // console.log(formData.value.ProgressTrackingOfProduction.data)
+      // } else
+       if (datalistitem.type == 'EquipmentOperationState') {
         oldEquipmentOperationStatedata.value = datalistitem.data
         formData.value.EquipmentOperationState = datalistitem
         datalistitem.data = JSON.parse(datalistitem.data)
@@ -794,14 +798,14 @@ const addUtilizationRateOfEquipment = () => {
     formData.value.UtilizationRateOfEquipment.data.push(['', ''])
   }
 }
-//新增各产品合格率
-const addQualifiedRateOfEachProduct = () => {
-  if (formData.value.QualifiedRateOfEachProduct.data == null) {
-    formData.value.QualifiedRateOfEachProduct.data = [['', '']]
-  } else {
-    formData.value.QualifiedRateOfEachProduct.data.push(['', ''])
-  }
-}
+// //新增各产品合格率
+// const addQualifiedRateOfEachProduct = () => {
+//   if (formData.value.QualifiedRateOfEachProduct.data == null) {
+//     formData.value.QualifiedRateOfEachProduct.data = [['', '']]
+//   } else {
+//     formData.value.QualifiedRateOfEachProduct.data.push(['', ''])
+//   }
+// }
 //新增设备状态
 const addEquipmentOperationState = () => {
   if (formData.value.EquipmentOperationState.data == null) {
@@ -833,9 +837,9 @@ const handleDeleteEquipment = (index: number) => {
   formData.value.UtilizationRateOfEquipment.data.splice(index, 1)
 }
 //删除各产品合格率
-const handleDeleteProduct = (index: number) => {
-  formData.value.QualifiedRateOfEachProduct.data.splice(index, 1)
-}
+// const handleDeleteProduct = (index: number) => {
+//   formData.value.QualifiedRateOfEachProduct.data.splice(index, 1)
+// }
 
 //删除设备状态
 const handleDeletetionState = (index: number) => {
@@ -852,7 +856,7 @@ const submitForm = async () => {
     await ScreenApi.updateScreen(formData.value.ProductionOrderState)
     await ScreenApi.updateScreen(formData.value.QuantityOfEachProductProduced)
     await ScreenApi.updateScreen(formData.value.UtilizationRateOfEquipment)
-    await ScreenApi.updateScreen(formData.value.QualifiedRateOfEachProduct)
+    // await ScreenApi.updateScreen(formData.value.QualifiedRateOfEachProduct)
     await ScreenApi.updateScreen(formData.value.EquipmentOperationState)
     message.success(t('common.updateSuccess'))
     getlist()
@@ -899,21 +903,21 @@ const submitForm = async () => {
     }, [])
     formData.value.UtilizationRateOfEquipment.mockData = transposedArray2
     //各产品合格率
-    formData.value.QualifiedRateOfEachProduct.mockData = JSON.parse(
-      JSON.stringify(formData.value.QualifiedRateOfEachProduct.data)
-    )
-    const QualifiedArray = formData.value.QualifiedRateOfEachProduct.mockData
-    const transposedArray3 = QualifiedArray.reduce((acc, curr) => {
-      curr.forEach((el, i) => {
-        if (!acc[i]) {
-          acc[i] = [el]
-        } else {
-          acc[i].push(el)
-        }
-      })
-      return acc
-    }, [])
-    formData.value.QualifiedRateOfEachProduct.mockData = transposedArray3
+    // formData.value.QualifiedRateOfEachProduct.mockData = JSON.parse(
+    //   JSON.stringify(formData.value.QualifiedRateOfEachProduct.data)
+    // )
+    // const QualifiedArray = formData.value.QualifiedRateOfEachProduct.mockData
+    // const transposedArray3 = QualifiedArray.reduce((acc, curr) => {
+    //   curr.forEach((el, i) => {
+    //     if (!acc[i]) {
+    //       acc[i] = [el]
+    //     } else {
+    //       acc[i].push(el)
+    //     }
+    //   })
+    //   return acc
+    // }, [])
+    // formData.value.QualifiedRateOfEachProduct.mockData = transposedArray3
 
     //设备状态
     formData.value.EquipmentOperationState.mockData = JSON.parse(
@@ -932,9 +936,11 @@ const submitForm = async () => {
         item.data = oldQuantityOfEachProductProduceddata.value
       } else if (item.type == 'UtilizationRateOfEquipment') {
         item.data = oldUtilizationRateOfEquipmentdata.value
-      } else if (item.type == 'QualifiedRateOfEachProduct') {
-        item.data = oldQualifiedRateOfEachProductdata.value
-      } else if (item.type == 'EquipmentOperationState') {
+      } else 
+      // if (item.type == 'QualifiedRateOfEachProduct') {
+      //   item.data = oldQualifiedRateOfEachProductdata.value
+      // } else 
+      if (item.type == 'EquipmentOperationState') {
         item.data = oldEquipmentOperationStatedata.value
       }
       datalistitem.value.push(item)