Browse Source

[bug] 优化

byq 1 month ago
parent
commit
94518ec40d

+ 2 - 1
src/utils/request.js

@@ -55,7 +55,8 @@ service.interceptors.request.use(config => {
             const s_url = sessionObj.url                // 请求地址
             const s_url = sessionObj.url                // 请求地址
             const s_data = sessionObj.data              // 请求数据
             const s_data = sessionObj.data              // 请求数据
             const s_time = sessionObj.time              // 请求时间
             const s_time = sessionObj.time              // 请求时间
-            const interval = 1000                       // 间隔时间(ms),小于此时间视为重复提交
+            const interval = 1000// 间隔时间(ms),小于此时间视为重复提交
+            console.log("s_url",s_url);
             if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
             if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
                 const message = '数据正在处理,请勿重复提交'
                 const message = '数据正在处理,请勿重复提交'
                 console.warn(`[${s_url}]: ` + message)
                 console.warn(`[${s_url}]: ` + message)

+ 8 - 8
src/views/xjc-integratedmachine/components/collection_component.vue

@@ -44,17 +44,17 @@ function collection() {
 }
 }
 //加入对比
 //加入对比
 function addCompareList (){
 function addCompareList (){
-
   let data = {
   let data = {
     type: props.collection.contentType,
     type: props.collection.contentType,
-    businessId: props.collection.contentId
-  }
-  addCompare(
-      data
-  ).then(resp => {
+    businessId: props.collection.contentId}
+    setTimeout(() => {
+    addCompare(
+        data
+    ).then(resp => {
 
 
-  })
-  parentMethod();
+    })
+      parentMethod();
+  }, 700)
 }
 }
 
 
 const parentMethod = inject('parentMethod');
 const parentMethod = inject('parentMethod');

+ 11 - 30
src/views/xjc-integratedmachine/components/head_component.vue

@@ -7,10 +7,10 @@
       <div class="head-title">
       <div class="head-title">
         <div v-if="headinfo.title">{{headinfo.title}}</div>
         <div v-if="headinfo.title">{{headinfo.title}}</div>
       </div>
       </div>
-      <div class="contrast-box" v-show="headinfo.contrast" >
-        <img class="contrast"  src="@/assets/images/environment/contrast-btn.png"
+      <div class="contrast-box"  >
+        <img class="contrast" v-show="headinfo.contrast" src="@/assets/images/environment/contrast-btn.png"
              @click="contrastTo">
              @click="contrastTo">
-        <p class="text">{{contrastSize}}</p>
+        <p class="text" v-show="headinfo.contrast">{{contrastSize}}</p>
       </div>
       </div>
       <div class="head-right" v-if="!headinfo.isLogin">
       <div class="head-right" v-if="!headinfo.isLogin">
         <div class="right-user">
         <div class="right-user">
@@ -53,28 +53,6 @@
         // clearData()
         // clearData()
       }
       }
     }
     }
-    //返回后清空对比数据;
-    // function clearData(){
-    //   let contrastList = [];
-    //   console.log("props.headinfo.contrastType",props.headinfo.contrastType)
-    //   if(props.headinfo.contrastType === 'major'){
-    //     contrastList = JSON.parse(sessionStorage.getItem('majorList'));
-    //     if(contrastList && contrastList.length >= 2 ){
-    //       sessionStorage.removeItem('majorList');
-    //     }
-    //   }else if(props.headinfo.contrastType === 'university'){
-    //     contrastList = JSON.parse(sessionStorage.getItem('contrastList'));
-    //     if(contrastList && contrastList.length >= 2 ){
-    //       sessionStorage.removeItem('contrastList');
-    //     }
-    //   }else if(props.headinfo.contrastType === 'occ'){
-    //     contrastList = JSON.parse(sessionStorage.getItem('occList'));
-    //     if(contrastList && contrastList.length >= 2 ){
-    //       sessionStorage.removeItem('occList');
-    //     }
-    //   }
-    //
-    // }
     function homeUrlTo() {
     function homeUrlTo() {
         router.push({
         router.push({
           path: props.headinfo.homeUrl
           path: props.headinfo.homeUrl
@@ -119,11 +97,14 @@
     //拿到对比数量
     //拿到对比数量
    function getCompareSizeData (num){
    function getCompareSizeData (num){
       console.log("num",num)
       console.log("num",num)
-     getCompareSize({
-       type:props.headinfo.contrastType || num
-     }).then(resp => {
-       contrastSize.value =  resp.data
-     })
+     setTimeout(() => {
+       getCompareSize({
+         type:props.headinfo.contrastType || num
+       }).then(resp => {
+         contrastSize.value =  resp.data
+       })
+     }, 500)
+
    }
    }
     onMounted(() => {
     onMounted(() => {
       // getCompareSizeData()
       // getCompareSizeData()

+ 1 - 0
src/views/xjc-integratedmachine/environment/constrast_career.vue

@@ -188,6 +188,7 @@ function getData() {
       }).then(res => {
       }).then(res => {
         item.bk_list = res.bk_list;
         item.bk_list = res.bk_list;
       })
       })
+      console.log("contrastData",contrastData)
     })
     })
   })
   })
 }
 }

+ 23 - 17
src/views/xjc-integratedmachine/environment/contrast_major.vue

@@ -50,26 +50,25 @@
             </tr>
             </tr>
             <tr>
             <tr>
               <td>学科门类</td>
               <td>学科门类</td>
-<!--              <td class="text-td" v-for="(item,index) in contrastData" :key="index">-->
-<!--                <p style="text-align: center;font-size: 32px">{{ item.smoSpecialty.subjectcategories }}</p>-->
-<!--              </td>-->
+              <td class="text-td" v-for="(item,index) in contrastData" :key="index">
+                <p style="text-align: center;font-size: 32px">{{ item.smoSpecialty && item.smoSpecialty.subjectcategories }}</p>
+              </td>
             </tr>
             </tr>
             <tr>
             <tr>
               <td>一级学科</td>
               <td>一级学科</td>
-<!--              <td class="text-td" v-for="(item,index) in contrastData" :key="index">-->
-<!--                <p style="text-align: center">{{ item.smoSpecialty.firstsubject }}</p>-->
-<!--              </td>-->
+              <td class="text-td" v-for="(item,index) in contrastData" :key="index">
+                <p style="text-align: center">{{ item.smoSpecialty &&  item.smoSpecialty.firstsubject }}</p>
+              </td>
             </tr>
             </tr>
             <tr>
             <tr>
               <td>授权学位</td>
               <td>授权学位</td>
               <td v-for="(item,index) in contrastData" :key="index" >
               <td v-for="(item,index) in contrastData" :key="index" >
                 <p>{{ item.specialty.degree }}</p>
                 <p>{{ item.specialty.degree }}</p>
                 </td>
                 </td>
-
             </tr>
             </tr>
             <tr>
             <tr>
               <td>修学年限</td>
               <td>修学年限</td>
-              <td v-for="(item,index) in contrastData" :key="index" class="text-td">{{ item.years }}</td>
+              <td v-for="(item,index) in contrastData" :key="index" class="text-td">{{ item.specialty.years }}</td>
             </tr>
             </tr>
             </tbody>
             </tbody>
           </table>
           </table>
@@ -87,7 +86,7 @@
             <tr class="two-tr">
             <tr class="two-tr">
               <td>主修课程</td>
               <td>主修课程</td>
               <td class="text-td" v-for="(item,index) in contrastData" :key="index">
               <td class="text-td" v-for="(item,index) in contrastData" :key="index">
-                <p style="text-align: center" v-html="item.course"></p>
+                <p style="text-align: left;padding:10px;font-size: 28px" v-html="item.specialty.course"></p>
               </td>
               </td>
             </tr>
             </tr>
             </tbody>
             </tbody>
@@ -106,10 +105,8 @@
             <tr class="two-tr">
             <tr class="two-tr">
               <td>专业解读</td>
               <td>专业解读</td>
               <td class="text-td" v-for="(item,index) in contrastData" :key="index">
               <td class="text-td" v-for="(item,index) in contrastData" :key="index">
-                <div class="info" v-if="!item.describe"  v-html="item.describe"></div>
+                <div class="info" v-if="!item.specialty.describe"  v-html="item.specialty.describe"></div>
                 <div class="info" v-else >暂无</div>
                 <div class="info" v-else >暂无</div>
-
-<!--                <p style="text-align: center" >{{ item.code }}</p>-->
               </td>
               </td>
             </tr>
             </tr>
             </tbody>
             </tbody>
@@ -120,7 +117,7 @@
             <thead>
             <thead>
             <tr class="one-tr">
             <tr class="one-tr">
               <td class="first-title">专业名称</td>
               <td class="first-title">专业名称</td>
-              <td v-for="(item,index) in contrastData" :key="index">{{ item.name }}</td>
+              <td v-for="(item,index) in contrastData" :key="index">{{ item.specialty.name }}</td>
             </tr>
             </tr>
             </thead>
             </thead>
             <tbody>
             <tbody>
@@ -128,7 +125,7 @@
             <tr class="two-tr">
             <tr class="two-tr">
               <td>就业前景与方向</td>
               <td>就业前景与方向</td>
               <td class="text-td" v-for="(item,index) in contrastData" :key="index">
               <td class="text-td" v-for="(item,index) in contrastData" :key="index">
-                <div class="info"  v-html="item.describe"></div>
+                <div class="info"  v-html="item.specialty.describe"></div>
                 <!--                <p style="text-align: center" >{{ item.code }}</p>-->
                 <!--                <p style="text-align: center" >{{ item.code }}</p>-->
               </td>
               </td>
             </tr>
             </tr>
@@ -169,6 +166,8 @@ import Drag_component from "@/views/xjc-integratedmachine/components/drag_compon
 import {ref} from "vue";
 import {ref} from "vue";
 import {getUniversityByKeyword} from "@/api/xjc-integratedmachine/environment/university.js";
 import {getUniversityByKeyword} from "@/api/xjc-integratedmachine/environment/university.js";
 import {getCompareList} from "@/api/xjc-integratedmachine/environment/common.js";
 import {getCompareList} from "@/api/xjc-integratedmachine/environment/common.js";
+import {occupationDetail} from "@/api/xjc-integratedmachine/environment/occupation.js";
+import {specialtyDetail} from "@/api/xjc-integratedmachine/environment/specialty.js";
 
 
 
 
 const router = useRouter()
 const router = useRouter()
@@ -253,7 +252,6 @@ function backTo() {
 
 
 onMounted(() => {
 onMounted(() => {
   setHeadinfo()
   setHeadinfo()
-
 })
 })
 
 
 const contrastData = ref([])
 const contrastData = ref([])
@@ -262,9 +260,17 @@ function getData() {
   getCompareList({
   getCompareList({
     type:'2'
     type:'2'
   }).then(resp => {
   }).then(resp => {
-    console.log("resp.rows",resp.rows)
     contrastData.value = resp.rows
     contrastData.value = resp.rows
-    console.log("contrastData.value----",contrastData.value)
+    contrastData.value.map(item =>{
+      specialtyDetail({
+        id: item.businessId
+      }).then(resp => {
+        console.log(resp,"resp")
+        item.smoSpecialty = resp.smoSpecialty
+        item.kaishe_list = resp.kaishe_list
+      })
+    })
+    console.log("contrastData.value",contrastData.value);
   })
   })
 }
 }
 
 

+ 15 - 18
src/views/xjc-integratedmachine/environment/occ_details_video.vue

@@ -117,6 +117,7 @@ const router = useRouter()
 const route = useRoute()
 const route = useRoute()
 const tabIndex = ref("zyjd")
 const tabIndex = ref("zyjd")
 const headinfo = ref({})
 const headinfo = ref({})
+const headinfoRef = ref(null);
 const onePage = ref(true)
 const onePage = ref(true)
 const twoPage = ref(false)
 const twoPage = ref(false)
 const threePage = ref(false)
 const threePage = ref(false)
@@ -147,12 +148,8 @@ const param = route.query
 
 
 
 
 const entity = ref({})
 const entity = ref({})
-const kaishe_list = ref([])
-const pinggu_list = ref([])
-const similar_list = ref([])
 const collectionRef = ref(null)
 const collectionRef = ref(null)
 const collection_data = ref({})
 const collection_data = ref({})
-const headinfoRef = ref(null);
 
 
 function setCollection_data(){
 function setCollection_data(){
   collection_data.value = {
   collection_data.value = {
@@ -161,29 +158,34 @@ function setCollection_data(){
     contentVal: entity.value,
     contentVal: entity.value,
     source:'occ_details_video'
     source:'occ_details_video'
   }
   }
-
 }
 }
-
 const bk_list = ref([])
 const bk_list = ref([])
 const zk_list = ref([])
 const zk_list = ref([])
 function detail() {
 function detail() {
-  console.log("param.id",param.id)
   occupationDetail({
   occupationDetail({
     id: param.id
     id: param.id
   }).then(resp => {
   }).then(resp => {
     resp.entity.bk_list = resp.bk_list
     resp.entity.bk_list = resp.bk_list
     resp.entity.compare = resp.compare
     resp.entity.compare = resp.compare
     entity.value = resp.entity
     entity.value = resp.entity
-    console.log("entity.value",entity.value)
     bk_list.value = entity.value.bk_list
     bk_list.value = entity.value.bk_list
     zk_list.value = resp.zk_list
     zk_list.value = resp.zk_list
+    setCollection_data()
+    collectionRef.value.getIsContrast(entity.value)
+    if (headinfoRef.value) {
+      headinfoRef.value.getCompareSizeData(3); // 调用子组件的 sayHello 函数
+    }
     setTimeout(() => {
     setTimeout(() => {
       setCollection_data();
       setCollection_data();
-      // collectionRef.value.getSource('occ_details_video');
-      // collectionRef.value.isContrast(entity.value);
-    }, 500);
+    }, 1000);
+
   })
   })
 }
 }
+const parentMethod = () => {
+  console.log('父组件方法被调用');
+  detail()
+};
+provide('parentMethod', parentMethod);
 
 
 const showPage = (val) => {
 const showPage = (val) => {
   if (val === 1) {
   if (val === 1) {
@@ -251,13 +253,6 @@ function jumpZY(item){
     }
     }
   })
   })
 }
 }
-const parentMethod = () => {
-  console.log('父组件方法被调用');
-  if (headinfoRef.value) {
-    headinfoRef.value.getCompareSizeData(); // 调用子组件的 sayHello 函数
-  }
-};
-provide('parentMethod', parentMethod);
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
@@ -513,6 +508,8 @@ p, div {
       border: 1px solid #A2F57F;
       border: 1px solid #A2F57F;
       font-weight: 400;
       font-weight: 400;
       font-size: 30px;
       font-size: 30px;
+      padding-left: 10px;
+      padding-right: 10px;
       color: #000000;
       color: #000000;
       line-height:  80px;
       line-height:  80px;
       text-align: center;
       text-align: center;

+ 11 - 2
src/views/xjc-integratedmachine/environment/occdb_interestcode.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="occdb_interestcode">
   <div class="occdb_interestcode">
-    <head-component :headinfo=headinfo @childEvent="backTo"></head-component>
+    <head-component :headinfo=headinfo @childEvent="backTo" ref="headinfoRef"></head-component>
     <div class="page-content">
     <div class="page-content">
       <div class="content">
       <div class="content">
         <div class="result-box">
         <div class="result-box">
@@ -33,13 +33,15 @@ import headComponent from '@/views/xjc-integratedmachine/components/head_compone
 import Drag_component from "@/views/xjc-integratedmachine/components/drag_component.vue";
 import Drag_component from "@/views/xjc-integratedmachine/components/drag_component.vue";
 import {handleThemeStyle} from "@/utils/theme.js";
 import {handleThemeStyle} from "@/utils/theme.js";
 import useSettingsStore from "@/store/modules/settings.js";
 import useSettingsStore from "@/store/modules/settings.js";
-import { getCurrentInstance } from 'vue';
+import {getCurrentInstance, ref} from 'vue';
 const instance = getCurrentInstance();
 const instance = getCurrentInstance();
 const {proxy} = getCurrentInstance()
 const {proxy} = getCurrentInstance()
 const {interestcode} = proxy.useDict('interestcode')
 const {interestcode} = proxy.useDict('interestcode')
 const router = useRouter()
 const router = useRouter()
 const route = useRoute()
 const route = useRoute()
 const headinfo = ref({})
 const headinfo = ref({})
+const headinfoRef = ref(null);
+
 const interestData = ref([])
 const interestData = ref([])
 const conditions = ref([])
 const conditions = ref([])
 function setHeadinfo() {
 function setHeadinfo() {
@@ -52,6 +54,8 @@ function setHeadinfo() {
     backUrl: '/xjc-integratedmachine/environment/index',
     backUrl: '/xjc-integratedmachine/environment/index',
     homeUrl: '/xjc-integratedmachine/environment/index',
     homeUrl: '/xjc-integratedmachine/environment/index',
     interestcodePage:true,
     interestcodePage:true,
+    contrast:true,
+    contrastType:3
   }
   }
 }
 }
 onMounted(() => {
 onMounted(() => {
@@ -59,6 +63,11 @@ onMounted(() => {
   nextTick(() => {
   nextTick(() => {
     getData()
     getData()
   })
   })
+  setTimeout(() => {
+    if (headinfoRef.value) {
+      headinfoRef.value.getCompareSizeData(3); // 调用子组件的 sayHello 函数
+    }
+  }, 500)
 })
 })
 function getData (){
 function getData (){
   let lettersToFindArray = JSON.parse(sessionStorage.getItem('conditionsList'))
   let lettersToFindArray = JSON.parse(sessionStorage.getItem('conditionsList'))

+ 11 - 11
src/views/xjc-integratedmachine/environment/occdb_interestcode_list.vue

@@ -1,20 +1,10 @@
 <template>
 <template>
   <div class="prodb_specialtylist1" v-loading='loading'>
   <div class="prodb_specialtylist1" v-loading='loading'>
-    <head-component :headinfo=headinfo></head-component>
+    <head-component :headinfo=headinfo ref="headinfoRef"></head-component>
     <div class="page-content">
     <div class="page-content">
       <div class="content">
       <div class="content">
         <div class="result-box">
         <div class="result-box">
           <div class="two-page-result">
           <div class="two-page-result">
-<!--            <div  v-for="(item,index) in interestcode"-->
-<!--                  :class="{-->
-<!--                itemResultBoxActive: item.isSelected,-->
-<!--                itemResultBox: !item.isSelected-->
-<!--            }"-->
-
-<!--                  @click="addSelected(item,index)">-->
-<!--              <div>{{item.label}} {{item.value}}</div>-->
-<!--            </div>-->
-
             <div v-for="(item,index) in code_list">
             <div v-for="(item,index) in code_list">
               <p class="title">{{item.code}}--{{item.name}}</p>
               <p class="title">{{item.code}}--{{item.name}}</p>
             <div  v-for="(it,ind) in code_map" class="two-page-result">
             <div  v-for="(it,ind) in code_map" class="two-page-result">
@@ -38,10 +28,13 @@
 import headComponent from '@/views/xjc-integratedmachine/components/head_component.vue'
 import headComponent from '@/views/xjc-integratedmachine/components/head_component.vue'
 import Drag_component from "@/views/xjc-integratedmachine/components/drag_component.vue";
 import Drag_component from "@/views/xjc-integratedmachine/components/drag_component.vue";
 import {codeList} from '@/api/xjc-integratedmachine/environment/occupation.js'
 import {codeList} from '@/api/xjc-integratedmachine/environment/occupation.js'
+import {ref} from "vue";
 const {proxy} = getCurrentInstance()
 const {proxy} = getCurrentInstance()
 const {interestcode} = proxy.useDict('interestcode')
 const {interestcode} = proxy.useDict('interestcode')
 
 
 const headinfo = ref({})
 const headinfo = ref({})
+const headinfoRef = ref(null);
+
 const interestData = ref([])
 const interestData = ref([])
 const conditions = ref('')
 const conditions = ref('')
 const router = useRouter()
 const router = useRouter()
@@ -75,10 +68,17 @@ function setHeadinfo() {
     homeUrl: '/xjc-integratedmachine/environment/index',
     homeUrl: '/xjc-integratedmachine/environment/index',
     backUrl:'/xjc-integratedmachine/environment/occdb_search_industry',
     backUrl:'/xjc-integratedmachine/environment/occdb_search_industry',
     // backUrlUse:true,
     // backUrlUse:true,
+    contrast:true,
+    contrastType:3
   }
   }
 }
 }
 onMounted(() => {
 onMounted(() => {
   setHeadinfo()
   setHeadinfo()
+  setTimeout(() => {
+    if (headinfoRef.value) {
+      headinfoRef.value.getCompareSizeData(2); // 调用子组件的 sayHello 函数
+    }
+  }, 500)
 })
 })
 
 
 function toDetail(item){
 function toDetail(item){

+ 10 - 1
src/views/xjc-integratedmachine/environment/occdb_list.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="prodb_specialtylist1">
   <div class="prodb_specialtylist1">
-    <head-component :headinfo=headinfo></head-component>
+    <head-component :headinfo=headinfo ref="headinfoRef"></head-component>
     <div class="page-content">
     <div class="page-content">
       <div class="content">
       <div class="content">
         <div class="result-box">
         <div class="result-box">
@@ -25,6 +25,7 @@
 import headComponent from '@/views/xjc-integratedmachine/components/head_component.vue'
 import headComponent from '@/views/xjc-integratedmachine/components/head_component.vue'
 import Drag_component from "@/views/xjc-integratedmachine/components/drag_component.vue";
 import Drag_component from "@/views/xjc-integratedmachine/components/drag_component.vue";
 import {occupationList} from '@/api/xjc-integratedmachine/environment/occupation.js'
 import {occupationList} from '@/api/xjc-integratedmachine/environment/occupation.js'
+import {ref} from "vue";
 
 
 const router = useRouter()
 const router = useRouter()
 const route = useRoute()
 const route = useRoute()
@@ -32,6 +33,8 @@ const total = ref(0)
 const param = route.query
 const param = route.query
 const data_rows = ref([])
 const data_rows = ref([])
 const headinfo = ref({})
 const headinfo = ref({})
+const headinfoRef = ref(null);
+
 function setHeadinfo() {
 function setHeadinfo() {
   headinfo.value = {
   headinfo.value = {
     title: '职业分类列表',
     title: '职业分类列表',
@@ -42,10 +45,16 @@ function setHeadinfo() {
     backUrl: '/xjc-integratedmachine/environment/index',
     backUrl: '/xjc-integratedmachine/environment/index',
     homeUrl: '/xjc-integratedmachine/environment/index',
     homeUrl: '/xjc-integratedmachine/environment/index',
     contrast:true,
     contrast:true,
+    contrastType:3
   }
   }
 }
 }
 onMounted(() => {
 onMounted(() => {
   setHeadinfo()
   setHeadinfo()
+  setTimeout(() => {
+    if (headinfoRef.value) {
+      headinfoRef.value.getCompareSizeData(3); // 调用子组件的 sayHello 函数
+    }
+  }, 800)
 })
 })
 
 
 
 

+ 10 - 2
src/views/xjc-integratedmachine/environment/occdb_search_industry.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="occdb_search_industry">
   <div class="occdb_search_industry">
-    <head-component :headinfo=headinfo></head-component>
+    <head-component :headinfo=headinfo ref="headinfoRef"></head-component>
     <div class="page-content">
     <div class="page-content">
       <div class="content-left">
       <div class="content-left">
         <div class="tab-box">
         <div class="tab-box">
@@ -140,6 +140,7 @@ const form = ref({
 })
 })
 const keyInput = ref(false);
 const keyInput = ref(false);
 const headinfo = ref({})
 const headinfo = ref({})
+const headinfoRef = ref(null);
 
 
 function setHeadinfo() {
 function setHeadinfo() {
   headinfo.value = {
   headinfo.value = {
@@ -150,7 +151,9 @@ function setHeadinfo() {
     },
     },
     backUrl: '/xjc-integratedmachine/environment/index',
     backUrl: '/xjc-integratedmachine/environment/index',
     backUrlUse:true,
     backUrlUse:true,
-    homeUrl: '/xjc-integratedmachine/environment/index'
+    homeUrl: '/xjc-integratedmachine/environment/index',
+    contrast:true,
+    contrastType:3
   }
   }
 }
 }
 
 
@@ -184,6 +187,11 @@ function jumpTo(path) {
 
 
 onMounted(() => {
 onMounted(() => {
   setHeadinfo()
   setHeadinfo()
+  setTimeout(() => {
+    if (headinfoRef.value) {
+      headinfoRef.value.getCompareSizeData(3); // 调用子组件的 sayHello 函数
+    }
+  }, 800)
 })
 })
 const universityList = ref([])
 const universityList = ref([])
 
 

+ 0 - 84
src/views/xjc-integratedmachine/environment/occdb_search_industry1.vue

@@ -1,84 +0,0 @@
-<template>
-  职业信息查询
-  <el-card style="width:200px">
-    <div @click="changeTab('hyfl')">
-      <el-button @click="jumpTo('/xjc-integratedmachine/environment/occdb_search_industry_list')">点击查询</el-button>
-    </div>
-    <div @click="changeTab('hldm')">
-      霍兰德码查询
-      <el-button @click="jumpTo('/xjc-integratedmachine/environment/occdb_interestcode')">点击查询s</el-button>
-    </div>
-    <div @click="changeTab('gjz')">
-      关键字查询
-      <el-input v-model="form.name"></el-input>
-      <el-button @click="byKeyWord">关键字查询</el-button>
-
-      <el-table :data="data_list">
-        <el-table-column label="名称" align="center" key="name" prop="name"/>
-        <el-table-column label="详情">
-          <template #default="scope">
-            <el-tooltip content="详情>>" placement="top">
-              <el-button link type="primary" icon="Edit" @click="toDetail(scope.row)"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-  </el-card>
-  <div v-show="tab == 'hyfl'">
-    行业分类是把.............................
-  </div>
-  <div v-show="tab == 'hldm'">
-  </div>
-  <div v-show="tab == 'gjz'">
-  </div>
-
-</template>
-
-<script setup>
-import {getOccupationByKeyword} from '@/api/xjc-integratedmachine/environment/occupation.js'
-
-const router = useRouter()
-const route = useRoute()
-const total = ref(0)
-const param = route.query
-
-
-const tab = ref("hyfl")
-
-function changeTab(path) {
-  tab.value = path
-}
-
-function jumpTo(path) {
-  router.push({
-    path: path
-  })
-}
-
-const form = ref({
-  name: ''
-})
-
-const data_list = ref([])
-function byKeyWord() {
-  getOccupationByKeyword(form.value).then(resp =>{
-    console.log("sss",resp)
-    data_list.value = resp.list
-  })
-}
-
-function toDetail(item){
-  router.push({
-    path : '/xjc-integratedmachine/environment/occ_details_video',
-    query :{
-      id :  item.id
-    }
-  })
-}
-
-</script>
-
-<style scoped>
-
-</style>

+ 10 - 1
src/views/xjc-integratedmachine/environment/occdb_search_industry_list.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="prodb_specialtylist1">
   <div class="prodb_specialtylist1">
-    <head-component :headinfo=headinfo></head-component>
+    <head-component :headinfo=headinfo ref="headinfoRef"></head-component>
     <div class="page-content">
     <div class="page-content">
       <div class="content">
       <div class="content">
         <div class="result-box">
         <div class="result-box">
@@ -25,6 +25,7 @@
 import headComponent from '@/views/xjc-integratedmachine/components/head_component.vue'
 import headComponent from '@/views/xjc-integratedmachine/components/head_component.vue'
 import Drag_component from "@/views/xjc-integratedmachine/components/drag_component.vue";
 import Drag_component from "@/views/xjc-integratedmachine/components/drag_component.vue";
 import {categoryList1} from '@/api/xjc-integratedmachine/environment/occupation.js'
 import {categoryList1} from '@/api/xjc-integratedmachine/environment/occupation.js'
+import {ref} from "vue";
 const router = useRouter()
 const router = useRouter()
 const data_list = ref([])
 const data_list = ref([])
 const route = useRoute()
 const route = useRoute()
@@ -32,6 +33,8 @@ const total = ref(0)
 const param = route.query
 const param = route.query
 const data_rows = ref([])
 const data_rows = ref([])
 const headinfo = ref({})
 const headinfo = ref({})
+const headinfoRef = ref(null);
+
 function setHeadinfo() {
 function setHeadinfo() {
   headinfo.value = {
   headinfo.value = {
     title: '行业分类列表',
     title: '行业分类列表',
@@ -42,10 +45,16 @@ function setHeadinfo() {
     backUrl: '/xjc-integratedmachine/environment/index',
     backUrl: '/xjc-integratedmachine/environment/index',
     homeUrl: '/xjc-integratedmachine/environment/index',
     homeUrl: '/xjc-integratedmachine/environment/index',
     contrast:true,
     contrast:true,
+    contrastType:3
   }
   }
 }
 }
 onMounted(() => {
 onMounted(() => {
   setHeadinfo()
   setHeadinfo()
+  setTimeout(() => {
+    if (headinfoRef.value) {
+      headinfoRef.value.getCompareSizeData(3); // 调用子组件的 sayHello 函数
+    }
+  }, 800)
 })
 })
 
 
 
 

+ 5 - 19
src/views/xjc-integratedmachine/environment/pro_details_video.vue

@@ -150,7 +150,6 @@ function setHeadinfo(){
 
 
 onMounted(() => {
 onMounted(() => {
   setHeadinfo()
   setHeadinfo()
-
 })
 })
 
 
 const param = route.query
 const param = route.query
@@ -191,12 +190,8 @@ function detail(id) {
       headinfoRef.value.getCompareSizeData(2); // 调用子组件的 sayHello 函数
       headinfoRef.value.getCompareSizeData(2); // 调用子组件的 sayHello 函数
     }
     }
   })
   })
-setTimeout(() => {
-    setCollection_data()
-  }, 500);
 }
 }
 
 
-
 const showPage = (val) => {
 const showPage = (val) => {
   if (val === 1) {
   if (val === 1) {
     onePage.value = true;
     onePage.value = true;
@@ -211,21 +206,18 @@ const showPage = (val) => {
     threePage.value = false;
     threePage.value = false;
     fourPage.value = false;
     fourPage.value = false;
     fivePage.value = false;
     fivePage.value = false;
-
   } else if (val === 3) {
   } else if (val === 3) {
     onePage.value = false;
     onePage.value = false;
     twoPage.value = false;
     twoPage.value = false;
     threePage.value = true;
     threePage.value = true;
     fourPage.value = false;
     fourPage.value = false;
     fivePage.value = false;
     fivePage.value = false;
-
   } else if (val === 4) {
   } else if (val === 4) {
     onePage.value = false;
     onePage.value = false;
     twoPage.value = false;
     twoPage.value = false;
     threePage.value = false;
     threePage.value = false;
     fourPage.value = true;
     fourPage.value = true;
     fivePage.value = false;
     fivePage.value = false;
-
   } else if (val === 5) {
   } else if (val === 5) {
     onePage.value = false;
     onePage.value = false;
     twoPage.value = false;
     twoPage.value = false;
@@ -264,22 +256,14 @@ function dialogBeforeClose() {
   eightPage.value = false;
   eightPage.value = false;
 }
 }
 function toDetail(item){
 function toDetail(item){
-  // router.push({
-  //   path:'/xjc-integratedmachine/environment/pro_details_video',
-  //   query : {
-  //     id : item.id
-  //   }
-  // })
   detail(item.id)
   detail(item.id)
 }
 }
 const parentMethod = () => {
 const parentMethod = () => {
   console.log('父组件方法被调用');
   console.log('父组件方法被调用');
   detail()
   detail()
-  if (headinfoRef.value) {
-    headinfoRef.value.getCompareSizeData(1); // 调用子组件的 sayHello 函数
-  }
 };
 };
 provide('parentMethod', parentMethod);
 provide('parentMethod', parentMethod);
+
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
@@ -420,7 +404,7 @@ p, div {
            flex-wrap: wrap;
            flex-wrap: wrap;
 
 
           .info-item{
           .info-item{
-            width: 244px;
+            min-width: 244px;
             height: 80px;
             height: 80px;
             margin-left: 10px;
             margin-left: 10px;
             background: #FFFFFF;
             background: #FFFFFF;
@@ -432,6 +416,8 @@ p, div {
             line-height:  80px;
             line-height:  80px;
             text-align: center;
             text-align: center;
             margin-top: 14px;
             margin-top: 14px;
+            padding-left: 10px;
+            padding-right: 10px;
           }
           }
         }
         }
         .info-text{
         .info-text{
@@ -517,7 +503,7 @@ p, div {
 
 
 .one-page {
 .one-page {
   width: 1832px;
   width: 1832px;
-  height: 341px;
+  height: 426px;
   background: #FFFFFF;
   background: #FFFFFF;
   border-radius: 0px 0px 35px 35px;
   border-radius: 0px 0px 35px 35px;
   border: 1px solid #FFFFFF;
   border: 1px solid #FFFFFF;

+ 13 - 2
src/views/xjc-integratedmachine/environment/prodb_search_undergraduate.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="prodb_search_undergraduate">
   <div class="prodb_search_undergraduate">
-    <head-component :headinfo=headinfo></head-component>
+    <head-component :headinfo=headinfo ref="headinfoRef"></head-component>
     <div class="page-content">
     <div class="page-content">
       <div class="content-left">
       <div class="content-left">
         <div class="tab-box">
         <div class="tab-box">
@@ -138,6 +138,7 @@ const threePage = ref(false)
 
 
 const keyInput = ref(false);
 const keyInput = ref(false);
 const headinfo = ref({})
 const headinfo = ref({})
+const headinfoRef = ref(null);
 
 
 function setHeadinfo() {
 function setHeadinfo() {
   headinfo.value = {
   headinfo.value = {
@@ -147,7 +148,9 @@ function setHeadinfo() {
       nickName: '张三'
       nickName: '张三'
     },
     },
     backUrl: '/xjc-integratedmachine/environment/index',
     backUrl: '/xjc-integratedmachine/environment/index',
-    homeUrl: '/xjc-integratedmachine/environment/index'
+    homeUrl: '/xjc-integratedmachine/environment/index',
+    contrast:true,
+    contrastType:2
   }
   }
 }
 }
 
 
@@ -177,6 +180,11 @@ function jumpTo(path) {
 
 
 onMounted(() => {
 onMounted(() => {
   setHeadinfo()
   setHeadinfo()
+  setTimeout(() => {
+    if (headinfoRef.value) {
+      headinfoRef.value.getCompareSizeData(2); // 调用子组件的 sayHello 函数
+    }
+  }, 500)
 })
 })
 const universityList = ref([])
 const universityList = ref([])
 
 
@@ -254,6 +262,9 @@ function specialty() {
   specialtyQuery().then(resp => {
   specialtyQuery().then(resp => {
     specialtyEntity.value = resp
     specialtyEntity.value = resp
   })
   })
+  if (headinfoRef.value) {
+    headinfoRef.value.getCompareSizeData(2); // 调用子组件的 sayHello 函数
+  }
 }
 }
 
 
 function toSpecialty1(item) {
 function toSpecialty1(item) {

+ 13 - 1
src/views/xjc-integratedmachine/environment/prodb_specialtylist1.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="prodb_specialtylist1" v-loading="loading">
   <div class="prodb_specialtylist1" v-loading="loading">
-    <head-component :headinfo=headinfo></head-component>
+    <head-component :headinfo=headinfo ref="headinfoRef"></head-component>
     <div class="page-content">
     <div class="page-content">
       <div class="content">
       <div class="content">
         <div class="result-box">
         <div class="result-box">
@@ -38,6 +38,7 @@
 import headComponent from '@/views/xjc-integratedmachine/components/head_component.vue'
 import headComponent from '@/views/xjc-integratedmachine/components/head_component.vue'
 import Drag_component from "@/views/xjc-integratedmachine/components/drag_component.vue";
 import Drag_component from "@/views/xjc-integratedmachine/components/drag_component.vue";
 import {specialtyList1} from '@/api/xjc-integratedmachine/environment/specialty.js'
 import {specialtyList1} from '@/api/xjc-integratedmachine/environment/specialty.js'
+import {ref} from "vue";
 
 
 const router = useRouter()
 const router = useRouter()
 const route = useRoute()
 const route = useRoute()
@@ -45,6 +46,8 @@ const total = ref(0)
 const param = route.query
 const param = route.query
 const data_rows = ref([])
 const data_rows = ref([])
 const headinfo = ref({})
 const headinfo = ref({})
+const headinfoRef = ref(null);
+
 const loading= ref(false)
 const loading= ref(false)
 function setHeadinfo() {
 function setHeadinfo() {
   headinfo.value = {
   headinfo.value = {
@@ -56,10 +59,16 @@ function setHeadinfo() {
     backUrl: '/xjc-integratedmachine/environment/index',
     backUrl: '/xjc-integratedmachine/environment/index',
     homeUrl: '/xjc-integratedmachine/environment/index',
     homeUrl: '/xjc-integratedmachine/environment/index',
     contrast:true,
     contrast:true,
+    contrastType:2
   }
   }
 }
 }
 onMounted(() => {
 onMounted(() => {
   setHeadinfo()
   setHeadinfo()
+  setTimeout(() => {
+    if (headinfoRef.value) {
+      headinfoRef.value.getCompareSizeData(2); // 调用子组件的 sayHello 函数
+    }
+  }, 500)
 })
 })
 const queryParams = ref({
 const queryParams = ref({
   pageNum: 1,
   pageNum: 1,
@@ -74,6 +83,9 @@ function list1() {
     total.value = resp.data.total
     total.value = resp.data.total
     loading.value = false;
     loading.value = false;
   })
   })
+  if (headinfoRef.value) {
+    headinfoRef.value.getCompareSizeData(2); // 调用子组件的 sayHello 函数
+  }
 }
 }
 
 
 function toSpecialty2(item) {
 function toSpecialty2(item) {

+ 10 - 1
src/views/xjc-integratedmachine/environment/prodb_specialtylist2.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="prodb_specialtylist2">
   <div class="prodb_specialtylist2">
-    <head-component :headinfo=headinfo></head-component>
+    <head-component :headinfo=headinfo ref="headinfoRef"></head-component>
     <div class="page-content">
     <div class="page-content">
       <div class="content">
       <div class="content">
         <div class="result-box">
         <div class="result-box">
@@ -23,6 +23,7 @@
 import headComponent from '@/views/xjc-integratedmachine/components/head_component.vue'
 import headComponent from '@/views/xjc-integratedmachine/components/head_component.vue'
 import Drag_component from "@/views/xjc-integratedmachine/components/drag_component.vue";
 import Drag_component from "@/views/xjc-integratedmachine/components/drag_component.vue";
 import {specialtyList2} from '@/api/xjc-integratedmachine/environment/specialty.js'
 import {specialtyList2} from '@/api/xjc-integratedmachine/environment/specialty.js'
+import {ref} from "vue";
 
 
 const router = useRouter()
 const router = useRouter()
 const route = useRoute()
 const route = useRoute()
@@ -36,6 +37,8 @@ const queryParams = ref({
   oldid: param.oldid
   oldid: param.oldid
 })
 })
 const headinfo = ref({})
 const headinfo = ref({})
+const headinfoRef = ref(null);
+
 function setHeadinfo() {
 function setHeadinfo() {
   headinfo.value = {
   headinfo.value = {
     title: '专业类',
     title: '专业类',
@@ -46,10 +49,16 @@ function setHeadinfo() {
     backUrl: '/xjc-integratedmachine/environment/index',
     backUrl: '/xjc-integratedmachine/environment/index',
     homeUrl: '/xjc-integratedmachine/environment/index',
     homeUrl: '/xjc-integratedmachine/environment/index',
     contrast:true,
     contrast:true,
+    contrastType:2
   }
   }
 }
 }
 onMounted(() => {
 onMounted(() => {
   setHeadinfo()
   setHeadinfo()
+  setTimeout(() => {
+    if (headinfoRef.value) {
+      headinfoRef.value.getCompareSizeData(2); // 调用子组件的 sayHello 函数
+    }
+  }, 500)
 })
 })
 function list2() {
 function list2() {
   specialtyList2(queryParams.value).then(resp => {
   specialtyList2(queryParams.value).then(resp => {

+ 11 - 4
src/views/xjc-integratedmachine/environment/query_universitydb_conditions.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="query_universitydb_conditions">
   <div class="query_universitydb_conditions">
-    <head-component :headinfo=headinfo></head-component>
-    <div class="page-content">
+    <head-component :headinfo=headinfo ref="headinfoRef"></head-component>
+      <div class="page-content">
       <div class="content-left">
       <div class="content-left">
         <div class="tab-box">
         <div class="tab-box">
           <div :class="[onePage?'item-box-active':'item-box']" @click="showPage(1)">
           <div :class="[onePage?'item-box-active':'item-box']" @click="showPage(1)">
@@ -152,6 +152,7 @@ const form = ref({
 })
 })
 const keyInput = ref(false);
 const keyInput = ref(false);
 const headinfo = ref({})
 const headinfo = ref({})
+const headinfoRef = ref(null);
 
 
 function setHeadinfo() {
 function setHeadinfo() {
   headinfo.value = {
   headinfo.value = {
@@ -161,7 +162,9 @@ function setHeadinfo() {
       nickName: '张三'
       nickName: '张三'
     },
     },
     backUrl: '/xjc-integratedmachine/environment/index',
     backUrl: '/xjc-integratedmachine/environment/index',
-    homeUrl: '/xjc-integratedmachine/environment/index'
+    homeUrl: '/xjc-integratedmachine/environment/index',
+    contrast:true,
+    contrastType:1
   }
   }
 }
 }
 
 
@@ -191,7 +194,11 @@ function jumpTo(path) {
 
 
 onMounted(() => {
 onMounted(() => {
   setHeadinfo()
   setHeadinfo()
-  // getDate();
+  setTimeout(() => {
+    if (headinfoRef.value) {
+      headinfoRef.value.getCompareSizeData(3); // 调用子组件的 sayHello 函数
+    }
+  }, 500)
 })
 })
 const universityList = ref([])
 const universityList = ref([])
 
 

+ 2 - 4
src/views/xjc-integratedmachine/environment/university_details_video.vue

@@ -499,9 +499,7 @@ const headinfoRef = ref(null);
 const parentMethod = () => {
 const parentMethod = () => {
   console.log('父组件方法被调用');
   console.log('父组件方法被调用');
   detail()
   detail()
-  if (headinfoRef.value) {
-    headinfoRef.value.getCompareSizeData(1); // 调用子组件的 sayHello 函数
-  }
+
 };
 };
 provide('parentMethod', parentMethod);
 provide('parentMethod', parentMethod);
 
 
@@ -690,7 +688,7 @@ p, div {
           align-items: center;
           align-items: center;
 
 
           .right-top-icon {
           .right-top-icon {
-            width: 130px;
+            width: 200px;
             height: 68px;
             height: 68px;
             display: flex;
             display: flex;
             margin-right: 30px;
             margin-right: 30px;

+ 6 - 5
src/views/xjc-integratedmachine/environment/university_list.vue

@@ -67,8 +67,11 @@ function getList() {
     tableData.value = resp.data.rows
     tableData.value = resp.data.rows
     total.value = resp.data.total
     total.value = resp.data.total
   })
   })
-
-
+  setTimeout(() => {
+    if (headinfoRef.value) {
+      headinfoRef.value.getCompareSizeData(2); // 调用子组件的 sayHello 函数
+    }
+  }, 500)
 }
 }
 
 
 function handleDetail(row) {
 function handleDetail(row) {
@@ -99,9 +102,7 @@ function setHeadinfo() {
     contrast:true,
     contrast:true,
     contrastType:1,
     contrastType:1,
   }
   }
-  if (headinfoRef.value) {
-    headinfoRef.value.getCompareSizeData(1); // 调用子组件的 sayHello 函数
-  }
+
 }
 }
 
 
 </script>
 </script>