diff --git a/package-lock.json b/package-lock.json index 5fb87b6..8ba26c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,9 +8,9 @@ "name": "ix-siemens", "version": "0.1.0", "dependencies": { - "@siemens/ix": "^2.5.0", + "@siemens/ix": "^2.7.0", "@siemens/ix-icons": "^2.2.0", - "@siemens/ix-vue": "^2.5.0", + "@siemens/ix-vue": "^2.7.0", "axios": "^1.7.9", "core-js": "^3.8.3", "echarts": "^5.6.0", @@ -2093,15 +2093,14 @@ "dev": true }, "node_modules/@siemens/ix": { - "version": "2.5.0", - "resolved": "https://registry.npmmirror.com/@siemens/ix/-/ix-2.5.0.tgz", - "integrity": "sha512-ms3B6rKJEN/VAEn55qoMcc91eK+7v0VRZs3eQGkxLt4nKUKVrhfBMz55Npx7KHug5cA+VIHdSEha5SdH8utd0w==", + "version": "2.7.0", + "resolved": "https://registry.npmmirror.com/@siemens/ix/-/ix-2.7.0.tgz", + "integrity": "sha512-JyHF4PEAdOdJqvjXPMBDWsOShsa7A6RZkPklrn91lL/h12XnqgBCWrXLQfDd+7U+4wxQYynLMoUkvvtZdVaHSA==", "dependencies": { "@floating-ui/dom": "^1.6.10", "@stencil/core": "~4.17.0", "@types/luxon": "^3.3.7", "animejs": "~3.2.1", - "hyperlist": "^1.0.0", "luxon": "^3.4.4" }, "peerDependencies": { @@ -2123,11 +2122,11 @@ } }, "node_modules/@siemens/ix-vue": { - "version": "2.5.0", - "resolved": "https://registry.npmmirror.com/@siemens/ix-vue/-/ix-vue-2.5.0.tgz", - "integrity": "sha512-pApnMwHlIo+mATu5cFjE5V9Wb/mpRLvIjCyvZQAqvR6wDugSSatwKXfZK4jBmoyXJha0n8hPrd+1qiKRhBb8/g==", + "version": "2.7.0", + "resolved": "https://registry.npmmirror.com/@siemens/ix-vue/-/ix-vue-2.7.0.tgz", + "integrity": "sha512-f1t1Ux1vIdGr1318e3wz24rNxya1sPUgj0AOURWyxN2l4/dKuPJw/Ltb37sZn45U8EMk8fgXxt6SbjNjMBRk5w==", "dependencies": { - "@siemens/ix": "~2.5.0" + "@siemens/ix": "~2.7.0" }, "peerDependencies": { "@siemens/ix-icons": "^2.0.0", @@ -7032,11 +7031,6 @@ "node": ">=10.17.0" } }, - "node_modules/hyperlist": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/hyperlist/-/hyperlist-1.0.0.tgz", - "integrity": "sha512-1qAjO29EJW/mPyqY+9wFjruD2YWur1dPsPYmt9RvMX6P+8Cr2UmT75MCWjjK+1/4Jxc3sm/G3Kr8DzGgEDRG+Q==" - }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz", diff --git a/package.json b/package.json index 91b3194..ef09525 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "@siemens/ix": "^2.5.0", + "@siemens/ix": "^2.7.0", "@siemens/ix-icons": "^2.2.0", - "@siemens/ix-vue": "^2.5.0", + "@siemens/ix-vue": "^2.7.0", "axios": "^1.7.9", "core-js": "^3.8.3", "echarts": "^5.6.0", diff --git a/src/api/inspection.js b/src/api/inspection.js index dde312f..e9d6ab8 100644 --- a/src/api/inspection.js +++ b/src/api/inspection.js @@ -14,4 +14,12 @@ export function getInspectionData(deviceId, inputTime) { url: `/Check/sharp?deviceId=${deviceId}&inputTime=${inputTime}`, method: 'get' }); +} + +// 获取点检页面参数 +export function getCheckParas(deviceId, inputTime) { + return request({ + url: `/Check/CheckParas?deviceId=${deviceId}&inputTime=${inputTime}`, + method: 'get' + }); } \ No newline at end of file diff --git a/src/components/ProcessGanttChart.vue b/src/components/ProcessGanttChart.vue index f7773aa..eb71bf9 100644 --- a/src/components/ProcessGanttChart.vue +++ b/src/components/ProcessGanttChart.vue @@ -146,8 +146,10 @@ const mapDataToTimeline = (data, startTime, endTime) => { const adjustedDuration = adjustedEndTime.getTime() - adjustedBeginTime.getTime(); return { id: item.id, - stopReason: item.stopReason, name: 'Process', + stopReason: item.stopReason, + blendStatus: item.blendStatus, + capacity: item.capacity, value: adjustedDuration, deviceStatus: item.deviceStatus, mixerStep: item.mixerStep, diff --git a/src/views/Dashboard/index.vue b/src/views/Dashboard/index.vue index adc6c7d..df30fee 100644 --- a/src/views/Dashboard/index.vue +++ b/src/views/Dashboard/index.vue @@ -240,7 +240,7 @@