airkoon/cellsysArt
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'airkoon/master'

Browse Source
This commit is contained in:
ag 2025-03-21 17:14:16 +08:00
commit dd1c9a7d48
3 changed files with 242 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artRepairFile.js
View File

@ -12,6 +12,7 @@ import ArtSystem from './artSystem';
class ArtRepairFile { class ArtRepairFile {
constructor(params = {}) { constructor(params = {}) {
this.cellsysType = "ArtRepairFile";
this.id = params.id; this.id = params.id;
this.name = params.name; this.name = params.name;
this.description = params.description; this.description = params.description;
@ -41,6 +42,7 @@ class ArtRepairFile {
//发布状态有关逻辑 //发布状态有关逻辑
this.isPublish = params.is_publish; this.isPublish = params.is_publish;
this.isUnlock = params.is_unlock; this.isUnlock = params.is_unlock;
this.publishRange=params.publish_range
} }
//艺术品封面图 //艺术品封面图

2
artRepairPlan.js
View File

@ -78,7 +78,7 @@ class ArtRepairPlan {
//变更修复方案 //变更修复方案
modificationRepairPlan(params) { modificationRepairPlan(params) {
let editTask = new EditTask(artApi.repairPlanInsert); let editTask = new EditTask(artApi.repairPlanInsert);
editTask.addParam('_repair_record_id', this.id); editTask.addParam('_repair_record_id', params.repairRecordId);
editTask.addParam('_id', params.id); editTask.addParam('_id', params.id);
editTask.addParam('_name', params.name); editTask.addParam('_name', params.name);
editTask.addParam('_repair_nodes', params.repairNodes); editTask.addParam('_repair_nodes', params.repairNodes);

473
components/Signature/write.vue
View File

@ -1,273 +1,278 @@
<template> <template>
<div class="signature-pad"> <div class="signature-pad">
<div class="container"> <div class="container">
<vue-signature-pad <vue-signature-pad
ref="signaturePadRef" ref="signaturePadRef"
:scaleToDevicePixelRatio="false" :scaleToDevicePixelRatio="false"
:options="options"></vue-signature-pad> :options="options"></vue-signature-pad>
</div>
<div class="dialog-footer">
<el-button
style="margin-left: 20px"
@click="close">
取消
</el-button>
<el-button
type="danger"
style="margin-left: 20px"
@click="clear">
清除
</el-button>
<el-button
plain
type="primary"
:loading="btnloading"
style="margin-left: 20px"
@click="save">
保存
</el-button>
</div>
</div> </div>
<div class="dialog-footer">
<el-button
style="margin-left: 20px"
@click="close">
取消
</el-button>
<el-button
type="danger"
style="margin-left: 20px"
@click="clear">
清除
</el-button>
<el-button
plain
type="primary"
:loading="btnloading"
style="margin-left: 20px"
@click="save">
保存
</el-button>
</div>
</div>
</template> </template>
<script> <script>
import { artApi } from '../../artApi.js'; import {artApi} from '../../artApi.js';
import { ElMessageBox } from 'element-plus'; import {ElMessageBox} from 'element-plus';
import { base64toFile } from '../../utils/utils.js'; import {base64toFile} from '../../utils/utils.js';
import ArtSystem from '../../artSystem.js'; import ArtSystem from '../../artSystem.js';
import { VueSignaturePad } from 'vue-signature-pad'; import {VueSignaturePad} from 'vue-signature-pad';
export default { export default {
name: 'write', name: 'write',
components: { VueSignaturePad }, components: {VueSignaturePad},
emits: ['save', 'close'], emits: ['save', 'close'],
props: { props: {
role: String, role: String,
id: Number, id: Number,
module: { module: {
type: String, //签名图片上传的所属模块 type: String, //签名图片上传的所属模块
},
}, },
data() { },
return { data() {
signaturePadKey: 0, return {
dialogVisible: false, signaturePadKey: 0,
options: { dialogVisible: false,
penColor: '#000', options: {
onBegin: () => { penColor: '#000',
//该签名组件有bug，在非移动端环境下需要重新渲染canvas的尺寸才能正常使用 onBegin: () => {
this.$refs.signaturePadRef.resizeCanvas(); //该签名组件有bug，在非移动端环境下需要重新渲染canvas的尺寸才能正常使用
this.$refs.signaturePadRef.resizeCanvas();
},
},
uploadApi: `/v2${artApi.artUploadPicture}`, //事件图片上传api地址
btnloading: false,
};
},
mounted() {
// 如果是移动端设备，强制横屏
// if (window.innerWidth < window.innerHeight) {
// this.lockOrientation();
// }
},
beforeUnmount() {
//组件销毁时退出横屏
this.exitFullscreenAndRestoreOrientation();
},
methods: {
// 退出全屏并恢复竖屏
exitFullscreenAndRestoreOrientation() {
// 恢复屏幕方向
if (screen.orientation && screen.orientation.unlock) {
// screen.orientation.unlock();
screen.orientation.lock('portrait');
} // 退出全屏
if (document.exitFullscreen && document.fullscreenElement !== null) {
document.exitFullscreen();
}
},
lockOrientation() {
if (document.documentElement.requestFullscreen) {
document.documentElement
.requestFullscreen()
.then(() => {
// 全屏成功后锁定横屏
screen.orientation.lock('landscape').catch((err) => {
console.error('无法锁定横屏:', err);
});
})
.catch((err) => {
console.error('全屏失败:', err);
ElMessageBox.alert('请使用横屏进行签名', '提示', {
confirmButtonText: '确定',
callback: () => {
this.lockOrientation();
}, },
}, });
uploadApi: `/v2${artApi.artUploadPicture}`, //事件图片上传api地址 });
btnloading: false, } else {
}; console.error('当前浏览器不支持全屏API');
}
}, },
mounted() {
// 如果是移动端设备，强制横屏
if (window.innerWidth < window.innerHeight) {
this.lockOrientation();
}
},
beforeUnmount() {
//组件销毁时退出横屏
this.exitFullscreenAndRestoreOrientation();
},
methods: {
// 退出全屏并恢复竖屏
exitFullscreenAndRestoreOrientation() {
// 恢复屏幕方向
if (screen.orientation && screen.orientation.unlock) {
// screen.orientation.unlock();
screen.orientation.lock('portrait');
} // 退出全屏
if (document.exitFullscreen && document.fullscreenElement !== null) {
document.exitFullscreen();
}
},
lockOrientation() {
if (document.documentElement.requestFullscreen) {
document.documentElement
.requestFullscreen()
.then(() => {
// 全屏成功后锁定横屏
screen.orientation.lock('landscape').catch((err) => {
console.error('无法锁定横屏:', err);
});
})
.catch((err) => {
console.error('全屏失败:', err);
ElMessageBox.alert('请使用横屏进行签名', '提示', {
confirmButtonText: '确定',
callback: () => {
this.lockOrientation();
},
});
});
} else {
console.error('当前浏览器不支持全屏API');
}
},
close() { close() {
this.exitFullscreenAndRestoreOrientation(); this.exitFullscreenAndRestoreOrientation();
this.$emit('close'); this.$emit('close');
}, },
clear() { clear() {
this.$refs.signaturePadRef.clearSignature(); this.$refs.signaturePadRef.clearSignature();
}, },
save() { save() {
const signatureData = this.$refs.signaturePadRef.saveSignature(); const signatureData = this.$refs.signaturePadRef.saveSignature();
this.btnloading = true; this.btnloading = true;
let base64Url = signatureData.data; let base64Url = signatureData.data;
let files = base64toFile(base64Url); let files = base64toFile(base64Url);
ArtSystem.uploadImage({ ArtSystem.uploadImage({
files: files, files: files,
module: this.module, module: this.module,
}) })
.then((res) => { .then((res) => {
let { code, data, message } = res; let {code, data, message} = res;
if (code !== 200) { if (code !== 200) {
this.$message({ this.$message({
message: '签名图片提交失败！原因：' + message, message: '签名图片提交失败！原因：' + message,
type: 'error', type: 'error',
}); });
return; return;
} }
const imageUrl = data.img_path; const imageUrl = data.img_path;
this.$emit('save', imageUrl); this.$emit('save', imageUrl);
}) })
.catch((error) => { .catch((error) => {
console.error(error); console.error(error);
this.$emit('error', error); this.$emit('error', error);
this.$message({
message: error,
type: 'error',
});
})
.finally(() => {
this.btnloading = false;
});
},
/*uploadSignatureImage(signatureData) {
this.btnloading = true;
let base64Url = signatureData.data;
let files = base64toFile(base64Url);
ArtSystem.uploadImage({
files: files,
module: this.module,
})
.then((res) => {
let { code, data, message } = res;
if (code !== 200) {
this.$message({ this.$message({
message: error, message: '签名图片提交失败！原因：' + message,
type: 'error', type: 'error',
}); });
}) return;
.finally(() => { }
this.btnloading = false; const imageUrl = data.img_path;
}); this.$emit('uploadSignatureImage', imageUrl);
},
/*uploadSignatureImage(signatureData) {
this.btnloading = true;
let base64Url = signatureData.data;
let files = base64toFile(base64Url);
ArtSystem.uploadImage({
files: files,
module: this.module,
}) })
.then((res) => { .catch((error) => {
let { code, data, message } = res; console.error(error);
if (code !== 200) { this.$emit('error', error);
this.$message({ this.$message({
message: '签名图片提交失败！原因：' + message, message: error,
type: 'error', type: 'error',
});
return;
}
const imageUrl = data.img_path;
this.$emit('uploadSignatureImage', imageUrl);
})
.catch((error) => {
console.error(error);
this.$emit('error', error);
this.$message({
message: error,
type: 'error',
});
})
.finally(() => {
this.btnloading = false;
}); });
},*/ })
}, .finally(() => {
this.btnloading = false;
});
},*/
},
}; };
</script> </script>
<style scoped> <style scoped>
.signature-pad { .signature-pad {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; padding: 5px;
padding: 5px;
} }
.container { .container {
width: 100%; width: 100%;
height: 100%; height: calc(100% - 120px);
padding: 8px; padding: 8px;
border: 1px solid; border: 1px solid;
} }
.dialog-footer { .dialog-footer {
display: flex;
flex-direction: row;
justify-content: space-around;
align-items: center;
height: 100px;
.otherSet {
width: 40%;
display: flex; display: flex;
flex-direction: column;
justify-content: space-around;
align-items: center; align-items: center;
.otherSet { .b1 {
width: 40%; width: 4px;
display: flex; height: 4px;
align-items: center;
.b1 {
width: 4px;
height: 4px;
}
.b2 {
width: 6px;
height: 6px;
}
.b3 {
width: 8px;
height: 8px;
}
.b1,
.b2,
.b3 {
display: inline-block;
background: #000;
border-radius: 50%;
}
.active {
border: 1px dashed #0074d9;
}
.circleWrap {
display: flex;
justify-content: center;
align-items: center;
width: 18px;
height: 18px;
cursor: pointer;
margin-right: 20px;
}
.penTxt {
width: 70px;
font-size: 12px;
color: #000;
}
} }
.b2 {
width: 6px;
height: 6px;
}
.b3 {
width: 8px;
height: 8px;
}
.b1,
.b2,
.b3 {
display: inline-block;
background: #000;
border-radius: 50%;
}
.active {
border: 1px dashed #0074d9;
}
.circleWrap {
display: flex;
justify-content: center;
align-items: center;
width: 18px;
height: 18px;
cursor: pointer;
margin-right: 20px;
}
.penTxt {
width: 70px;
font-size: 12px;
color: #000;
}
}
} }
:deep(.el-card) { :deep(.el-card) {
height: 25%; height: 25%;
width: 50%; width: 50%;
} }
:deep(.el-card__body) { :deep(.el-card__body) {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.svgClass { .svgClass {
width: 5rem; width: 5rem;
height: 5rem; height: 5rem;
margin-bottom: 2rem; margin-bottom: 2rem;
} }
</style> </style>