diff --git a/.env.development b/.env.development index 456802b..1cce8b9 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 榄菊管理系统 +VUE_APP_TITLE = 榄菊生产管理系统 # 开发环境配置 ENV = 'development' diff --git a/.env.staging b/.env.staging index 471773d..8c0be33 100644 --- a/.env.staging +++ b/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 榄菊管理系统 +VUE_APP_TITLE = 榄菊生产管理系统 NODE_ENV = production diff --git a/package.json b/package.json index 60d05e1..0b90b1d 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "MIT", "scripts": { "###": "高版本node请使用如下配置启动 SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", - "dev": "vue-cli-service serve", + "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", "build:prod": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", @@ -46,14 +46,12 @@ "highlight.js": "9.18.5", "js-beautify": "1.13.0", "js-cookie": "3.0.1", - "jsbarcode": "^3.11.6", "jsencrypt": "3.0.0-rc.1", "less": "^3.9.0", "less-loader": "^5.0.0", "moment": "^2.29.4", "nprogress": "0.2.0", "print-js": "^1.6.0", - "qrcode": "^1.5.4", "quill": "1.3.7", "screenfull": "5.0.2", "sortablejs": "1.10.2", @@ -64,7 +62,6 @@ "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", "xlsx": "^0.17.0" diff --git a/src/api/quality/inventoryReport.js b/src/api/quality/inventoryReport.js index c6ea8d1..03ba0a2 100644 --- a/src/api/quality/inventoryReport.js +++ b/src/api/quality/inventoryReport.js @@ -91,3 +91,11 @@ export function getCkeckProjectList(query) { params: query }); } +// 仓库质量巡查记录 +export function printXJRecordList(query) { + return request({ + url: '/quality/qcInventoryReport/printXJRecordList', + method: 'get', + params: query + }); +} \ No newline at end of file diff --git a/src/assets/board/RGV-红.png b/src/assets/board/RGV-红.png new file mode 100644 index 0000000..c47c070 Binary files /dev/null and b/src/assets/board/RGV-红.png differ diff --git a/src/assets/board/RGV-绿.png b/src/assets/board/RGV-绿.png new file mode 100644 index 0000000..5a33619 Binary files /dev/null and b/src/assets/board/RGV-绿.png differ diff --git a/src/assets/board/RGV-蓝.png b/src/assets/board/RGV-蓝.png new file mode 100644 index 0000000..d226425 Binary files /dev/null and b/src/assets/board/RGV-蓝.png differ diff --git a/src/assets/board/弹窗1-设备信息.png b/src/assets/board/弹窗1-设备信息.png new file mode 100644 index 0000000..8f1bd4c Binary files /dev/null and b/src/assets/board/弹窗1-设备信息.png differ diff --git a/src/assets/board/弹窗2-名称.png b/src/assets/board/弹窗2-名称.png new file mode 100644 index 0000000..41b904b Binary files /dev/null and b/src/assets/board/弹窗2-名称.png differ diff --git a/src/assets/board/弹窗3-产量.png b/src/assets/board/弹窗3-产量.png new file mode 100644 index 0000000..6df3fa4 Binary files /dev/null and b/src/assets/board/弹窗3-产量.png differ diff --git a/src/assets/board/弹窗3-产量2.png b/src/assets/board/弹窗3-产量2.png new file mode 100644 index 0000000..afd0185 Binary files /dev/null and b/src/assets/board/弹窗3-产量2.png differ diff --git a/src/assets/board/旋转.png b/src/assets/board/旋转.png new file mode 100644 index 0000000..2d86613 Binary files /dev/null and b/src/assets/board/旋转.png differ diff --git a/src/assets/board/楼层-右背景 选中.png b/src/assets/board/楼层-右背景 选中.png new file mode 100644 index 0000000..d32da83 Binary files /dev/null and b/src/assets/board/楼层-右背景 选中.png differ diff --git a/src/assets/board/楼层-右背景.png b/src/assets/board/楼层-右背景.png new file mode 100644 index 0000000..4717d19 Binary files /dev/null and b/src/assets/board/楼层-右背景.png differ diff --git a/src/assets/board/楼层-左背景 选中.png b/src/assets/board/楼层-左背景 选中.png new file mode 100644 index 0000000..72c9b68 Binary files /dev/null and b/src/assets/board/楼层-左背景 选中.png differ diff --git a/src/assets/board/楼层-左背景.png b/src/assets/board/楼层-左背景.png new file mode 100644 index 0000000..e61134f Binary files /dev/null and b/src/assets/board/楼层-左背景.png differ diff --git a/src/assets/board/烘房 生产中.png b/src/assets/board/烘房 生产中.png new file mode 100644 index 0000000..6334f33 Binary files /dev/null and b/src/assets/board/烘房 生产中.png differ diff --git a/src/assets/board/烘房.png b/src/assets/board/烘房.png new file mode 100644 index 0000000..70e61f3 Binary files /dev/null and b/src/assets/board/烘房.png differ diff --git a/src/assets/board/箭头 上.png b/src/assets/board/箭头 上.png new file mode 100644 index 0000000..02711e4 Binary files /dev/null and b/src/assets/board/箭头 上.png differ diff --git a/src/assets/board/箭头 下.png b/src/assets/board/箭头 下.png new file mode 100644 index 0000000..a854e8c Binary files /dev/null and b/src/assets/board/箭头 下.png differ diff --git a/src/assets/board/箭头 下2.png b/src/assets/board/箭头 下2.png new file mode 100644 index 0000000..7fd3b20 Binary files /dev/null and b/src/assets/board/箭头 下2.png differ diff --git a/src/assets/board/箱子 打开.png b/src/assets/board/箱子 打开.png new file mode 100644 index 0000000..93450d1 Binary files /dev/null and b/src/assets/board/箱子 打开.png differ diff --git a/src/assets/board/箱子.png b/src/assets/board/箱子.png new file mode 100644 index 0000000..4f1cc6f Binary files /dev/null and b/src/assets/board/箱子.png differ diff --git a/src/assets/board/蚊香1.png b/src/assets/board/蚊香1.png new file mode 100644 index 0000000..5a6835e Binary files /dev/null and b/src/assets/board/蚊香1.png differ diff --git a/src/assets/board/蚊香盒.png b/src/assets/board/蚊香盒.png new file mode 100644 index 0000000..b45bb87 Binary files /dev/null and b/src/assets/board/蚊香盒.png differ diff --git a/src/assets/board/货架.png b/src/assets/board/货架.png new file mode 100644 index 0000000..f3162be Binary files /dev/null and b/src/assets/board/货架.png differ diff --git a/src/assets/board/车间监控系统 - 02-1.jpg b/src/assets/board/车间监控系统 - 02-1.jpg new file mode 100644 index 0000000..5ac0c20 Binary files /dev/null and b/src/assets/board/车间监控系统 - 02-1.jpg differ diff --git a/src/assets/board/车间监控系统 - 02.jpg b/src/assets/board/车间监控系统 - 02.jpg new file mode 100644 index 0000000..9b08179 Binary files /dev/null and b/src/assets/board/车间监控系统 - 02.jpg differ diff --git a/src/assets/board/车间监控系统 - 04-1.jpg b/src/assets/board/车间监控系统 - 04-1.jpg new file mode 100644 index 0000000..ca5f853 Binary files /dev/null and b/src/assets/board/车间监控系统 - 04-1.jpg differ diff --git a/src/assets/board/车间监控系统 - 04.jpg b/src/assets/board/车间监控系统 - 04.jpg new file mode 100644 index 0000000..8831238 Binary files /dev/null and b/src/assets/board/车间监控系统 - 04.jpg differ diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 5481b1b..b257c16 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -35,8 +35,8 @@ export default { }, data() { return { - title: '管理系统', - logo: logoImg + title: '榄菊生产管理系统', + // logo: logoImg } } } diff --git a/src/router/index.js b/src/router/index.js index 2ecae50..39d80c8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -30,6 +30,8 @@ import Layout from '@/layout' // 公共路由 export const constantRoutes = [ + {path: '/cs', component: () => import('@/views/cs/index.vue')}, + {path: '/cs2', component: () => import('@/views/cs/index2.vue')}, { path: '/redirect', component: Layout, diff --git a/src/views/cs/index.vue b/src/views/cs/index.vue new file mode 100644 index 0000000..ee6d6ee --- /dev/null +++ b/src/views/cs/index.vue @@ -0,0 +1,694 @@ + + + diff --git a/src/views/cs/index2.vue b/src/views/cs/index2.vue new file mode 100644 index 0000000..f6510fe --- /dev/null +++ b/src/views/cs/index2.vue @@ -0,0 +1,472 @@ + + + diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue index d2d2ec6..405cb9e 100644 --- a/src/views/index_v1.vue +++ b/src/views/index_v1.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/kanban/finishproduct/BottomRightTable1.vue b/src/views/kanban/finishproduct/BottomRightTable1.vue index 0075416..228babf 100644 --- a/src/views/kanban/finishproduct/BottomRightTable1.vue +++ b/src/views/kanban/finishproduct/BottomRightTable1.vue @@ -76,7 +76,6 @@ export default { width: calc(~"100% + 10px"); height: 100%; margin: 0 -5px; - .border-box-content { padding: 20px; diff --git a/src/views/login.vue b/src/views/login.vue index 8a26445..30ea557 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -161,7 +161,7 @@ export default { justify-content: end; align-items: center; height: 100%; - background-image: url("../assets/images/login-background.jpg"); + background-image: url("../assets/images/login-background-none.jpg"); background-size: cover; } .title { diff --git a/src/views/mes/monthProductionSut/index.vue b/src/views/mes/monthProductionSut/index.vue index fdfc1de..a50e14e 100644 --- a/src/views/mes/monthProductionSut/index.vue +++ b/src/views/mes/monthProductionSut/index.vue @@ -13,7 +13,19 @@ 搜索 - + + + 导出 + + + @@ -326,6 +338,12 @@ export default { handleQuery() { this.getList(); + }, + /** 导出按钮操作 */ + handleExport() { + this.download('mes/reportWork/getmonthProductionSut/export', { + ...this.queryParams + }, `汇总报表_${new Date().getTime()}.xlsx`) } } }; diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue index 25bace1..3893c6d 100644 --- a/src/views/mes/prepare/index.vue +++ b/src/views/mes/prepare/index.vue @@ -275,7 +275,7 @@ - + @@ -313,7 +313,7 @@ export default { data() { return { fenyeNumber:5, - fenyeNumberTwo:5, + fenyeNumberTwo:7, shengchan:true, newWorkerLoading: false, refreshNewWorkerTable:true, @@ -511,7 +511,7 @@ export default { // 遍历this.printData.workTable for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) { - + // 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素） let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo)); // 将切割后的数组添加到chunkedArray中 @@ -595,20 +595,12 @@ export default { this.resetForm("queryForm"); this.handleQuery(); }, - /**单选**/ - handleCurrentChange(selection) { - this.ids = selection.prepareId - this.single = selection==null - this.selectPrepare = [] - this.selectPrepare.push(selection) - }, - // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.prepareId) this.single = selection.length!==1 this.multiple = !selection.length - this.selectPrepare = selection + this.selectPrepare = selection }, /** 新增按钮操作 */ handleAdd() { @@ -667,16 +659,16 @@ export default { diff --git a/src/views/quality/llAnalysisReport/index.vue b/src/views/quality/llAnalysisReport/index.vue index bed2721..b44e2db 100644 --- a/src/views/quality/llAnalysisReport/index.vue +++ b/src/views/quality/llAnalysisReport/index.vue @@ -43,6 +43,7 @@ 搜索 重置 + 导出 导出明细 @@ -499,6 +500,11 @@ export default { ...this.queryParams }, `incomeNoOkList_${new Date().getTime()}.xlsx`) }, + handleExportTable() { + this.download('quality/staticTable/exportIncomeTable', { + ...this.queryParams + }, `LLList_${new Date().getTime()}.xlsx`) + }, } }; diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue index 5aeacf3..2260719 100644 --- a/src/views/quality/productReport/index.vue +++ b/src/views/quality/productReport/index.vue @@ -9,6 +9,14 @@ @keyup.enter.native="handleQuery" /> + + +
- + + + + + + + 搜索 重置 @@ -203,12 +219,12 @@ - + - + @@ -259,7 +275,7 @@ import ItemSelectProject from "../qcIncome/checkProjectType.vue"; import moment from 'moment'; import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js"; export default { - name: "Inventory", + name: "QcInventory", components: {ItemPutInOrder,ItemSelectUser,ItemSelectProject}, dicts: ["unit","check_status","check_result"], data() { @@ -336,7 +352,7 @@ export default { { required: true, message: "单位不能为空", trigger: "blur" } ], supplierName: [ - { required: true, message: "供应商不能为空", trigger: "blur" } + { required: true, message: "仓库不能为空", trigger: "blur" } ], incomeTime: [ { required: true, message: "来料时间不能为空", trigger: "blur" } diff --git a/src/views/quality/qcTableCheckDevelop/index.vue b/src/views/quality/qcTableCheckDevelop/index.vue index 5264514..e113e73 100644 --- a/src/views/quality/qcTableCheckDevelop/index.vue +++ b/src/views/quality/qcTableCheckDevelop/index.vue @@ -43,6 +43,7 @@ 搜索 重置 + 导出 导出明细 @@ -495,6 +496,12 @@ export default { handleExport() { this.download('quality/staticTable/exportXJDetail', { ...this.queryParams + }, `XJDetialList_${new Date().getTime()}.xlsx`) + }, + + handleExportTable() { + this.download('quality/staticTable/exportXJTable', { + ...this.queryParams }, `XJList_${new Date().getTime()}.xlsx`) }, } diff --git a/src/views/quality/qcTableXJ/index.vue b/src/views/quality/qcTableXJ/index.vue index a74554c..ac80191 100644 --- a/src/views/quality/qcTableXJ/index.vue +++ b/src/views/quality/qcTableXJ/index.vue @@ -9,10 +9,10 @@ @keyup.enter.native="handleQuery" /> - + diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue index 20e2850..bc45dd4 100644 --- a/src/views/quality/qcWarehousing/index.vue +++ b/src/views/quality/qcWarehousing/index.vue @@ -47,6 +47,14 @@ @keyup.enter.native="handleQuery" /> + + +