Merge remote-tracking branch 'origin/develop' into develop

src/components/drawers/project/AddCertificate.vue

@@ -462,20 +462,6 @@ export default {
     function CreateCertificate() {
       state.CCertificate = true;
     }
-    //上传封面
-    const handleChange = (info) => {
-      if (info.file.status === "uploading") {
-        return;
-      }
-      if (info.file.status === "done") {
-        console.log("上传图片返回的信息 %o", info.file.name);
-        state.imageUrl = process.env.VUE_APP_FILE_PATH + info.file.name;
-        state.imageName = process.env.VUE_APP_FILE_PATH + info.file.name;
-      }
-      if (info.file.status === "error") {
-        message.error("upload error");
-      }
-    };
 
     const beforeUpload = (file) => {
       const isJpgOrPng =
@@ -501,19 +487,14 @@ export default {
       fileUp(formDatas).then((res) => {
         if (res.data.code === 200) {
           console.log(file)
-          state.imageUrl = res.data.data;
-          state.imageName = file.name;
+          state.imageUrl =  process.env.VUE_APP_FILE_PATH + res.data.data;
+          state.imageName =  process.env.VUE_APP_FILE_PATH + res.data.data; 
         }
       });
       return false;
     };
 
-    // function beforeUpload(file) {
-    //   if (!state.fileType.includes(file.name.split(".").slice(-1).join(""))) {
-    //     message.error("不支持该格式");
-    //     return false;
-    //   }
-    // }
+
 
     //查看证书
     const getcertificate = () => {
@@ -528,7 +509,7 @@ export default {
           if (res.data.code === 200) {
             let info = res.data.data;
             state.certificateName = info.name; //证书名称
-            state.imageUrl = process.env.VUE_APP_FILE_PATH + info.url; //证书封面
+            state.imageUrl = info.url; //证书封面
             state.certificateRemark = info.remark; //证书说明
             state.condition = info.finishType; //选择条件
             state.large = info.finishType == 1 ? info.finishValue : null; //选择项目里的全部任务或必修任务
@@ -634,7 +615,6 @@ export default {
       closeDrawer,
       selectCondition,
       selectlarge,
-      handleChange,
       beforeUpload,
       CreateCertificate,
       saveupdatecertificate,

src/components/student/CommonStudent.vue

@@ -85,7 +85,7 @@
                   <div class="tab2">
                     <a-form-item label="组织：">
                       <a-input v-model:value="searchOrgName.keyword"
-                        style="width: 230px; height: 40px; border-radius: 8px" placeholder="请输入组织" />
+                        style="width: 230px; height: 40px; border-radius: 8px" placeholder="请输入组织" @click="orgValue"/>
                       <a-button type="primary" @click="searchOrg" style="margin-left: 20px; border-radius: 4px">
                         <template #icon>
                           <SearchOutlined />
@@ -97,13 +97,13 @@
                     </a-form-item>
                   </div>
                   <div class="boeTree">
-                    <a-tree :tree-data="searchOrgName.keyword ? orgData : treeOrgData" @select="onOrgSelectChange"
+                    <a-tree v-model:selectedKeys="selectedOrgKeys" :tree-data="searchOrgName.keyword ? orgData : treeOrgData" @select="onOrgSelectChange"
                       :loading="orgOrgLoading" :load-data="onLoadOrgData" :fieldNames="{
                         children: 'treeChildList',
                         key: 'id',
                         title: 'name',
                         value: 'name',
-                      }" row-key="id" :row-selection="orgRowSelection" multiple>
+                      }" row-key="id" :row-selection="orgRowSelection"  multiple>
                     </a-tree>
                   </div>
                 </div>
@@ -196,7 +196,7 @@
                   <div v-if="i < 11">
                     <div class="chose1">
                       <div class="span">{{ item.name }}</div>
-                      <div class="ch1" @click="orgDel(i)"></div>
+                      <div class="ch1" @click="orgDel(i)" style="cursor: pointer;"></div>
                     </div>
                   </div>
                   <div v-else>
@@ -613,6 +613,7 @@ const closeDrawer = () => {
   visiable.value = false;
   stuData.value = [];
   nameSearch.value.keyword = "";
+  selectedOrgKeys.value = [];
 };
 
 function onLoadData(treeNode) {
@@ -661,8 +662,16 @@ function stuDel(i) {
   selectsData.value.studentList.splice(i, 1);
 }
 
+const selectedOrgKeys = ref([]);
+
+watch(selectedOrgKeys, () => {
+  console.log('selectedKeys', selectedOrgKeys);
+});
+
 function orgDel(i) {
+  console.log(selectedOrgKeys.value)
   orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
+  selectedOrgKeys.value.splice(i, 1)
   selectsData.value.deptList.splice(i, 1)
 }
 
@@ -685,8 +694,12 @@ function onStuSelectChange(e, l) {
 }
 
 function onOrgSelectChange(e, l) {
+
   orgRowSelection.value = e;
   selectsData.value.deptList = l.selectedNodes;
+
+  // 获取被点击的树节点
+  
 }
 
 function onAuditSelectChange(e, l) {
@@ -727,6 +740,7 @@ const resetStu = () => {
 //清空选择部门信息
 const deleteDepSelect = () => {
   stuSelectKeys.value = [];
+  selectedOrgKeys.value = [];
 };
 //重置组织
 const resetOrg = () => {
@@ -821,6 +835,12 @@ function handleStageOk() {
   // }
 }
 
+// 搜索受众值发生变化
+function orgValue(value) {
+  console.log("", value.target.value);
+  searchOrgName.value.keyword = value.target.value;
+}
+
 watch(visiable, () => {
   stuSelectKeys.value = [];
   orgSelectKeys.value = [];