diff --git a/apps/hand-factory/api/push/live.js b/apps/hand-factory/api/push/live.js new file mode 100644 index 0000000..032c662 --- /dev/null +++ b/apps/hand-factory/api/push/live.js @@ -0,0 +1,7 @@ +import request from '@/utils/request' + +export function getLiveData () { + return request({ + method: 'get', + }) +} \ No newline at end of file diff --git a/apps/hand-factory/components/klp-header/klp-header.vue b/apps/hand-factory/components/klp-header/klp-header.vue index 4c8b2fd..033f35e 100644 --- a/apps/hand-factory/components/klp-header/klp-header.vue +++ b/apps/hand-factory/components/klp-header/klp-header.vue @@ -36,11 +36,11 @@ export default { return { // 产线列表(原Tab列表改造,可外部传入,此处保留默认值) lineList: [ - { name: "酸轧机组", key: "acidity" }, - { name: "彩涂机组", key: "paint" }, - { name: "镀锌线一组", key: "zinc1" }, - { name: "镀锌线二组", key: "zinc2" }, - { name: "镀锌线三组", key: "zinc3" }, + { name: "科伦普重工-酸轧机组", key: "acidity" }, + { name: "科伦普重工-彩涂机组", key: "paint" }, + { name: "科伦普重工-镀锌线一组", key: "zinc1" }, + { name: "科伦普重工-镀锌线二组", key: "zinc2" }, + { name: "科伦普重工-镀锌线三组", key: "zinc3" }, ], // 当前选中的产线索引(关联picker) currentLineIndex: 0, diff --git a/apps/hand-factory/components/klp-shutdown-statistic/klp-shutdown-statistic.vue b/apps/hand-factory/components/klp-shutdown-statistic/klp-shutdown-statistic.vue index 3c2e189..c420bf5 100644 --- a/apps/hand-factory/components/klp-shutdown-statistic/klp-shutdown-statistic.vue +++ b/apps/hand-factory/components/klp-shutdown-statistic/klp-shutdown-statistic.vue @@ -335,10 +335,13 @@ export default { switch (this.activeTab) { case "day": return this.startDate; + break; case "month": return `${this.startDate} 至 ${this.endDate}`; + break; case "year": return `${this.startDate} 至 ${this.endDate}`; + break; default: return ""; } diff --git a/apps/hand-factory/pages/login.vue b/apps/hand-factory/pages/login.vue index 85bd27c..0ea5f4b 100644 --- a/apps/hand-factory/pages/login.vue +++ b/apps/hand-factory/pages/login.vue @@ -17,7 +17,7 @@ - + @@ -86,7 +86,7 @@ // 获取图形验证码 getCode() { getCodeImg().then(res => { - this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled + this.captchaEnabled = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled console.log(res, '验证码结果') if (this.captchaEnabled) { this.codeUrl = 'data:image/gif;base64,' + res.data.img diff --git a/apps/l3/src/views/index.vue b/apps/l3/src/views/index.vue index 9f2b3cc..0afd089 100644 --- a/apps/l3/src/views/index.vue +++ b/apps/l3/src/views/index.vue @@ -3,13 +3,13 @@