Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

jeecgboot-vue3-master/src/router/routes/index.ts

@@ -123,15 +123,14 @@ export const compcom = {
 
     },
 
-    {
+    // {
-      path:'topic/topic/list5',
+    //   path:'topic/topic/list5',
-      name:'topic/topic/list5',
+    //   name:'topic/topic/list5',
-      component: ()=> import('/@/views/topic/TopicList5.vue'),
+    //   component: ()=> import('/@/views/topic/TopicList5.vue'),
-      meta:{
+    //   meta:{
-        title:'评分标准'
+    //     title:'评分标准'
-      }
+    //   }
-
+    // },
-    },
     {
       path:'organizingCommittee',
       name:'OrganizingCommittee',

jeecgboot-vue3-master/src/utils/http/axios/index.ts

@@ -235,7 +235,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
         // authentication schemes，e.g: Bearer
         // authenticationScheme: 'Bearer',
         authenticationScheme: '',
-        timeout: 10 * 1000,
+        timeout: 20 * 1000,
         // 基础接口地址
         // baseURL: globSetting.apiUrl,
         headers: { 'Content-Type': ContentTypeEnum.JSON },

jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue

@@ -237,7 +237,7 @@
    */
   function pfbz(record: Recordable) {
     router.push({
-      path: '/compp/topic/topic/list5',
+      path: '/topic/topic/list5',
       query: {acpid: record.id}
     });
   }

jeecgboot-vue3-master/src/views/expscore/ExpScoreList.vue

@@ -146,8 +146,9 @@
     xzzf({zjpfid:record.id}).then((result)=>{
       console.log(result)
       if(result=="true"){
-        registerModal.value.disableSubmit = false;
         registerModal.value.edit(record);
+        registerModal.value.disableSubmit = false;
+
       }else{
         createMessage.warning("评分细则总分不足100分，请先添加评分细则");
       }

jeecgboot-vue3-master/src/views/expscore/components/ExpScoreModal.vue

@@ -8,7 +8,6 @@
   import { ref, nextTick, defineExpose } from 'vue';
   import ExpScoreForm from '../../scorestapointd/ScoreStaPointDList.vue'
   import { useRoute } from 'vue-router';
-
   const route = useRoute();
   const title = ref<string>('');
   const width = ref<number>(800);
@@ -16,7 +15,6 @@
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();
   const emit = defineEmits(['register', 'success']);
-
   /**
    * 新增
    */
@@ -33,6 +31,9 @@
    * @param record
    */
   function edit(record) {
+    console.log(record.id);
+    console.log(registerForm.value);
+    registerForm.value?  registerForm.value.searchReset() : ''
     title.value = disableSubmit.value ? '详情' : '细则得分';
     visible.value = true;
     let id= record.id;

jeecgboot-vue3-master/src/views/scorestapointd/ScoreStaPointDList.vue

@@ -184,6 +184,8 @@
    * 查询
    */
   function searchQuery() {
+    console.log('查询');
+    
     reload();
   }
 
@@ -218,6 +220,8 @@
   }
   defineExpose({
     submitForm,
+    searchQuery,
+    searchReset
   });