Merge branch 'projects/mescc/develop' into projects/mescc/zhp

修改ui
Merge pull request '修改bug' (#109 ) from projects/mescc/zhp into projects/mescc/develop
2024-08-01 14:30:05 +08:00 · 2024-08-01 14:29:31 +08:00 · 2024-07-26 19:23:38 +08:00 · 2024-07-26 17:03:09 +08:00 · 2024-07-26 11:17:35 +08:00 · 2024-07-26 11:16:16 +08:00
21 changed files with 111 additions and 77 deletions
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
 ###
 # @Author: zhp
 # @Date: 2024-04-28 13:42:51
- # @LastEditTime: 2024-07-25 15:43:42
+ # @LastEditTime: 2024-07-26 10:50:10
 # @LastEditors: zhp
 # @Description:
 ###
@@ -13,7 +13,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台

 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.70:30307'
-# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
+VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
 # 闫阳
 # VUE_APP_BASE_API = 'http://192.168.1.81:48080'
 # 徐
@@ -21,7 +21,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
 # 郭
 # VUE_APP_BASE_API = 'http://192.168.1.61:48080'
 # sara
-VUE_APP_BASE_API = 'http://192.168.1.63:8080'
+# VUE_APP_BASE_API = 'http://192.168.1.63:8080'
 # 张一丁
 # VUE_APP_BASE_API = 'http://192.168.4.139:48080'
 # 蔡
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <template>
  <div ref="navbar" class="navbar"
-    :style="changeColor ? 'background: rgba(0, 21, 41, 1);boxShadow:0px 1px 8px 0px rgba(0,131,255,0.35);margin-left:20px' : 'margin-left:20px'">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
+    :style="changeColor ? 'background: rgba(0, 21, 41, 1);boxShadow:0px 1px 8px 0px rgba(0,131,255,0.35);' : ''">
+    <hamburger style="margin-left: 20px;" id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
      @toggleClick="toggleSideBar" />

    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" />
--- a/src/views/copilot/components/CopilotHeader.vue
+++ b/src/views/copilot/components/CopilotHeader.vue
@@ -7,7 +7,7 @@

 <template>
  <div class="copilot-header">
-    <section class="menu">
+    <section class="menu left">
      <CopilotButton v-for="i in ['产量', '效率']" :key="i" :label="i" :active="i === active"
        @click="() => $emit('update:active', i)" />
      <div class="type-name"></div>
@@ -15,7 +15,7 @@
        @click="() => $emit('update:than', i)" />
    </section>
    <div class="page-title">{{ active }}驾驶舱</div>
-    <section class="menu" style="width: 24vw;float: right;">
+    <section class="menu right" style="width: 24vw;float: right;">
      <CopilotButton v-for="i in ['日', '周', '月', '年']" :key="i" :label="i" :active="i === period"
        @click="() => $emit('update:period', i)" />
      <div class="btn-group">
@@ -132,7 +132,13 @@ export default {
  justify-content: space-between;
 }

-.copilot-header > section {
+.copilot-header > .left {
+  width: 26vw;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+.copilot-header >.right {
  width: 26vw;
  display: flex;
  align-items: center;
@@ -184,7 +190,7 @@ export default {
      /* top: 10px; */
    }
 .page-title {
-  width: 25vw;
+  width: 26vw;
  font-size: 54px;
  line-height: 70px;
  letter-spacing: 5px;
--- a/src/views/copilot/components/button.vue
+++ b/src/views/copilot/components/button.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-05-31 13:26:32
+ * @LastEditTime: 2024-07-31 08:52:25
 * @LastEditors: zhp
 * @Description:
 -->
@@ -54,8 +54,8 @@ button {
  background: #006acd40;
  backdrop-filter: blur(3px);
  text-align: center;
-  padding: 12px;
-  padding-left: 20px;
+  padding: 16px 24px 16px 24px;
+  padding-left: 32px;
  color: #fff;
  font-size: 18px;
  letter-spacing: 10px;
--- a/src/views/copilot/factoryData/components/BarChartBase.vue
+++ b/src/views/copilot/factoryData/components/BarChartBase.vue
@@ -6,7 +6,7 @@
        :style="{ fontSize: isFullscreen ? '0.85vw' : '0.73vw' }">{{ item.label }}</span>
    </div> -->

-      <div id="factoryEnergyChart" style="width: 100%; height: 100%"></div>
+      <div v-if="energyCockpits.length != 0" id="factoryEnergyChart" style="width: 100%; height: 100%"></div>
    </div>
  </chart-container>
 </template>
--- a/src/views/copilot/factoryData/components/BarChartChipOEE.vue
+++ b/src/views/copilot/factoryData/components/BarChartChipOEE.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-30 08:58:39
- * @LastEditTime: 2024-07-25 15:42:47
+ * @LastEditTime: 2024-07-26 16:48:15
 * @LastEditors: zhp
 * @Description:
 -->
@@ -58,7 +58,7 @@ export default {
        grid: {
          left: "10%",
          right: "3%",
-          bottom: "10%",
+          bottom: "14%",
          top: "20%",
          // containLabel: true,
        },
--- a/src/views/copilot/factoryData/components/Order.vue
+++ b/src/views/copilot/factoryData/components/Order.vue
@@ -13,7 +13,8 @@
        <CopilotButton v-for="i in ['目标产量', '计划投入', '实际投入', '实际产出', '废品数量', '待再加工']" :key="i" :label="i"
          :active="i === type" @click="() => $emit('update:type', i)" />
      </div>
-      <barChartBase :type="type" :energyCockpits="prodOrder" ref="barChart" style="height: 0;flex:1"></barChartBase>
+      <barChartBase  :type="type" :energyCockpits="prodOrder" ref="barChart" style="height: 0;flex:1">
+      </barChartBase>
    </div>
  </div>

@@ -114,7 +115,7 @@ export default {
              `<span style='color: rgba(223,241,254,.8);font-size:16px' title=${this.prodOrder[i].actualProduction || ""}>${this.prodOrder[i].actualProduction || ""
              }</span>`,
              `<span style="display:inline-block;width:45px;color: rgba(223,241,254,.8)">${this.prodOrder[i].productionProgress
-                ? this.prodOrder[i].productionProgress.toFixed(2) * 100 + "%"
+                ? parseFloat((this.prodOrder[i].productionProgress * 100).toFixed(2)) + "%"
                : "0%"
              }</span>
            <div style="display:inline-block;height:20px;vertical-align:top;margin-top:3px;">
--- a/src/views/copilot/factoryData/components/bipvProdMonitor.vue
+++ b/src/views/copilot/factoryData/components/bipvProdMonitor.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-07-25 10:10:07
- * @LastEditTime: 2024-07-25 10:44:01
+ * @LastEditTime: 2024-07-26 16:47:15
 * @LastEditors: zhp
 * @Description:
 -->
@@ -125,7 +125,7 @@
    <div class="chart">
      <div class="chart-title">
        <span class="title">生产情况</span>
-        <div class="button-than" style="position: absolute;right: 3%;">
+        <div class="button-than" style="position: absolute;right: 0%;">
          <CopilotButton v-for="i in ['同比', '环比']" :key="i" :label="i" :active="i === than"
            @click="() => $emit('update:than', i)" />
        </div>
@@ -224,6 +224,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
 .prod-monitor {
  height: 100%;
  display: flex;
@@ -235,7 +236,7 @@ export default {
    position: relative;
    // gap: 6px;
    .chart-title{
-      margin-top: 5px;
+      margin-top: 20px;
      // flex: 1;
      // gap: 6px;
      height: 1.5vw;
--- a/src/views/cost/accounting.vue
+++ b/src/views/cost/accounting.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-07-26 10:32:14
+ * @LastEditTime: 2024-07-26 14:28:19
 * @LastEditors: zhp
 * @Description:
 -->
@@ -30,12 +30,12 @@
        </el-form-item>
      </el-form>
      <!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
-      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
-        :max-height="tableH">
+      <base-table :row-key="(record, index) => { return record.in }" border :table-props="tableProps"
+        :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData" :max-height="tableH">
        <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
          :method-list="tableBtn" @clickBtn="handleClick" /> -->
      </base-table>
-      <pagination :limit.sync="listQuery.size" :page.sync="listQuery.current" :total="listQuery.total"
+      <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
        @pagination="getDataList" />
    </div>

@@ -69,13 +69,13 @@ import basicPage from '@/mixins/basic-page'
 import { getBaseHeader } from "@/utils/request";

 import { factoryList } from "@/utils/constants";
-import tableHeightMixin from "@/mixins/tableHeightMixin";
+// import tableHeightMixin from "@/mixins/tableHeightMixin";

 // import FileSaver from 'file-saver'
 // import * as XLSX from 'xlsx'
 export default {
  // components: { ButtonNav, detailOrUpdate, addOrUpdate },
-  mixins: [basicPage, tableHeightMixin],
+  mixins: [basicPage],
  data() {
    const currentYear = new Date().getFullYear();
    const startYear = currentYear - 10;
@@ -100,9 +100,10 @@ export default {
      end: undefined,
      // selectedValues: [],
      options,
+      tableH: this.tableHeight(300),
      listQuery: {
-        // size: 10,
-        // current: 1,
+        pageSize: 20,
+        pageNo: 1,
        total: 0,
        center: undefined,
        start: undefined,
@@ -282,7 +283,7 @@ export default {
          showOverflowtooltip: true
        },
        {
-          prop: 'CMaterial',
+          prop: 'material',
          label: '子项物料名称',
          minWidth: 150,
          // filter: (val) => factoryList[val],
@@ -394,6 +395,10 @@ export default {
      this.listQuery.yearPhaseEnd = this.listQuery.end ? this.listQuery.end.slice(0, 6) : undefined
      if (this.listQuery.end && this.listQuery.start) {
        if (this.listQuery.end.slice(0, 4) - this.listQuery.start.slice(0, 4) > 10) {
+          this.listQuery.end = undefined
+          this.listQuery.start = undefined
+          this.listQuery.yearPhaseStart = undefined
+          this.listQuery.yearPhaseEnd = undefined
          return this.$message({
            message: '起止年份不能超过十年',
            type: 'warning'
@@ -402,8 +407,10 @@ export default {
        await getCostMainPage(this.listQuery).then(res => {
          if (res.code === 0) {
            // this.tableData = res.data.list
-            res.data.list.forEach(item => {
+            res.data.list.forEach((item, index) => {
              let obj = {
+                in: Math.random().toString().slice(2, 10),
+                id:item.id,
                yearPhase: item.yearPhase,
                center: item.center,
                product: item.product,
@@ -425,12 +432,15 @@ export default {
                createTime: item.createTime,
                yearPhaseName: item.yearPhaseName,
                project: item.project,
-                CMaterial: item.material,
+                material: item.material,
+                children:[]
              }
              this.tableData.push(obj)
-              item.children.forEach(ele => {
+              item.children.forEach((ele, ind) => {
                // for (let i in item.projs) {
                let obj = {
+                  in: Math.random().toString().slice(2, 10),
+                  id: ele.id,
                  yearPhase: ele.yearPhase,
                  center: ele.center,
                  product: ele.product,
@@ -452,12 +462,15 @@ export default {
                  createTime: ele.createTime,
                  yearPhaseName: ele.yearPhaseName,
                  project: ele.project,
-                  CMaterial: ele.material,
+                  material: ele.material,
+                  children:[]
                }
-                this.tableData.push(obj)
-                ele.children?.forEach(i => {
+                this.tableData[index].children.push(obj)
+                ele.children?.forEach((i,inde) => {
                  // for (let i in item.projs) {
                  let obj = {
+                    in: Math.random().toString().slice(2, 10),
+                    id: i.id,
                    yearPhase: i.yearPhase,
                    center: i.center,
                    product: i.product,
@@ -479,9 +492,9 @@ export default {
                    createTime: i.createTime,
                    yearPhaseName: i.yearPhaseName,
                    project: i.project,
-                    CMaterial: i.material,
+                    material: i.material,
                  }
-                  this.tableData.push(obj)
+                  this.tableData[index].children[ind].children.push(obj)
                  // });
                  // }
                });
@@ -490,6 +503,7 @@ export default {
              });

            });
+            console.log(this.tableData);
            this.listQuery.total = res.data.total
          }
        })
@@ -505,8 +519,8 @@ export default {
      this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
      switch (val.btnName) {
        case 'search':
-          this.listQuery.current = 1;
-          this.listQuery.size = 10;
+          this.listQuery.pageNo = 1;
+          this.listQuery.pageSize = 10;
          this.getDataList();
          break;
        case 'export':
@@ -519,8 +533,8 @@ export default {
    /** 导出按钮操作 */
    handleExport() {
      const queryParams = this.listQuery;
-      queryParams.current = 1
-      queryParams.size = 999
+      // queryParams.current = 1
+      // queryParams.size = 999
      // if (this.facType === 0) {
      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
        this.exportLoading = true;
--- a/src/views/produce/data/index.vue
+++ b/src/views/produce/data/index.vue
@@ -1,13 +1,13 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-07-25 14:15:21
+ * @LastEditTime: 2024-07-30 10:31:35
 * @LastEditors: zhp
 * @Description:
 -->
 <template>
  <div style="display: flex; flex-direction: column; min-height: calc(100vh - 200px - 31px)">
-    <div class="app-container" style="padding: 16px 24px 0; height: auto; flex-grow: 1;">
+    <div class="app-container" style="padding: 16px 16px 0; height: auto; flex-grow: 1;">
      <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
        <el-form-item label="时间维度" prop="type">
          <el-select @change="changType" v-model="listQuery.type" size="small" clearable placeholder="请选择">
--- a/src/views/report/components/bmLineBar.vue
+++ b/src/views/report/components/bmLineBar.vue
@@ -75,7 +75,7 @@ export default {
                    : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${params[i].color}"></span>`
                }` +
                `<span style='display:inline-block;width:180px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
-                `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${
+                `<span style='color:rgba(0,0,0,0.48);width:150px;display:inline-block;font-size:14px;text-align:right'>${
                  params[i].name === "%"
                    ? (params[i].value ? params[i].value.toFixed(2) : "0.00") +
                      params[i].name
--- a/src/views/report/components/produceLineBar.vue
+++ b/src/views/report/components/produceLineBar.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-06-19 15:28:34
- * @LastEditTime: 2024-07-12 09:12:10
+ * @LastEditTime: 2024-07-30 10:56:01
 * @LastEditors: zhp
 * @Description:
 -->
@@ -61,7 +61,7 @@ export default {
                : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${params[i].color}"></span>`
              }` +
                `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
-              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
+              `<span style='color:rgba(0,0,0,0.48);width:100px;display:inline-block;font-size:14px;text-align:right'>${params[i].seriesName === "综合良率"
                  ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
                : params[i].seriesName === "转化效率"
                    ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
--- a/src/views/report/components/produceLineBarTarget.vue
+++ b/src/views/report/components/produceLineBarTarget.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-06-20 16:13:36
- * @LastEditTime: 2024-07-09 16:15:10
+ * @LastEditTime: 2024-07-30 16:04:05
 * @LastEditors: zhp
 * @Description:
 -->
@@ -58,7 +58,7 @@ export default {
                "<br/>" +
                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[i].color}'></span>` +
                `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
-              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
+              `<span style='color:rgba(0,0,0,0.48);width:auto;display:inline-block;font-size:14px;text-align:right'>${params[i].seriesName === "综合良率"
                ? (params[i].data.titleValue ? parseFloat(params[i].data.titleValue.toFixed(2)) : 0.0) + "%"
                : params[i].seriesName === "转化效率"
                  ? (params[i].data.titleValue ? parseFloat(params[i].data.titleValue.toFixed(2)) : 0.0) + "%"
--- a/src/views/report/components/produceLineBarYearTarget.vue
+++ b/src/views/report/components/produceLineBarYearTarget.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-06-20 16:13:52
- * @LastEditTime: 2024-07-11 16:45:08
+ * @LastEditTime: 2024-07-30 10:42:10
 * @LastEditors: zhp
 * @Description:
 -->
@@ -57,7 +57,7 @@ export default {
                "<br/>" +
                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[i].color}'></span>` +
                `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
-              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
+              `<span style='color:rgba(0,0,0,0.48);width:150px;display:inline-block;font-size:14px;text-align:right'>${params[i].seriesName === "综合良率"
                  ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
                : params[i].seriesName === "转化效率"
                  ? parseFloat(params[i].value.toFixed(2)) + "%"
--- a/src/views/report/components/produceLineYieldBar.vue
+++ b/src/views/report/components/produceLineYieldBar.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-07-09 16:06:13
- * @LastEditTime: 2024-07-09 16:14:54
+ * @LastEditTime: 2024-07-30 10:42:16
 * @LastEditors: zhp
 * @Description:
 -->
@@ -68,7 +68,7 @@ export default {
                : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${params[i].color}"></span>`
              }` +
                `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
-              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
+              `<span style='color:rgba(0,0,0,0.48);width:150px;display:inline-block;font-size:14px;text-align:right'>${params[i].seriesName === "综合良率"
                  ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
                : params[i].seriesName === "转化效率"
                    ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
@@ -139,6 +139,7 @@ export default {
            height: 3,
            // 设置滚动条显示位置
            left: "center",
+            minValueSpan:2,
            // 是否锁定选择区域（或叫做数据窗口）的大小
            zoomLoxk: true,
            // 控制手柄的尺寸
--- a/src/views/report/components/produceLineYieldBarTarget.vue
+++ b/src/views/report/components/produceLineYieldBarTarget.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-06-21 09:05:14
- * @LastEditTime: 2024-07-09 16:15:04
+ * @LastEditTime: 2024-07-30 10:42:20
 * @LastEditors: zhp
 * @Description:
 -->
@@ -74,7 +74,7 @@ export default {
              res +=
                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[1].color}'></span>` +
              `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[1].axisValueLabel}</span>` +
-              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[1].name === "综合良率"
+              `<span style='color:rgba(0,0,0,0.48);width:150px;display:inline-block;font-size:14px;text-align:right'>${params[1].name === "综合良率"
                ? (params[1].value ? parseFloat(params[1].value.toFixed(2)) : 0.0) + "%"
                : params[1].name === "转化效率"
                  ? (params[1].value ? parseFloat(params[1].value.toFixed(2)) : 0.0) + "%"
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -770,6 +770,7 @@ export default {

 <style lang="scss" scoped>

+
 .search {
  // height: calc((100px));
  background-color: #fff;
@@ -797,7 +798,7 @@ export default {
  height: calc((100vh - 170px));
  background-color: #fff;
  border-radius: 8px;
-  padding: 4px 16px 16px 16px;
+  padding: 16px 16px 16px 16px;
 }

 .blueTip::before {
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -78,8 +78,8 @@
          生产情况对比
        </div>
      </el-row>
-      <el-row v-if="this.listQuery.type === 2">
-        <el-col :span="12">
+      <el-row v-if="this.listQuery.type === 2" type="flex" justify="space-around">
+        <el-col :span="11">
          <!-- <div class="blueTip">
            生产情况对比
          </div> -->
@@ -89,6 +89,9 @@
        <el-col :span="6">
          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'" :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="1">
+
        </el-col>
        <el-col :span="6">
          <!-- <div class="blueTip">
@@ -985,6 +988,7 @@ export default {
 </script>

 <style lang="scss" scoped>
+
 .search {
  // height: calc((100px));
  background-color: #fff;
@@ -1013,7 +1017,7 @@ export default {
  height: calc((100vh - 170px));
  background-color: #fff;
  border-radius: 8px;
-  padding: 4px 16px 16px 16px;
+  padding: 16px 16px 16px 16px;
 }

 .blueTip::before {
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -78,8 +78,8 @@
          生产情况对比
        </div>
      </el-row>
-      <el-row v-if="this.listQuery.type === 2">
-        <el-col :span="12">
+      <el-row v-if="this.listQuery.type === 2" type="flex" justify="space-around">
+        <el-col :span="11">
          <!-- <div class="blueTip">
            生产情况对比
          </div> -->
@@ -91,6 +91,9 @@
            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart" :chartId=" 'chartTarget'"
            :chartNum="chartNum" />
        </el-col>
+        <el-col :span="1">
+          <!-- <div v-show="false">1111111111111</div> -->
+        </el-col>
        <el-col :span="6">
          <!-- <div class="blueTip">
            {{ title }}
@@ -108,9 +111,8 @@
            :legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :chartNum="chartNum" />
        </el-col>
        <el-col :span="6">
-          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight"
-            :legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartDayTarget'"
-            :chartNum="chartNum" />
+          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
+            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartDayTarget'" :chartNum="chartNum" />
        </el-col>
        <!-- <el-col :span="6">
          <div class="blueTip">
@@ -1393,7 +1395,7 @@ export default {
  height: calc((100vh - 170px));
  background-color: #fff;
  border-radius: 8px;
-  padding: 4px 16px 16px 16px;
+  padding: 16px 16px 16px 16px;
 }

 .blueTip::before {
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@@ -846,6 +846,7 @@ export default {

 <style lang="scss" scoped>

+
 .search {
  // height: calc((100px));
  background-color: #fff;
@@ -873,7 +874,7 @@ export default {
  height: calc((100vh - 170px));
  background-color: #fff;
  border-radius: 8px;
-  padding: 4px 16px 16px 16px;
+  padding: 16px 16px 16px 16px;
 }

 .blueTip::before {
--- a/src/views/warehouse/index.vue
+++ b/src/views/warehouse/index.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-07-26 10:28:53
+ * @LastEditTime: 2024-07-26 13:58:56
 * @LastEditors: zhp
 * @Description:
 -->
@@ -10,7 +10,7 @@
    <div class="app-container" style="height: auto; flex-grow: 1;">
      <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
        <el-form-item label="快捷查询" prop="mDType">
-          <el-select size="small" v-model="listQuery.mDType" clearable>
+          <el-select size="small" v-model="listQuery.mDType" clearable @change="handleChange">
            <el-option v-for="item in mDTypeList" :key="item.value" :label="item.label" :value="item.value">
            </el-option>
          </el-select>
@@ -54,12 +54,12 @@
        </el-form-item>
      </el-form>
      <!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
-      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
+      <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"
        :max-height="tableH">
        <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
          :method-list="tableBtn" @clickBtn="handleClick" /> -->
      </base-table>
-      <pagination :limit.sync="listQuery.size" :page.sync="listQuery.current" :total="listQuery.total"
+      <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
        @pagination="getDataList" />
    </div>

@@ -86,7 +86,7 @@ import basicPage from '@/mixins/basic-page'
 // import addOrUpdate from './add-or-updata';
 // import { factoryList, dhgfactoryList, tyjxfactoryList } from "@/utils/constants";
 import { getBaseHeader } from "@/utils/request";
-import tableHeightMixin from "@/mixins/tableHeightMixin";
+// import tableHeightMixin from "@/mixins/tableHeightMixin";

 import { factoryList } from "@/utils/constants";

@@ -94,14 +94,14 @@ import { factoryList } from "@/utils/constants";
 // import * as XLSX from 'xlsx'
 export default {
  // components: { ButtonNav, detailOrUpdate, addOrUpdate },
-  mixins: [basicPage, tableHeightMixin],
+  mixins: [basicPage],
  data() {
    return {
      start: undefined,
      end: undefined,
      listQuery: {
-        size: 10,
-        current: 1,
+        pageSize: 20,
+        pageNo: 1,
        total: 0,
        mDType:0,
        wDType: 0,
@@ -109,6 +109,7 @@ export default {
        materialName: null,
        warehouse: null,
      },
+      tableH: this.tableHeight(300),
      // 用户导入参数
      mainFormConfig: [
        {
@@ -283,6 +284,10 @@ export default {
    // this.changeTime()
  },
  methods: {
+    handleChange() {
+      this.listQuery.materialCode = undefined
+      this.listQuery.materialName = undefined
+    },
    async getDataList() {
        await getStockRealTimePage(this.listQuery).then(res => {
          if (res.code === 0) {
@@ -295,8 +300,8 @@ export default {
      this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
      switch (val.btnName) {
        case 'search':
-          this.listQuery.current = 1;
-          this.listQuery.size = 10;
+          this.listQuery.pageNo = 1;
+          this.listQuery.pageSize = 10;
          this.getDataList();
          break;
        case 'export':
@@ -309,8 +314,6 @@ export default {
    /** 导出按钮操作 */
    handleExport() {
      const queryParams = this.listQuery;
-      queryParams.current = 1
-      queryParams.size = 999
      // if (this.facType === 0) {
        this.$modal.confirm('是否确认导出所有数据项?').then(() => {
          this.exportLoading = true;
Author	SHA1	Message	Date
‘937886381’	a618e081b5	Merge branch 'projects/mescc/develop' into projects/mescc/zhp	2024-08-01 14:30:05 +08:00
‘937886381’	9efddba586	修改ui	2024-08-01 14:29:31 +08:00
juzi	12b37c13c7	Merge pull request '修改bug' (#109 ) from projects/mescc/zhp into projects/mescc/develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #109	2024-07-26 19:23:38 +08:00
‘937886381’	eda007d713	修改bug	2024-07-26 17:03:09 +08:00
juzi	9e3c9fff6d	Merge pull request 'projects/mescc/zhp' (#108 ) from projects/mescc/zhp into projects/mescc/develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #108	2024-07-26 11:17:35 +08:00
‘937886381’	4d8300d213	修改页码页数	2024-07-26 11:16:16 +08:00
‘937886381’	52dbb694a8	Merge branch 'projects/mescc/develop' into projects/mescc/zhp	2024-07-26 11:08:45 +08:00
‘937886381’	cd36d33be9	修改bug	2024-07-26 11:07:52 +08:00