Merge branch 'projects/mesxc-test' into projects/mesxc-dy

bug
Merge pull request 'projects/mesxc-dy' (#378 ) from projects/mesxc-dy into projects/mesxc-test
2024-04-29 16:58:15 +08:00 · 2024-04-29 16:57:45 +08:00 · 2024-04-29 09:04:59 +08:00
2 changed files with 3 additions and 2 deletions
--- a/src/views/quality/monitoring/originalGlassRetrace/index.vue
+++ b/src/views/quality/monitoring/originalGlassRetrace/index.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-08-01 14:55:51
 * @LastEditors: DY
- * @LastEditTime: 2024-04-28 16:10:20
+ * @LastEditTime: 2024-04-29 15:25:52
 * @Description:
 -->
 <template>
@ -142,6 +142,7 @@ const tableProps = [
 export default {
  // mixins: [basicPage],
  mixins: [tableHeightMixin],
  name: 'originalGlassRetrace',
  data() {
    return {
      lineOptions: [],
--- a/src/views/quality/monitoring/qualityInspectionRecord/index.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
@ -278,7 +278,7 @@ export default {
 					prop: 'source',
 					label: '来源',
 					width: 80,
-					filter: (val) => (val == 1 ? '平板端' : '网页端'),
+					filter: (val) => ['', '平板端', '网页端'][val],
 				},
 			],
 			// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
Author	SHA1	Message	Date
helloDy	74003e9d89	Merge branch 'projects/mesxc-test' into projects/mesxc-dy	2024-04-29 16:58:15 +08:00
helloDy	cb72e2b68a	bug	2024-04-29 16:57:45 +08:00
juzi	025b061ec2	Merge pull request 'projects/mesxc-dy' (#378 ) from projects/mesxc-dy into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #378	2024-04-29 09:04:59 +08:00