diff --git a/.env.dev b/.env.dev
index 5ca0e399..40a1806e 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,12 +1,12 @@
###
# @Author: Do not edit
# @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-12-14 14:02:40
- # @LastEditors: DY
+ # @LastEditTime: 2023-12-18 13:35:00
+ # @LastEditors: zhp
# @Description:
###
# 开发环境配置
-ENV = 'development'
+ENV = 'development'
# 页面标题
VUE_APP_TITLE = MES系统
@@ -14,13 +14,14 @@ VUE_APP_TITLE = MES系统
# 芋道管理系统/开发环境
# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
+# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
# VUE_APP_BASE_API = 'http://192.168.1.49:48082'
# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
# VUE_APP_BASE_API = 'http://192.168.1.56:48082'
# VUE_APP_BASE_API = 'http://192.168.1.62:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
# 积木报表指向地址
VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
diff --git a/.env.prod b/.env.prod
index 085ca647..d89ed16a 100644
--- a/.env.prod
+++ b/.env.prod
@@ -15,7 +15,7 @@ VUE_APP_TITLE = MES系统
VUE_APP_BASE_API = '/prod-api'
# 积木报表指向地址
-VUE_APP_JIMU_API = 'http://10.70.2.2:8080'
+VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
# 根据服务器或域名修改
diff --git a/src/api/base/qualityHotMaterial.js b/src/api/base/qualityHotMaterial.js
index 23ceeeb1..b665f1dc 100644
--- a/src/api/base/qualityHotMaterial.js
+++ b/src/api/base/qualityHotMaterial.js
@@ -2,7 +2,7 @@
/*
* @Author: zhp
* @Date: 2023-11-06 15:38:12
- * @LastEditTime: 2023-12-08 16:08:35
+ * @LastEditTime: 2023-12-15 15:29:16
* @LastEditors: zhp
* @Description:
*/
@@ -99,3 +99,27 @@ export function getMaterialCheckList(query) {
params: query
})
}
+
+export function createQualityHotMaterialDet(query){
+ return request({
+ url: '/base/quality-hot-material-det/create',
+ method: 'post',
+ data: query
+ })
+}
+
+export function updateQualityHotMaterialDet(query){
+ return request({
+ url: '/base/quality-hot-material-det/listbyfilter',
+ method: 'put',
+ data: query
+ })
+}
+
+export function getQualityHotMaterialDetList(query){
+ return request({
+ url: '/base/quality-hot-material-det/listbyfilter',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/api/base/qualityInspectionBoxBtn.js b/src/api/base/qualityInspectionBoxBtn.js
index 45998d1a..18954b61 100644
--- a/src/api/base/qualityInspectionBoxBtn.js
+++ b/src/api/base/qualityInspectionBoxBtn.js
@@ -1,7 +1,7 @@
/*
* @Author: zhp
* @Date: 2023-12-04 14:10:37
- * @LastEditTime: 2023-12-13 16:03:46
+ * @LastEditTime: 2023-12-14 10:06:03
* @LastEditors: zhp
* @Description:
*/
@@ -19,7 +19,7 @@ export function createQualityInspectionBoxBtn(data) {
// 更新安灯按钮16键对应
export function updateQualityInspectionBoxBtn(data) {
return request({
- url: '/base/quality-inspection-box-btn/update',
+ url: '/base/quality-inspection-box-btn/updateBatch',
method: 'put',
data: data
})
@@ -44,7 +44,7 @@ export function getQualityInspectionBoxBtn(id) {
// 获得安灯按钮16键对应分页
export function getQualityInspectionBoxBtnPage(query) {
return request({
- url: '/base/quality-inspection-box-btn/page',
+ url: '/base/quality-inspection-box-btn/listGroupByLineSection',
method: 'get',
params: query
})
diff --git a/src/api/report/production.js b/src/api/report/production.js
index aecf5bda..adaf9d14 100644
--- a/src/api/report/production.js
+++ b/src/api/report/production.js
@@ -1,7 +1,7 @@
/*
* @Author: zhp
* @Date: 2023-12-12 13:49:02
- * @LastEditTime: 2023-12-13 15:52:11
+ * @LastEditTime: 2023-12-14 14:21:43
* @LastEditors: zhp
* @Description:
*/
@@ -39,3 +39,19 @@ export function getAutoDeliveDataList(query) {
data: query,
})
}
+
+export function updateAutoDeliveDataList(query) {
+ return request({
+ url: '/base/report-auto-delive/update',
+ method: 'put',
+ data: query,
+ })
+}
+
+export function updateSumAutoDeliveDataList(query) {
+ return request({
+ url: '/base/report-auto-delive/updatePlus',
+ method: 'put',
+ data: query,
+ })
+}
diff --git a/src/assets/icons/svg/menuIcon.svg b/src/assets/icons/svg/menuIcon.svg
new file mode 100644
index 00000000..fbb3e14d
--- /dev/null
+++ b/src/assets/icons/svg/menuIcon.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/noStandards.svg b/src/assets/icons/svg/noStandards.svg
new file mode 100644
index 00000000..2e70ef07
--- /dev/null
+++ b/src/assets/icons/svg/noStandards.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/standards.svg b/src/assets/icons/svg/standards.svg
new file mode 100644
index 00000000..bb02bee3
--- /dev/null
+++ b/src/assets/icons/svg/standards.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index e3bdd359..6c744c05 100644
Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ
diff --git a/src/assets/logo/logo1.png b/src/assets/logo/logo1.png
new file mode 100644
index 00000000..e3bdd359
Binary files /dev/null and b/src/assets/logo/logo1.png differ
diff --git a/src/assets/logo/xcac.png b/src/assets/logo/xcac.png
new file mode 100644
index 00000000..907e32bd
Binary files /dev/null and b/src/assets/logo/xcac.png differ
diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss
index 4df69394..ab43c3a6 100644
--- a/src/assets/styles/login.scss
+++ b/src/assets/styles/login.scss
@@ -139,7 +139,7 @@ $base1px: 0.15vh; // 1px / 1080px;
.title {
margin: 0;
- margin-left: calc(28 * 0.12vh);
+ margin-left: calc(18px * 0.12vh);
font-weight: 400;
user-select: none;
color: #000;
@@ -148,8 +148,8 @@ $base1px: 0.15vh; // 1px / 1080px;
letter-spacing: calc(2 * 0.12vh);
.cnbm_logo {
- height: calc(40 * 0.12vh);
- width: calc(40 * 0.12vh);
+ height: calc(160 * 0.12vh);
+ width: calc(182 * 0.12vh);
position: relative;
top: calc(8 * 0.12vh);
right: calc(8 * 0.12vh);
diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue
index 0c4fcff1..ac7e32ac 100644
--- a/src/components/DialogForm/index.vue
+++ b/src/components/DialogForm/index.vue
@@ -86,8 +86,8 @@
-
+
@@ -117,6 +119,7 @@
v-for="file in form[col.prop]"
:file="file"
:key="file.fileUrl"
+ :disabled="disabled"
@delete="!disabled && handleDeleteFile(file, col.prop)" />
@@ -142,6 +145,9 @@ function findMaxLabelWidth(rows) {
if (!opt.label) return 0;
if (opt.label.length > max) {
max = opt.label.length;
+ if (opt.label.includes('(')) {
+ max = max - 3;
+ }
}
});
});
@@ -150,7 +156,7 @@ function findMaxLabelWidth(rows) {
const uploadedFile = {
name: 'UploadedFile',
- props: ['file'],
+ props: ['file', 'disabled'],
data() {
return {};
},
@@ -195,13 +201,15 @@ const uploadedFile = {
display: 'inline-block',
}}>
{this.file.fileName}
-
+ {!this.disabled && (
+
+ )}
);
},
@@ -404,8 +412,26 @@ export default {
}
if (!promiseList.length) this.formLoading = false;
},
+
// 上传成功的特殊处理
- beforeUpload() {},
+ beforeUpload(file) {
+ const checkFileSize = () => {
+ const isLt2M = file.size / 1024 / 1024 < 2;
+ if (!isLt2M) {
+ this.$modal.msgError('上传文件大小不能超过 2MB!');
+ }
+ return isLt2M;
+ };
+ const checkFileType = () => {
+ const isJPG =
+ file.type === 'image/jpeg' ||
+ file.type === 'image/png' ||
+ file.type === 'image/jpg';
+ return isJPG;
+ };
+ return checkFileSize() && checkFileType();
+ },
+
// 上传前的验证规则可通过 bind 属性传入
handleUploadSuccess(response, file, prop) {
console.log('[handleUploadSuccess]', response, file, prop);
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index be3285df..30873bd5 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -17,7 +17,9 @@ export default {
const vnodes = []
if (icon) {
- vnodes.push()
+ vnodes.push()
+ } else {
+ vnodes.push()
}
if (title) {
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 1e58cd7f..c02cd648 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -15,7 +15,7 @@
key="collapse"
class="sidebar-logo-link"
to="/">
-
+