zs преди 8 месеца
родител
ревизия
bb1058d59b
променени са 6 файла, в които са добавени 46 реда и са изтрити 41 реда
  1. 2 1
      .env.development
  2. 2 1
      .env.production
  3. 5 1
      src/components/custom/custom-layout.vue
  4. 8 9
      src/views/detail/newsDetail.vue
  5. 27 27
      src/views/four/parts/index.vue
  6. 2 2
      src/views/one/index.vue

+ 2 - 1
.env.development

@@ -9,9 +9,10 @@ VITE_APP_BASE_API = '/cxyy/api'
 
 VITE_APP_BASE_APIWS ='/websocket/api'
 
-VITE_APP_HOME = "http://localhost:3003/"
+VITE_APP_HOME = "http://localhost:3000/"
 
 VITE_APP_HOST = "http://127.0.0.1:19700"
 
 VITE_BASE_URL = "/cxyyWeb"
+
 VITE_OUT_DIR = "cxyyWeb"

+ 2 - 1
.env.production

@@ -11,8 +11,9 @@ VITE_APP_BASE_APIWS ='/websocket/api'
 
 VITE_APP_HOST = "http://10.120.114.6"
 
-VITE_APP_HOME = "/cxyyAdmin"
+VITE_APP_HOME = "http://localhost:3000/"
 
 
 VITE_BASE_URL = "/cxyyWeb"
+
 VITE_OUT_DIR = "cxyyWeb"

+ 5 - 1
src/components/custom/custom-layout.vue

@@ -20,7 +20,7 @@
               </span>
               <template #dropdown>
                 <el-dropdown-menu>
-                  <el-dropdown-item> 个人中心 </el-dropdown-item>
+                  <el-dropdown-item @click="toCenter"> 个人中心 </el-dropdown-item>
                   <el-dropdown-item @click="toOut"> 退出登录 </el-dropdown-item>
                 </el-dropdown-menu>
               </template>
@@ -171,6 +171,10 @@ const selectMenu = (item, query) => {
 const toHelp = () => {
   router.push({ path: `/help` })
 }
+// 个人中心
+const toCenter = () => {
+  window.location.href = `${import.meta.env.VITE_APP_HOME}cxyyAdmin/center`
+}
 // 消息
 const toChat = () => {
   router.push({ path: `/chat` })

+ 8 - 9
src/views/detail/newsDetail.vue

@@ -33,8 +33,8 @@
                   </template>
                 </el-image>
                 <el-image v-else class="image" :src="match_3" fit="fill" />
-                <div class="name">{{ matchInfo.name || '暂无' }}</div>
-                <div class="brief">{{ removeHtmlStyle(matchInfo.brief) }}</div>
+                <div class="name textMore">{{ matchInfo.name || '暂无' }}</div>
+                <div class="brief">{{ removeHtmlStyle(matchInfo.brief) || '暂无' }}</div>
                 <div class="other">
                   <div class="time">
                     <el-image class="image" :src="time1" fit="fill" />
@@ -51,7 +51,7 @@
               </div>
               <div class="content_2">
                 <div class="list" v-for="(item, index) in expertList" :key="index" @click="toView(item, '1')">
-                  <div class="name">
+                  <div class="name textMore">
                     <el-image class="image" :src="liIcon" fit="fill"></el-image>
                     <span>{{ item.name || '暂无' }}</span>
                   </div>
@@ -68,7 +68,7 @@
               <div class="content_3">
                 <div class="list" v-for="(item, index) in projectList" :key="index" @click="toView(item, '2')">
                   <el-image class="image" :src="liIcon" fit="fill"></el-image>
-                  <div class="name">
+                  <div class="name textMore">
                     <div>{{ item.name || '暂无' }}</div>
                     <div>来源:{{ item.source || '暂无' }}</div>
                     <!-- <div>项目进展:{{ item.progress || '暂无' }}</div> -->
@@ -254,22 +254,21 @@ const toView = (item, type) => {
           }
           .content_1 {
             margin: 10px 0;
-            width: 430px;
-            padding: 20px;
+            padding: 10px;
             transition: box-shadow 0.3s ease; /* 添加过渡效果,使阴影的出现更平滑 */
             .image {
-              width: 390px;
+              width: 410px;
               height: 270px;
               border-radius: 4px;
               overflow: hidden;
             }
             .name {
               margin: 16px 0;
-              height: 52px;
+              max-height: 52px;
               font-size: $global-font-size-20;
             }
             .brief {
-              margin-bottom: 20px !important;
+              margin-bottom: 10px !important;
               font-size: $global-font-size-16;
               color: #717794;
               -webkit-line-clamp: 3;

+ 27 - 27
src/views/four/parts/index.vue

@@ -317,9 +317,9 @@ const search = async (active) => {
     else {
       const info = {
         skip: 0,
-        limit: 9,
-        is_use: '0',
-        status: '1'
+        limit: 9
+        // is_use: '0',
+        // status: '1'
       }
       if (active) info.industry = '汽车电子及新型汽车零部件'
       const res = await store.query(info)
@@ -334,9 +334,9 @@ const search = async (active) => {
     else {
       const info = {
         skip: 0,
-        limit: 9,
-        is_use: '0',
-        status: '1'
+        limit: 9
+        // is_use: '0',
+        // status: '1'
       }
       if (active) info.industry = '光电子及智能传感器'
       const res = await store.query(info)
@@ -351,9 +351,9 @@ const search = async (active) => {
     else {
       const info = {
         skip: 0,
-        limit: 9,
-        is_use: '0',
-        status: '1'
+        limit: 9
+        // is_use: '0',
+        // status: '1'
       }
       if (active) info.industry = '精密仪器及先进装备'
       const res = await store.query(info)
@@ -368,9 +368,9 @@ const search = async (active) => {
     else {
       const info = {
         skip: 0,
-        limit: 9,
-        is_use: '0',
-        status: '1'
+        limit: 9
+        // is_use: '0',
+        // status: '1'
       }
       if (active) info.industry = '生物医药及先进医疗器械'
       const res = await store.query(info)
@@ -385,9 +385,9 @@ const search = async (active) => {
     else {
       const info = {
         skip: 0,
-        limit: 9,
-        is_use: '0',
-        status: '1'
+        limit: 9
+        // is_use: '0',
+        // status: '1'
       }
       if (active) info.industry = '车规级芯片及功率半导体器件'
       const res = await store.query(info)
@@ -402,9 +402,9 @@ const search = async (active) => {
     else {
       const info = {
         skip: 0,
-        limit: 9,
-        is_use: '0',
-        status: '1'
+        limit: 9
+        // is_use: '0',
+        // status: '1'
       }
       if (active) info.industry = '人工智能及智能机器人'
       const res = await store.query(info)
@@ -419,9 +419,9 @@ const search = async (active) => {
     else {
       const info = {
         skip: 0,
-        limit: 9,
-        is_use: '0',
-        status: '1'
+        limit: 9
+        // is_use: '0',
+        // status: '1'
       }
       if (active) info.industry = '生物基及高性能新材料'
       const res = await store.query(info)
@@ -436,9 +436,9 @@ const search = async (active) => {
     else {
       const info = {
         skip: 0,
-        limit: 9,
-        is_use: '0',
-        status: '1'
+        limit: 9
+        // is_use: '0',
+        // status: '1'
       }
       if (active) info.industry = '新能源及动力电池'
       const res = await store.query(info)
@@ -453,9 +453,9 @@ const search = async (active) => {
     else {
       const info = {
         skip: 0,
-        limit: 9,
-        is_use: '0',
-        status: '1'
+        limit: 9
+        // is_use: '0',
+        // status: '1'
       }
       if (active) info.industry = '碳纤维及复合材料'
       const res = await store.query(info)

+ 2 - 2
src/views/one/index.vue

@@ -590,8 +590,8 @@ const getUrl = (item, type) => {
         background-size: cover;
         text-align: center;
         font-size: $global-font-size-36;
-        line-height: 34px;
-        height: 34px;
+        line-height: 40px;
+        height: 40px;
         margin: 20px 0;
         .title {
           font-size: $global-font-size-20;