feat:合并

src/components/common/FJUpload.vue

@@ -58,7 +58,7 @@
 import {defineEmits, defineProps, ref, watch, onMounted} from "vue";
 import Upload from "./BaseUpload.vue";
 
-const emit = defineEmits({})
+const emit = defineEmits(["changevalue"])
 const props = defineProps({
   value: String,
 })
@@ -98,6 +98,7 @@ function init() {
 
 function del(i) {
   uploadRef.value.remove(i)
+  emit('changevalue', i)
 }
 
 </script>

src/views/courselibrary/courseModal.vue

@@ -337,7 +337,7 @@
                   <span style="margin-right: 10px">附件</span>
                 </div>
                 <div class="item_inp">
-                  <FJUpload v-model:value="attach"/>
+                  <FJUpload v-model:value="attach" @changevalue="changevalue"/>
                 </div>
               </div>
             </div>
@@ -572,6 +572,23 @@ export default defineComponent({
       ],
     });
 
+    // 删除文件返回参数
+    const changevalue = (e) => {
+      let arr = state.attach.split(',')
+      let newarr = []
+      for(let i=0;i<arr.length;i++){
+        if(i!==e){
+          newarr.push(arr[i])
+        }
+      }
+      if(newarr.length==0){
+        state.attach = "";
+      }else{
+        state.attach = newarr.toString()
+      }
+      console.log('changevalue', e, newarr,  state.attach)
+    }
+
     const visibleOpen = (offcourseId, name) => {
       state.offcourseId = offcourseId;
 
@@ -588,6 +605,7 @@ export default defineComponent({
     };
     const visibleClose = () => {
       state.ft_hs = false;
+      valueHtml.value = "";
       ft_exit();
       emit("visibleClose");
     };
@@ -626,6 +644,8 @@ export default defineComponent({
       state.attach = "";
       state.auditDescription = "";
 
+      valueHtml.value = "";
+
       // valueHtml.value = "";
     };
 
@@ -963,7 +983,8 @@ export default defineComponent({
       toolbarConfig,
       editorConfig,
       handleCreated,
-      choicePic
+      choicePic,
+      changevalue
     };
   },
 });

src/views/learningpath/LevelAdd.vue

@@ -1382,8 +1382,8 @@ export default {
         //         //  },
         {
           title: "当前关卡",
-          dataIndex: "cur",
-          key: "cur",
+          dataIndex: "currentStageName",
+          key: "currentStageName",
           width: 110,
           align: "center",
           className: "h",
@@ -1395,6 +1395,11 @@ export default {
           width: 110,
           align: "center",
           className: "h",
+          customRender: ({ record }) => (
+              <div>
+                {record.finishTaskNum}/{record.totalTaskNum}
+              </div>
+          ),
         },
         // {
         //   title: "开始时间",

src/views/projectcenter/ProjectManage.vue

@@ -1553,7 +1553,7 @@ export default {
                     state.projectInfo = {
                       parentName: value.record.name,
                       parentId: value.record.projectId,
-                      name: value.record.name,
+                      name: '',
                       sourceBelongId: value.record.sourceBelongId,
                       sourceBelongName: value.record.sourceBelongName,
                       manager: value.record.manager,