[feat] 环境探索 专业库对比

src/views/xjc-integratedmachine/components/head_component.vue

@@ -7,7 +7,9 @@
       <div class="head-title">
         <div v-if="headinfo.title">{{headinfo.title}}</div>
       </div>
-      <img v-show="headinfo.contrast" class="contrast" src="@/assets/images/environment/contrast-btn.png" @click="contrastTo">
+      <div class="contrast-box">
+        <img  v-show="headinfo.contrast" class="contrast" src="@/assets/images/environment/contrast-btn.png" @click="contrastTo">
+      </div>
       <div class="head-right" v-if="!headinfo.isLogin">
         <div class="right-user">
           <img  src="@/assets/images/wakeup/user.png" @click="backTo" alt="404">
@@ -36,7 +38,12 @@
       }else {
         router.go(-1);
       }
-      emit('backTo');
+      // emit('backTo');
+      // clearData()
+    }
+    function clearData(){
+      sessionStorage.removeItem('contrastList');
+      sessionStorage.removeItem('majorList');
     }
     function homeUrlTo() {
         router.push({
@@ -52,7 +59,7 @@
         console.log("university")
          contrastList = JSON.parse(sessionStorage.getItem('contrastList'));
       }
-      if(contrastList.length <= 2 ){
+      if(contrastList && contrastList.length <= 2 ){
        //暂无
       }else {
         ElMessage({
@@ -115,10 +122,13 @@
         font-size: 48px;
         color: #060606;
       }
-      .contrast{
+      .contrast-box{
         width: 209px;
         height: 80px;
-        margin-top: 15px;
+        img{
+          width: 209px;
+          height: 80px;
+        }
       }
       .head-right{
           width:750px;

src/views/xjc-integratedmachine/environment/contrast_major.vue

@@ -14,18 +14,18 @@
             <img v-else src="@/assets/images/environment/score.png">
             主修课程
           </div>
-          <div :class="[twoPage?'item-box-active':'item-box']" @click="showPage(3)">
-            <img v-if="twoPage" src="@/assets/images/environment/score-h.png">
+          <div :class="[threePage?'item-box-active':'item-box']" @click="showPage(3)">
+            <img v-if="threePage" src="@/assets/images/environment/score-h.png">
             <img v-else src="@/assets/images/environment/score.png">
             专业解读
           </div>
-          <div :class="[twoPage?'item-box-active':'item-box']" @click="showPage(4)">
-            <img v-if="twoPage" src="@/assets/images/environment/score-h.png">
+          <div :class="[fourPage?'item-box-active':'item-box']" @click="showPage(4)">
+            <img v-if="fourPage" src="@/assets/images/environment/score-h.png">
             <img v-else src="@/assets/images/environment/score.png">
             就业前景与方向
           </div>
-          <div :class="[twoPage?'item-box-active':'item-box']" @click="showPage(5)">
-            <img v-if="twoPage" src="@/assets/images/environment/score-h.png">
+          <div :class="[fivePage?'item-box-active':'item-box']" @click="showPage(5)">
+            <img v-if="fivePage" src="@/assets/images/environment/score-h.png">
             <img v-else src="@/assets/images/environment/score.png">
             开设院校
           </div>
@@ -45,26 +45,13 @@
             <tr class="two-tr">
               <td>专业代码</td>
               <td class="text-td" v-for="(item,index) in contrastData" :key="index">
-                <p>创建时间：<span>{{ item.ctime }}</span></p>
-                <p>所在地区：<span>{{ item.areaname }}</span></p>
-                <p>院校隶属：<span>{{ item.subjection }}</span></p>
-                <p class="text-td-p">院校类型：<span>  <dict-tag :options="school_category"
-                                                                :value="item.categoryid"/></span></p>
+                <p style="text-align: center">{{ item.code }}</p>
               </td>
             </tr>
             <tr>
               <td>学科门类</td>
               <td v-for="(item,index) in contrastData" :key="index">
-                <div class="school-level-box">
-                  <p class="school-level" style="background-color: #B3FC7C" v-show="item.nef==='1'">985</p>
-                  <p class="school-level" style="background-color: #BBF88D" v-show="item.too==='1'">211</p>
-                  <p class="school-level" style="background-color: #8CE349" v-show="item.istopschool==='1'">
-                    一流大学</p>
-                  <p class="school-level" style="background-color: #9DFF51" v-show="item.istopsubject==='1'">
-                    一流学科</p>
-                  <p class="school-level" style="background-color: #8ADFC4" v-show="item.self==='1'">强</p>
-                  <p class="school-level" style="background-color: #1EC590" v-show="item.graduate==='1'">研</p>
-                </div>
+                <p>{{ item.remarks }}</p>
               </td>
             </tr>
             <tr>
@@ -75,56 +62,101 @@
             </tr>
             <tr>
               <td>授权学位</td>
-              <td v-for="(item,index) in contrastData" :key="index" class="text-td">{{ item.address }}</td>
+              <td v-for="(item,index) in contrastData" :key="index" >
+                <p>{{ item.degree }}</p>
+                </td>
             </tr>
             <tr>
               <td>修学年限</td>
-              <td v-for="(item,index) in contrastData" :key="index" class="text-td">{{ item.address }}</td>
+              <td v-for="(item,index) in contrastData" :key="index" class="text-td">{{ item.years }}</td>
             </tr>
             </tbody>
           </table>
         </div>
         <div class="two-page" v-show="twoPage">
+          <table class="table table-bordered">
+            <thead>
+            <tr class="one-tr">
+              <td class="first-title">专业名称</td>
+              <td v-for="(item,index) in contrastData" :key="index">{{ item.name }}</td>
+            </tr>
+            </thead>
+            <tbody>
+            <tr v-show="false"></tr>
+            <tr class="two-tr">
+              <td>主修课程</td>
+              <td class="text-td" v-for="(item,index) in contrastData" :key="index">
+                <p style="text-align: center">{{ item.code }}</p>
+              </td>
+            </tr>
+            </tbody>
+          </table>
         </div>
-      </div>
-      <drag_component></drag_component>
-    </div>
-    <div>
-      <!--院校属地-->
-      <el-dialog v-model="showAreaChoose" width="1000px" append-to-body>
-        <div class="dialog-box">
-          <div v-for="dict in gk_province" :key="dict.value" @click="chooseArea(dict)">
-            <p>
-              {{ dict.label }}
-            </p>
-          </div>
-        </div>
-      </el-dialog>
+        <div class="three-page" v-show="threePage">
+          <table class="table table-bordered">
+            <thead>
+            <tr class="one-tr">
+              <td class="first-title">专业名称</td>
+              <td v-for="(item,index) in contrastData" :key="index">{{ item.name }}</td>
+            </tr>
+            </thead>
+            <tbody>
+            <tr v-show="false"></tr>
+            <tr class="two-tr">
+              <td>专业解读</td>
+              <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-else >暂无</div>
 
-    </div>
-    <div>
-      <!--学历层次-->
-      <el-dialog v-model="showEducationlevel" width="1000px" append-to-body>
-        <div class="dialog-box dialog-box2">
-          <div v-for="dict in educationlevel" :key="dict.value" @click="chooseEducationlevel(dict)">
-            <p>
-              {{ dict.label }}
-            </p>
-          </div>
+<!--                <p style="text-align: center" >{{ item.code }}</p>-->
+              </td>
+            </tr>
+            </tbody>
+          </table>
         </div>
-      </el-dialog>
-    </div>
-    <div>
-      <!--特色-->
-      <el-dialog v-model="showCharacteristic" width="1000px" append-to-body>
-        <div class="dialog-box">
-          <div v-for="dict in characteristic" :key="dict.value" @click="chooseCharacteristic(dict)">
-            <p>
-              {{ dict.label }}
-            </p>
-          </div>
+        <div class="four-page" v-show="fourPage">
+          <table class="table table-bordered">
+            <thead>
+            <tr class="one-tr">
+              <td class="first-title">专业名称</td>
+              <td v-for="(item,index) in contrastData" :key="index">{{ item.name }}</td>
+            </tr>
+            </thead>
+            <tbody>
+            <tr v-show="false"></tr>
+            <tr class="two-tr">
+              <td>就业前景与方向</td>
+              <td class="text-td" v-for="(item,index) in contrastData" :key="index">
+                <div class="info"  v-html="item.describe"></div>
+                <!--                <p style="text-align: center" >{{ item.code }}</p>-->
+              </td>
+            </tr>
+            </tbody>
+          </table>
         </div>
-      </el-dialog>
+        <div class="five-page" v-show="fivePage">
+          <table class="table table-bordered">
+            <thead>
+            <tr class="one-tr">
+              <td class="first-title">专业名称</td>
+              <td v-for="(item,index) in contrastData" :key="index">{{ item.name }}</td>
+            </tr>
+            </thead>
+            <tbody>
+            <tr v-show="false"></tr>
+            <tr class="two-tr">
+              <td>开设院校</td>
+              <td class="school-box" v-for="(item,index) in contrastData" :key="index">
+                <div class="info"  v-for="(item,index) in item.kaishe_list">
+                  {{ item.name }}
+                </div>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+      <drag_component></drag_component>
     </div>
   </div>
 
@@ -142,6 +174,8 @@ const router = useRouter()
 const onePage = ref(true)
 const twoPage = ref(false)
 const threePage = ref(false)
+const fourPage = ref(false)
+const fivePage = ref(false)
 const contrastList = ref(false)
 
 const form = ref({
@@ -158,7 +192,7 @@ const headinfo = ref({})
 
 function setHeadinfo() {
   headinfo.value = {
-    title: '高校信息查询',
+    title: '',
     user: {
       avatar: '头像路径',
       nickName: '张三'
@@ -174,14 +208,32 @@ const showPage = (val) => {
     onePage.value = true;
     twoPage.value = false;
     threePage.value = false;
+    fourPage.value = false;
+    fivePage.value = false;
   } else if (val === 2) {
     onePage.value = false;
     twoPage.value = true;
     threePage.value = false;
+    fourPage.value = false;
+    fivePage.value = false;
   } else if (val === 3) {
     onePage.value = false;
     twoPage.value = false;
     threePage.value = true;
+    fourPage.value = false;
+    fivePage.value = false;
+  }else if (val === 4) {
+    onePage.value = false;
+    twoPage.value = false;
+    threePage.value = false;
+    fourPage.value = true;
+    fivePage.value = false;
+  }else if (val === 5) {
+    onePage.value = false;
+    twoPage.value = false;
+    threePage.value = false;
+    fourPage.value = false;
+    fivePage.value = true;
   }
 }
 
@@ -204,7 +256,7 @@ onMounted(() => {
 
 const contrastData = ref({})
 function getData() {
-  const contrastList = sessionStorage.getItem('contrastList') && JSON.parse(sessionStorage.getItem('contrastList'));
+  const contrastList = sessionStorage.getItem('majorList') && JSON.parse(sessionStorage.getItem('majorList'));
   contrastData.value = contrastList;
   console.log("{{contrastA.name}}", contrastData.value)
 }
@@ -340,7 +392,6 @@ p, div {
     bottom: 0;
     display: flex;
     justify-content: space-between;
-
     .content-left {
       width: 244px;
       height: 957px;
@@ -397,7 +448,7 @@ p, div {
       border-radius: 35px 35px 35px 35px;
       margin-top: 13px;
       margin-right: 24px;
-
+      overflow: auto;
       .one-page {
         display: flex;
         justify-content: center;
@@ -576,6 +627,7 @@ p, div {
               font-size: 32px;
               color: #333333;
               line-height: 52px;
+              text-align: center;
             }
 
             td:nth-child(3) {
@@ -587,6 +639,7 @@ p, div {
               font-size: 32px;
               color: #333333;
               line-height: 52px;
+              text-align: center;
             }
           }
           tr:nth-child(6) {
@@ -613,6 +666,7 @@ p, div {
               font-size: 32px;
               color: #333333;
               line-height: 52px;
+              text-align: center;
             }
 
             td:nth-child(3) {
@@ -625,12 +679,12 @@ p, div {
               font-size: 32px;
               color: #333333;
               line-height: 52px;
+              text-align: center;
             }
           }
           .school-level-box {
             display: flex;
             justify-content: left;
-            //margin-top: 32px;
             flex-wrap: wrap;
             width: 620px;
             padding-left: 30px;
@@ -651,13 +705,9 @@ p, div {
           }
 
           .text-td {
-            //text-align: center;
             width: 300px;
-            //border: 1px solid;
-            padding-left: 150px;
             .text-td-p {
               display: flex;
-              //justify-content: center;
             }
           }
         }
@@ -749,61 +799,181 @@ p, div {
             }
           }
 
-          tr:nth-child(3) {
+
+          .text-td {
+            text-align: center;
+
+            .text-td-p {
+              display: flex;
+              justify-content: center;
+            }
+          }
+        }
+
+      }
+       .three-page {
+         display: flex;
+         flex-direction: column;
+         align-items: center;
+
+         .table {
+           width: 1526px;
+           height: 887px;
+           margin-top: 25px;
+
+           .one-tr {
+             font-weight: 400;
+             font-size: 32px;
+             color: #FFFFFF;
+             text-align: center;
+
+             td:nth-child(1) {
+               width: 290px;
+               height: 100px;
+               background: #1E410E;
+               border-radius: 32px 4px 4px 4px;
+               border: 8px solid #E0EEF4;
+
+             }
+
+             td:nth-child(2) {
+               width: 620px;
+               height: 100px;
+               background: #1EC590;
+               border-top: 8px solid #E0EEF4;
+               border-right: 8px solid #E0EEF4;
+               border-bottom: 8px solid #E0EEF4;
+             }
+
+             td:nth-child(3) {
+               width: 616px;
+               height: 119px;
+               background: #8CE349;
+               border-radius: 4px 32px 4px 4px;
+               border-top: 8px solid #E0EEF4;
+               border-right: 8px solid #E0EEF4;
+               border-bottom: 8px solid #E0EEF4;
+
+             }
+           }
+
+           .two-tr {
+             td:nth-child(1) {
+               height: 100px;
+               border-radius: 0px 0px 0px 0px;
+               background: #1E410E;
+               border-left: 8px solid #E0EEF4;
+               border-right: 8px solid #E0EEF4;
+               border-bottom: 8px solid #E0EEF4;
+               font-weight: 400;
+               font-size: 32px;
+               color: #FFFFFF;
+               text-align: center;
+             }
+             td:nth-child(2) {
+               width: 620px;
+               height: 290px;
+               background: #FFFFFF;
+               border-radius: 4px 4px 4px 4px;
+               //border-top: 8px solid #E0EEF4;
+               border-bottom: 8px solid #E0EEF4;
+               border-right: 8px solid #E0EEF4;
+               font-weight: 400;
+               font-size: 32px;
+               color: #333333;
+               line-height: 52px;
+             }
+             td:nth-child(3) {
+               width: 620px;
+               height: 290px;
+               background: #FFFFFF;
+               border-radius: 4px 4px 4px 4px;
+               border-bottom: 8px solid #E0EEF4;
+               border-right: 8px solid #E0EEF4;
+               font-weight: 400;
+               font-size: 32px;
+               color: #333333;
+               line-height: 52px;
+             }
+           }
+
+
+           .text-td {
+             text-align: center;
+
+             .text-td-p {
+               display: flex;
+               justify-content: center;
+             }
+           }
+         }
+
+       }
+      .four-page{
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        .table {
+          width: 1526px;
+          height: 887px;
+          margin-top: 25px;
+
+          .one-tr {
+            font-weight: 400;
+            font-size: 32px;
+            color: #FFFFFF;
+            text-align: center;
+
             td:nth-child(1) {
               width: 290px;
-              height: 180px;
+              height: 100px;
               background: #1E410E;
-              border-radius: 4px 4px 4px 4px;
-              border-left: 8px solid #E0EEF4;
-              border-right: 8px solid #E0EEF4;
-              border-bottom: 8px solid #E0EEF4;
-              font-weight: 400;
-              font-size: 32px;
-              color: #FFFFFF;
-              text-align: center;
+              border-radius: 32px 4px 4px 4px;
+              border: 8px solid #E0EEF4;
+
             }
 
             td:nth-child(2) {
               width: 620px;
-              height: 210px;
-              background: #FFFFFF;
-              border-radius: 4px 4px 4px 4px;
-              border-bottom: 8px solid #E0EEF4;
+              height: 100px;
+              background: #1EC590;
+              border-top: 8px solid #E0EEF4;
               border-right: 8px solid #E0EEF4;
+              border-bottom: 8px solid #E0EEF4;
             }
 
             td:nth-child(3) {
-              width: 620px;
-              height: 210px;
-              background: #FFFFFF;
-              border-radius: 4px 4px 4px 4px;
-              border-bottom: 8px solid #E0EEF4;
+              width: 616px;
+              height: 119px;
+              background: #8CE349;
+              border-radius: 4px 32px 4px 4px;
+              border-top: 8px solid #E0EEF4;
               border-right: 8px solid #E0EEF4;
+              border-bottom: 8px solid #E0EEF4;
+
             }
           }
 
-          tr:nth-child(4) {
+          .two-tr {
             td:nth-child(1) {
-              width: 290px;
-              height: 110px;
+              height: 100px;
+              border-radius: 0px 0px 0px 0px;
               background: #1E410E;
-              border-radius: 4px 4px 4px 4px;
               border-left: 8px solid #E0EEF4;
               border-right: 8px solid #E0EEF4;
               border-bottom: 8px solid #E0EEF4;
               font-weight: 400;
               font-size: 32px;
               color: #FFFFFF;
-              line-height: 16px;
               text-align: center;
             }
-
             td:nth-child(2) {
               width: 620px;
-              height: 119px;
+              height: 290px;
               background: #FFFFFF;
               border-radius: 4px 4px 4px 4px;
+              //border-top: 8px solid #E0EEF4;
               border-bottom: 8px solid #E0EEF4;
               border-right: 8px solid #E0EEF4;
               font-weight: 400;
@@ -811,10 +981,9 @@ p, div {
               color: #333333;
               line-height: 52px;
             }
-
             td:nth-child(3) {
               width: 620px;
-              height: 119px;
+              height: 290px;
               background: #FFFFFF;
               border-radius: 4px 4px 4px 4px;
               border-bottom: 8px solid #E0EEF4;
@@ -825,108 +994,114 @@ p, div {
               line-height: 52px;
             }
           }
-          tr:nth-child(5) {
+
+
+          .text-td {
+            text-align: center;
+
+            .text-td-p {
+              display: flex;
+              justify-content: center;
+            }
+          }
+        }
+
+      }
+      .five-page{
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        .table {
+          width: 1526px;
+          height: 887px;
+          margin-top: 25px;
+
+          .one-tr {
+            font-weight: 400;
+            font-size: 32px;
+            color: #FFFFFF;
+            text-align: center;
+
             td:nth-child(1) {
               width: 290px;
-              height: 110px;
+              height: 100px;
               background: #1E410E;
-              border-radius: 4px 4px 4px 4px;
-              border-left: 8px solid #E0EEF4;
-              border-right: 8px solid #E0EEF4;
-              border-bottom: 8px solid #E0EEF4;
-              font-weight: 400;
-              font-size: 32px;
-              color: #FFFFFF;
-              line-height: 16px;
-              text-align: center;
+              border-radius: 32px 4px 4px 4px;
+              border: 8px solid #E0EEF4;
+
             }
 
             td:nth-child(2) {
-              width: 290px;
+              width: 620px;
               height: 100px;
+              background: #1EC590;
+              border-top: 8px solid #E0EEF4;
               border-right: 8px solid #E0EEF4;
               border-bottom: 8px solid #E0EEF4;
-              font-weight: 400;
-              font-size: 32px;
-              color: #333333;
-              line-height: 52px;
             }
 
             td:nth-child(3) {
-              width: 290px;
-              height: 100px;
+              width: 616px;
+              height: 119px;
+              background: #8CE349;
+              border-radius: 4px 32px 4px 4px;
+              border-top: 8px solid #E0EEF4;
               border-right: 8px solid #E0EEF4;
               border-bottom: 8px solid #E0EEF4;
-              border-radius: 4px 4px 32px 4px;
-              font-weight: 400;
-              font-size: 32px;
-              color: #333333;
-              line-height: 52px;
+
             }
           }
-          tr:nth-child(6) {
+
+          .two-tr {
             td:nth-child(1) {
-              width: 290px;
               height: 100px;
+              border-radius: 0px 0px 0px 0px;
               background: #1E410E;
-              border-radius: 4px 4px 4px 32px;
               border-left: 8px solid #E0EEF4;
               border-right: 8px solid #E0EEF4;
               border-bottom: 8px solid #E0EEF4;
               font-weight: 400;
               font-size: 32px;
               color: #FFFFFF;
-              line-height: 16px;
               text-align: center;
             }
-
             td:nth-child(2) {
-              width: 290px;
-              height: 100px;
-              border-right: 8px solid #E0EEF4;
+              width: 620px;
+              background: #FFFFFF;
+              border-radius: 4px 4px 4px 4px;
+              //border-top: 8px solid #E0EEF4;
               border-bottom: 8px solid #E0EEF4;
+              border-right: 8px solid #E0EEF4;
               font-weight: 400;
               font-size: 32px;
               color: #333333;
               line-height: 52px;
             }
-
             td:nth-child(3) {
-              width: 290px;
-              height: 100px;
-              border-right: 8px solid #E0EEF4;
+              width: 620px;
+              background: #FFFFFF;
+              border-radius: 4px 4px 4px 4px;
               border-bottom: 8px solid #E0EEF4;
-              border-radius: 4px 4px 32px 4px;
+              border-right: 8px solid #E0EEF4;
               font-weight: 400;
               font-size: 32px;
               color: #333333;
               line-height: 52px;
             }
-          }
-
-          .school-level-box {
-            display: flex;
-            justify-content: left;
-            //margin-top: 32px;
-            flex-wrap: wrap;
-            width: 620px;
-            padding-left: 30px;
-
-            .school-level {
-              margin-right: 20px;
-              width: 174px;
-              height: 54px;
-              background: #B3FC7C;
-              border-radius: 5px 5px 5px 5px;
-              font-weight: bold;
-              font-size: 20px;
-              color: #000000;
-              line-height: 54px;
-              text-align: center;
-              margin-top: 10px;
+            .school-box{
+               //display: flex;
+               //justify-content: space-around;
+              //flex-wrap: wrap;
+               .info{
+                 //width: 200px;
+                 //height: 200px;
+                 margin-left: 30px;
+               }
             }
           }
 
+
           .text-td {
             text-align: center;
 

src/views/xjc-integratedmachine/environment/contrast_university.vue

@@ -18,64 +18,6 @@
             </div>
             <div class="content-right">
                 <div class="one-page" v-show="onePage">
-                    <!--          <table class="table" v-for="(item,index) in contrastData">-->
-                    <!--            <tr>-->
-                    <!--              <td>大学名称</td>-->
-                    <!--              <td>{{ item.name }}</td>-->
-                    <!--            </tr>-->
-                    <!--            <tr>-->
-                    <!--              <td>基本信息</td>-->
-                    <!--              <td class="text-td">-->
-                    <!--                <p>创建时间：<span>{{ item.ctime }}</span></p>-->
-                    <!--                <p>所在地区：<span>{{ item.areaname }}</span></p>-->
-                    <!--                <p>院校隶属：<span>{{ item.subjection }}</span></p>-->
-                    <!--                <p class="text-td-p">院校类型：<span>  <dict-tag :options="school_category" :value="item.categoryid"/></span></p>-->
-                    <!--              </td>-->
-                    <!--&lt;!&ndash;              <td class="text-td">&ndash;&gt;-->
-                    <!--&lt;!&ndash;                <p>创建时间：<span>{{ contrastA.ctime }}</span></p>&ndash;&gt;-->
-                    <!--&lt;!&ndash;                <p>所在地区：<span>{{ contrastA.areaname }}</span></p>&ndash;&gt;-->
-                    <!--&lt;!&ndash;                <p>院校隶属：<span>{{ contrastA.subjection }}</span></p>&ndash;&gt;-->
-                    <!--&lt;!&ndash;                <p class="text-td-p">院校类型：<span>  <dict-tag :options="school_category" :value="contrastA.categoryid"/></span></p>&ndash;&gt;-->
-                    <!--&lt;!&ndash;              </td>&ndash;&gt;-->
-                    <!--            </tr>-->
-                    <!--            <tr>-->
-                    <!--              <td>院校特色</td>-->
-                    <!--              <td>-->
-                    <!--                <div class="school-level-box">-->
-                    <!--                  <p class="school-level" style="background-color: #B3FC7C" v-show="item.nef==='1'">985</p>-->
-                    <!--                  <p class="school-level" style="background-color: #BBF88D" v-show="item.too==='1'">211</p>-->
-                    <!--                  <p class="school-level" style="background-color: #8CE349" v-show="item.istopschool==='1'">-->
-                    <!--                    一流大学</p>-->
-                    <!--                  <p class="school-level" style="background-color: #9DFF51" v-show="item.istopsubject==='1'">-->
-                    <!--                    一流学科</p>-->
-                    <!--                  <p class="school-level" style="background-color: #8ADFC4" v-show="item.self==='1'">强</p>-->
-                    <!--                  <p class="school-level" style="background-color: #1EC590" v-show="item.graduate==='1'">研</p>-->
-                    <!--                </div>-->
-                    <!--              </td>-->
-                    <!--              <td>-->
-                    <!--                <div class="school-level-box">-->
-                    <!--                  <p class="school-level" style="background-color: #B3FC7C" v-show="item.nef==='1'">985</p>-->
-                    <!--                  <p class="school-level" style="background-color: #BBF88D" v-show="item.too==='1'">211</p>-->
-                    <!--                  <p class="school-level" style="background-color: #8CE349" v-show="item.istopschool==='1'">-->
-                    <!--                    一流大学</p>-->
-                    <!--                  <p class="school-level" style="background-color: #9DFF51" v-show="item.istopsubject==='1'">-->
-                    <!--                    一流学科</p>-->
-                    <!--                  <p class="school-level" style="background-color: #8ADFC4" v-show="item.self==='1'">强</p>-->
-                    <!--                  <p class="school-level" style="background-color: #1EC590" v-show="item.graduate==='1'">研</p>-->
-                    <!--                </div>-->
-                    <!--              </td>-->
-                    <!--            </tr>-->
-                    <!--            <tr>-->
-                    <!--              <td>学校性质</td>-->
-                    <!--              <td class="text-td "><dict-tag :options="property" :value="item.property"/></td>-->
-                    <!--              <td class="text-td"><dict-tag :options="property" :value="item.property"/></td>-->
-                    <!--            </tr>-->
-                    <!--            <tr>-->
-                    <!--              <td>学校地址</td>-->
-                    <!--              <td class="text-td">{{ item.address }}</td>-->
-                    <!--              <td class="text-td">{{ item.address }}</td>-->
-                    <!--            </tr>-->
-                    <!--          </table>-->
                     <table class="table table-bordered">
                         <thead>
                         <tr class="one-tr">
@@ -131,7 +73,27 @@
                     </table>
                 </div>
                 <div class="two-page" v-show="twoPage">
-                    <!--对比 孙一石 -->
+<!--                  <table class="table table-bordered">-->
+<!--                    <thead>-->
+<!--                    <tr class="one-tr">-->
+<!--                      <td class="first-title">大学名称</td>-->
+<!--                      <td v-for="(item,index) in contrastData" :key="index">{{ item.name }}</td>-->
+<!--                    </tr>-->
+<!--                    </thead>-->
+<!--                    <tbody>-->
+<!--                    <tr v-show="false"></tr>-->
+<!--                    <tr class="two-tr">-->
+<!--                      <td>录取分数线</td>-->
+<!--&lt;!&ndash;                      <td><div v-for="(item,index) in contrastData" :key="index">&ndash;&gt;-->
+<!--&lt;!&ndash;                        {{ item.name }}&ndash;&gt;-->
+<!--&lt;!&ndash;                      </div></td>&ndash;&gt;-->
+<!--                      <td><div v-for="(item,index) in dbForm" :key="index">-->
+<!--                        {{ item.name }}-->
+<!--                      </div></td>-->
+<!--                    </tr>-->
+<!--                    </tbody>-->
+<!--                  </table>-->
+<!--                    对比 孙一石-->
                     <select v-model="dbForm.area">
                         <option v-for="dict in gk_province" :key="dict.value" :value="dict.value">{{dict.label}}
                         </option>
@@ -390,6 +352,7 @@
         if (contrastData) {
             contrastList.value = contrastData
         }
+      // dbResult();
     })
 </script>
 
@@ -767,7 +730,7 @@
                                 background: #1E410E;
                                 border-left: 8px solid #E0EEF4;
                                 border-right: 8px solid #E0EEF4;
-                                border-bottom: 8px solid #E0EEF4;
+                                //border-bottom: 8px solid #E0EEF4;
                                 font-weight: 400;
                                 font-size: 32px;
                                 color: #FFFFFF;
@@ -810,7 +773,7 @@
                                 border-radius: 4px 4px 4px 4px;
                                 border-left: 8px solid #E0EEF4;
                                 border-right: 8px solid #E0EEF4;
-                                border-bottom: 8px solid #E0EEF4;
+                                //border-bottom: 8px solid #E0EEF4;
                                 font-weight: 400;
                                 font-size: 32px;
                                 color: #FFFFFF;
@@ -844,7 +807,7 @@
                                 border-radius: 4px 4px 4px 4px;
                                 border-left: 8px solid #E0EEF4;
                                 border-right: 8px solid #E0EEF4;
-                                border-bottom: 8px solid #E0EEF4;
+                                //border-bottom: 8px solid #E0EEF4;
                                 font-weight: 400;
                                 font-size: 32px;
                                 color: #FFFFFF;
@@ -887,7 +850,7 @@
                                 border-radius: 4px 4px 4px 32px;
                                 border-left: 8px solid #E0EEF4;
                                 border-right: 8px solid #E0EEF4;
-                                border-bottom: 8px solid #E0EEF4;
+                                //border-bottom: 8px solid #E0EEF4;
                                 font-weight: 400;
                                 font-size: 32px;
                                 color: #FFFFFF;

src/views/xjc-integratedmachine/environment/pro_details_video.vue

@@ -60,7 +60,7 @@
           <div class="one-page" v-show="twoPage">
             <p class="title">开设院校</p>
             <div class="info"  v-for="(item,index) in kaishe_list">
-              {{ entity.name }}
+              {{ item.name }}
             </div>
           </div>
           <div class="one-page" v-show="threePage">
@@ -91,7 +91,7 @@
         v-model="fivePage"
         @before-close="dialogBeforeClose"
         destroy-on-close
-        title="学校视频"
+        title="专业视频"
         width="1832px"
         height="915px"
         center
@@ -177,6 +177,7 @@ function detail() {
     kaishe_list.value = resp.kaishe_list
     pinggu_list.value = resp.pinggu_list
     similar_list.value = resp.similar_list
+    entity.value.kaishe_list = kaishe_list
   })
 setTimeout(() => {
     setCollection_data();

src/views/xjc-integratedmachine/environment/prodb_search_undergraduate.vue

@@ -133,7 +133,7 @@ const headinfo = ref({})
 
 function setHeadinfo() {
   headinfo.value = {
-    title: '高校信息查询',
+    title: '专业信息查询',
     user: {
       avatar: '头像路径',
       nickName: '张三'

src/views/xjc-integratedmachine/environment/query_universitydb_conditions.vue

@@ -26,11 +26,11 @@
           <div class="search-btn">
             <p v-show="form.educationlevelName || form.areaname || form.characteristicName">
               <span style="margin-right: 3px;margin-left: 3px">已选择条件:</span>
-              <span style="margin-right: 3px;margin-left: 3px">{{form.educationlevelName}}</span>
-              <span v-show="form.areaname">|</span>
-              <span style="margin-right: 3px;margin-left: 3px">{{form.areaname}}</span>
-              <span v-show="form.characteristicName">|</span>
-              <span style="margin-right: 3px;margin-left: 3px">{{form.characteristicName}}</span>
+              <span style="margin-left: 3px">{{form.areaname}}</span>
+
+              <span ><span v-show="form.educationlevelName" style="margin-right: 3px;margin-left: 3px">|</span>{{form.educationlevelName}}</span>
+
+              <span ><span style="margin-right: 3px;margin-left: 3px" v-show="form.characteristicName">|</span>{{form.characteristicName}}</span>
             </p>
             <img @click="search" style="z-index:10" src="@/assets/images/environment/search-btn.png">
           </div>

src/views/xjc-integratedmachine/environment/university_details_video.vue

@@ -139,6 +139,11 @@
           </div>
           <div class="one-page" v-show="eightPage">
             <p class="title">学校视频</p>
+            <div class="video-content" style="display: flex;justify-content: center" v-if="entity.path">
+              <video ref="videoPlayer" video preload="auto" autoplay muted controls width="1000" height="400">
+                <source :src="entity.path" type="video/mp4">
+              </video>
+            </div>
           </div>
         </div>
       </div>
@@ -146,7 +151,7 @@
     </div>
   </div>
   <el-dialog
-      v-model="sixPage"
+      v-model="sixPageDialog"
       destroy-on-close
       title=""
       width="90%"
@@ -154,9 +159,9 @@
       style="width: 90%;height: 910px;"
       center
       align-center
-      close-on-click-modal="false"
+      :show-close="false"
   >
-    <div class="one-page" style="width: 1658px" v-show="sixPage">
+    <div class="one-page" style="width: 1658px;height: 880px;" v-show="sixPage">
       <div class="select-div">
         <p>招生地区:</p>
         <p class="select-box" @click="showAreaChooseHandler">
@@ -173,7 +178,7 @@
         </p>
         <p class="select-box click-search" @click="getPlan">点击查询</p>
       </div>
-      <el-table :data="jh_tableData">
+      <el-table :data="jh_tableData" style="height: 640px;margin-bottom: 20px;">
         <el-table-column label="招生年份" align="center" key="years" prop="years"/>
         <el-table-column label="专业名称" align="center" key="enrollname" prop="enrollname"/>
         <el-table-column label="大学学制" align="center" key="studyyears" prop="studyyears"/>
@@ -181,20 +186,22 @@
         <el-table-column label="计划招生人数" align="center" key="plannum" prop="plannum"/>
         <el-table-column label="学费" align="center" key="fee" prop="fee"/>
       </el-table>
+      <div class="footer-div">
+        <el-button type="success" class="close-box click-close" @click="sixPageDialog = false">关闭</el-button>
+      </div>
     </div>
   </el-dialog>
   <el-dialog
-      v-model="fivePage"
-      destroy-on-close
+      v-model="fivePageDialog"
       title=""
       width="90%"
       height="910px"
       style="width: 90%;height: 910px;"
       center
       align-center
-      close-on-click-modal="false"
+      :show-close="false"
   >
-    <div class="one-page" style="width: 1658px" v-show="fivePage">
+    <div class="one-page" style="width: 1658px;height: 880px;" v-show="fivePage">
       <div class="select-div">
         <p>招生地区:</p>
         <p class="select-box" @click="showAreaChooseHandler">
@@ -209,13 +216,32 @@
         </p>
         <p class="select-box click-search" @click="getScore">点击查询</p>
       </div>
-      <el-table :data="kf_tableData">
+      <el-table :data="kf_tableData" style="height: 640px;margin-bottom: 20px;">
         <el-table-column label="招生年份" align="center" key="years" prop="years" style="height: 95px"/>
         <el-table-column label="录取批次" align="center" key="batchname" prop="batchname" style="height: 95px"/>
         <el-table-column label="最低分" align="center" key="lowscore" prop="lowscore" style="height: 95px"/>
         <el-table-column label="最低分位次" align="center" key="totalorder" prop="totalorder" style="height: 95px"
                          ya/>
       </el-table>
+      <div class="footer-div">
+        <el-button type="success" class="close-box click-close" @click="fivePageDialog = false">关闭</el-button>
+      </div>
+    </div>
+  </el-dialog>
+  <el-dialog
+      v-model="eightPageDialog"
+      @before-close="dialogBeforeClose"
+      destroy-on-close
+      title="学校视频"
+      width="1832px"
+      height="915px"
+      center
+      align-center
+  >
+    <div class="video-content" v-if="entity.path">
+      <video ref="videoPlayer" video preload="auto" autoplay muted controls width="1798" height="900">
+        <source :src="entity.path" type="video/mp4">
+      </video>
     </div>
   </el-dialog>
   <div>
@@ -243,22 +269,6 @@
         <div class="dict-box" v-for="item in grade" :key="item" @click="chooseGrade(item)">{{ item }}</div>
       </div>
     </el-dialog>
-    <el-dialog
-        v-model="eightPage"
-        @before-close="dialogBeforeClose"
-        destroy-on-close
-        title="学校视频"
-        width="1832px"
-        height="915px"
-        center
-        align-center
-    >
-      <div class="video-content" v-if="entity.path">
-        <video ref="videoPlayer" video preload="auto" autoplay muted controls width="1798" height="900">
-          <source :src="entity.path" type="video/mp4">
-        </video>
-      </div>
-    </el-dialog>
   </div>
 </template>
 <script setup>
@@ -317,6 +327,11 @@ const twoPage = ref(false)
 const threePage = ref(false)
 const fourPage = ref(false)
 const fivePage = ref(false)
+const fivePageDialog = ref(false)
+const sixPageDialog = ref(false)
+const eightPageDialog = ref(false)
+
+
 const sixPage = ref(false)
 const senvenPage = ref(false)
 const eightPage = ref(false)
@@ -523,6 +538,7 @@ const showPage = (val) => {
     sixPage.value = false
     senvenPage.value = false
     eightPage.value = false;
+    fivePageDialog.value = true;
   } else if (val === 6) {
     onePage.value = false;
     twoPage.value = false;
@@ -532,6 +548,7 @@ const showPage = (val) => {
     sixPage.value = true
     senvenPage.value = false
     eightPage.value = false;
+    sixPageDialog.value = true;
   } else if (val === 7) {
     onePage.value = false;
     twoPage.value = false;
@@ -550,6 +567,7 @@ const showPage = (val) => {
     sixPage.value = false
     senvenPage.value = false;
     eightPage.value = true;
+    eightPageDialog.value = true;
   }
   //清空数据
   form.area = '';
@@ -658,9 +676,10 @@ p, div {
           align-items: center;
 
           .right-top-icon {
-            width: 200px;
+            width: 130px;
             height: 68px;
             display: flex;
+            margin-right: 30px;
             justify-content: space-between;
             margin-top: 24px;
 
@@ -668,18 +687,17 @@ p, div {
               display: flex;
               flex-direction: column;
               align-items: center;
-
+              width:68px;
               p {
                 font-weight: 400;
                 font-size: 20px;
                 color: #515F6A;
-
               }
 
               img {
                 width: 36px;
                 height: 36px;
-                border: 1px solid;
+                //border: 1px solid;
               }
             }
           }
@@ -800,7 +818,7 @@ p, div {
     justify-content: center;
     align-items: center;
     margin-bottom: 21px;
-
+    margin-top: 10px;
     .select-box {
       width: 300px;
       height: 90px;
@@ -821,7 +839,30 @@ p, div {
       margin-left: 20px;
     }
   }
+  .footer-div{
+    width:100%;
+    display: flex;
+    justify-content: space-around;
+    .close-box {
+      width: 300px;
+      height: 90px;
+      border: 1px solid #CCCCCC;
+      line-height: 90px;
+      text-align: center;
+      margin-left: 10px;
+    }
 
+    .click-close {
+      width: 170px;
+      height: 66px;
+      //background: linear-gradient(180deg, #73EE71 0%, #0ACB63 100%);
+      border-radius: 5px;
+      font-weight: 400;
+      font-size: 24px;
+      color: #FFFFFF;
+      margin-left: 20px;
+    }
+  }
   ::v-deep .el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th {
     height: 74px !important;
     font-size: 24px;

src/views/xjc-integratedmachine/environment/university_list.vue

@@ -4,12 +4,14 @@
     <div class="page-content">
       <div class="page-img-box">
         <div class="box-content">
-          <div class="school-box" v-for="(item,index) in tableData" :key="index">
+          <div class="school-box" v-for="(item,index) in tableData" :key="index" @click="handleDetail(item)">
             <img src="@/assets/images/environment/contrast.png"/>
             <div class="right-box">
               <div class="right-top">
                 <div class="right-top-title">{{ item.name }}</div>
-                <div class="right-top-details" @click="handleDetail(item)">详情 ></div>
+                <div class="right-top-details">详情
+                  <img style="width: 24px;height: 24px" src="@/assets/images/environment/details_icon.png"/>
+                  </div>
               </div>
               <p class="info"><span>创建时间:</span><span>{{
                   item.ctime
@@ -91,6 +93,7 @@ function setHeadinfo() {
     backUrl: '/xjc-integratedmachine/environment/query_universitydb_conditions',
     homeUrl: '/xjc-integratedmachine/environment/index',
     contrast:true,
+    contrastType:'university',
   }
 }
 
@@ -155,6 +158,7 @@ p, div {
             width: 154px;
             height: 154px;
             //border: 1px solid;
+            margin-left: 13px;
           }
 
           .right-box {
@@ -180,6 +184,10 @@ p, div {
                 font-weight: 400;
                 font-size: 20px;
                 color: #515F6A;
+                display: flex;
+                justify-content: space-around;
+                align-items: center;
+                margin-right: 30px;
               }
             }
 

vite.config.js

@@ -47,7 +47,7 @@ export default defineConfig(({ mode, command }) => {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
           // target: 'http://localhost:8080',
-          target: 'http://192.168.3.169:8080',//临时11
+          target: 'http://192.168.3.100:8080',//服务器
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         }