Merge branch 'qingban' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-CLIENT-TEMP into qingban

.env.development

@@ -11,7 +11,7 @@ VITE_APP_BASE_API = '/dev-api'
 VITE_APP_UPLOAD_URL = 'http://139.155.176.112:19000'
 
 # 开发接口地址
-VITE_APP_API_URL = 'http://192.168.1.112:7103'
+VITE_APP_API_URL = 'http://192.168.0.26:7104'
 # Websocket地址
 VITE_WEBSOCKET_URL = 'ws://192.168.1.112:7103'
 ``

src/components/ExcelView/index.vue

@@ -3,6 +3,8 @@
     <div class="header">
       <div style="display: flex">
         <span v-if="option.out" class="btn" @click="downloadExcel">导出</span>
+    
+
         <!-- <el-button
           type="primary"
           class="btn"
@@ -48,7 +50,6 @@ import { onMounted, ref, watch } from "vue";
 import { exportExcel } from "./export";
 import LuckyExcel from "luckyexcel";
 import resData from "./resetData";
-
 const props = defineProps({
   //双向绑定的data
   data: {
@@ -192,6 +193,12 @@ const leadingExcel = (item, fileList) => {
     emits("update:data", data);
     inName.value = file.name;
     window.luckysheet.create(resetOb.value);
+    luckysheet.imageInsertAfter = function (item) {
+      console.log("新的图片插入完成");
+      console.log("文件对象:", item);
+
+      // 在这里添加自定义逻辑
+    };
   });
 };
 //导出
@@ -271,7 +278,6 @@ defineExpose({
   addImg,
 });
 onMounted(() => {
-console.log(luckysheet)
   if (props.data == null) {
     inName.value = "表格模版";
     resetOb.value.data = resetdata;

src/views/pro-steps/components/excel.vue

@@ -87,7 +87,7 @@
             v-for="item in options"
             :key="item.id"
             :label="item.signatureName"
-            :value="item.signatureFiles"
+            :value="item.signBase64"
           />
         </el-select>
         <el-button
@@ -136,9 +136,7 @@ const addImg = () => {
     excelViewRef.value.selectCellValue.c &&
     excelViewRef.value.selectCellValue.r
   ) {
-    excelViewRef.value.addImg(
-      import.meta.env.VITE_APP_UPLOAD_URL + imgUrl.value
-    );
+    excelViewRef.value.addImg("data:image/png;base64," + imgUrl.value);
   } else {
     ElMessage.error("请先选择签章部署单元格");
   }