diff --git a/.gitignore b/.gitignore
index be001bbb8fd113303c7b623539ca60f47af6220f..9ad28d23dd04e6d428779b6567d0731ff8d40dd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
.DS_Store
node_modules/
+dist/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
diff --git a/README.en.md b/README.en.md
deleted file mode 100644
index 55d2db2ee41929bb2ab4a4341e95649e51a1b1d6..0000000000000000000000000000000000000000
--- a/README.en.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# WeBASE-Cdappadmin
-
-#### Description
-{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### Instructions
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### Contribution
-
-1. Fork the repository
-2. Create Feat_xxx branch
-3. Commit your code
-4. Create Pull Request
-
-
-#### Gitee Feature
-
-1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4. The most valuable open source project [GVP](https://gitee.com/gvp)
-5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
diff --git a/dist/index.html b/dist/index.html
index 292c52f2b14f00faf7c9d8733682870d1defcdc0..cbf676d167c19b68c72bf6bfc5769c331e33fc6b 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -1 +1 @@
-证书配置管理台
\ No newline at end of file
+证书配置管理台
\ No newline at end of file
diff --git a/dist/static/css/chunk-2fdb63b0.1d0b5cf1.css b/dist/static/css/chunk-2fdb63b0.1d0b5cf1.css
deleted file mode 100644
index ad3707334346880dde02b37dd0403abaff5f32ac..0000000000000000000000000000000000000000
--- a/dist/static/css/chunk-2fdb63b0.1d0b5cf1.css
+++ /dev/null
@@ -1 +0,0 @@
-.previewPic-dialog[data-v-16ca893a]{width:100%;height:560px;background:#f4f4f4}.previewPic-dialog img[data-v-16ca893a]{width:100%;height:100%;background-repeat:no-repeat;background-size:cover}.app-container[data-v-2b159789]{width:100%;height:100%;background:#fff;min-height:calc(100vh - 100px)}.app-container .header[data-v-2b159789]{width:100%;height:32px}.app-container .header .certCochain[data-v-2b159789],.app-container .header .downLoadCert[data-v-2b159789],.app-container .header .publish[data-v-2b159789],.app-container .header .stopPulish[data-v-2b159789],.app-container .header .uploadExcel[data-v-2b159789]{display:inline-block;height:32px;background-color:#3071f2;border-radius:4px;text-align:center;line-height:32px;padding:0 16px;cursor:pointer}.app-container .header .certCochain .logo[data-v-2b159789],.app-container .header .downLoadCert .logo[data-v-2b159789],.app-container .header .publish .logo[data-v-2b159789],.app-container .header .stopPulish .logo[data-v-2b159789],.app-container .header .uploadExcel .logo[data-v-2b159789]{background-size:cover;background-repeat:no-repeat;width:16px;height:16px;display:inline-block;vertical-align:text-bottom;margin-right:8px}.app-container .header .certCochain[data-v-2b159789]{margin-left:16px;cursor:pointer}.app-container .header .stopPulish[data-v-2b159789]{border-radius:4px;background:var(--red,#ff4d4f)}.app-container .header .downLoadCert[data-v-2b159789]{float:right;background-color:#fff;color:var(--grey-1,#262a32);font-family:PingFang SC;font-size:14px;font-style:normal;font-weight:400;border-radius:4px;border:1px solid var(--grey-5,#e0e4ed);cursor:pointer}.operateSpan[data-v-2b159789]{font-family:PingFang SC;font-size:14px;font-weight:400;line-height:22px;letter-spacing:0;text-align:left;color:#fff}.el-table tr[data-v-2b159789],[data-v-2b159789] .el-table th{background-color:#f6f7fb;color:var(--grey-1,#262a32);font-family:PingFang SC;font-size:14px;font-style:normal;font-weight:700;line-height:22px}[data-v-2b159789] .el-table__header th,[data-v-2b159789] .el-table__header tr{padding:0;height:42px}.configData[data-v-2b159789]{margin-top:24px}.configData .unchaining[data-v-2b159789]{color:var(--grey-1,#262a32);font-family:PingFang SC;font-size:12px;font-style:normal;font-weight:400;line-height:20px;display:inline-block;padding:0 8px;background-color:#edf0f6;border-radius:2px}.configData .chaining[data-v-2b159789]{background-color:#52b81f}.configData .chaining[data-v-2b159789],.configData .released[data-v-2b159789]{color:var(--grey-1,#fff);font-family:PingFang SC;font-size:12px;font-style:normal;font-weight:400;line-height:20px;display:inline-block;padding:0 8px;border-radius:2px}.configData .released[data-v-2b159789]{background-color:#c79d5e}.dialogPreviewPic[data-v-2b159789] .el-dialog__header{padding:0}.dialogPreviewPic[data-v-2b159789] .el-dialog__header .el-dialog__headerbtn{right:-40px;top:-40px}.dialogPreviewPic[data-v-2b159789] .el-dialog__header .el-dialog__headerbtn .el-dialog__close{font-size:32px;color:#fff}[data-v-2b159789] .el-dialog__body{padding:0}[data-v-2b159789] .el-upload-list{display:none}
\ No newline at end of file
diff --git a/src/views/addConfigManange/certificateConfigImg.vue b/src/views/addConfigManange/certificateConfigImg.vue
index fb8da89c65bb05bed2b8cd8d60b358e6d3f2aed8..4c81f4a1d6d58bedd95aa139d1000f0197667bad 100644
--- a/src/views/addConfigManange/certificateConfigImg.vue
+++ b/src/views/addConfigManange/certificateConfigImg.vue
@@ -182,10 +182,10 @@ export default {
numFont: "34",
filedFont: "28",
qrCodeLocal: {
- h: "48",
- w: "180",
- x: "234",
- y: "518",
+ h: "174",
+ w: "174",
+ x: "1290",
+ y: "244",
},
fields: [
{
@@ -363,7 +363,7 @@ export default {
},
saveCertPic_Way(jump) {
this.SET_LOADING(true);
- const reqData = this.configData;
+ const reqData = JSON.parse(JSON.stringify(this.configData));
if (this.certificate_Id) {
reqData.id = this.certificate_Id;
}
@@ -470,10 +470,10 @@ export default {
},
recoverCodeP() {
this.configData.qrCodeLocal = {
- h: "48",
- w: "180",
- x: "234",
- y: "518",
+ h: "174",
+ w: "174",
+ x: "1290",
+ y: "244",
};
this.$refs["configData"].clearValidate();
},
diff --git a/src/views/addConfigManange/certificateConfigImport.vue b/src/views/addConfigManange/certificateConfigImport.vue
index 6f145285e38609852cf73627fd90fdac66528f7b..632d585b0553bcf909e7226edca4d58a5019c813 100644
--- a/src/views/addConfigManange/certificateConfigImport.vue
+++ b/src/views/addConfigManange/certificateConfigImport.vue
@@ -7,7 +7,7 @@
点击上传文件
- 支持xls、xlsx格式
+ 支持xlsx格式
diff --git a/src/views/addConfigManange/certificateConfigResult.vue b/src/views/addConfigManange/certificateConfigResult.vue
index 48e36e9998123c542fd53da49adf02f10c217dfe..ee894cab57a6251b4a50aa533273daee87751511 100644
--- a/src/views/addConfigManange/certificateConfigResult.vue
+++ b/src/views/addConfigManange/certificateConfigResult.vue
@@ -243,20 +243,35 @@ export default {
}
});
},
- updateSelectedOptions(newSelection) {
+ updateSelectedOptions(selection) {
// Find newly selected options
- const newlySelectedOptions = [];
- newSelection.forEach((option) =>
- newlySelectedOptions.push(JSON.parse(option))
- );
+ let newlySelectedOptions = [];
+ let newSelection = [];
+ const allFileds = this.resultData.fields;
+ const fields = [];
+ const allFields = [];
+ allFileds.forEach((option) => {
+ fields.push(JSON.stringify(JSON.parse(JSON.stringify(option))));
+ allFields.push(JSON.parse(JSON.stringify(option)));
+ });
+
+ selection.forEach((option) => newSelection.push(JSON.parse(option)));
+ newlySelectedOptions = newSelection.filter((option) =>
+ fields.includes(JSON.stringify(option))
+ );
// Find unselected options
- const unselectedOptions = this.resultData.fields.filter(
- (option) => !newSelection.includes(JSON.stringify(option))
+ const newlySelectedOptionsString = [];
+ newlySelectedOptions.forEach((option) =>
+ newlySelectedOptionsString.push(JSON.stringify(option))
+ );
+ const unselectedOptions = allFields.filter(
+ (option) => !newlySelectedOptionsString.includes(JSON.stringify(option))
);
// Update selectedOptions array with the new selection
// Preserve the original order of selectedOptions
+ this.resultData.enableFields = newlySelectedOptionsString
this.resultData.fields = [...newlySelectedOptions, ...unselectedOptions];
// Update prevSelectedOptions for the next change event
diff --git a/src/views/createCertList/index.vue b/src/views/createCertList/index.vue
index 30d9c2f0b7ecad0cb4f92bcda4a235affc3ba23b..705e94086e3335152287228f1ed4d56dc37c4b56 100644
--- a/src/views/createCertList/index.vue
+++ b/src/views/createCertList/index.vue
@@ -129,7 +129,7 @@ export default {
},
coChaining() {
this.$confirm(
- "上链后证书内容将不可修改巴啦啦啦提示说明",
+ "上链后证书内容将不可修改",
"确定上链所有证书？",
{
customClass: "messageBox_coChain",
@@ -196,6 +196,7 @@ export default {
});
},
downLoad(row) {
+ debugger
const reqData = {
id: row.id,
};
@@ -204,7 +205,7 @@ export default {
const previewCertPicData = res.result;
let downloadElement = document.createElement("a");
downloadElement.href = previewCertPicData;
- downloadElement.download = row.name + ".png"; //下载后文件名
+ downloadElement.download = row.certificatID + ".png"; //下载后文件名
document.body.appendChild(downloadElement);
downloadElement.click(); //触发点击下载
document.body.removeChild(downloadElement); //下载完成移除元素
@@ -260,7 +261,7 @@ export default {
.map((char) => char.charCodeAt(0))
);
// Add the image to the zip
- folder.file(`image_${index + 1}.${extension}`, byteArray, {
+ folder.file(`${base64Image.certificatID}.${extension}`, byteArray, {
base64: true,
});
});