From 42931db490f14b9f0038033846bd25630b1c52d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cyiyousong=E2=80=9D?= <鈥測ousong_yi@foxmail.com鈥�>
Date: Tue, 27 Dec 2022 15:10:41 +0800
Subject: [PATCH] =?UTF-8?q?pref:=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/src/assets/css/common.css | 3 +
.../appmarket/components/DataUpdate.vue | 2 +-
.../appmarket/components/FieldConfig.vue | 4 +-
.../appmarket/components/TerminalApp.vue | 4 +-
.../basicset/appmarket/modal/AddData.vue | 62 +++++++++++++++++--
.../basicset/appmarket/modal/AddField.vue | 6 +-
.../business/components/businessTabs1.vue | 4 +-
.../business/components/businessTabs2.vue | 4 +-
.../business/components/businessTabs3.vue | 4 +-
.../src/pages/basicset/deploy/deploy.vue | 2 +-
.../pages/basicset/dept/addWindowMatter.vue | 2 +-
.../src/pages/basicset/dept/department.vue | 16 ++---
.../src/pages/basicset/holiday/festival.vue | 11 ++--
.../basicset/surface/AddSurfaceTemplate.vue | 4 +-
.../src/pages/basicset/workman/personnel.vue | 4 +-
15 files changed, 97 insertions(+), 35 deletions(-)
diff --git a/base-manager-ui/admin/src/assets/css/common.css b/base-manager-ui/admin/src/assets/css/common.css
index 623a88ee..a76b6d1a 100644
--- a/base-manager-ui/admin/src/assets/css/common.css
+++ b/base-manager-ui/admin/src/assets/css/common.css
@@ -8,6 +8,9 @@
.green{
color:#1BBC9B;
}
+.edit{
+ color:#03d76f;
+}
.clofff{
color:#fff;
}
diff --git a/base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue b/base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue
index e6962ad5..49004221 100644
--- a/base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue
+++ b/base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue
@@ -64,7 +64,7 @@
<!-- 鎿嶄綔 -->
<template slot="action" slot-scope="text">
<a-space size="middle">
- <a class="primary" @click="handleEdit(text)">缂栬緫</a>
+ <a class="edit" @click="handleEdit(text)">缂栬緫</a>
<a class="delete" @click="handleDel(text.id)">鍒犻櫎</a>
</a-space>
</template>
diff --git a/base-manager-ui/admin/src/pages/basicset/appmarket/components/FieldConfig.vue b/base-manager-ui/admin/src/pages/basicset/appmarket/components/FieldConfig.vue
index b08e8e18..ac04c700 100644
--- a/base-manager-ui/admin/src/pages/basicset/appmarket/components/FieldConfig.vue
+++ b/base-manager-ui/admin/src/pages/basicset/appmarket/components/FieldConfig.vue
@@ -40,7 +40,7 @@
<!-- 鎿嶄綔 -->
<template slot="action" slot-scope="text">
<a-space size="middle">
- <a class="primary" @click="handleEdit(text)">缂栬緫</a>
+ <a class="edit" @click="handleEdit(text)">缂栬緫</a>
<a class="delete" @click="handleDel(text.id)">鍒犻櫎</a>
</a-space>
</template>
@@ -113,7 +113,7 @@ export default {
},
{
title: "鎿嶄綔",
- width: "10%",
+ width: "110px",
scopedSlots: { customRender: "action" },
},
];
diff --git a/base-manager-ui/admin/src/pages/basicset/appmarket/components/TerminalApp.vue b/base-manager-ui/admin/src/pages/basicset/appmarket/components/TerminalApp.vue
index 206d75ee..838b0979 100644
--- a/base-manager-ui/admin/src/pages/basicset/appmarket/components/TerminalApp.vue
+++ b/base-manager-ui/admin/src/pages/basicset/appmarket/components/TerminalApp.vue
@@ -77,7 +77,7 @@
<!-- 鎿嶄綔 -->
<template slot="action" slot-scope="text">
<a-space size="middle">
- <a class="primary" @click="handleEdit(text)">缂栬緫</a>
+ <a class="edit" @click="handleEdit(text)">缂栬緫</a>
<a class="primary" @click="handleCheck(text.id)">鏌ョ湅</a>
<a
class="delete"
@@ -156,7 +156,7 @@ const columns = [
},
{
title: "鎿嶄綔",
- width: "10%",
+ width: "150px",
scopedSlots: { customRender: "action" },
},
];
diff --git a/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue b/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue
index ccd00922..9edbe811 100644
--- a/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue
+++ b/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue
@@ -18,15 +18,15 @@
v-for="(v, i) in form.appInfoFieldList"
:key="v.fieldCode"
:label="v.fieldName"
- :class="{ content: v.fieldType == 'text' }"
+ :class="{
+ content: v.fieldType == 'text',
+ 'upload-item': v.fieldType == 'upload',
+ }"
:prop="`appInfoFieldList.${i}.fieldValue`"
:rules="{
required: v.fieldNull ? false : true,
message: `${v.fieldName}涓嶈兘涓虹┖`,
- trigger:
- v.fieldType == 'date' || v.fieldType == 'text'
- ? 'change'
- : 'blur',
+ trigger: v.fieldType == 'text' ? 'blur' : 'change',
}"
>
<a-input
@@ -53,6 +53,21 @@
<div v-else-if="v.fieldType == 'text'" class="content-box">
<YQuillEditor v-model="v.fieldValue" height="auto"></YQuillEditor>
</div>
+ <a-upload
+ v-else-if="v.fieldType == 'upload'"
+ :action="api2 + 'file/commonupload'"
+ :multiple="false"
+ :file-list="v.fileList"
+ @change="
+ (info) => {
+ handleChange(info, v);
+ }
+ "
+ >
+ <a-button type="primary">
+ <a-icon type="upload" /> 鐐瑰嚮涓婁紶
+ </a-button>
+ </a-upload>
</a-form-model-item>
</a-form-model>
</div>
@@ -98,6 +113,10 @@ export default {
},
data() {
return {
+ api: process.env.VUE_APP_API_BASE_URL.includes("base")
+ ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
+ : process.env.VUE_APP_API_BASE_URL,
+ api2: process.env.VUE_APP_API_BASE_URL + "/",
labelCol: {
span: 2,
},
@@ -151,14 +170,44 @@ export default {
delete v.id;
}
v.fieldValue = "";
+ if (v.fieldType == "upload") {
+ v.fileList = [];
+ }
return v;
});
this.form.appId = this.$route.query.id;
},
// 缂栬緫
onEdit(data) {
+ data.appInfoFieldList.forEach((v) => {
+ if (v.fieldType == "upload") {
+ v.fileList = [
+ {
+ uid: v.id,
+ name: v.fieldValue,
+ status: "done",
+ url: v.fieldValue,
+ },
+ ];
+ }
+ });
this.form = { ...data };
},
+ // 鏂囦欢涓婁紶
+ handleChange(info, row) {
+ let fileList = [...info.fileList];
+ fileList = fileList.slice(-1);
+ fileList = fileList.map((file) => {
+ if (file.response) {
+ file.url = file.response.url;
+ } else {
+ file.url = "";
+ }
+ return file;
+ });
+ row.fileList = fileList;
+ row.fieldValue = fileList.map((v) => v.url).join(",");
+ },
},
};
</script>
@@ -201,4 +250,7 @@ export default {
display: flex;
}
}
+.upload-item {
+ display: block !important;
+}
</style>
\ No newline at end of file
diff --git a/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue b/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue
index 60cefda7..5369e310 100644
--- a/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue
+++ b/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue
@@ -86,6 +86,10 @@ const fieldTypeItem = [
value: "text",
label: "瀵屾枃鏈�",
},
+ {
+ value: "upload",
+ label: "鏂囦欢涓婁紶",
+ },
];
export default {
props: {
@@ -117,7 +121,7 @@ export default {
fieldName: [
{ required: true, message: "璇疯緭鍏ュ瓧娈靛悕绉�", trigger: "blur" },
],
- fieldTyp: [
+ fieldType: [
{ required: true, message: "璇烽€夋嫨瀛楁绫诲瀷", trigger: "change" },
],
fieldNull: [
diff --git a/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs1.vue b/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs1.vue
index 4efb54bb..d83ee18c 100644
--- a/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs1.vue
+++ b/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs1.vue
@@ -177,7 +177,7 @@ const leftColumns = [
},
{
title: "鎿嶄綔",
- width: "20%",
+ width: "110px",
scopedSlots: {
customRender: "action",
},
@@ -199,7 +199,7 @@ const rightColumns = [
},
{
title: "鎿嶄綔",
- width: "20%",
+ width: "110px",
scopedSlots: {
customRender: "action",
},
diff --git a/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue b/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue
index 062d0572..c5a54440 100644
--- a/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue
+++ b/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue
@@ -198,7 +198,7 @@ const leftColumns = [
},
{
title: "鎿嶄綔",
- width: "20%",
+ width: "110px",
scopedSlots: {
customRender: "action",
},
@@ -224,7 +224,7 @@ const rightColumns = [
},
{
title: "鎿嶄綔",
- width: "20%",
+ width: "110px",
scopedSlots: {
customRender: "action",
},
diff --git a/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue b/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue
index 285f705b..c5defa51 100644
--- a/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue
+++ b/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue
@@ -265,7 +265,7 @@ const leftColumns = [
{
title: "鎿嶄綔",
- width: "20%",
+ width: "110px",
scopedSlots: {
customRender: "action",
},
@@ -292,7 +292,7 @@ const rightColumns = [
},
{
title: "鎿嶄綔",
- width: "20%",
+ width: "110px",
scopedSlots: {
customRender: "action",
},
diff --git a/base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue b/base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue
index df8f46fd..be0eaf56 100644
--- a/base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue
+++ b/base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue
@@ -253,7 +253,7 @@ const columns = [
},
{
title: "鎿嶄綔",
- width: "9%",
+ width: "120px",
scopedSlots: { customRender: "action" },
},
];
diff --git a/base-manager-ui/admin/src/pages/basicset/dept/addWindowMatter.vue b/base-manager-ui/admin/src/pages/basicset/dept/addWindowMatter.vue
index 05db63e5..21c00b2f 100644
--- a/base-manager-ui/admin/src/pages/basicset/dept/addWindowMatter.vue
+++ b/base-manager-ui/admin/src/pages/basicset/dept/addWindowMatter.vue
@@ -218,7 +218,7 @@ const leftColumns = [
},
{
title: "鎿嶄綔",
- width: "12%",
+ width: "110px",
scopedSlots: {
customRender: "action",
},
diff --git a/base-manager-ui/admin/src/pages/basicset/dept/department.vue b/base-manager-ui/admin/src/pages/basicset/dept/department.vue
index 97a72769..c7b70d01 100644
--- a/base-manager-ui/admin/src/pages/basicset/dept/department.vue
+++ b/base-manager-ui/admin/src/pages/basicset/dept/department.vue
@@ -137,12 +137,14 @@
{{ text.createTime | dateFormat }}
</template>
<!-- 鎿嶄綔 -->
- <span slot="action" slot-scope="text">
- <a class="yewu" type="primary" @click="workModal(text)">涓氬姟</a>
- <a class="shixiang" @click="addWindowMatter(text)">浜嬮」</a>
- <a class="edit" type="primary" @click="editModal(text)">缂栬緫</a>
- <a class="delete" @click="delWindow(text.id)">鍒犻櫎</a>
- </span>
+ <div slot="action" slot-scope="text">
+ <div class="flex flexwrap">
+ <a class="yewu" type="primary" @click="workModal(text)">涓氬姟</a>
+ <a class="shixiang" @click="addWindowMatter(text)">浜嬮」</a>
+ <a class="edit" type="primary" @click="editModal(text)">缂栬緫</a>
+ <a class="delete" @click="delWindow(text.id)">鍒犻櫎</a>
+ </div>
+ </div>
</a-table>
</div>
</div>
@@ -721,7 +723,7 @@ export default {
background-color: #fff;
}
.edit {
- color: rgb(41, 184, 41);
+ color: #03d76f;
margin-right: 5px;
}
.delete {
diff --git a/base-manager-ui/admin/src/pages/basicset/holiday/festival.vue b/base-manager-ui/admin/src/pages/basicset/holiday/festival.vue
index 4a441d68..dee7021f 100644
--- a/base-manager-ui/admin/src/pages/basicset/holiday/festival.vue
+++ b/base-manager-ui/admin/src/pages/basicset/holiday/festival.vue
@@ -63,8 +63,10 @@
</template>
<!-- 鎿嶄綔 -->
<template slot="action" slot-scope="text">
- <a type="primary" @click="handleEdit(text)" class="edit">缂栬緫</a>
- <a class="delet" @click="handleDel(text.id)">鍒犻櫎</a>
+ <a-space>
+ <a @click="handleEdit(text)" class="edit">缂栬緫</a>
+ <a class="delet" @click="handleDel(text.id)">鍒犻櫎</a>
+ </a-space>
</template>
</a-table>
</div>
@@ -123,7 +125,7 @@ const columns = [
},
{
title: "鎿嶄綔",
- width: "10%",
+ width: "110px",
scopedSlots: {
customRender: "action",
},
@@ -289,8 +291,7 @@ export default {
letter-spacing: normal;
}
.edit {
- color: rgb(41, 184, 41);
- margin-right: 40px;
+ color: #03d76f;
}
.delet {
color: red;
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/AddSurfaceTemplate.vue b/base-manager-ui/admin/src/pages/basicset/surface/AddSurfaceTemplate.vue
index 11a1fed0..e62d5a9a 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/AddSurfaceTemplate.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/AddSurfaceTemplate.vue
@@ -258,7 +258,7 @@ const leftColumns = [
},
{
title: "鎿嶄綔",
- width: "20%",
+ width: "110px",
scopedSlots: {
customRender: "action",
},
@@ -307,7 +307,7 @@ const rightColumns = [
},
{
title: "鎿嶄綔",
- width: "20%",
+ width: "110px",
scopedSlots: {
customRender: "action",
},
diff --git a/base-manager-ui/admin/src/pages/basicset/workman/personnel.vue b/base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
index e090af78..d70d9dee 100644
--- a/base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
+++ b/base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
@@ -231,7 +231,7 @@ const columns = [
{
title: "鎿嶄綔",
- width: "12%",
+ width: "160px",
scopedSlots: {
customRender: "action",
},
@@ -533,7 +533,7 @@ export default {
object-fit: cover;
}
.edit {
- color: #1bbc9b;
+ color: #03d76f;
}
.edit-pwd {
color: #1890ff;
--
2.24.3