页面暂时修改

src/api/test.js

@@ -44,6 +44,26 @@ const testApi = {
   queryFollowAccountReviews(data){
 	return http.post('/invest/admin/pc/followaccount/queryFollowAccountReviews', data)
   },
+  //调仓记录
+  followAccountZfzt(data){
+	return http.post('/invest/admin/pc/followaccount/queryFollowAccountDeals', data)
+  },
+  //跟投详情
+  followaccountDetail(data){
+	return http.post('/invest/admin/pc/followaccount/getFollowAccount', data)
+  },
+  //持仓配置
+  queryFollowAccountPositions(data){
+	return http.post('/invest/admin/pc/followaccount/queryFollowAccountPositions', data)
+  },
+  //行业占比信息
+  getFollowAccountIndustryPercent(data){
+	return http.post('/invest/admin/pc/followaccount/getFollowAccountIndustryPercent', data)
+  },
+  //曲线图
+  getFollowAccountYieldsRecords(data){
+	return http.post('/invest/admin/pc/followaccount/getFollowAccountYieldsRecords', data)
+  },
 };
 
 export default testApi

src/router/router_modular/index.js

@@ -56,7 +56,7 @@ const router_modular = [
         component: () => import('@/views/actualCombat/abnormalReview')
     },
     {
-        path: '/record',
+        path: '/actualCombatRecord',
         name: 'record',
         component: () => import('@/views/actualCombat/record')
     },

src/views/actualCombat/abnormalReview.vue

 <template>
   <div class="content">
+    <div class="ster">
+        <img
+          src="../../assets/left.png"
+          alt=""
+          style="width: 0.5rem;
+    height: 0.8rem;
+    margin-top: 0.1rem;
+    margin-left: 0.2rem;"
+          @click="tab_oimg"
+        />
+        <div class="deta">异动点评</div>
+      </div>
     <div class="listBox" v-for="i in list" :key="i.id">
         <div class="left-box">
           <div class="left-time">
@@ -46,7 +58,7 @@ export default {
     // ...mapMutations("store_modular", ["operation"]),
     getList() {
       let temp={
-        followAccountId:5,
+        followAccountId:this.$route.query.id,
         page:1,
         pageSize:100
       }
@@ -107,6 +119,15 @@ let Sechond = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSecond
 let  GMT =  Hour + ':' + Minute
 return GMT
         },
+          tab_oimg: function () {
+            this.$router.push({
+          path: '/detail',
+          query: {
+              id:this.$route.query.id
+          }
+        });
+      // this.$router.push("../detail");
+    },
   },
  
 };
@@ -166,4 +187,19 @@ return GMT
   color: blue;
   font-size: 0.3rem;
 }
+.ster {
+  display: flex;
+  background-color: rgb(226, 74, 68);
+  height: 1rem;
+  line-height: 1rem;
+}
+.deta {
+  width: 70%;
+  text-align: center;
+  margin-left: 34px;
+  font-size: 0.5rem;
+  color: white;
+  /* background: #e03939; */
+  font-weight: bolder;
+}
 </style>
\ No newline at end of file

src/views/actualCombat/index.vue

@@ -19,7 +19,7 @@
       </div>
       <!-- 卡片盒子 -->
       <div class="card-box">
-          <div class="left-card">
+          <div class="left-card" @click="jumpDetail(profitIdTwo)">
               <div class="card-title">
                   <span style="display:block;margin-bottom:0.1rem">{{tableName}}</span>
                   <span style="display:block;font-size:0.5rem;">{{profitSecond*100}}%</span>
@@ -31,7 +31,7 @@
               <span v-if="isBuyFirst==1" class="clickBtnGray" >已兑换</span>
               
           </div>
-          <div class="center-card">
+          <div class="center-card" @click="jumpDetail(profitIdFirst)">
               <div class="card-title">
                   <span style="display:block;margin-bottom:0.1rem">{{tableName}}</span>
                   <span style="display:block;font-size:0.5rem;">{{profitFirst*100}}%</span>
@@ -42,7 +42,7 @@
               <span v-if="isBuyTwo==2"  class="clickBtn"  @click="showPopup(profitIdFirst)">兑换解锁</span>
               <span v-if="isBuyTwo==1" class="clickBtnGray"   >已兑换</span>
           </div> 
-           <div class="rigth-card">
+           <div class="rigth-card" @click="jumpDetail(profitThree)">
                <div class="card-title">
                   <span style="display:block;margin-bottom:0.1rem">{{tableName}}</span>
                   <span style="display:block;font-size:0.5rem;">{{profitThree*100}}%</span>
@@ -56,7 +56,7 @@
       </div>
       <!-- 内容盒子 -->
       <div  style="padding-bottom:0.5rem">
- <div class="bottomcontect-box" v-for="(i,index) in profitList" :key="i.id" style="margin-bottom:0.5rem">
+ <div class="bottomcontect-box" v-for="(i,index) in profitList" :key="i.id" @click="jumpDetail(i.id)" style="margin-bottom:0.5rem">
 <div class="topthis-box">
 <div class="top-left">
 <span style="display:block;font-size:0.5rem">{{i.productName}}</span>
@@ -236,6 +236,15 @@ this.clickTab('yields','总收益')
         this.checkList=res.data.data
       })
     },
+    //跳转到详情页
+    jumpDetail(id){
+  this.$router.push({
+          path: '/detail',
+          query: {
+              id:id
+          }
+        });
+    },
     //点击标签页
     clickTab(index,name){
       console.log()

src/views/actualCombat/record.vue

 <template>
   <div class="content">
+       <div class="ster">
+        <img
+          src="../../assets/left.png"
+          alt=""
+          style="width: 0.5rem;
+    height: 0.8rem;
+    margin-top: 0.1rem;
+    margin-left: 0.2rem;"
+          @click="tab_oimg"
+        />
+        <div class="deta">调仓记录</div>
+      </div>
     <div class="head-box">
         <div class="tab-box">
             <span>买/卖</span>
@@ -22,22 +34,26 @@
     <div class="line">
 
     </div>
-    <div class="contect-list">
-        <div class="mai">
+    <div v-for="i in list" :key="i.code">
+<div class="contect-list">
+        <div v-if="i.direction==1" class="maiTwo">
+            <span >买</span>
+        </div>
+        <div v-if="i.direction==2" class="mai">
             <span >卖</span>
         </div>
         <div class="contectBox">
-            <span>300***</span>
+            <span>{{i.count}}</span>
         </div>
         <div class="contectBox">
-            <span>*</span>
+            <span>{{i.price}}</span>
         </div>
         <div class="contectBox">
-            <span>100%</span>
+            <span>{{i.remark.toFixed(2)}}%</span>
         </div>
         <div class="contectBox">
-            <span style="display:block;height:0.5rem;margin-top:-0.3rem">08/26</span>
-            <span>14:28</span>
+            <span style="display:block;height:0.5rem;margin-top:-0.3rem">{{state_type(i.created_TIME)}}</span>
+            <span>{{state_typeTwo(i.created_TIME)}}</span>
         </div>
     </div>
     <!-- 灰线 -->
@@ -45,6 +61,8 @@
 
     </div>
     </div>
+    
+  </div>
 </template>
 
 <script>
@@ -61,9 +79,72 @@ export default {
       list: [],
     };
   },
-  
+  mounted(){
+      this.getList()
+  },
   methods: {
     // ...mapMutations("store_modular", ["operation"]),
+    getList() {
+      let temp={
+        followAccountId:this.$route.query.id,
+        page:1,
+        pageSize:100
+      }
+       this.server.followAccountZfzt(temp).then((res) =>{
+          this.list=res.data.data.list
+          this.list.forEach((i,index)=>{
+            i.remark=parseFloat(i.remark)*100
+          })
+        })
+        
+      
+//       this.$toast.loading({
+//   message: '加载中...',
+//   forbidClick: true,
+//   duration:0
+// });
+     
+    },
+     tab_oimg: function () {
+            this.$router.push({
+          path: '/detail',
+          query: {
+              id:this.$route.query.id
+          }
+        });
+      // this.$router.push("../detail");
+    },
+     state_type(row) {
+              console.log("睡觉哦",row)
+              // if(cellValue==null){
+              //   return cellValue
+              // }
+             let date = new Date(parseInt(row));
+let Year = date.getFullYear();
+let Moth = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
+let Day = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate());
+let Hour = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours());
+let Minute = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
+let Sechond = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+let  GMT =  Moth + '/' + Day
+return GMT
+        },
+      state_typeTwo(row) {
+              console.log("睡觉哦",row)
+              // if(cellValue==null){
+              //   return cellValue
+              // }
+             let date = new Date(parseInt(row));
+let Year = date.getFullYear();
+let Moth = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
+let Day = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate());
+let Hour = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours());
+let Minute = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
+let Sechond = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+let  GMT =  Hour + ':' + Minute
+return GMT
+        },
+  
     
   },
  
@@ -75,7 +156,7 @@ export default {
        height: 1.2rem;
     width: 100%;
     display: flex;
-    background-color: yellow;
+    /* background-color: yellow; */
 }
 .tab-box{
 width: 20%;
@@ -83,7 +164,7 @@ height: 100%;
 text-align: center;
 line-height: 1.2rem;
 font-size: 0.35rem;
-background-color: aquamarine;
+/* background-color: aquamarine; */
 }
 .line{
     width: 100%;
@@ -99,7 +180,7 @@ background-color: aquamarine;
       display: flex;
        height: 1.5rem;
     width: 100%;
-    background-color: yellowgreen;
+    /* background-color: yellowgreen; */
     font-size: 0.5rem;
 }
 .contectBox{
@@ -120,4 +201,30 @@ line-height: 1.5rem;
     border-radius: 50%;
 
 }
+.maiTwo{
+    display: block;
+    height: 1rem;
+    width: 1rem;
+    border: 1px solid rgb(214, 85, 72);
+    color: rgb(214, 85, 72);
+    text-align: center;
+    line-height: 1rem;
+    margin: auto;
+    border-radius: 50%;
+}
+.ster {
+  display: flex;
+  background-color: rgb(226, 74, 68);
+  height: 1rem;
+  line-height: 1rem;
+}
+.deta {
+  width: 70%;
+  text-align: center;
+  margin-left: 34px;
+  font-size: 0.5rem;
+  color: white;
+  /* background: #e03939; */
+  font-weight: bolder;
+}
 </style>
\ No newline at end of file

vue.config.js

@@ -10,6 +10,9 @@ module.exports = defineConfig({
     port: 8080,
     hot: true,
     https: false, 
+    client: {
+      overlay: false,
+    },
     proxy: { //配置多个代理
       "/testIp": {
           target: "http://197.0.0.1:8088",