projects/mescc/dy #54

Merged
juzi merged 2 commits from projects/mescc/dy into projects/mescc/develop 2024-06-20 16:58:00 +08:00
3 changed files with 16 additions and 17 deletions

View File

@ -1,7 +1,7 @@
###
# @Author: zhp
# @Date: 2024-04-28 13:42:51
# @LastEditTime: 2024-06-19 16:05:46
# @LastEditTime: 2024-06-20 10:16:40
# @LastEditors: DY
# @Description:
###

View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-06-19 15:47:17
* @LastEditTime: 2024-06-20 10:16:25
* @LastEditors: DY
* @Description:
-->
@ -234,7 +234,7 @@ export default {
{
prop: 'goodRatio',
label: '良品率%',
filter: (val) => (val * 100) + '%'
filter: (val) => val + '%'
},
],
tableData: [],

View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-06-17 09:49:15
* @LastEditTime: 2024-06-20 16:41:48
* @LastEditors: DY
* @Description:
-->
@ -144,7 +144,6 @@
import { parseTime } from '@/utils/ruoyi';
import { prodTargetDiPage, prodTargetToPage, exportDiTargetExcel, exportToTargetExcel, delTarget, importToTarget, importDiTarget } from '@/api/produceData';
// import inputTable from './inputTable.vue';
import lineChart from './lineChart';
import moment from 'moment'
import ButtonNav from '@/components/ButtonNav'
import basicPage from '@/mixins/basic-page'
@ -157,7 +156,7 @@ import {getBaseHeader} from "@/utils/request";
// import FileSaver from 'file-saver'
// import * as XLSX from 'xlsx'
export default {
components: { lineChart, ButtonNav, detailOrUpdate, addOrUpdate },
components: { ButtonNav, detailOrUpdate, addOrUpdate },
mixins: [basicPage],
data() {
return {
@ -414,12 +413,12 @@ export default {
},
],
// timeSelect:'month',
startTimeStamp:null, //
endTimeStamp:null, //
// startTimeStamp:null, //
// endTimeStamp:null, //
// date:'2024',
// reportTime: '',
startTimeStamp: '',
endTimeStamp: '',
// startTimeStamp: '',
// endTimeStamp: '',
tableData: [],
facType: 0
// proLineList: [],