Merge pull request 'projects/mescc/dy' (#54) from projects/mescc/dy into projects/mescc/develop

Reviewed-on: #54

.env.dev

@@ -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:
 ###

src/views/produce/data/index.vue

@@ -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: [],

src/views/produce/target/index.vue

@@ -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: [],
@@ -458,13 +457,13 @@ export default {
     this.changeTime()
 	},
   methods: {
-  clearTime() {
-    this.listQuery.beginTime = undefined
-    this.listQuery.endTime = undefined
-    this.listQuery.reportTime = []
-    this.start = undefined
-    this.end = undefined
-  },
+    clearTime() {
+      this.listQuery.beginTime = undefined
+      this.listQuery.endTime = undefined
+      this.listQuery.reportTime = []
+      this.start = undefined
+      this.end = undefined
+    },
     handleImport() {
       this.upload.title = "生产目标导入";
       this.upload.open = true;