fix bug

dsk-operate-ui/.env.development

@@ -16,4 +16,4 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 VUE_APP_SUB_SYSTEM_ADDRESS = "http://192.168.60.104:3400"
 
 # Bi大屏系统地址
-VUE_APP_BI_SYSTEM_ADDRESS = "http://192.168.60.104:8001"
+VUE_APP_BI_SYSTEM_ADDRESS = "https://192.168.60.104:8001"
\ No newline at end of file

dsk-operate-ui/.env.production

@@ -10,4 +10,5 @@ VUE_APP_BASE_API = 'https://szhapi.jiansheku.com'
 # 子系统地址
 VUE_APP_SUB_SYSTEM_ADDRESS = "https://plug.jiansheku.com"
 
-VUE_APP_BI_SYSTEM_ADDRESS = "http://192.168.60.104:8001"
+# Bi大屏系统地址
+VUE_APP_BI_SYSTEM_ADDRESS = "https://192.168.60.104:8001"

dsk-operate-ui/.env.test

@@ -14,4 +14,5 @@ VUE_APP_BASE_API = '/prod-api'
 # 子系统地址
 VUE_APP_SUB_SYSTEM_ADDRESS = "https://pre-plug.jiansheku.com"
 
-VUE_APP_BI_SYSTEM_ADDRESS = "http://192.168.60.104:8001"
+# Bi大屏系统地址
\ No newline at end of file
+VUE_APP_BI_SYSTEM_ADDRESS = "https://192.168.60.104:8001"
\ No newline at end of file

dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue

 <template>
-  <div>
+  <div class="details-of-cooperation">
 
     <template v-if="!isDetailId">
       <div class="cooperate">
@@ -62,8 +62,8 @@
           <div class="addhzqk_from">
             <el-form :model="addParam" :rules="rules" ref="addParam"  size="small" label-width="70px">
               <el-form-item label="项目名称：" prop="projectName" label-width="120px">
-                <el-input v-model="addParam.projectName" placeholder="请输入项目名称" @input="getCompany1"></el-input>
-                <div class="resultlist" v-if="showlist1">
+                <el-input v-model="addParam.projectName" placeholder="请输入项目名称" @input="resetProjectSearch();getCompany1()"></el-input>
+                <div class="resultlist" v-infinite-scroll="load" v-if="showlist1">
                   <div v-for="(item,index) in companData1" @click="selCompany1(item.projectName)"><span  v-html="item.projectName"></span></div>
                 </div>
               </el-form-item>
@@ -219,6 +219,9 @@ export default {
       //
       detailId: null,
       isDetailId: false,
+      projectpage : 1,
+      isscroll : false,
+      threshold : false,
     }
   },
   watch:{
@@ -253,6 +256,12 @@ export default {
 
   },
   methods: {
+    load(){
+      if(this.threshold) return;
+      if(this.isscroll){
+        this.getCompany1()
+      }
+    },
     handleQuery(params) {
       this.list(params)
     },
@@ -309,18 +318,33 @@ export default {
         }
       });
     },
+    resetProjectSearch() {
+      this.companData1 = []
+      this.projectpage = 1
+      console.log(this.companData1);
+    },
     //获取项目名称
-    getCompany1(value){
-      if (value.length>=2){
+    getCompany1(){
+      if (this.addParam?.projectName?.length>=2){
+        this.threshold = true;
         let param = {
-          projectName:value,
+          projectName:this.addParam?.projectName,
+          pageSize:20,
+          pageNum:this.projectpage
         }
         queryProject(JSON.stringify(param)).then(result=>{
-          if(result.code != 200)
-            return
-          this.showlist1 = true
-          this.companData1 = result.data
-        })
+          if(result.code != 200){
+              return false
+          }
+          if(result.data && result.data?.length) {
+            this.showlist1 = true;
+            this.isscroll = true
+            this.companData1 = [...this.companData,...result.data]
+            this.projectpage ++;
+            return;
+          }
+          this.isscroll = false;
+        }).finally(() => this.threshold = false)
       }
     },
     selCompany1(item){
@@ -632,9 +656,16 @@ export default {
 }
 
 ::v-deep .cooperate-detail{
+  width: 100%;
+  height: 100%;
   .miantitle, .app-container{
     //margin: 12px 0;
   }
 }
 
+.details-of-cooperation {
+  width: 100%;
+  height: 100%;
+}
+
 </style>

dsk-operate-ui/src/views/detail/party-a/index.vue

@@ -7,7 +7,7 @@
           :partBoxHeight="partBoxHeight" :customerId="customerId" :isCompany="isCompany" :isCustomer="isCustomer" />
       </div>
       <div class="part-right">
-        <div id="partBox" v-if="companyId">
+        <div id="partBox" v-if="companyId" class="part-common-container-style">
           <template v-if="isCompany">
             <!-- 企业概览 -->
             <Overview v-if="currentPath.pathName=='overview'" :company-id="companyId" :isSkeleton="isSkeleton" :companyInfo="companyInfo" />
@@ -433,5 +433,10 @@ export default {
       overflow: auto;
     }
   }
+
+  .part-common-container-style {
+    width: 100%;
+    height: 100%;
+  }
 }
 </style>

dsk-operate-ui/src/views/index.vue

@@ -476,7 +476,7 @@
   import CustomTimeSelect from './component/CustomTimeSelect'
   import CustomMoneySelect from './component/CustomMoneySelect'
   import skeleton from './component/skeleton'
-  import { countByCompany,bidRank,bigWinningBidsPage,bigBidPage,getInfo } from '@/api/index'
+  import { countByCompany,bidRank,bigWinningBidsPage,bigBidPage } from '@/api/index'
   import { getUipIdByCid } from '@/api/macro/macro'
   import api from '@/api/radar/radar.js';
   import { v4 } from "uuid";
@@ -741,11 +741,8 @@ export default {
       }).catch(error=>{});
     },
     getInfo(){
-      getInfo().then(res=>{
-        console.log(res)
-        this.permissions=res.data.permissions;
-        this.nickName=res.data.user.nickName
-      }).catch(error=>{});
+      this.permissions= this.$store.state.user.permissions;
+      this.nickName= this.$store.state.user.name
     },
     getCountByCompany(){
       let params={};