diff --git a/.env.development b/.env.development
index 456802bb..1cce8b91 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 471773d7..8c0be338 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 60d05e19..0b90b1dd 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/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 5481b1b0..b257c169 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/views/index_v1.vue b/src/views/index_v1.vue
index d2d2ec63..405cb9e7 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 0075416a..228babfe 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 8a264458..30ea557d 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 fdfc1de0..a50e14ee 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 16759a71..68061b94 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -272,7 +272,7 @@
-
+