diff --git a/src/api/home.js b/src/api/home.js index 16e6b3e..bf4020b 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -32,9 +32,9 @@ export function getBaseInfoNew() { }) } //首页 产量堆叠图 -export function qualitynewDeviceOutputQuality() { +export function halfHourOutputPassInfo() { return request({ - url: '/casm/quality/newDeviceOutputQuality', + url: '/casm/quality/halfHourOutputPassInfo', method: 'get' }) } @@ -46,5 +46,12 @@ export function getNewestFiveInfo() { method: 'get' }) } +//首页 张力值 +export function getTensionInfo() { + return request({ + url: '/casm/quality/getTensionInfo', + method: 'get' + }) +} diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 43eb411..1d18fee 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -21,14 +21,14 @@
- 请上传 + {{tLang('tip','请上传')}} - 的文件 + {{tLang('tip','的文件')}}
+ + + + diff --git a/src/lang/i18n-en-US.js b/src/lang/i18n-en-US.js index 8dd2941..2b9eae5 100644 --- a/src/lang/i18n-en-US.js +++ b/src/lang/i18n-en-US.js @@ -79,6 +79,10 @@ export default { }, "tip": { "确定删除选中记录?": "Are you sure to delete the selected record?", + "请上传": "Please upload", + "大小不超过": "Size is not more than", + "格式为": "Format is", + "的文件": "file", }, "login": { "标题": "CASM Sewing Management System", @@ -129,12 +133,16 @@ export default { "张力值": "Tension Value", "张力": "Tension", '针数': 'Needle', + "针1": "Needle1", + "针2": "Needle2", }, "user":{ '人员信息': 'User Info', '操作员': 'Operator', '人员ID': 'Staff ID', + '员工姓名': 'Staff Name', + '员工编号': 'Staff Code', }, "device": { "设备信息": "Device Info", diff --git a/src/lang/i18n-zh-CN.js b/src/lang/i18n-zh-CN.js index 57369ea..df83d74 100644 --- a/src/lang/i18n-zh-CN.js +++ b/src/lang/i18n-zh-CN.js @@ -80,6 +80,10 @@ export default { }, "tip": { "确定删除选中记录?": "确定删除选中记录?", + "请上传": "请上传", + "大小不超过": "大小不超过", + "格式为": "格式为", + "的文件": "的文件", }, "login": { "标题": "智能缝纫管理系统", @@ -130,12 +134,15 @@ export default { "张力值": "张力值", "张力": "张力", '针数': '针数', - + "针1": "针1", + "针2": "针2", }, "user":{ '人员信息': '人员信息', '操作员': '操作员', '人员ID': '人员ID', + '员工姓名': '员工姓名', + '员工编号': '员工编号', }, "device": { "设备信息": "设备信息", diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue index c27c969..0922453 100644 --- a/src/views/dashboard.vue +++ b/src/views/dashboard.vue @@ -14,10 +14,10 @@
- +
- +
{{ deviceState.on + tLang('home', '台') }}/{{ deviceState.total + tLang('home', '台') }}
@@ -87,6 +87,12 @@ let item_color = { 4: '#CCCCCC', } +let lineChartRef = ref(null); +let pieChartRef = ref(null); +window.onresize = () => { + lineChartRef.value.resize(); + pieChartRef.value.resize(); +} const line_option = ref({ title: { diff --git a/src/views/device/device/info.vue b/src/views/device/device/info.vue index 600f524..0b76720 100644 --- a/src/views/device/device/info.vue +++ b/src/views/device/device/info.vue @@ -30,7 +30,6 @@ style="width: 100px; height: 100px; margin-right: 10px; margin-bottom: 10px" @click="dialogImageUrl = item; dialogVisible = true">
- diff --git a/src/views/index.vue b/src/views/index.vue index 7c21acc..7c7c898 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -18,7 +18,7 @@ {{ tLang('device', '运行时长') }} - {{ info.runTime||0 + tLang('common','分钟') }} + {{ info.runTime || 0 + tLang('common', '分钟') }}
@@ -46,36 +46,42 @@
- 操作员 - 张一一 + {{ tLang('product', '产品名称') }} + {{ info.productionName }} + {{ tLang('product', '产品编码') }} + {{ info.productionCode }} - - 人员ID - 11 + + {{ tLang('product', '面线信息') }} + {{ item.surfacelineCode }} + {{ tLang('product', '底线信息') }} + {{ item.bottomlineCode }} + {{ tLang('product', '梭芯信息') }} + {{ item.shuttlecoreCode }}
- +
- +
-