Merge branch 'master' of http://182.92.169.222:3000/zhc077/zmd_kejiju

jeecgboot-vue3/.env.production

@@ -14,6 +14,7 @@ VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 #后台接口父地址(必填)
 VITE_GLOB_API_URL=/kjj
+VITE_GLOB_API_URL_CXQ=http://localhost:18088/jeecg-boot
 
 #后台接口全路径地址(必填)
 VITE_GLOB_DOMAIN_URL=http://182.92.169.222:8080/jeecg-boot

jeecgboot-vue3/src/views/demo/main-home/components/NewsList/index.vue

@@ -20,7 +20,7 @@
     <div class="column-list">
       <div class="title">栏目列表</div>
       <div class="list">
-        <div class="item" @click="getindexallarticleEvent">全部</div>
+        <div :class="columnId === '0' ? 'item active' : 'item'" @click="getindexallarticleEvent">全部</div>
         <div :class="columnId === i.id ? 'item active' : 'item'" v-for="i in newColumnList" :key="i.id" @click="getMyNewsList(i)">{{ i.name }}</div>
         <!-- <div class="item">项目申报</div>
         <div class="item">新闻列表</div> -->
@@ -84,6 +84,9 @@
     }
   };
   const getindexallarticleEvent = async () => {
+    columnId.value = '0';
+    console.log( columnId.value);
+    
     const res = await getindexallarticle();
     console.log(res);
     newList.value = res.records;

jeecgboot-vue3/src/views/demo/main-home/components/articleManagement/index.vue

@@ -20,8 +20,8 @@
     <div class="column-list">
       <div class="title">栏目列表</div>
       <div class="list">
-        <div class="item" @click="getindexallarticleEvent">全部</div>
-        <div class="item" v-for="i in newColumnList" :key="i.id" @click="getMyNewsList(i)">{{ i.name }}</div>
+        <div :class="columnId === '0' ? 'item active' : 'item'" @click="getindexallarticleEvent">全部</div>
+        <div :class="columnId === i.id ? 'item active' : 'item'" v-for="i in newColumnList" :key="i.id" @click="getMyNewsList(i)">{{ i.name }}</div>
         <!-- <div class="item">项目申报</div>
         <div class="item">新闻列表</div> -->
       </div>
@@ -43,6 +43,8 @@
     pageSize: 10,
     pageNo: 1,
   });
+  const columnId = ref('');
+
   const newColumnList = ref([]);
   const getindexcolumnEvent = async () => {
     const res = await getindexcolumn();
@@ -63,7 +65,6 @@
     newList.value = res.records;
     total.value = res.total;
   };
-  const columnId = ref('');
   const onChange = (page) => {
     console.log(page);
     page.pageNo = page;
@@ -74,6 +75,7 @@
     }
   };
   const getindexallarticleEvent = async () => {
+    columnId.value = '0';
     const res = await getindexgzdt();
     console.log(res);
     newList.value = res.records;
@@ -192,8 +194,8 @@
           border-bottom: 1px solid #d9d9d9;
           cursor: pointer;
         }
-        .item:hover {
-          color: #002e97;
+        .active{
+        color: #002e97 !important;
       }
       }
     }

jeecgboot-vue3/src/views/demo/main-home/components/columnManagement/index.vue

@@ -20,8 +20,9 @@
     <div class="column-list">
       <div class="title">栏目列表</div>
       <div class="list">
-        <div class="item" @click="getindexallarticleEvent">全部</div>
-        <div class="item" v-for="i in newColumnList" :key="i.id" @click="getMyNewsList(i)">{{ i.name }}</div>
+     
+        <div :class="columnId === '0' ? 'item active' : 'item'" @click="getindexallarticleEvent">全部</div>
+        <div :class="columnId === i.id ? 'item active' : 'item'" v-for="i in newColumnList" :key="i.id" @click="getMyNewsList(i)">{{ i.name }}</div>
         <!-- <div class="item">项目申报</div>
         <div class="item">新闻列表</div> -->
       </div>
@@ -43,6 +44,8 @@
     pageSize: 10,
     pageNo: 1,
   });
+  const columnId = ref('');
+
   const newColumnList = ref([]);
   const getindexcolumnEvent = async () => {
     const res = await getindexcolumn();
@@ -63,7 +66,6 @@
     newList.value = res.records;
     total.value = res.total;
   };
-  const columnId = ref('');
   const onChange = (page) => {
     console.log(page);
     page.pageNo = page;
@@ -74,6 +76,7 @@
     }
   };
   const getindexallarticleEvent = async () => {
+    columnId.value = '0'
     const res = await getindexnotice();
     console.log(res);
     newList.value = res.records;
@@ -112,6 +115,7 @@
         border-bottom: 2px solid #ccc;
         padding-bottom: 45px;
         margin-top: 40px;
+       
         .left {
           width: 100px;
           height: 100px;
@@ -192,9 +196,9 @@
           border-bottom: 1px solid #d9d9d9;
           cursor: pointer;
         }
-        .item:hover {
-          color: #002e97;
-        }
+        // .item:hover {
+        //   color: #002e97;
+        // }
       }
     }
   }
@@ -209,4 +213,7 @@
     display: flex;
     justify-content: center;
   }
+  .active{
+        color: #002e97 !important;
+      }
 </style>

jeecgboot-vue3/src/views/demo/main-home/components/homePage/index.vue

@@ -525,13 +525,13 @@
     color: #fff;
   }
   :deep(:where(.css-dev-only-do-not-override-1hajlzy).ant-carousel .slick-dots) {
-    justify-content: end;
-    bottom: 4px;
-    right: 5px;
+    justify-content: end !important;
+    bottom: 4px !important;
+    right: 5px !important;
   }
   :deep(:where(.css-dev-only-do-not-override-1hajlzy).ant-carousel .slick-dots li button) {
-    width: 8px;
-    height: 8px;
-    border-radius: 50%;
+    width: 8px !important;
+    height: 8px !important;
+    border-radius: 50% !important; 
   }
 </style>