mt-fe-group/yudao-init
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
朱菊兰 2024-06-20 17:08:51 +08:00
commit 4fb88a5201
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.dev
View File

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

4
src/views/produce/data/index.vue
View File

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

27
src/views/produce/target/index.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-04-15 10:49:13 * @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-06-17 09:49:15 * @LastEditTime: 2024-06-20 16:41:48
* @LastEditors: DY * @LastEditors: DY
* @Description: * @Description:
--> -->
@ -144,7 +144,6 @@
import { parseTime } from '@/utils/ruoyi'; import { parseTime } from '@/utils/ruoyi';
import { prodTargetDiPage, prodTargetToPage, exportDiTargetExcel, exportToTargetExcel, delTarget, importToTarget, importDiTarget } from '@/api/produceData'; import { prodTargetDiPage, prodTargetToPage, exportDiTargetExcel, exportToTargetExcel, delTarget, importToTarget, importDiTarget } from '@/api/produceData';
// import inputTable from './inputTable.vue'; // import inputTable from './inputTable.vue';
import lineChart from './lineChart';
import moment from 'moment' import moment from 'moment'
import ButtonNav from '@/components/ButtonNav' import ButtonNav from '@/components/ButtonNav'
import basicPage from '@/mixins/basic-page' import basicPage from '@/mixins/basic-page'
@ -157,7 +156,7 @@ import {getBaseHeader} from "@/utils/request";
// import FileSaver from 'file-saver' // import FileSaver from 'file-saver'
// import * as XLSX from 'xlsx' // import * as XLSX from 'xlsx'
export default { export default {
components: { lineChart, ButtonNav, detailOrUpdate, addOrUpdate }, components: { ButtonNav, detailOrUpdate, addOrUpdate },
mixins: [basicPage], mixins: [basicPage],
data() { data() {
return { return {
@ -414,12 +413,12 @@ export default {
}, },
], ],
// timeSelect:'month', // timeSelect:'month',
startTimeStamp:null, //开始时间 // startTimeStamp:null, //开始时间
endTimeStamp:null, //结束时间 // endTimeStamp:null, //结束时间
// date:'凯盛玻璃控股成员企业2024生产数据', // date:'凯盛玻璃控股成员企业2024生产数据',
// reportTime: '', // reportTime: '',
startTimeStamp: '', // startTimeStamp: '',
endTimeStamp: '', // endTimeStamp: '',
tableData: [], tableData: [],
facType: 0 facType: 0
// proLineList: [], // proLineList: [],
@ -458,13 +457,13 @@ export default {
this.changeTime() this.changeTime()
}, },
methods: { methods: {
clearTime() { clearTime() {
this.listQuery.beginTime = undefined this.listQuery.beginTime = undefined
this.listQuery.endTime = undefined this.listQuery.endTime = undefined
this.listQuery.reportTime = [] this.listQuery.reportTime = []
this.start = undefined this.start = undefined
this.end = undefined this.end = undefined
}, },
handleImport() { handleImport() {
this.upload.title = "生产目标导入"; this.upload.title = "生产目标导入";
this.upload.open = true; this.upload.open = true;