package.json

@@ -50,6 +50,7 @@
     "code-brick-zj": "^1.0.2",
     "core-js": "^3.26.0",
     "crypto-js": "^4.0.0",
+    "diagram-js": "^12.3.0",
     "echarts": "5.4.0",
     "element-ui": "2.15.12",
     "file-saver": "^2.0.5",
@@ -64,21 +65,25 @@
     "moment": "^2.29.4",
     "nprogress": "0.2.0",
     "qrcode.vue": "^1.7.0",
+    "qs": "^6.11.2",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
     "throttle-debounce": "2.1.0",
+    "video.js": "^8.5.2",
     "vue": "2.7.14",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.8",
     "vue-meta": "^2.4.0",
+    "vue-plugin-hiprint": "^0.0.54-fix",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "3.4.9",
     "vue-video-player": "^5.0.2",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.2",
     "xlsx": "^0.18.5",
-    "xml-js": "1.6.11"
+    "xml-js": "1.6.11",
+    "yorkie": "^2.0.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.5.18",
@@ -92,7 +97,7 @@
     "chalk": "4.1.0",
     "compression-webpack-plugin": "5.0.2",
     "connect": "3.6.6",
-    "eslint": "7.15.0",
+    "eslint": "6.8.0",
     "eslint-config-airbnb-base": "^14.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^3.1.0",

src/views/equipment/analysis/quality/index.vue

@@ -302,7 +302,7 @@ export default {
 			});
 			this.list = data.map((item) => ({
 				...item,
-				products: item.products.join(','),
+				products: item.products?.join(','),
 			}));
 		},
 
@@ -312,7 +312,7 @@ export default {
 				case 'search':
 					this.queryParams.lineId = btn.lineId;
 					this.queryParams.productId = btn.productId;
-					this.queryParams.recordTime = btn.recordTime;
+					this.queryParams.recordTime = btn.recordTime ? btn.recordTime.map(time => moment(new Date(time)).format('YYYY-MM-DD HH:mm:ss')) : null;
 					this.$nextTick(() => {
 						this.getList();
 					});

src/views/quality/monitoring/qualityStatistics/index.vue

@@ -302,8 +302,8 @@ export default {
 				},
 				{
 					// width: 128,
-					prop: 'ratio',
-					label: '比例',
+					prop: 'scrapRatio',
+					label: '比例(%)',
 					// subcomponent: {
 					// 	name: 'TextOnly',
 					// 	props: {
@@ -445,6 +445,7 @@ export default {
 					inspectionContent: item.inspectionContent,
 					...keyValuePairs,
 					sumInput: item.sumInput,
+					scrapRatio: item.scrapRatio,
 				};
 			});
 		},