From 8ced988725eb9ba1761a9153f8908651c61688a6 Mon Sep 17 00:00:00 2001
From: yangrd <1020519285@qq.com>
Date: Tue, 18 Mar 2025 10:41:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=AD=BE=E5=90=8D=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E7=AB=96=E5=B1=8F=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Signature/write.vue | 473 +++++++++++++++++----------------
 1 file changed, 239 insertions(+), 234 deletions(-)

diff --git a/components/Signature/write.vue b/components/Signature/write.vue
index ba1c177..56a8812 100644
--- a/components/Signature/write.vue
+++ b/components/Signature/write.vue
@@ -1,273 +1,278 @@
 <template>
-    <div class="signature-pad">
-        <div class="container">
-            <vue-signature-pad
-                ref="signaturePadRef"
-                :scaleToDevicePixelRatio="false"
-                :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 class="signature-pad">
+    <div class="container">
+      <vue-signature-pad
+          ref="signaturePadRef"
+          :scaleToDevicePixelRatio="false"
+          :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>
 </template>
 
 <script>
-import { artApi } from '../../artApi.js';
-import { ElMessageBox } from 'element-plus';
-import { base64toFile } from '../../utils/utils.js';
+import {artApi} from '../../artApi.js';
+import {ElMessageBox} from 'element-plus';
+import {base64toFile} from '../../utils/utils.js';
 import ArtSystem from '../../artSystem.js';
-import { VueSignaturePad } from 'vue-signature-pad';
+import {VueSignaturePad} from 'vue-signature-pad';
 
 export default {
-    name: 'write',
-    components: { VueSignaturePad },
-    emits: ['save', 'close'],
-    props: {
-        role: String,
-        id: Number,
-        module: {
-            type: String, //签名图片上传的所属模块
-        },
+  name: 'write',
+  components: {VueSignaturePad},
+  emits: ['save', 'close'],
+  props: {
+    role: String,
+    id: Number,
+    module: {
+      type: String, //签名图片上传的所属模块
     },
-    data() {
-        return {
-            signaturePadKey: 0,
-            dialogVisible: false,
-            options: {
-                penColor: '#000',
-                onBegin: () => {
-                    //该签名组件有bug，在非移动端环境下需要重新渲染canvas的尺寸才能正常使用
-                    this.$refs.signaturePadRef.resizeCanvas();
+  },
+  data() {
+    return {
+      signaturePadKey: 0,
+      dialogVisible: false,
+      options: {
+        penColor: '#000',
+        onBegin: () => {
+          //该签名组件有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() {
-            this.exitFullscreenAndRestoreOrientation();
-            this.$emit('close');
-        },
-        clear() {
-            this.$refs.signaturePadRef.clearSignature();
-        },
+    close() {
+      this.exitFullscreenAndRestoreOrientation();
+      this.$emit('close');
+    },
+    clear() {
+      this.$refs.signaturePadRef.clearSignature();
+    },
 
-        save() {
-            const signatureData = this.$refs.signaturePadRef.saveSignature();
-            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({
-                            message: '签名图片提交失败！原因：' + message,
-                            type: 'error',
-                        });
-                        return;
-                    }
-                    const imageUrl = data.img_path;
-                    this.$emit('save', imageUrl);
-                })
-                .catch((error) => {
-                    console.error(error);
-                    this.$emit('error', error);
+    save() {
+      const signatureData = this.$refs.signaturePadRef.saveSignature();
+      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({
+                message: '签名图片提交失败！原因：' + message,
+                type: 'error',
+              });
+              return;
+            }
+            const imageUrl = data.img_path;
+            this.$emit('save', imageUrl);
+          })
+          .catch((error) => {
+            console.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({
-                        message: error,
+                        message: '签名图片提交失败！原因：' + message,
                         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,
+                    return;
+                }
+                const imageUrl = data.img_path;
+                this.$emit('uploadSignatureImage', imageUrl);
             })
-                .then((res) => {
-                    let { code, data, message } = res;
-                    if (code !== 200) {
-                        this.$message({
-                            message: '签名图片提交失败！原因：' + message,
-                            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;
+            .catch((error) => {
+                console.error(error);
+                this.$emit('error', error);
+                this.$message({
+                    message: error,
+                    type: 'error',
                 });
-        },*/
-    },
+            })
+            .finally(() => {
+                this.btnloading = false;
+            });
+    },*/
+  },
 };
 </script>
 
 <style scoped>
 .signature-pad {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    padding: 5px;
+  width: 100%;
+  height: 100%;
+  padding: 5px;
 }
+
 .container {
-    width: 100%;
-    height: 100%;
-    padding: 8px;
-    border: 1px solid;
+  width: 100%;
+  height: calc(100% - 120px);
+  padding: 8px;
+  border: 1px solid;
 }
+
 .dialog-footer {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  align-items: center;
+  height: 100px;
+
+  .otherSet {
+    width: 40%;
     display: flex;
-    flex-direction: column;
-    justify-content: space-around;
     align-items: center;
 
-    .otherSet {
-        width: 40%;
-        display: flex;
-        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;
-        }
+    .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;
+    }
+  }
 }
+
 :deep(.el-card) {
-    height: 25%;
-    width: 50%;
+  height: 25%;
+  width: 50%;
 }
+
 :deep(.el-card__body) {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
 }
+
 .svgClass {
-    width: 5rem;
-    height: 5rem;
-    margin-bottom: 2rem;
+  width: 5rem;
+  height: 5rem;
+  margin-bottom: 2rem;
 }
 </style>

From 908a61d6b6a2d4d609fb048107b6ba1a5f0d9660 Mon Sep 17 00:00:00 2001
From: yangrd <1020519285@qq.com>
Date: Thu, 20 Mar 2025 11:16:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0cellsystype?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 artRepairFile.js | 2 ++
 1 file changed, 2 insertions(+)

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

From 08fffc674d9920dc7ea95cd1090b9d390d5f0b80 Mon Sep 17 00:00:00 2001
From: yangrd <1020519285@qq.com>
Date: Thu, 20 Mar 2025 11:17:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88id=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 artRepairPlan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/artRepairPlan.js b/artRepairPlan.js
index 11b85f3..82fd396 100644
--- a/artRepairPlan.js
+++ b/artRepairPlan.js
@@ -78,7 +78,7 @@ class ArtRepairPlan {
     //变更修复方案
     modificationRepairPlan(params) {
         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('_name', params.name);
         editTask.addParam('_repair_nodes', params.repairNodes);