8 months ago · 87d3459b64
--- a/index.html
+++ b/index.html
@@ -12,6 +12,8 @@
 
				   <body>
			
 
				     <div id="app"></div>
			
 
				     <script type="module" src="/src/main.ts"></script>
			
 
				+    <script src="/public/jquery/jquery.min.js"></script>
			
 
				+    <script src="/public/webuploader/webuploader.min.js"></script>
			
 
				     <!-- <script type="module" src="./public/static/Build/Build.data"></script>
			
 
				     <script type="module" src="./public/static/Build/Build.wasm"></script> -->
			
 
				   </body>
			
--- a/public/jquery/jquery.min.js
+++ b/public/jquery/jquery.min.js
--- a/public/webuploader/webuploader.min.js
+++ b/public/webuploader/webuploader.min.js
--- a/src/assets/flowimg/ffdFileSave.png
+++ b/src/assets/flowimg/ffdFileSave.png
--- a/src/views/components/fileuploads.vue
+++ b/src/views/components/fileuploads.vue
@@ -6,7 +6,9 @@
 
				                     <el-col :span="6"> <div :id="'picker'+upId" class="text_color" >选择文件</div>  </el-col> -->
			
 
				                     <!-- <el-button :id="'picker'+upId"> {{name}} </el-button> -->
			
 
				                     <div class="btntext upname wenjian" > {{ gfname}}</div>
			
 
				-                    <div class="btntext upname" :id="'picker'+upId">{{name}}</div>
			
 
				+                    <div class="btntext upname" :id="'picker'+upId" style="width:28px;height:24px;">
			
 
				+                        <img :src="imgSrc" alt="upload icon" class="custom-icon"/>
			
 
				+                    </div>
			
 
				                 </el-row>
			
 
				 
			
 
				                 <el-row v-for="(fileObj,key) in files" :key="key" class="disflex">
			
@@ -23,7 +25,7 @@
 
				 </template>
			
 
				 <script setup>
			
 
				 import $ from 'jquery' ;
			
 
				-import WebUploader from 'webuploader';
			
 
				+// import WebUploader from 'webuploader';
			
 
				 import store from "@/store";
			
 
				 import { request, uploadFile } from "@/utils/request";
			
 
				 import { ElMessage, ElButton, ElDialog } from "element-plus";
			
@@ -36,13 +38,14 @@ import {
 
				   Star,
			
 
				 } from '@element-plus/icons-vue'
			
 
				 const props = defineProps({ 
			
 
				-         projectId: Number,
			
 
				+        projectId: Number,
			
 
				         solverType: String,
			
 
				         accept:String,
			
 
				         upId:String,
			
 
				         name:String,
			
 
				         namelist:Array,//文件名的集合
			
 
				-        gfname:String
			
 
				+        gfname:String,
			
 
				+        imgSrc:String, // 按钮logo
			
 
				  });
			
 
				  let emit = defineEmits(['Gassaddgfid', 'Gassaddbfid'])
			
 
				 let runupboolen=ref(true);
			
@@ -319,4 +322,10 @@ color: #fff;
 
				 .webuploader-container .el-icon{
			
 
				     color: #fff;
			
 
				 }
			
 
				+
			
 
				+.custom-icon {
			
 
				+    width: 100%; 
			
 
				+    height: auto; 
			
 
				+    display: block; 
			
 
				+}
			
 
				 </style>
			
--- a/src/views/titlecomponent/ffds.vue
+++ b/src/views/titlecomponent/ffds.vue
@@ -1,6 +1,24 @@
 
				 <template>
			
 
				   <div class="XFpdding">
			
 
				     <div>
			
 
				+      <el-form-item label="FFD box：" :label-width="formLabelWidth1">
			
 
				+        <el-input
			
 
				+          v-model="cstnum"
			
 
				+          :max="20"
			
 
				+          controls-position="right"
			
 
				+          @keydown.enter="keydownenter"
			
 
				+        >
			
 
				+        <template #append>
			
 
				+          <fileUploads
			
 
				+          :projectId="123" 
			
 
				+          solverType="exampleSolver" 
			
 
				+          accept=".xyz" 
			
 
				+          upId="uniqueId1" 
			
 
				+          name="点击选择文件"
			
 
				+          :imgSrc="imageSrc"
			
 
				+          />
			
 
				+        </template>
			
 
				+        </el-input>
			
 
				       <el-form-item label="FFD包围盒：" :label-width="formLabelWidth1" style="align-items: center;">
			
 
				         <el-row align="middle" :gutter="20">
			
 
				           <el-col :span="22">
			
@@ -77,6 +95,7 @@
 
				 import { ref, onMounted, reactive, provide, nextTick } from "vue"
			
 
				 import { RouterView, RouterLink, useRouter, useRoute } from "vue-router"
			
 
				 import myheader from "@/components/header.vue"
			
 
				+import fileUploads from '../components/fileuploads.vue'
			
 
				 import { request, uploadFile } from "@/utils/request"
			
 
				 import { ElMessage, ElButton, ElDialog, ElSelect } from "element-plus"
			
 
				 import { Edit, CaretBottom } from "@element-plus/icons-vue"
			
@@ -96,7 +115,7 @@ let order = ref(0)
 
				 let vars = ref()
			
 
				 let tableDatacst1 = ref([])
			
 
				 let tablecstHeaders = ref([]) // 表格列头
			
 
				-
			
 
				+const imageSrc = new URL('@/assets/flowimg/ffdFileSave.png', import.meta.url).href;
			
 
				 const generateTable = () => {
			
 
				   console.log("generateTable");