Merge pull request 'projects/mesxc-zhp' (#238) from projects/mesxc-zhp into projects/mesxc-test

Reviewed-on: #238
2024-03-12 11:22:06 +08:00 · 2024-03-12 11:22:06 +08:00 · bf700b316e
commit bf700b316e
parent b23d7427bd 4c9277b361
10 changed files with 58 additions and 42 deletions
--- a/src/api/report/production.js
+++ b/src/api/report/production.js
@ -1,7 +1,7 @@
 /*
 * @Author: zhp
 * @Date: 2023-12-12 13:49:02
- * @LastEditTime: 2024-01-24 15:54:58
+ * @LastEditTime: 2024-03-12 11:16:01
 * @LastEditors: zhp
 * @Description:
 */
--- a/src/assets/img/OperationalOverview/title.png
+++ b/src/assets/img/OperationalOverview/title.png
--- a/src/views/OperationalOverview/AGVBoard.vue
+++ b/src/views/OperationalOverview/AGVBoard.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-07-19 15:18:30
 * @LastEditors: zhp
- * @LastEditTime: 2024-02-29 15:48:47
+ * @LastEditTime: 2024-03-12 09:05:20
 * @Description:
 -->
 <template>
@ -870,6 +870,8 @@ export default {
 </script>

 <style lang="scss" scoped>
+
+
 .visual-container {
  width: 1920px;
  height: 1080px;
@ -886,14 +888,16 @@ export default {
    position: relative;
    .unit{
      position: absolute;
-      left: 260px;
+      left: 290px;
      top:25px;
+      color: rgba($color: #ffffff, $alpha: 8);
      font-size: 20px;
    }
    .time{
      position: absolute;
      left: 1360px;
      top:25px;
+      color: rgba($color: #ffffff, $alpha: 8);
      font-size: 20px;
    }
    .title-button {
--- a/src/views/OperationalOverview/components/baseContainer/index.vue
+++ b/src/views/OperationalOverview/components/baseContainer/index.vue
@ -24,7 +24,7 @@
    <div class="bar-item">
      <div v-if="title" class="bar-title" ds>
        <span>
-          <svg-icon :icon-class="titleIcon" style="font-size: 1em; position: relative; top: .08em" />
+          <svg-icon :icon-class="titleIcon" style="font-size: 1em; position: relative; top: .01em" />
          {{ title }}
        </span>
        <!-- <span v-if="showTime" style="font-size: 20px;color:#52FFF8;margin-left: 10px;margin-top: 2px;">
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-07-19 15:18:30
 * @LastEditors: zhp
- * @LastEditTime: 2024-03-06 12:01:10
+ * @LastEditTime: 2024-03-12 09:34:06
 * @Description:
 -->
 <template>
@ -982,6 +982,8 @@ export default {
 </script>

 <style lang="scss" scoped>
+
+
 .visual-container {
  width: 1920px;
  height: 1080px;
@ -993,12 +995,15 @@ export default {
    background: url('../../assets/img/OperationalOverview/title.png') no-repeat;
    background-size: 100% 100%;
    color: #00fff0;
-    word-spacing: 8px;
+    // word-spacing: 8px;
+    letter-spacing: 8px;
    text-align: center;
      .unit {
          position: absolute;
-          left: 260px;
+          left: 290px;
          top: 25px;
+          letter-spacing: 0px;
+          color: rgba($color: #ffffff, $alpha: 8);
          font-size: 20px;
        }

@ -1006,6 +1011,8 @@ export default {
          position: absolute;
          left: 1360px;
          top: 25px;
+          letter-spacing: 0px;
+          color: rgba($color: #ffffff, $alpha: 8);
          font-size: 20px;
        }
    .title-button {
--- a/src/views/report/productionDayReport/index.vue
+++ b/src/views/report/productionDayReport/index.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-11 16:13:38
+ * @LastEditTime: 2024-03-12 11:17:53
 * @LastEditors: zhp
 * @Description:
 -->
@ -114,13 +114,14 @@
            <template slot-scope="scope">
              <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
              </el-input>
-              <span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }} </span>
+              <span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }}
+              </span>
            </template>
          </el-table-column>
        </el-table-column>
      </el-table-column>
-      <div class="remark" slot="append">
-        <el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
+      <div style="height: 50px;" class="remark" slot="append">
+        <el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
        </el-input>
        <span v-else>{{ remark }} </span>
      </div>
@ -530,14 +531,13 @@ export default {
      const result = await Promise.all([
        await updateSumProductionDataList(obj),
        await updateProductionDataList(updateArr),
-      ]);
-      if (result[0] == true && result[1] == true) {
+      ])
+      console.log(result);
+      if (result[0].data == true && result[1].data == true) {
        // console.log(res)
        this.disabled = true
        this.isSave = false
        this.getDataList()
-      } else {
-        this.$modal.msgError('更新失败');
      }
    },
    async getDict() {
--- a/src/views/report/productionMonthReport/index.vue
+++ b/src/views/report/productionMonthReport/index.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-11 16:16:31
+ * @LastEditTime: 2024-03-12 11:14:04
 * @LastEditors: zhp
 * @Description:
 -->
@ -122,8 +122,8 @@
          </el-table-column>
        </el-table-column>
      </el-table-column>
-      <div class="remark" slot="append">
-        <el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
+      <div style="height: 50px;" class="remark" slot="append">
+        <el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
        </el-input>
        <span v-else>{{ remark }} </span>
      </div>
@ -535,14 +535,13 @@ export default {
      const result = await Promise.all([
        await updateSumProductionDataList(obj),
        await updateProductionDataList(updateArr),
-      ]);
-      if (result[0] == true && result[1] == true) {
+      ])
+      console.log(result);
+      if (result[0].data == true && result[1].data == true) {
        // console.log(res)
        this.disabled = true
        this.isSave = false
        this.getDataList()
-      } else {
-        this.$modal.msgError('更新失败');
      }
    },
    async getDataList() {
--- a/src/views/report/productionShipmentsReport/index.vue
+++ b/src/views/report/productionShipmentsReport/index.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-11 15:43:16
+ * @LastEditTime: 2024-03-12 11:17:14
 * @LastEditors: zhp
 * @Description:
 -->
@ -33,6 +33,12 @@
            <span v-else>{{ scope.row.glassType }} </span>
          </template>
        </el-table-column>
+        <el-table-column prop="productionH" label="厚度" align="center">
+          <template slot-scope="scope">
+            <el-input v-if="!disabled" v-model="scope.row.productionH" :disabled="disabled"></el-input>
+            <span v-else>{{ scope.row.productionH }} </span>
+          </template>
+        </el-table-column>
        <el-table-column label="规格" align="center">
          <el-table-column label="成品" align="center">
            <el-table-column :show-header="false">
@ -154,8 +160,8 @@
      </el-table-column>

      <!-- </el-table-column> -->
-      <div class="remark" slot="append">
-        <el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
+      <div style="height: 50px;" class="remark" slot="append">
+        <el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
        </el-input>
        <span v-else>{{ remark }} </span>
      </div>
@ -180,8 +186,10 @@
 <script>
 import {
  getAutoDeliveDataList,
-  updateSumAutoDeliveDataList,
-  updateAutoDeliveDataList
+  // updateSumAutoDeliveDataList,
+  // updateAutoDeliveDataList
+  updateAutoDeliveDataList,
+  updateSumAutoDeliveDataList
 } from '@/api/report/production';
 // import Editor from '@/components/Editor';
 import moment from 'moment';
@ -509,10 +517,10 @@ export default {
      let updateArr = this.list
      // console.log(JSON.stringify(updateArr[1]))
      const result = await Promise.all([
-        await updateSumProductionDataList(obj),
-        await updateAutoDeliveDataList(updateArr),
+        await updateAutoDeliveDataList(obj),
+        await updateSumAutoDeliveDataList(updateArr),
      ]);
-      if (result[0] == true && result[1] == true) {
+      if (result[0].data == true && result[1].data == true) {
        // console.log(res)
        this.disabled = true
        this.isSave = false
--- a/src/views/report/productionWeekReport/index.vue
+++ b/src/views/report/productionWeekReport/index.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-11 17:05:50
+ * @LastEditTime: 2024-03-12 11:14:55
 * @LastEditors: zhp
 * @Description:
 -->
@ -123,8 +123,8 @@
          </el-table-column>
        </el-table-column>
      </el-table-column>
-      <div class="remark" slot="append">
-        <el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
+      <div style="height: 50px;" class="remark" slot="append">
+        <el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
        </el-input>
        <span v-else>{{ remark }} </span>
      </div>
@ -505,14 +505,13 @@ export default {
      const result = await Promise.all([
        await updateSumProductionDataList(obj),
        await updateProductionDataList(updateArr),
-      ]);
+      ])
+      console.log(result);
      if (result[0].data == true && result[1].data == true) {
        // console.log(res)
        this.disabled = true
        this.isSave = false
        this.getDataList()
-      } else {
-        this.$modal.msgError('更新失败');
      }
    },
    changeTime(val) {
--- a/src/views/report/productionYearReport/index.vue
+++ b/src/views/report/productionYearReport/index.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-11 16:18:07
+ * @LastEditTime: 2024-03-12 11:15:05
 * @LastEditors: zhp
 * @Description:
 -->
@ -126,8 +126,8 @@
          </el-table-column>
        </el-table-column>
      </el-table-column>
-      <div class="remark" slot="append">
-        <el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
+      <div style="height: 50px;" class="remark" slot="append">
+        <el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
        </el-input>
        <span v-else>{{ remark }} </span>
      </div>
@ -449,14 +449,13 @@ export default {
      const result = await Promise.all([
        await updateSumProductionDataList(obj),
        await updateProductionDataList(updateArr),
-      ]);
+      ])
+      console.log(result);
      if (result[0].data == true && result[1].data == true) {
        // console.log(res)
        this.disabled = true
        this.isSave = false
        this.getDataList()
-      } else {
-        this.$modal.msgError('更新失败');
      }
    },
    transformYear(timeStamp) {// 本年最后一天