411

src/views/titlecomponent/TACS.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="XFpdding" style="height: 550px;">
+  <div class="XFpdding" style="height: 510px;">
     <ul>
       <li
         class="item"
@@ -29,10 +29,21 @@
                 upId="uniqueId1"
                 :imgSrc="tacsfileSrc"
                 name="点击选择文件"
+                @update-percentage="updatePercentage"
                 @upload-success="handleFileUploadSuccess"
+                @upload-status="getUploadStatus"
               />
             </template>
           </el-input>
+          <!-- 进度条 -->
+          <el-row v-if="showProgress" style="width: 100%; margin-top: 10px;">
+            <el-col :span="20">
+              <el-progress :percentage="percentage"></el-progress>
+            </el-col>
+            <el-col :span="4">
+              <div style="line-height: 15px">{{uploadStatus}}</div>
+            </el-col>
+          </el-row>
         </el-form-item>
       </el-form>
       <div style="flex-grow: 1;">
@@ -133,7 +144,7 @@
         <el-table
           :data="inParams"
           border
-          style="width: 100%; "
+          style="width: 100%;height: 450px;"
         >
           <el-table-column label="启用">
             <el-table-column type="index" width="70" label="编号">
@@ -247,77 +258,112 @@ let inParams=ref([
   {
     code:'thickness',
     name: '厚度分布',
-    value: '0.995208',
+    value: '0.005',
+    flag: 1,
+    con: ''
+  },
+  {
+    code:'thickness',
+    name: '厚度分布',
+    value: '0.003',
+    flag: 1,
+    con: ''
+  },
+  {
+    code:'thickness',
+    name: '厚度分布',
+    value: '0.003',
     flag: 1,
     con: ''
   },
   {
     code:'thickness',
     name: '厚度分布',
-    value: '0.992144',
+    value: '0.003',
     flag: 1,
     con: ''
   },
   {
     code:'thickness',
     name: '厚度分布',
-    value: '0.988525',
+    value: '0.003',
     flag: 1,
     con: ''
   },
   {
     code:'thickness',
     name: '厚度分布',
-    value: '0.984251',
+    value: '0.003',
     flag: 1,
     con: ''
   },
   {
     code:'thickness',
     name: '厚度分布',
-    value: '0.979202',
+    value: '0.003',
     flag: 1,
     con: ''
   },
   {
     code:'thickness',
     name: '厚度分布',
-    value: '0.973236',
+    value: '0.003',
     flag: 1,
     con: ''
   },
   {
     code:'thickness',
     name: '厚度分布',
-    value: '0.966186',
+    value: '0.003',
     flag: 1,
     con: ''
   },
   {
     code:'thickness',
     name: '厚度分布',
-    value: '0.957851',
+    value: '0.003',
     flag: 1,
     con: ''
   },
   {
     code:'thickness',
     name: '厚度分布',
-    value: '',
+    value: '0.003',
     flag: 1,
     con: ''
   },
   {
     code:'thickness',
     name: '厚度分布',
-    value: '',
+    value: '0.003',
     flag: 1,
     con: ''
   },
   {
     code:'thickness',
     name: '厚度分布',
-    value: '',
+    value: '0.003',
+    flag: 1,
+    con: ''
+  },
+  {
+    code:'thickness',
+    name: '厚度分布',
+    value: '0.003',
+    flag: 1,
+    con: ''
+  },
+  {
+    code:'thickness',
+    name: '厚度分布',
+    value: '0.003',
+    flag: 1,
+    con: ''
+  },
+  {
+    code:'thickness',
+    name: '厚度分布',
+    value: '0.003',
     flag: 1,
     con: ''
   },
@@ -344,6 +390,20 @@ let outParams=ref([
   },
 ])
 
+let percentage = ref(0)
+let uploadStatus = ref('')
+
+// 控制进度条显隐
+const showProgress = computed(() => percentage.value > 0 && percentage.value <= 100);
+// 更新进度条
+const updatePercentage = (newValue) => {
+  percentage.value = newValue
+}
+// 更新上传状态
+const getUploadStatus = (newValue) => {
+  uploadStatus.value = newValue
+}
+
 const selectTab2=(index)=>{
   currentTab2.value = index;
 }

src/views/vuetree/index.vue

@@ -474,10 +474,10 @@ function onNodeClick(e) {
 const  bgcolorfunc= (color)=>{
 
   bgcolor.value=color;
-if(noid.value.style!=undefined){
-  console.log(noid.value.style);
-  noid.value.style.backgroundColor=color;
-}
+  if(noid.value.style!=undefined){
+    console.log(noid.value.style);
+    noid.value.style.backgroundColor=color;
+  }
 
 }
 
@@ -1271,9 +1271,9 @@ const changeAllEdgesColor = (color1) => {
     // 更新该边缘的颜色
     let newColor = linecolor.value;
 
-    // 如果选中的线 `linetype` 是 `data`，则增加透明度 0.3
+    // 如果选中的线 `linetype` 是 `data`，则增加透明度 0.2
     if (seledge.value.data.type === 'data') {
-      newColor = convertToRGBA(linecolor.value, 0.3);
+      newColor = convertToRGBA(linecolor.value, 0.2);
     }
     const updatedEdge = { 
       ...seledge.value,