13 changed files with 79 additions and 86 deletions
--- a/.env.dev
+++ b/.env.dev
@ -1,7 +1,7 @@
 ###
 # @Author: zhp
 # @Date: 2024-04-28 13:42:51
- # @LastEditTime: 2024-06-24 08:29:45
+ # @LastEditTime: 2024-06-21 13:40:38
 # @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'
 # 徐
@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
 # 张一丁
 # VUE_APP_BASE_API = 'http://192.168.4.139:48080'
 # 蔡
-# VUE_APP_BASE_API = 'http://192.168.1.54:48080'
+VUE_APP_BASE_API = 'http://192.168.1.54:48080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

--- a/src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue
+++ b/src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue
@ -20,7 +20,7 @@
    <el-form-item v-show="form.type === 0" label="时间" prop="dayTime">
      <el-date-picker
        size="small"
-        :clearable="false"
+        clearable
        v-model="form.dayTime"
        type="date"
        placeholder="选择日期"
@ -32,7 +32,6 @@
    <el-form-item v-show="form.type === 1" label="时间" prop="weekTime">
      <el-date-picker
        v-model="form.weekTime"
-        :clearable="false"
        type="week"
        format="yyyy-MM-dd"
        placeholder="选择周"
@ -44,7 +43,6 @@
    <el-form-item v-show="form.type === 2" label="时间" prop="monthTime">
      <el-date-picker
        v-model="form.monthTime"
-        :clearable="false"
        type="month"
        placeholder="选择月份"
        value-format="yyyy-MM-dd"
@ -55,7 +53,6 @@
    <el-form-item v-show="form.type === 3" label="时间" prop="yearTime">
      <el-date-picker
        v-model="form.yearTime"
-        :clearable="false"
        type="year"
        placeholder="选择年份"
        value-format="yyyy-MM-dd"
@ -119,10 +116,6 @@ export default {
          break;
      }
      params.type = this.form.type;
-      if (!params.startDate) {
-        this.$message.warning("时间不能为空");
-        return;
-      }
      if (val === "search") {
        this.$emit("getSearch", params);
      } else {
--- a/src/views/report/components/bmSearchBar.vue
+++ b/src/views/report/components/bmSearchBar.vue
@ -19,7 +19,7 @@
    <el-form-item v-show="form.type === 0" label="时间" prop="dayTime">
      <el-date-picker
        size="small"
-        :clearable="false"
+        clearable
        v-model="form.dayTime"
        type="date"
        placeholder="选择日期"
@ -31,7 +31,6 @@
    <el-form-item v-show="form.type === 1" label="时间" prop="weekTime">
      <el-date-picker
        v-model="form.weekTime"
-        :clearable="false"
        type="week"
        format="yyyy-MM-dd"
        placeholder="选择周"
@ -43,7 +42,6 @@
    <el-form-item v-show="form.type === 2" label="时间" prop="monthTime">
      <el-date-picker
        v-model="form.monthTime"
-        :clearable="false"
        type="month"
        placeholder="选择月份"
        value-format="yyyy-MM-dd"
@ -54,7 +52,6 @@
    <el-form-item v-show="form.type === 3" label="时间" prop="yearTime">
      <el-date-picker
        v-model="form.yearTime"
-        :clearable="false"
        type="year"
        placeholder="选择年份"
        value-format="yyyy-MM-dd"
@ -141,10 +138,6 @@ export default {
          break;
      }
      params.type = this.form.type;
-      if (!params.startDate) {
-        this.$message.warning("时间不能为空");
-        return;
-      }
      if (val === "search") {
        this.$emit("getSearch", params);
      } else {
--- 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-06-24 08:46:34
+ * @LastEditTime: 2024-06-21 14:37:44
 * @LastEditors: zhp
 * @Description:
 -->
@ -83,7 +83,7 @@ export default {
        dataZoom: [//滚动条
          {
            // 设置滚动条的隐藏与显示
-            show: false,
+            show: true,
            // 设置滚动条类型
            type: "slider",
            // 设置背景颜色
--- a/src/views/report/components/produceLineBarTarget.vue
+++ b/src/views/report/components/produceLineBarTarget.vue
@ -1,7 +1,14 @@
 <!--
 * @Author: zhp
 * @Date: 2024-06-20 16:13:36
- * @LastEditTime: 2024-06-24 08:46:42
+ * @LastEditTime: 2024-06-21 14:37:56
+ * @LastEditors: zhp
+ * @Description:
+-->
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-19 15:28:34
+ * @LastEditTime: 2024-06-20 16:02:21
 * @LastEditors: zhp
 * @Description:
 -->
@ -83,7 +90,7 @@ export default {
        dataZoom: [//滚动条
          {
            // 设置滚动条的隐藏与显示
-            show: false,
+            show: true,
            // 设置滚动条类型
            type: "slider",
            // 设置背景颜色
--- 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-06-24 08:46:46
+ * @LastEditTime: 2024-06-21 14:37:59
 * @LastEditors: zhp
 * @Description:
 -->
@ -83,7 +83,7 @@ export default {
        dataZoom: [//滚动条
          {
            // 设置滚动条的隐藏与显示
-            show: false,
+            show: true,
            // 设置滚动条类型
            type: "slider",
            // 设置背景颜色
--- 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-06-24 08:46:49
+ * @LastEditTime: 2024-06-21 14:38:06
 * @LastEditors: zhp
 * @Description:
 -->
@ -101,7 +101,7 @@ export default {
        dataZoom: [//滚动条
          {
            // 设置滚动条的隐藏与显示
-            show: false,
+            show: true,
            // 设置滚动条类型
            type: "slider",
            // 设置背景颜色
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-24 09:39:27
+ * @LastEditTime: 2024-06-21 15:18:20
 * @LastEditors: zhp
 * @Description:
 -->
@ -58,7 +58,7 @@
        </el-form-item>
      </el-form>
      <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.pageNo"
-        :limit="listQuery.pageSize" :table-data="tableData" :max-height="tableH">
+        :limit="listQuery.pageSize" :table-data="tableData">
      </base-table>
    </div>
  </div>
@ -101,7 +101,6 @@ export default {
        end: undefined,
        reportTime: []
      },
-      tableH: this.tableHeight(269),
      timeList: [
        {
          value: 0,
@ -192,7 +191,6 @@ export default {
  //   this.changeTime()
  // },
  mounted() {
-    this.tableH = this.tableHeight(269);
    // this.getOverView()
    const today = new Date()
    const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
@ -491,7 +489,7 @@ export default {
      if (res.data.length === 0) {
        this.tableData = []
      } else {
-        if (this.currentMenu != '瑞昌') {
+        if (this.currentMenu !== '瑞昌') {
          this.tableData = dataArr
        } else {
          this.tableData = dataArr.filter(function (item) {
@ -499,6 +497,13 @@ export default {
          });
        }
      }
+      this.listQuery.total = res.data.total
+      if (this.listQuery.total > 0) {
+        this.tableData.forEach(item => {
+          item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
+          item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
+        })
+      }
    },
    buttonClick(val) {
      this.listQuery.factorys = val.factory?.length > 0 ? val.factory : undefined
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@ -195,7 +195,26 @@ export default {
          {
            name: "",
            // yAxisIndex: 0,
-            data: [],
+            data: [
+              {
+                value: 1,
+                itemStyle: {
+                  color: '#8EF0AB'
+                }
+              },
+              {
+                value: 2,
+                itemStyle: {
+                  color: '#288AFF'
+                }
+              },
+              {
+                value: 0,
+                yAxisIndex: 1,
+                itemStyle: {
+                  color: '#64BDFF'
+                }
+              }],
            type: "bar",
            barWidth: 20,
            label: {
@ -210,7 +229,13 @@ export default {
          {
            name: '',
            type: 'bar',
-            data: [],
+            data: [0, 0, 0,
+              {
+                value: 5,
+                itemStyle: {
+                  color: '#68C483'
+                }
+              }],
            type: "bar",
            barWidth: 20,
            label: {
@ -345,7 +370,7 @@ export default {
  watch: {
    // 监听左侧菜单栏是否展开
    isOpen(val) {
-      if (this.$route.name === "produceConversion") {
+      if (this.$route.name === "ChipYieldBM") {
        this.chartNum++;
      }
    },
@ -360,7 +385,7 @@ export default {
  },
  activated() {
    // 图重新加载，为了防止窗口变化后尺寸图显示不佳，数据不更新
-    if (this.$route.name === "produceConversion") {
+    if (this.$route.name === "ChipYieldBM") {
      this.chartNum++;
    }
  },
@ -488,12 +513,6 @@ export default {
    async getDataList() {
      this.otherProps = []
      this.chartMsg.xData = []
-      this.chartMsg.series[0].data = []
-      this.chartMsg.series[1].data = []
-      this.chartMsg.series[2].data = []
-      this.chartMsgYearTarget.series[0].data = []
-      this.chartMsgYearTarget.series[1].data = []
-
      console.log(this.listQuery);
      if (this.listQuery.type == 3) {
        this.listQuery.beginTime = this.listQuery.reportTime[0]
@ -657,7 +676,7 @@ export default {
    _setTableHeight() {
      this.tableH = this.tableHeight(137) / 2 - 70;
      this.chartHeight = this.tableHeight(137) / 2 - 111;
-      if (this.$route.name === "produceConversion") {
+      if (this.$route.name === "ChipYieldBM") {
        this.chartNum++;
      }
    },
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@ -95,9 +95,6 @@
        </el-col> -->
      </el-row>
      <el-row v-else>
-        <div class="blueTip">
-          生产情况对比
-        </div>
        <!-- <el-col :span="12"> -->
        <bm-line-bar :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg"
          :chartId="chartId" :chartNum="chartNum" />
@ -294,7 +291,7 @@ export default {
  },
  computed: {
    dataArr() {
-      // if (this.currentMenu != '瑞昌') {
+      if (this.currentMenu != '瑞昌') {
        return [{
          factory: null,
          item: '芯片总功率',
@ -305,7 +302,7 @@ export default {
          item: '	标准组件总功率',
          unit: 'MW'
        }]
-      // }
+      }
    },
    tableProps() {
      return [
@ -487,11 +484,6 @@ export default {
      this.chartMsg.xData = []
      this.chartMsgTarget.xData = []
      this.chartMsgYearTarget.xData = []
-      this.chartMsg.series[0].data = []
-      this.chartMsg.series[1].data = []
-      this.chartMsgTarget.series = []
-      this.chartMsgYearTarget.series[0].data = []
-      this.chartMsgYearTarget.series[1].data = []
      console.log(this.listQuery);
      let arr = []
      this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@ -95,9 +95,6 @@
        </el-col> -->
      </el-row>
      <el-row v-else>
-        <div class="blueTip">
-          生产情况对比
-        </div>
        <!-- <el-col :span="12"> -->
        <bm-line-bar :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg"
          :chartId="chartId" :chartNum="chartNum" />
@ -260,7 +257,9 @@ export default {
          },
          axisLabel: {},
        },
-        series: [],
+        series: [
+
+        ],
      },
      chartMsg: {
        color: ["#8EF0AB", "#288AFF", "#64BDFF", '#7164FF'],
@ -426,7 +425,7 @@ export default {
  watch: {
    // 监听左侧菜单栏是否展开
    isOpen(val) {
-      if (this.$route.name === "productionSituationTablets") {
+      if (this.$route.name === "ChipYieldBM") {
        this.chartNum++;
      }
    },
@ -441,7 +440,7 @@ export default {
  },
  activated() {
    // 图重新加载，为了防止窗口变化后尺寸图显示不佳，数据不更新
-    if (this.$route.name === "productionSituationTablets") {
+    if (this.$route.name === "ChipYieldBM") {
      this.chartNum++;
    }
  },
@ -571,19 +570,6 @@ export default {
      this.chartMsg.xData = []
      this.chartMsgTarget.xData = []
      this.chartMsgYearTarget.xData = []
-      this.chartMsg.series[0].data = []
-      this.chartMsg.series[1].data = []
-      this.chartMsg.series[2].data = []
-      if (this.chartMsg.series[3]) {
-        this.chartMsg.series[3].data = []
-      }
-      this.chartMsgTarget.series = []
-      this.chartMsgYearTarget.series[0].data = []
-      this.chartMsgYearTarget.series[1].data = []
-      this.chartMsgYearTarget.series[2].data = []
-      if (this.chartMsgYearTarget.series[3]) {
-        this.chartMsgYearTarget.series[3].data = []
-      }
      console.log(this.listQuery);
      let arr = []
      this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
@ -1202,7 +1188,6 @@ export default {
        for (let i in this.dataArr[0]) {
            this.chartMsg.series[0].name = this.dataArr[0]['item']
            if (i.search('value') === 0) {
-            console.log("this.dataArr[0]['item']", this.dataArr[0]['item'], this.dataArr[0][i]);
              this.chartMsg.series[0].data.push({
                name: this.dataArr[0]['item'],
                value: this.dataArr[0][i]
@ -1239,7 +1224,6 @@ export default {
          }
          }
      }
-      console.log(this.dataArr[0]['item'],this.chartMsg.series[0].data)
      this.tableData = res.data.length != 0 ? this.dataArr : []
      // this.tableProps = otherProps
      // res.data.list.forEach((ele) => {
@ -1269,7 +1253,7 @@ export default {
    _setTableHeight() {
      this.tableH = this.tableHeight(137) / 2 - 70;
      this.chartHeight = this.tableHeight(137) / 2 - 111;
-      if (this.$route.name === "productionSituationTablets") {
+      if (this.$route.name === "ChipYieldBM") {
        this.chartNum++;
      }
    },
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@ -364,7 +364,7 @@ export default {

    },
    isOpen(val) {
-      if (this.$route.name === "productionYield") {
+      if (this.$route.name === "ChipYieldBM") {
        this.chartNum++;
      }
    },
@ -507,12 +507,6 @@ export default {
    async getDataList() {
      this.otherProps = []
      this.chartMsg.xData = []
-      this.chartMsg.series[0].data = []
-      this.chartMsg.series[1].data = []
-      this.chartMsg.series[2].data = []
-      this.chartMsg.series[3].data = []
-      this.chartMsgYearTarget.series[0].data = []
-      this.chartMsgYearTarget.series[1].data = []
      let arr = []
      this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
      this.listQuery.factory = arr
@ -666,7 +660,7 @@ export default {
          }
        }
      } else {
-        res.data.list.forEach((ele, index) => {
+        res.data.list.slice.forEach((ele, index) => {
          let i = index + 1
          this.chartMsg.xData.push(ele.titleValue)
          this.otherProps.push({
@ -730,11 +724,18 @@ export default {
      console.log(dataArr)
      this.tableData = res.data.length != 0 ? dataArr : []
      // this.tableProps.push()
+      this.listQuery.total = res.data.total
+      if (this.listQuery.total > 0) {
+        this.tableData.forEach(item => {
+          item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
+          item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
+        })
+      }
    },
    _setTableHeight() {
      this.tableH = this.tableHeight(137) / 2 - 70;
      this.chartHeight = this.tableHeight(137) / 2 - 111;
-      if (this.$route.name === "productionYield") {
+      if (this.$route.name === "ChipYieldBM") {
        this.chartNum++;
      }
    },
--- a/src/views/report/turnoverRateBM/index.vue
+++ b/src/views/report/turnoverRateBM/index.vue
@ -254,7 +254,6 @@ export default {
              data: [],
              type: "bar",
              barWidth: 20,
-              barGap: "100%",
              label: {
                show: true,
                position: "top",