设置轮播图最大上限

dall

@@ -0,0 +1,47 @@
+commit 5f872e57924957043d6f0565ef9f092d99dc16bf (HEAD -> master)
+Author: nahida <1019904632@qq.com>
+Date:   Tue Sep 3 16:59:51 2024 +0800
+
+    修改身份证脱敏出现的BUG
+
+commit dd1e1ed1ec52a3619fbff78f6ba33ac5c9a9fcb7
+Author: nahida <1019904632@qq.com>
+Date:   Tue Aug 20 16:19:52 2024 +0800
+
+    项目推进
+
+commit b5673e0ba5d4bf297207a5c0c92efe04e5a470d2
+Author: nahida <1019904632@qq.com>
+Date:   Fri Jul 12 14:41:56 2024 +0800
+
+    项目推进
+
+commit f7dab17469f6652a866ef07046859e0d974c2621
+Author: sdjakl <1019904632@qq.com>
+Date:   Sat Jun 22 18:19:47 2024 +0800
+
+    推进
+
+commit d3b0160cb99ab0ccdf61f677961c48fa6d360b86
+Author: 丁烨烨 <2802843862@qq.com>
+Date:   Sat Jun 8 17:59:16 2024 +0800
+
+    1
+
+commit d3e39f96e8c968647d8b198b2587fbe883962940
+Author: 丁烨烨 <2802843862@qq.com>
+Date:   Sat Jun 8 14:03:04 2024 +0800
+
+    跟新路由
+
+commit 7dd7afea8090d96f29f945bb768a9ee27eba2c87
+Author: 丁烨烨 <2802843862@qq.com>
+Date:   Sat Jun 8 13:58:19 2024 +0800
+
+    跟新
+
+commit 10296b743ce9f905dc3847fc9ab48370d660d7f8
+Author: 丁烨烨 <2802843862@qq.com>
+Date:   Wed May 29 08:59:06 2024 +0800
+
+    1

src/components/FourDynamics.vue

@@ -19,11 +19,11 @@ const knowMore = (dickMapKey:string|undefined,dickMapValue:string|undefined)=>{
       <img src="/src/assets/img/小图标1.png" />
       <span class="text-#003aac text-16px font-bold ">通知公告</span>
     </div>
-    <div class="mt-20px ml-10px flex flex-wrap w-100%">
-      <div class="m-10px text-12px color-#030303 w-118px h-52px line-height-52px bg-#cce2ff text-center cursor-pointer" @click="knowMore('provincialDynamics','省内动态')">省内公告</div>
-      <div class="m-10px text-12px color-#030303 w-118px h-52px line-height-52px bg-#ecf4ff text-center cursor-pointer" @click="knowMore('outsideProvincialDynamics','省外动态')">省外公告</div>
-      <div class="m-10px text-12px color-#030303 w-118px h-52px line-height-52px bg-#cce2ff text-center cursor-pointer" @click="knowMore('currentCityDynamics','本市动态')">本市公告</div>
-      <div class="m-10px text-12px color-#030303 w-118px h-52px line-height-52px bg-#ecf4ff text-center cursor-pointer" @click="knowMore('parkDynamics','园区动态')">园区公告</div>
+    <div class="mt-20px ml-10px pb-20px flex flex-wrap gap-10px w-100%">
+      <div class=" text-12px color-#030303 w-45% h-52px line-height-52px bg-#cce2ff text-center cursor-pointer" @click="knowMore('provincialDynamics','省内动态')">省内公告</div>
+      <div class=" text-12px color-#030303 w-45% h-52px line-height-52px bg-#ecf4ff text-center cursor-pointer" @click="knowMore('outsideProvincialDynamics','省外动态')">省外公告</div>
+      <div class=" text-12px color-#030303 w-45% h-52px line-height-52px bg-#cce2ff text-center cursor-pointer" @click="knowMore('currentCityDynamics','本市动态')">本市公告</div>
+      <div class=" text-12px color-#030303 w-45% h-52px line-height-52px bg-#ecf4ff text-center cursor-pointer" @click="knowMore('parkDynamics','园区动态')">园区公告</div>
     </div>
   </div>
 </template>

src/components/Link1.vue

@@ -53,11 +53,11 @@ init()
 
 <template>
   <div>
-    <div class="w-912px bg-white ml-a mr-a text-16px pt-12px mb-10px line-height-44px border-dashed border-#e5e5e5 border-b-5px">
+    <div class="w-1112px bg-white ml-a mr-a text-16px pt-12px mb-10px line-height-44px border-dashed border-#e5e5e5 border-b-5px">
       <div class="w-240px border-solid border-#00306e border-b-5px relative">
         <img class="w-21px h-21px m-3px " src="/src/assets/img/信用小图标.png" />
         <span class="color-#003aac text-16px">政府项目资金需求发布及链接</span>
-        <span class="absolute right--650px top-10px cursor-pointer text-#959595" @click="knowMore('financial_need','政府项目资金需求')">查看更多 ></span>
+        <span class="absolute right--850px top-0px cursor-pointer text-#959595" @click="knowMore('financial_need','政府项目资金需求')">查看更多 ></span>
       </div>
       <div v-for="(item,index) in financialData" :key="index">
         <div class="flex justify-between">
@@ -72,7 +72,7 @@ init()
       </div>
     </div>
     <div>
-      <div class="w-912px ml-auto mr-auto flex flex-wrap justify-between bg-white">
+      <div class="w-1112px ml-auto mr-auto flex flex-wrap justify-between bg-white bg-opacity-22">
         <div class="w-174px h-116px mr-10px relative cursor-pointer" @click="toLink(1)">
           <img class="w-100% h-100%" src="/static/bg8.jpg" />
           <div class="absolute bottom-0 text-center w-100% h-22px text-white text-14px pt-4px pb-4px bg-#00306e bg-opacity-72">湖南省发改委项目审批</div>

src/components/Link2.vue

@@ -55,11 +55,11 @@ init()
 
 <template>
   <div>
-    <div class="w-912px bg-white ml-a mr-a text-16px mt-12px mb-10px line-height-44px border-dashed border-#e5e5e5 border-b-5px">
+    <div class="w-1112px bg-white ml-a mr-a text-16px mt-12px mb-10px line-height-44px border-dashed border-#e5e5e5 border-b-5px">
       <div class="w-240px border-solid border-#00306e border-b-5px relative">
         <img class="w-21px h-21px m-3px " src="/src/assets/img/信用小图标.png" />
         <span class="color-#003aac text-16px">园区企业融资贷款</span>
-        <span class="absolute right--650px top-10px cursor-pointer text-#959595" @click="knowMore('financing_loans','园区企业融资贷款')">查看更多 ></span>
+        <span class="absolute right--850px top-0px cursor-pointer text-#959595" @click="knowMore('financing_loans','园区企业融资贷款')">查看更多 ></span>
       </div>
       <div v-for="(item,index) in financingLoans" :key="index">
         <div class="flex justify-between">
@@ -74,7 +74,7 @@ init()
       </div>
     </div>
     <div>
-      <div class="w-912px ml-auto mr-auto flex flex-wrap justify-between bg-white">
+      <div class="w-1112px ml-auto mr-auto flex flex-wrap justify-between bg-white bg-opacity-22">
         <div class="w-174px h-116px mr-10px relative cursor-pointer" @click="toOrtherLink(1)">
           <img class="w-100% h-100%" src="/static/bg3.jpg" />
           <div class="absolute bottom-0 text-center w-100% h-22px text-white text-14px pt-4px pb-4px bg-#00306e bg-opacity-72">制造业中长期贷款</div>

src/components/NewDynamics.vue

@@ -15,7 +15,20 @@ const router = useRouter()
 const route = useRoute()
 const init = async ()=>{
   //获取信用动态 数据
-  const res3 = await getNews(queryFieldMethod('special_column','credit_dynamics'))
+  const conditionJsonWhole:any[] = [];
+  conditionJsonWhole.push({
+    column:'special_column',
+    type:'in',
+    value:"provincialDynamics,outsideProvincialDynamics,parkDynamics,currentCityDynamics"
+  });
+  conditionJsonWhole.push({
+    column:'date',
+    type:'orderByDesc'
+  });
+  const s = encodeURIComponent(JSON.stringify(conditionJsonWhole));
+  const res3 = await getNews({
+    conditionJson:s
+  })
   if(res3.code == 200){
     creditDynamics.value = res3.data.slice(0,props.limit);
   }
@@ -52,7 +65,7 @@ init()
     <div v-if="route.query.dickMapValue != '最新动态'" class="absolute right-10px top-15px cursor-pointer text-16px text-#006eff" @click="knowMore('credit_dynamics','最新动态')">查看更多></div>
     <div v-for="(item,index) in creditDynamics" :key="index">
       <div class="mt-20px mb-20px">
-        <div class="w-266px mr-auto ml-auto line-clamp-2 bold text-13px">{{item.title}}</div>
+        <div class="w-313px mr-auto ml-auto line-clamp-2 bold text-13px">{{item.title}}</div>
         <div class="text-#ff9900 text-13px cursor-pointer text-right mr-10px mt-5px" @click="toDetail(item.id)">查看更多></div>
       </div>
       <div class="h-1px bg-gray"></div>

src/components/SmallSearch.vue

@@ -3,6 +3,7 @@ import { useRouter } from 'vue-router'
 
 const router = useRouter();
 import {ref} from 'vue';
+import { Search } from '@element-plus/icons-vue'
 const toSearch = ()=>{
   router.push({
     path:'/search',
@@ -22,14 +23,24 @@ const smallInput = ref<string>('');
       <span class="text-#003aac text-16px font-bold ">文章搜索</span>
     </div>
     <div class="relative mb-15px">
-      <input class="w-266px h-31px bg-#f3f3f3 m-14px mt-30px mb-30px" placeholder="请输入站内文章关键字" v-model="smallInput" />
-      <button class="absolute right-13px top-30px h-31px" @click="toSearch">
-        <svg t="1718242035057" class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="19" height="19">
-          <path
-            d="M469.333333 85.333333a384 384 0 0 1 300.032 623.658667l139.306667 139.349333a42.666667 42.666667 0 1 1-60.330667 60.330667l-139.349333-139.306667A384 384 0 1 1 469.333333 85.333333z m0 85.333334a298.666667 298.666667 0 1 0 0 597.333333 298.666667 298.666667 0 0 0 0-597.333333z"
-            fill="#000000" p-id="1555"></path>
-        </svg>
-      </button>
+<!--      <input class="w-266px h-30px bg-#f3f3f3 m-14px mt-30px mb-30px mr-0" placeholder="请输入站内文章关键字" v-model="smallInput" />-->
+<!--      <button class=" h-30px" @click="toSearch">-->
+<!--        <svg t="1718242035057" class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="19" height="19">-->
+<!--          <path-->
+<!--            d="M469.333333 85.333333a384 384 0 0 1 300.032 623.658667l139.306667 139.349333a42.666667 42.666667 0 1 1-60.330667 60.330667l-139.349333-139.306667A384 384 0 1 1 469.333333 85.333333z m0 85.333334a298.666667 298.666667 0 1 0 0 597.333333 298.666667 298.666667 0 0 0 0-597.333333z"-->
+<!--            fill="#000000" p-id="1555"></path>-->
+<!--        </svg>-->
+<!--      </button>-->
+      <el-input
+        v-model="smallInput"
+        style="margin: 20px;width: 300px;"
+        placeholder="请输入站内文章关键字"
+        class="input-with-select"
+      >
+        <template #append>
+          <el-button :icon="Search" @click="toSearch" />
+        </template>
+      </el-input>
     </div>
   </div>
 </template>

src/layout/component/HeadBlock.vue

@@ -94,7 +94,7 @@ const getData =async ()=>{
   const res:NewsResponseData = await getNews(queryFieldMethod('special_column','big_news'));
   // console.log(res)
   if(res.code == 200){
-    firstNewsList.value = res.data;
+    firstNewsList.value = res.data.slice(0,5);
   }
   const res1:NewsResponseData = await getNews(queryFieldMethod('special_column','static_news'))
   if(res1.code == 200){
@@ -135,7 +135,7 @@ init()
 </script>
 
 <template>
-  <div class="headContainer w-99vw" style="background:url('/首页背景.png')">
+  <div class="headContainer w-99vw" style="background:url('static/首页背景.png');background-size: auto 100%">
     <!-- 标题部分登录跳转 -->
     <div class="headTitle">
       <text>欢迎来到怀化高新区企业信用分级分类网</text>
@@ -152,7 +152,7 @@ init()
       <div class="headSearch">
         <!-- 搜索上方tab切换选择 -->
         <div class="headSTab">
-          <div v-for="(tab, index) in tabs" :key="index" class="tab" :class="{ active: activeTab == index }"
+          <div v-for="(tab, index) in tabs" :key="index" class="tab cursor-pointer hover:bg-#FF9900 hover:bg-op-80" :class="{ active: activeTab == index }"
                @click="setActiveTab(index, tab)">
             {{ tab.title }}
           </div>
@@ -177,7 +177,7 @@ init()
         height:46px"
       >
         <div class="headMune bg-opacity-22">
-          <div v-for="(tab, index) in munTabs" :key="index" class="tab" :class="{ activeMun: activeMun === index }"
+          <div v-for="(tab, index) in munTabs" :key="index" class="tab cursor-pointer hover:bg-#FF9900 hover:bg-op-80" :class="{ activeMun: activeMun === index }"
                @click="munActiveTab(index,tab)">
             {{ tab.title }}
           </div>
@@ -186,21 +186,21 @@ init()
     </div>
     <div v-if="route.meta.title == '首页'">
       <div class="h-100px" >
-        <div class="w-912px ml-auto mr-auto text-center mt-21px mb-20px bg-white bg-opacity-90 h-102px cursor-pointer" @click="toDetail(staticNews?.id)">
+        <div class="w-1112px ml-auto mr-auto text-center mt-21px mb-20px bg-white bg-opacity-90 h-102px cursor-pointer" @click="toDetail(staticNews?.id)">
           <div class="text-26px font-600 color-black line-height-60px pt-21px pb-10px">{{staticNews?.title}}</div>
           <div class="mb-17px " ></div>
         </div>
       </div>
-      <div class="w-912px ml-auto mr-auto  mt-20px pb-54px ">
-        <el-carousel :interval="5000" arrow="always">
+      <div class="w-1112px ml-auto mr-auto  mt-20px pb-54px ">
+        <el-carousel :interval="5000" arrow="always" indicator-position="none" height="367px">
           <el-carousel-item v-for="item in firstNewsList" :key="item">
             <div class="flex">
-              <div class="w-562px h-288px">
+              <div class="w-685px h-351px">
                 <img class="w-100% h-100%" :src="computeImgUrl(item.files)" />
               </div>
-              <div class="w-350px h-288px p-22px bg-white bg-opacity-90">
-                <div class="w-302px h-44px mb-12px bold text-22px line-height-22px line-clamp-2">{{item.title}}</div>
-                <div class="w-302px h-156px mb-17px line-clamp-6 line-height-23px overflow-hidden text-13px" v-html="item.content"></div>
+              <div class="w-427px h-351px p-22px bg-white bg-opacity-90">
+                <div class="w-368px h-44px mb-12px bold text-22px line-height-22px line-clamp-2">{{item.title}}</div>
+                <div class="w-368px h-206px mb-17px line-clamp-8 line-height-23px overflow-hidden text-13px" v-html="item.content"></div>
                 <div class="color-006eff cursor-pointer text-right" @click="toDetail(item.id)" >了解更多 ></div>
               </div>
             </div>

src/views/HomeView/index.vue

@@ -45,7 +45,7 @@ const init =async ()=>{
     return acc;
   },new Map())
   dickMapAll.value = dickMap
-  console.log(dickMap)
+  // console.log(dickMap)
   //获取政府项目资金需求 数据
   // const res1 = await getNews(queryFieldMethod('special_column',dickMap.get('政府项目资金需求')))
   // if(res1.code == 200){
@@ -121,7 +121,7 @@ init()
 <!--        </div>-->
 <!--      </div>-->
       <div class="w-100px h-25px"></div>
-      <div class="w-912px ml-a mr-a flex flex-wrap relative">
+      <div class="w-1112px ml-a mr-a flex flex-wrap relative">
         <div class="absolute left--185px top-0px w-170px h-210px bg-white" >
           <div class="mt-20px text-blue text-20px font-bold text-center relative">
             <div class="w-20px h-20px absolute left-23px top-1px"><img class="w-100% h-100%" src="/static/img1.png" /></div>
@@ -149,7 +149,7 @@ init()
           <div class="p-10px pt-20px text-13px line-height-20px pb-20px">您可以通过本平台的网站进入信用中国网站，请仔细阅读流程指引和修复指南，并严格按要求准备材料。</div>
           <div class="bg-blue text-center text-white w-80% mr-a ml-a line-height-30px h-30px rounded-10px cursor-pointer hover:op-70" @click="toOrtherLink">进入</div>
         </div>
-        <div class="w-451px h-256px bg-white mb-20px mr-10px">
+        <div class="w-551px h-256px bg-white mb-20px mr-10px">
           <div class="h-4px bg-blue"></div>
           <div class=" flex justify-between">
             <div class="flex">
@@ -164,7 +164,7 @@ init()
             <div>{{item.statisticsTime.split('T')[0]}}</div>
           </div>
         </div>
-        <div class="w-451px h-256px bg-white mb-20px">
+        <div class="w-551px h-256px bg-white mb-20px">
           <div class="h-4px bg-blue"></div>
           <div class=" flex justify-between">
             <div class="flex">
@@ -179,7 +179,7 @@ init()
             <div>{{item.licenseDecisionDate.split("T")[0]}}</div>
           </div>
         </div>
-        <div class="w-451px h-256px bg-white mb-20px mr-10px">
+        <div class="w-551px h-256px bg-white mb-20px mr-10px">
           <div class="h-4px bg-blue"></div>
           <div class=" flex justify-between">
             <div class="flex">
@@ -194,8 +194,7 @@ init()
             {{item.penaltyDecisionDate.split('T')[0]}}
           </div>
         </div>
-
-        <div class="w-451px h-256px bg-white mb-20px">
+        <div class="w-551px h-256px bg-white mb-20px">
           <div class="h-4px bg-blue"></div>
           <div class=" flex justify-between">
             <div class="flex">
@@ -213,20 +212,20 @@ init()
           </div>
         </div>
       </div>
-      <div style="background-image:url(/bg1.jpg);" class="w-912px h-100px mr-a ml-a text-white  bg-white mt-10px bg-cover text-50px blod text-center line-height-90px cursor-pointer mb-25px hover:scale-120 duration-200" @click="toLink2">
+      <div style="background-image:url('static/bg1.jpg');" class="w-1112px h-100px mr-a ml-a text-white  bg-white mt-10px bg-cover text-50px blod text-center line-height-90px cursor-pointer mb-25px hover:scale-120 duration-200" @click="toLink2">
         湖南省企业融资综合信用服务平台
       </div>
-      <div style="background-image:url(/bg2.jpg);" class="w-912px h-100px mr-a ml-a  text-white bg-white mt-10px bg-cover text-50px blod text-center line-height-90px cursor-pointer mb-25px hover:scale-120 duration-200" @click="toLink1">
+      <div style="background-image:url('static/bg2.jpg');" class="w-1112px h-100px mr-a ml-a  text-white bg-white mt-10px bg-cover text-50px blod text-center line-height-90px cursor-pointer mb-25px hover:scale-120 duration-200" @click="toLink1">
         怀化市综合金融服务平台
       </div>
       <Link1></Link1>
       <Link2></Link2>
-      <div class="w-912px ml-auto mr-auto mt-20px mb-20px bg-white">
-        <div class="w-912px text-16px mt-12px mb-10px line-height-44px border-dashed border-#e5e5e5 border-b-5px">
+      <div class="w-1112px ml-auto mr-auto mt-20px mb-20px bg-white">
+        <div class="w-1112px text-16px mt-12px mb-10px line-height-44px border-dashed border-#e5e5e5 border-b-5px">
           <div class="w-140px border-solid border-#00306e border-b-5px relative">
             <img class="w-21px h-21px m-3px " src="/src/assets/img/信用小图标.png" />
             <span class="color-#003aac text-16px">园区动态通告</span>
-            <span class="absolute right--755px top-3px cursor-pointer text-#959595" @click="$router.push('/about')">查看更多 ></span>
+            <span class="absolute right--935px top-3px cursor-pointer text-#959595" @click="$router.push('/about')">查看更多 ></span>
           </div>
         </div>
         <div class="w-100% overflow-auto h-500px">
@@ -238,7 +237,7 @@ init()
               </div>
               <div class="color-#858585 text-13px pt-23px mr-24px">{{item.dataSource}}|{{formatTime(item.date)}}</div>
             </div>
-            <div class="mt-13px w-864px ml-auto mr-auto line-clamp-3 text-13px line-height-23px" v-html="item.content"></div>
+            <div class="mt-13px w-1064px ml-auto mr-auto line-clamp-3 text-13px line-height-23px" v-html="item.content"></div>
             <div class="h-1px bg-#e9e9e9 mt-20px"></div>
           </div>
         </div>

src/views/about/index.vue

@@ -33,11 +33,11 @@ init();
 
 <template>
   <div class="aboutContainer">
-    <div class="w-912px ml-auto mr-auto pt-20px mb-20px text-14px">
+    <div class="w-1112px ml-auto mr-auto pt-20px mb-20px text-14px">
       你所在的位置：<span class="cursor-pointer">首页</span> > <span class="color-#006eff">通知公告</span>
     </div>
-    <div class="flex justify-between w-912px mr-a ml-a">
-      <div class="w-603px pl-24px pr-24px pt-30px text-black bg-white">
+    <div class="flex justify-between w-1112px mr-a ml-a">
+      <div class="w-753px pl-24px pr-24px pt-30px text-black bg-white">
         <div v-for="(item,index) in aboutList" :key="index" @click="toDetail(item.id)" class="cursor-pointer">
           <div class="text-16px">{{item.title}}</div>
           <div class="text-12px line-height-20px text-#464646 line-clamp-4 mt-8px " v-html="item.content">
@@ -50,7 +50,7 @@ init();
           <div class="h-1px bg-#e9e9e9 mt-24px mb-24px"></div>
         </div>
       </div>
-      <div class="w-294px">
+      <div class="w-344px">
         <small-search />
         <four-dynamics />
         <new-dynamics />

src/views/creditDynamics/creditDynamicsDetail/index.vue

@@ -10,67 +10,108 @@ import FourDynamics from '@/components/FourDynamics.vue'
 
 const route = useRoute()
 const router = useRouter()
-const creditDynamicsList = ref<NewsData[]>([]);
-const currentPage = ref(1);
-const pageSize = ref(10);
-const total = ref(0);
-const knowMore = (dickMapKey:string|undefined,dickMapValue:string|undefined)=>{
+const currentPage = ref(1)
+const pageSize = ref(7)
+const total = ref(0)
+const knowMore = (dickMapKey: string | undefined, dickMapValue: string | undefined) => {
   router.push({
-    path:'/creditDynamicsDetail',
-    query:{
+    path: '/creditDynamicsDetail',
+    query: {
       dickMapKey,
       dickMapValue
     }
-  });
+  })
 }
-watch(()=>route.query.dickMapKey,()=>{
-  getData();
+watch(() => route.query.dickMapKey, () => {
+  getData()
 })
-const dataList = ref<NewsData[]>();
-const getData =async ()=>{
-  const res =await getNewsByPage(queryEqFieldMethod('special_column',route.query.dickMapKey as string,currentPage.value,pageSize.value));
-  if(res){
-    dataList.value = res.records;
-    total.value = res.total;
-  }else {
-    ElMessage({
-      message:'数据出现错误',
-      type:'error'
+const dataList = ref<NewsData[]>()
+const getData = async () => {
+  if (route.query.dickMapKey == 'credit_dynamics') {
+    const conditionJsonWhole:any[] = [];
+    conditionJsonWhole.push({
+      column:'special_column',
+      type:'or',
+      value:"provincialDynamics"
+    });
+    conditionJsonWhole.push({
+      column:'special_column',
+      type:'or',
+      value:"outsideProvincialDynamics"
+    });
+    conditionJsonWhole.push({
+      column:'special_column',
+      type:'or',
+      value:"currentCityDynamics"
+    });
+    conditionJsonWhole.push({
+      column:'special_column',
+      type:'or',
+      value:"parkDynamics"
+    });
+    conditionJsonWhole.push({
+      column:'date',
+      type:'orderByDesc'
+    });
+    const s = encodeURIComponent(JSON.stringify(conditionJsonWhole));
+    const res = await getNewsByPage({
+      conditionJson:s,
+      pageNum:currentPage.value,
+      pageSize:pageSize.value
     })
+    if (res) {
+      dataList.value = res.records
+      total.value = res.total
+    } else {
+      ElMessage({
+        message: '数据出现错误',
+        type: 'error'
+      })
+    }
+  } else {
+    const res = await getNewsByPage(queryEqFieldMethod('special_column', route.query.dickMapKey as string, currentPage.value, pageSize.value))
+    if (res) {
+      dataList.value = res.records
+      total.value = res.total
+    } else {
+      ElMessage({
+        message: '数据出现错误',
+        type: 'error'
+      })
+    }
   }
 }
-const init = async ()=>{
+const init = async () => {
   await getData()
-  const res5 = await getNews(queryFieldMethod('special_column','credit_dynamics'));
-  if (res5.code == 200){
-    creditDynamicsList.value = res5.data;
-  }
 }
-const toDetail = (id:number|undefined)=>{
-  if(!id){
+const toDetail = (id: number | undefined) => {
+  if (!id) {
     return
   }
   router.push({
-    path:'/newsDetail',
-    query:{
+    path: '/newsDetail',
+    query: {
       id
     }
   })
 }
-  window.scroll({
-    top: 0,
-  })
-init();
+window.scroll({
+  top: 0
+})
+init()
 </script>
 
 <template>
   <div class="warnningContainer">
-    <div class="w-912px ml-auto mr-auto pt-20px mb-20px text-14px">
-      你所在的位置：<span class="cursor-pointer" @click="$router.push('/home')" >首页</span> > <span class="cursor-pointer" @click="$router.push('/creditDynamics')">信用动态</span>> > <span class="color-#006eff">{{$route.query.dickMapValue?$route.query.dickMapValue:'详情'}}</span>
+    <div class="w-1112px ml-auto mr-auto pt-20px mb-20px text-14px">
+      你所在的位置：<span class="cursor-pointer" @click="$router.push('/home')">首页</span> > <span
+      class="cursor-pointer" @click="$router.push('/creditDynamics')">信用动态</span>> > <span
+      class="color-#006eff">{{ $route.query.dickMapValue ? $route.query.dickMapValue : '详情' }}</span>
     </div>
-    <div class="w-912px ml-auto mr-auto flex">
-      <div class="w-603px bg-white bg-opacity-90 mr-15px">
-        <div class="p-20px pl-24px pr-24px cursor-pointer " v-for="(item,index) in dataList" :key="index" @click="toDetail(item.id)">
+    <div class="w-1112px ml-auto mr-auto flex">
+      <div class="w-753px bg-white bg-opacity-90 mr-15px">
+        <div class="p-20px pl-24px pr-24px cursor-pointer " v-for="(item,index) in dataList" :key="index"
+             @click="toDetail(item.id)">
           <div class="text-16px text-#000000 bold ">{{ item.title }}</div>
           <div class="mt-8px line-height-23px text-13px text-#464646 line-clamp-4" v-html="item.content"></div>
           <div class="mt-20px h-1px bg-#e9e9e9"></div>
@@ -86,10 +127,10 @@ init();
           />
         </div>
       </div>
-      <div class="w-294px bg-opacity-90">
+      <div class="w-344px bg-opacity-90">
         <small-search />
         <four-dynamics />
-        <new-dynamics />
+        <new-dynamics :limit="11" />
       </div>
     </div>
   </div>

src/views/creditDynamics/index.vue

@@ -27,7 +27,6 @@ const inDynamicsData = ref<NewsData[]>([]);
 const outDynamicsData = ref<NewsData[]>([]);
 const currentCityDynamicsData = ref<NewsData[]>([]);
 const parkDynamicsData = ref<NewsData[]>([]);
-const creditDynamicsList = ref<NewsData[]>([]);
 const init = async ()=>{
   const {data} = await getDick()
   dickMapAll.value = data.reduce((acc: Map<string, string>, cur: { dictLabel: string, dictValue: string }) => {
@@ -37,8 +36,8 @@ const init = async ()=>{
   }, new Map())
   const res:NewsResponseData = await getNews(queryFieldMethod('special_column','big_news'))
   if(res.code === 200){
-    bigNewsData.value = res.data;
-    // console.log(bigNewsData.value)
+    bigNewsData.value = res.data.slice(0,5);
+    console.log(bigNewsData.value)
   }
   const res1 = await getNews(queryFieldMethod('special_column','provincialDynamics'))
   if(res1.code === 200){
@@ -56,10 +55,6 @@ const init = async ()=>{
   if(res4.code === 200){
     parkDynamicsData.value = res4.data.slice(0,3);
   }
-  const res5 = await getNews(queryFieldMethod('special_column','credit_dynamics'));
-  if (res5.code == 200){
-    creditDynamicsList.value = res5.data;
-  }
 }
 const knowMore = (dickMapKey:string|undefined,dickMapValue:string|undefined)=>{
   console.log(dickMapKey)
@@ -81,19 +76,19 @@ init()
 
 <template>
   <div class="creditDynamicsContainer">
-    <div class="w-912px ml-auto mr-auto pt-20px mb-20px text-14px">
+    <div class="w-1112px ml-auto mr-auto pt-20px mb-20px text-14px">
       你所在的位置：<span class="cursor-pointer"  @click="$router.push('/home')" >首页</span> > <span class="color-#006eff">信用动态</span>
     </div>
-    <div class="w-912px ml-auto mr-auto mt-20px pb-54px ">
-      <el-carousel :interval="5000" arrow="always">
+    <div class="w-1112px ml-auto mr-auto mt-20px pb-54px ">
+      <el-carousel :interval="5000" arrow="always" indicator-position="none" height="367px">
         <el-carousel-item v-for="(item,index) in bigNewsData" :key="index">
           <div class="flex">
-            <div class="w-562px h-288px">
+            <div class="w-685px h-351px">
               <img class="w-100% h-100%" :src="computeImgUrl(item.files)">
             </div>
-            <div class="w-350px h-288px p-22px bg-white bg-opacity-90">
-              <div class="w-302px h-44px mb-12px bold text-22px line-height-22px line-clamp-2">{{item.title}}</div>
-              <div class="w-302px h-156px mb-17px line-clamp-6 line-height-23px overflow-hidden text-13px" v-html="item.content"></div>
+            <div class="w-427px h-351px p-22px bg-white bg-opacity-90">
+              <div class="w-368px h-44px mb-12px bold text-22px line-height-22px line-clamp-2">{{item.title}}</div>
+              <div class="w-368px h-206px mb-17px line-clamp-8 line-height-23px overflow-hidden text-13px" v-html="item.content"></div>
               <div class="flex justify-between">
                 <div class="text-left text-#858585 text-13px" >{{formatTime(item.date)}}</div>
                 <div class="color-006eff cursor-pointer" @click="toNewsDetail(item.id)">了解更多 ></div>
@@ -103,74 +98,74 @@ init()
         </el-carousel-item>
       </el-carousel>
     </div>
-    <div class="w-912px ml-auto mr-auto flex">
-      <div class="w-603px flex flex-wrap">
-        <div class="w-294px h-480px bg-white rounded-10px mr-15px mb-15px p-10px">
+    <div class="w-1112px ml-auto mr-auto flex">
+      <div class="w-736px flex flex-wrap">
+        <div class="w-354px h-480px bg-white rounded-10px mr-15px mb-15px p-10px">
           <div class="w-117px border-solid border-#003aac border-b-3px h-32px relative">
             <img src="/src/assets/img/小图标2.png" />
             <span class="text-#003aac text-16px font-bold ">全国动态</span>
-            <span class="absolute right--150px top-10px text-#006eff text-14px cursor-pointer" @click="knowMore(dickMapAll.get('省外动态'),'省外动态')">查看更多> </span>
+            <span class="absolute right--210px top-10px text-#006eff text-14px cursor-pointer" @click="knowMore(dickMapAll.get('省外动态'),'省外动态')">查看更多> </span>
           </div>
           <div class="mt-25px mb-20px line-clamp-1">聚焦全国动态</div>
-          <div class="w-266px mr-auto ml-auto h-138px m-9px pb-20px">
+          <div class="w-323px mr-auto ml-auto h-138px m-9px pb-20px">
             <img class="w-100% h-100%" src="/static/bg14.jpg" />
           </div>
           <div v-for="(item,index) in outDynamicsData" :key="index" @click="toNewsDetail(item.id)" class="cursor-pointer">
             <div class="w-100% h-1px bg-#e9e9e9"></div>
-            <div class="w-266px line-clamp-1 text-13px mt-20px">{{item.title}}</div>
+            <div class="w-323px line-clamp-1 text-13px mt-20px">{{item.title}}</div>
             <div class="text-left text-#858585 text-13px mt-9px mb-13px" >{{item.dataSource}}|{{formatTime(item.date)}}</div>
           </div>
         </div>
-        <div class="w-294px h-480px bg-white rounded-10px mb-15px p-10px">
+        <div class="w-354px h-480px bg-white rounded-10px mb-15px p-10px">
           <div class="w-117px border-solid border-#003aac border-b-3px h-32px relative">
             <img src="/src/assets/img/小图标1.png" />
             <span class="text-#003aac text-16px font-bold ">省内动态</span>
-            <span class="absolute right--150px top-10px text-#006eff text-14px cursor-pointer" @click="knowMore(dickMapAll.get('省内动态'),'省内动态')">查看更多> </span>
+            <span class="absolute right--210px top-10px text-#006eff text-14px cursor-pointer" @click="knowMore(dickMapAll.get('省内动态'),'省内动态')">查看更多> </span>
           </div>
           <div class="mt-25px mb-20px line-clamp-1">聚焦省内</div>
-          <div class="w-266px mr-auto ml-auto h-138px m-9px pb-20px">
+          <div class="w-323px mr-auto ml-auto h-138px m-9px pb-20px">
             <img class="w-100% h-100%" src="/static/bg13.jpg" />
           </div>
           <div v-for="(item,index) in inDynamicsData" :key="index" @click="toNewsDetail(item.id)" class="cursor-pointer">
             <div class="w-100% h-1px bg-#e9e9e9"></div>
-            <div class="w-266px line-clamp-1 text-13px mt-20px">{{item.title}}</div>
+            <div class="w-323px line-clamp-1 text-13px mt-20px">{{item.title}}</div>
             <div class="text-left text-#858585 text-13px mt-9px mb-13px" >{{item.dataSource}}|{{formatTime(item.date)}}</div>
           </div>
         </div>
-        <div class="w-294px h-480px bg-white rounded-10px mr-15px mb-15px p-10px">
+        <div class="w-354px h-480px bg-white rounded-10px mr-15px mb-15px p-10px">
           <div class="w-117px border-solid border-#003aac border-b-3px h-32px relative">
             <img src="/src/assets/img/小图标3.png" />
             <span class="text-#003aac text-16px font-bold ">本市动态</span>
-            <span class="absolute right--150px top-10px text-#006eff text-14px cursor-pointer" @click="knowMore(dickMapAll.get('本市动态'),'本市动态')">查看更多> </span>
+            <span class="absolute right--210px top-10px text-#006eff text-14px cursor-pointer" @click="knowMore(dickMapAll.get('本市动态'),'本市动态')">查看更多> </span>
           </div>
           <div class="mt-25px mb-20px line-clamp-1">聚焦本市动态</div>
-          <div class="w-266px mr-auto ml-auto h-138px m-9px pb-20px">
+          <div class="w-323px mr-auto ml-auto h-138px m-9px pb-20px">
             <img class="w-100% h-100%" src="/static/bg15.jpg" />
           </div>
           <div v-for="(item,index) in currentCityDynamicsData" :key="index" @click="toNewsDetail(item.id)" class="cursor-pointer">
             <div class="w-100% h-1px bg-#e9e9e9"></div>
-            <div class="w-266px line-clamp-1 text-13px mt-20px">{{item.title}}</div>
+            <div class="w-323px line-clamp-1 text-13px mt-20px">{{item.title}}</div>
             <div class="text-left text-#858585 text-13px mt-9px mb-13px" >{{item.dataSource}}|{{formatTime(item.date)}}</div>
           </div>
         </div>
-        <div class="w-294px h-480px bg-white rounded-10px mb-15px p-10px">
+        <div class="w-354px h-480px bg-white rounded-10px mb-15px p-10px">
           <div class="w-117px border-solid border-#003aac border-b-3px h-32px relative">
             <img src="/src/assets/img/小图标4.png" />
             <span class="text-#003aac text-16px font-bold ">园区动态</span>
-            <span class="absolute right--150px top-10px text-#006eff text-14px cursor-pointer" @click="knowMore(dickMapAll.get('园区动态'),'园区动态')">查看更多> </span>
+            <span class="absolute right--210px top-10px text-#006eff text-14px cursor-pointer" @click="knowMore(dickMapAll.get('园区动态'),'园区动态')">查看更多> </span>
           </div>
           <div class="mt-25px mb-20px line-clamp-1">聚焦园区动态</div>
-          <div class="w-266px mr-auto ml-auto h-138px m-9px pb-20px">
+          <div class="w-323px mr-auto ml-auto h-138px m-9px pb-20px">
             <img class="w-100% h-100%" src="/static/bg16.jpg" />
           </div>
           <div v-for="(item,index) in parkDynamicsData" :key="index" @click="toNewsDetail(item.id)" class="cursor-pointer">
             <div class="w-100% h-1px bg-#e9e9e9"></div>
-            <div class="w-266px line-clamp-1 text-13px mt-20px">{{item.title}}</div>
+            <div class="w-323px line-clamp-1 text-13px mt-20px">{{item.title}}</div>
             <div class="text-left text-#858585 text-13px mt-9px mb-13px" >{{item.dataSource}}|{{formatTime(item.date)}}</div>
           </div>
         </div>
       </div>
-      <div class="w-294px min-h-480px bg-white bg-opacity-90 ml-15px rounded-10px">
+      <div class="w-365px min-h-480px bg-white bg-opacity-90 ml-15px rounded-10px">
         <NewDynamics :limit="11" />
       </div>
     </div>

src/views/creditEcaluationResults/index.vue

@@ -38,29 +38,33 @@ init()
 
 <template>
   <div class="resContainer">
-    <div class="w-912px ml-auto mr-auto pt-20px mb-20px text-14px">
+    <div class="w-1112px ml-auto mr-auto pt-20px mb-20px text-14px">
       你所在的位置：<span class="cursor-pointer" @click="$router.push('/')">首页</span> > <span class="color-#006eff">信用红榜</span>
     </div>
-    <div class="w-912px ml-auto mr-auto flex">
-      <div class="w-603px bg-white bg-opacity-90 mr-15px h-750px">
+    <div class="w-1112px ml-auto mr-auto flex">
+      <div class="w-753px bg-white bg-opacity-90 mr-15px h-750px">
 <!--        <div class="p-20px pl-24px pr-24px">-->
 <!--          <div class="text-16px text-#000000 bold ">文本企业</div>-->
 <!--          <div class="mt-8px line-height-23px text-13px text-#464646 line-clamp-4">文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本</div>-->
 <!--          <div class="mt-20px h-1px bg-#e9e9e9"></div>-->
 <!--        </div>-->
         <div class="flex justify-around border-solid border-#e9e9e9 border-b-1px text-18px line-height-28px bg-[#fbfbfbff]">
-          <div class="w-65% text-center border-solid border-#e9e9e9 border-1px">企业名称</div>
+          <div class="w-45% text-center border-solid border-#e9e9e9 border-1px">企业名称</div>
+          <div class="w-20% text-center border-solid border-#e9e9e9 border-1px">企业评分</div>
           <div class="w-35% text-center border-solid border-#e9e9e9 border-1px">企业信用评价等级</div>
         </div>
         <div class="flex justify-around border-solid border-#e9e9e9 border-b-1px text-18px line-height-60px" v-for="(item,index) in companyList" :key="index">
-          <div class="w-65% pl-20px border-solid border-#e9e9e9 border-b-1px">
+          <div class="w-45% pl-20px border-solid border-#e9e9e9 border-b-1px">
             <div class="border-solid border-#e9e9e9 border-b-1px line-clamp-1">{{ item.enterpriseName }}</div>
           </div>
+          <div class="w-20% pl-20px border-solid border-#e9e9e9 border-b-1px">
+            <div class="border-solid border-#e9e9e9 border-b-1px line-clamp-1 text-center">{{ item.total.toFixed(2) }}</div>
+          </div>
           <div class="w-35% text-center border-solid border-#e9e9e9 border-b-1px">
             <div class="text-center border-solid border-#e9e9e9 border-b-1px">{{item.grade}}</div>
           </div>
         </div>
-        <div class="ml-120px mt-20px">
+        <div class="ml-260px mt-20px">
           <div class="example-pagination-block">
             <el-pagination
               layout="prev, pager, next, total"
@@ -72,7 +76,7 @@ init()
           </div>
         </div>
       </div>
-      <div class="w-294px bg-opacity-90">
+      <div class="w-344px bg-opacity-90">
         <small-search />
         <new-dynamics />
       </div>

src/views/creditServices/index.vue

@@ -135,11 +135,11 @@ const companyUploadInformationList = ref<any>([]);
 
 <template>
   <div class="serviceContainer" v-loading="isloading">
-    <div class="w-912px ml-auto mr-auto pt-20px mb-20px text-14px">
+    <div class="w-1112px ml-auto mr-auto pt-20px mb-20px text-14px">
       你所在的位置：<span class="cursor-pointer">首页</span> > <span class="color-#006eff">企业自主上报</span>
     </div>
-    <div class="flex justify-between w-912px mr-a ml-a">
-      <div class="w-603px pl-24px pr-24px pt-30px text-black bg-white">
+    <div class="flex justify-between w-1112px mr-a ml-a">
+      <div class="w-753px pl-24px pr-24px pt-30px text-black bg-white">
         <div>
           <el-button class="float-right" @click="downloadFile(BASE_URL+'/owSelfReporting/downloadTemplateWord','企业自主上报模版.xlsx')" type="success">下载上报模版</el-button>
           <div>企业自主上报信息</div>
@@ -155,7 +155,6 @@ const companyUploadInformationList = ref<any>([]);
               label-width="auto"
               :model="selfReportForm"
               ref="selfReportRef"
-              style="max-width: 600px"
               :rules="rules"
             >
               <el-form-item label="联系人" prop="contacts">
@@ -204,7 +203,7 @@ const companyUploadInformationList = ref<any>([]);
           </div>
         </div>
       </div>
-      <div class="w-294px">
+      <div class="w-344px">
         <SmallSearch />
         <NewDynamics />
       </div>

src/views/creditWarning/index.vue

@@ -49,11 +49,11 @@ init()
 
 <template>
   <div class="resContainer">
-    <div class="w-912px ml-auto mr-auto pt-20px mb-20px text-14px">
+    <div class="w-1112px ml-auto mr-auto pt-20px mb-20px text-14px">
       你所在的位置：<span class="cursor-pointer" @click="$router.push('/')">首页</span> > <span class="color-#006eff">信用警示</span>
     </div>
-    <div class="w-912px ml-auto mr-auto flex">
-      <div class="w-603px bg-white bg-opacity-90 mr-15px h-750px">
+    <div class="w-1112px ml-auto mr-auto flex">
+      <div class="w-753px bg-white bg-opacity-90 mr-15px h-750px">
         <!--        <div class="p-20px pl-24px pr-24px">-->
         <!--          <div class="text-16px text-#000000 bold ">文本企业</div>-->
         <!--          <div class="mt-8px line-height-23px text-13px text-#464646 line-clamp-4">文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本</div>-->
@@ -71,7 +71,7 @@ init()
             <div class="text-center border-solid border-#e9e9e9 border-b-1px">{{item.grade}}</div>
           </div>
         </div>
-        <div class="ml-120px mt-20px">
+        <div class="ml-260px mt-20px">
           <div class="example-pagination-block">
             <el-pagination
               layout="prev, pager, next, total"
@@ -83,7 +83,7 @@ init()
           </div>
         </div>
       </div>
-      <div class="w-294px bg-opacity-90">
+      <div class="w-344px bg-opacity-90">
         <small-search />
         <new-dynamics />
       </div>

src/views/creditWiseEnterprise/index.vue

@@ -84,7 +84,7 @@
 
 <template>
   <div class="wiseEnterpriseContainer min-h-888px pb-20px">
-    <div class="w-912px ml-auto mr-auto pt-20px mb-20px text-14px">
+    <div class="w-1112px ml-auto mr-auto pt-20px mb-20px text-14px">
       你所在的位置：<span class="cursor-pointer" @click="$router.push('/')">首页</span> > <span class="color-#006eff">信用惠企</span>
     </div>
 <!--    <div class="w-912px h-100px mr-a ml-a bg-white mt-10px bg-cover text-50px blod text-center line-height-90px cursor-pointer mb-25px" @click="toLink2">湖南省企业融资综合信用服务平台</div>-->

src/views/search/index.vue

@@ -102,10 +102,10 @@ watch(()=>route.query.value,setSearchValue,{immediate:true})
 
 <template>
   <div class="aboutContainer">
-    <div class="w-912px ml-auto mr-auto pt-20px mb-20px text-14px">
+    <div class="w-1112px ml-auto mr-auto pt-20px mb-20px text-14px">
       你所在的位置：<span class="cursor-pointer">首页</span> > <span class="color-#006eff">搜索</span>
     </div>
-    <div class="w-912px ml-auto mr-auto pt-20px mb-20px text-14px">
+    <div class="w-1112px ml-auto mr-auto pt-20px mb-20px text-14px">
       <div><span v-if="route.query.value">你当前搜索的关键词是：</span> <span class="color-#ff9900">{{route.query.value}}</span>一共有：<span class="color-#ff9900">{{total}}</span>条数据</div>
     </div>
 <!--    <div class="w-912px ml-auto mr-auto pt-20px mb-20px text-14px">-->
@@ -118,8 +118,8 @@ watch(()=>route.query.value,setSearchValue,{immediate:true})
 <!--        </div>-->
 <!--      </div>-->
 <!--    </div>-->
-    <div class="flex justify-between w-912px mr-a ml-a">
-      <div class="w-603px pl-24px pr-24px pt-30px text-black bg-white">
+    <div class="flex justify-between w-1112px mr-a ml-a">
+      <div class="w-753px pl-24px pr-24px pt-30px text-black bg-white">
         <div  v-if="route.query.searchModule != '2'">
           <div v-for="(item,index) in searchResult" :key="index" @click="toCompanyDetail(item.id)" class="cursor-pointer">
             <div class="text-16px">{{item.enterpriseName}}</div>
@@ -161,7 +161,7 @@ watch(()=>route.query.value,setSearchValue,{immediate:true})
           </div>
         </div>
       </div>
-      <div class="w-294px">
+      <div class="w-344px">
         <SmallSearch />
         <FourDynamics />
         <NewDynamics />

vite.config.ts

@@ -11,6 +11,7 @@ import UnoCSS from 'unocss/vite'
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  // base: '/qyxyfjfl/',
   plugins: [
     vue(),
     vueJsx(),
@@ -31,7 +32,7 @@ export default defineConfig({
   server:{
     proxy:{
       '/api':{
-        target:'http://192.168.110.13:20002',
+        target:'http://192.168.110.235:20002',
         changeOrigin:true,
         rewrite:path=>path.replace(/^\/api/,'')
       }