新增

2024-05-07 10:03:55 +08:00
parent 1b8f2522c1 b6b0d32fa2
commit 61ea9ea4a6
80 changed files with 13648 additions and 8947 deletions
--- a/src/views/produce/data/add-or-updata.vue
+++ b/src/views/produce/data/add-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-04-17 15:37:39
+ * @LastEditTime: 2024-05-07 09:31:54
 * @LastEditors: zhp
 * @Description:
 -->
@@ -156,10 +156,9 @@

 <script>
 // import basicAdd from './basic-add';
-// import {
-//   createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
-//   getTeamList, getDetList, getLineList
-// } from "@/api/base/qualityScrapLog";
+import {
+  getProduceDataDetail
+} from "@/api/produceData";
 // import { getList, } from "@/api/base/qualityScrapType";
 import SmallTitle from './SmallTitle';
 export default {
@@ -223,8 +222,11 @@ export default {
    // this.getCurrentTime()
  },
  methods: {
-    init() {
+    init(id) {
      this.visible = true
+      if (id) {
+        getProduceDataDetail()
+      }
    },
    // getCurrentTime() {
    //   // new Date().Format("yyyy-MM-dd HH:mm:ss")
--- a/src/views/produce/data/index.vue
+++ b/src/views/produce/data/index.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-04-17 16:32:43
+ * @LastEditTime: 2024-05-07 09:18:01
 * @LastEditors: zhp
 * @Description:
 -->
@@ -10,17 +10,17 @@
    <div class="app-container" style="padding: 16px 24px 0;height: auto; flex-grow: 1;">
      <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
        <el-form-item label="时间维度" prop="reportTime">
-          <el-select clearable v-model="timeSelect" placeholder="请选择">
+          <el-select clearable v-model="listQuery.date" placeholder="请选择">
            <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
-        <el-form-item v-show="timeSelect === 'day'" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.date === 0" label="时间范围" prop="reportTime">
          <el-date-picker clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
            start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" @change="changeDayTime" end-placeholder="结束日期">
          </el-date-picker>
        </el-form-item>
-        <el-form-item v-show="timeSelect === 'week'" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
          <el-date-picker clearable v-model="listQuery.reportTime[0]" type="week" format="yyyy 第 WW 周" placeholder="选择周"
            style="width: 180px" @change="onValueChange">
          </el-date-picker>
@@ -32,12 +32,12 @@
            {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
          </span>
        </el-form-item>
-        <el-form-item v-show="timeSelect === 'month'" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.date === 2" label="时间范围" prop="reportTime">
          <el-date-picker clearable v-model="listQuery.reportTime" type="monthrange" range-separator="至"
            start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
          </el-date-picker>
        </el-form-item>
-        <el-form-item v-show="timeSelect === 'year'" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.date === 3" label="时间范围" prop="reportTime">
          <el-date-picker clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
            placeholder="开始时间">
          </el-date-picker>
@@ -46,8 +46,8 @@
            @change="getYear">
          </el-date-picker>
        </el-form-item>
-        <el-form-item label="工厂名称" prop="factoryId">
-          <el-select clearable v-model="listQuery.factoryId" placeholder="请选择工厂名称">
+        <el-form-item label="工厂名称" prop="factorys">
+          <el-select clearable v-model="listQuery.factorys" placeholder="请选择工厂名称" multiple >
            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
            </el-option>
          </el-select>
@@ -98,7 +98,7 @@

 <script>
 // import { parseTime } from '../../core/mixins/code-filter';
-// import { getGlassPage, exportGlasscExcel } from '@/api/report/glass';
+import { getProduceDataPage } from '@/api/produceData';
 // import inputTable from './inputTable.vue';
 import lineChart from './lineChart';
 import moment from 'moment'
@@ -114,12 +114,15 @@ export default {
 	data() {
    return {
      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        factoryId: null,
+        size: 10,
+        current: 1,
+        factorys: [],
        total: 0,
-        type: null,
+        date: 1,
+        type:undefined,
        // reportType: 2,
+        beginTime: undefined,
+        endTime:undefined,
        reportTime: []
      },
      detailOrUpdateVisible:false,
@@ -255,24 +258,24 @@ export default {
      formConfig: [
        {
          type: 'title',
-          label: '成本管理',
+          label: '生产数据管理',
        },
      ],
      timeList: [
        {
-          value: 'day',
+          value: 0,
          label: '日'
        },
        {
-          value: 'week',
+          value: 1,
          label: '周'
        },
        {
-          value: 'month',
+          value: 2,
          label:'月'
        },
        {
-          value: 'year',
+          value: 3,
          label: '年'
        }
      ],
@@ -283,67 +286,38 @@ export default {
        }
      ],
      tableProps: [
-        // {
-        // 	prop: 'createTime',
-        // 	label: '添加时间',
-        // 	fixed: true,
-        // 	width: 180,
-        // 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-        // },
        {
-          prop: 'userName',
+          prop: 'createTime',
          label: '日期',
        },
        {
-          prop: 'nickName',
+          prop: 'factory',
          label: '工厂名称',
+          filter: (val) => ['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司', '中建材株洲光电材料有限公司', '佳木斯中建材光电材料有限公司', '成都中建材光电材料有限公司', '凯盛光伏材料有限公司', '蚌埠兴科玻璃有限公司'][val]
        },
        {
-          prop: 'type',
+          prop: 'glassType',
          label: '玻璃类型',
+          filter: (val) => ['玻璃芯片', '标准组件', 'BIPV'][val]
        },
        {
-          prop: 'inNum',
+          prop: 'inputNumber',
          label: '投入数量',
        },
        {
-          prop: 'putNum',
+          prop: 'outputNumber',
          label: '产出数量',
        },
        {
-          prop: 'goodNum',
+          prop: 'goodNumber',
          label: '良品数量',
        },
        {
-          prop: 'goodYelid',
+          prop: 'yieldRate',
          label: '良品率%',
        },
      ],
-      timeSelect:'day',
-      startTimeStamp:null, //开始时间
-      endTimeStamp:null, //结束时间
-      // date:'凯盛玻璃控股成员企业2024生产数据',
-			// reportTime: '',
-			startTimeStamp: '',
-			endTimeStamp: '',
-      tableData: [
-        {
-          userName: 'userName',
-          nickName: '用户名',
-          datas:'111111'
-        },
-        {
-          userName: 'userName',
-          nickName: '用户名',
-          datas: '111111'
-        },
-        {
-          userName: 'userName',
-          nickName: '用户名',
-          datas: '111111'
-          // subcomponent: row
-        }
-      ],
+      tableData: [],
 			// proLineList: [],
 			// all: {}
 		};
@@ -521,6 +495,9 @@ export default {

    },
    async getDataList() {
+      const res = await getProduceDataPage(this.listQuery)
+      console.log(res)
+      this.tableData = res.data.records
    },
    add0(m) {
      return m < 10 ? '0' + m : m