diff --git a/package.json b/package.json index 7a99772..abcc114 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "vue-cropper": "0.5.5", "vue-meta": "2.4.0", "vue-router": "3.4.9", + "vue-seamless-scroll": "^1.1.23", "vuedraggable": "2.24.3", "vuex": "3.6.0" }, diff --git a/public/index.html b/public/index.html index 925455c..02a160b 100644 --- a/public/index.html +++ b/public/index.html @@ -1,6 +1,6 @@ - + diff --git a/src/assets/board/1内胆看板 拷贝.jpg b/src/assets/board/1内胆看板 拷贝.jpg new file mode 100644 index 0000000..4673c37 Binary files /dev/null and b/src/assets/board/1内胆看板 拷贝.jpg differ diff --git a/src/assets/board/6扫描下线看板 拷贝.jpg b/src/assets/board/6扫描下线看板 拷贝.jpg new file mode 100644 index 0000000..656487e Binary files /dev/null and b/src/assets/board/6扫描下线看板 拷贝.jpg differ diff --git a/src/assets/board/2-1箱壳看板.jpg b/src/assets/board/caseShell.jpg similarity index 65% rename from src/assets/board/2-1箱壳看板.jpg rename to src/assets/board/caseShell.jpg index c9b0ebe..13be622 100644 Binary files a/src/assets/board/2-1箱壳看板.jpg and b/src/assets/board/caseShell.jpg differ diff --git a/src/assets/board/door.jpg b/src/assets/board/door.jpg new file mode 100644 index 0000000..030aa9c Binary files /dev/null and b/src/assets/board/door.jpg differ diff --git a/src/assets/board/doorSafety.jpg b/src/assets/board/doorSafety.jpg new file mode 100644 index 0000000..5b34702 Binary files /dev/null and b/src/assets/board/doorSafety.jpg differ diff --git a/src/assets/board/foaming.jpg b/src/assets/board/foaming.jpg new file mode 100644 index 0000000..7e13f1e Binary files /dev/null and b/src/assets/board/foaming.jpg differ diff --git a/src/assets/board/liner.jpg b/src/assets/board/liner.jpg index 4673c37..c9b0ebe 100644 Binary files a/src/assets/board/liner.jpg and b/src/assets/board/liner.jpg differ diff --git a/src/assets/board/pourInto.jpg b/src/assets/board/pourInto.jpg new file mode 100644 index 0000000..bbbcbdd Binary files /dev/null and b/src/assets/board/pourInto.jpg differ diff --git a/src/components/board/Chart.vue b/src/components/board/Chart.vue new file mode 100644 index 0000000..c27ccfd --- /dev/null +++ b/src/components/board/Chart.vue @@ -0,0 +1,35 @@ + + + diff --git a/src/components/board/time.vue b/src/components/board/time.vue deleted file mode 100644 index 63ccbdb..0000000 --- a/src/components/board/time.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - - diff --git a/src/layout/boardIndex.vue b/src/layout/boardIndex.vue index 6486a28..f589660 100644 --- a/src/layout/boardIndex.vue +++ b/src/layout/boardIndex.vue @@ -17,8 +17,8 @@ export default { }, data() { return { - time: '1', - date: '1' + time: '', + date: '' } }, created() { @@ -26,14 +26,15 @@ export default { let date = new Date() let YYYY = date.getFullYear() let MM = (date.getMonth() + 1).toString().length === 1 ? ('0' + (date.getMonth() + 1)) : (date.getMonth() + 1) - let dd = (date.getDate() + 1).toString().length === 1 ? ('0' + (date.getDate() + 1)) : (date.getDate() + 1) - let HH = (date.getHours() + 1).toString().length === 1 ? ('0' + (date.getHours() + 1)) : (date.getHours() + 1) - let mm = (date.getMinutes() + 1).toString().length === 1 ? ('0' + (date.getMinutes() + 1)) : (date.getMinutes() + 1) - let ss = (date.getSeconds() + 1).toString().length === 1 ? ('0' + (date.getSeconds() + 1)) : (date.getSeconds() + 1) + let dd = date.getDate().toString().length === 1 ? ('0' + date.getDate()) : date.getDate() + let HH = date.getHours().toString().length === 1 ? ('0' + date.getHours()) : date.getHours() + let mm = date.getMinutes().toString().length === 1 ? ('0' + date.getMinutes()) : date.getMinutes() + let ss = date.getSeconds().toString().length === 1 ? ('0' + date.getSeconds()) : date.getSeconds() this.date = `${YYYY} - ${MM} - ${dd}` this.time = `${HH} : ${mm} : ${ss}` } - getDateIntervalFun = setInterval(getDate,1000) + getDate() + getDateIntervalFun = setInterval(getDate, 1000) }, beforeDestroy() { getDateIntervalFun = null diff --git a/src/views/board/caseShell/index.vue b/src/views/board/caseShell/index.vue new file mode 100644 index 0000000..f9d678c --- /dev/null +++ b/src/views/board/caseShell/index.vue @@ -0,0 +1,922 @@ + + + + diff --git a/src/views/board/caseShell/index2.vue b/src/views/board/caseShell/index2.vue new file mode 100644 index 0000000..962044f --- /dev/null +++ b/src/views/board/caseShell/index2.vue @@ -0,0 +1,472 @@ + + + + diff --git a/src/views/board/door/index.vue b/src/views/board/door/index.vue new file mode 100644 index 0000000..190e47d --- /dev/null +++ b/src/views/board/door/index.vue @@ -0,0 +1,702 @@ + + + + diff --git a/src/views/board/door/index2.vue b/src/views/board/door/index2.vue new file mode 100644 index 0000000..78e2c8d --- /dev/null +++ b/src/views/board/door/index2.vue @@ -0,0 +1,694 @@ + + + + diff --git a/src/views/board/foaming/index.vue b/src/views/board/foaming/index.vue new file mode 100644 index 0000000..8ea85b1 --- /dev/null +++ b/src/views/board/foaming/index.vue @@ -0,0 +1,809 @@ + + + + diff --git a/src/views/board/liner/index.vue b/src/views/board/liner/index.vue index 36b2890..ad294ec 100644 --- a/src/views/board/liner/index.vue +++ b/src/views/board/liner/index.vue @@ -1,18 +1,368 @@ + diff --git a/vue.config.js b/vue.config.js index afe0349..ab99287 100644 --- a/vue.config.js +++ b/vue.config.js @@ -35,8 +35,8 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://10.11.43.2:8080`, - // target: `http://localhost:8080`, + // target: `http://10.11.43.2:8080`, + target: `http://localhost:8080`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''