排序

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

@@ -20,8 +20,10 @@
           :resizable="false">
           <template slot-scope="scope">{{ queryParams.pageNum * queryParams.pageSize - queryParams.pageSize + scope.$index + 1 }}</template>
         </el-table-column>
-        <template v-for="item in forData">
+        <template >
           <el-table-column
+            v-for="(item,index) in forData"
+            :key="index"
             :label="item.label"
             :prop="item.prop"
             :width="item.width"

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

@@ -94,7 +94,6 @@ export default {
     },
 
     async handleQuery(params) {
-      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       let res = await historySendPage(param)

dsk-operate-ui/src/views/detail/party-a/mixins/mixin.js

@@ -83,11 +83,8 @@ export default {
     },
     //排序
     sortChange(e){
-      console.log(e)
       let item = this.forData.find(item => item.prop === e.prop)
       this.queryParams.sort = item[e.order]
-      console.log(this.queryParams)
-
       this.handleSearch()
     }
   }

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

@@ -83,7 +83,6 @@ export default {
   },
   methods: {
     async handleQuery(params) {
-      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       let res = await creditXzxkPage(param)

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

@@ -123,7 +123,6 @@ export default {
       }
     },
     async handleQuery(params) {
-      this.isSkeleton = true;
       this.tableLoading = true
       let param = this.getAreaList(params || this.queryParams)
       let res = await bidNoticePage(param)

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

@@ -92,7 +92,6 @@ export default {
       }
     },
     async handleQuery(params) {
-      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       let res = await bidPlanPage(param)

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

@@ -73,7 +73,6 @@ export default {
   },
   methods: {
     async handleQuery(params) {
-      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       let res = await specialDebtProjectPage(param)

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

@@ -90,7 +90,6 @@ export default {
       }
     },
     async handleQuery(params) {
-      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       let res = await landTransactionPage(param)

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

@@ -80,7 +80,6 @@ export default {
   },
   methods: {
     async handleQuery(params) {
-      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       let res = await approvalProjectPage(param)

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

@@ -129,7 +129,6 @@ export default {
       }
     },
     async handleQuery(params) {
-      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       let res = await bidNoticeProPage(param)

dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue

@@ -28,7 +28,7 @@
               </el-popover>
             </div>
             <span style="float: left;" :class="!labelArr.includes(companyInfo.businessStatus)?'label-bg1':'label-bg3'" v-if="companyInfo.businessStatus">{{companyInfo.businessStatus}}</span>
-           <span style="float: left;" :class="item.state===0?'label-bg2':'label-bg3'" v-for="(item, index) in labelList" :key="index">{{item.labelName}}</span>
+           <span style="float: left;" :style="'background:'+item.bgColor+';color:'+item.fontColor" v-for="(item, index) in labelList" :key="index">{{item.labelName}}</span>
             <template v-if="enterpriseLabel.length > 0">
               <template v-for="(item,index) in enterpriseLabel">
                 <template v-if="item.children.length > 0">

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

@@ -340,7 +340,6 @@ export default {
     },
 
     handleQuery(params){
-      this.isSkeleton = true
       let data = params ? params : this.queryParams
       urbanInvestmentPage(data).then(res => {
           this.tableData = res.data.list

dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue

@@ -70,9 +70,9 @@
                 </div>
                 <div class="count">共{{ localList1Total }}条</div>
                 <!-- 省管国企 -->
+                <div class="child-wrap"  id="管国企">
                     <div class="anchor"></div>
                     <div class="count1" >{{provinceId=='110000'||provinceId=='120000'||provinceId=='500000'||provinceId=='310000'?'市':'省'}}管国企<span> {{ localList.total }}</span></div>
-                <div class="child-wrap"  >
                     <template v-for="(item,index) in localList.local">
                         <div  class="infinite-list-item" v-if="index<localListPage*12" :key="index" @click="selCompany(item)" >
                             <!-- <img :src="item.logo" alt="" > -->
@@ -87,7 +87,7 @@
                     <el-divider v-if="localList.total>localListPage*12" @click="localListPage++">更多<span></span></el-divider>
                 </div>
                 <!-- 市区国企 -->
-                <div class="child-wrap" :id="item.type"  v-for="(item,index) in localList1" :key="index">
+                <div class="child-wrap" :id="item.address"  v-for="(item,index) in localList1" :key="index">
                     <div class="anchor"></div>
                     <div class="count1" >{{item.address}}<span> {{ item.total }}</span></div>
                     <div :key="index">
@@ -126,11 +126,11 @@
             </template>
             
         </div>
-        <div v-if="activeIndex==1||activeIndex==3" class="anchor_box" >
+        <div v-if="activeIndex!=0" class="anchor_box" :class="activeIndex==2?'anchor_box1':''">
             <div class="anchor_wrap">
                 <div class="anchor_item" v-for="(item,i) in childList"
                     :class="anchorIndex==i?'active_anchor_item':''" :key="i" @click="anchorClick(i)">
-                    {{item.type}}
+                    {{item.type||item.address=='管国企'?provinceId=='110000'||provinceId=='120000'||provinceId=='500000'||provinceId=='310000'?'市管国企':'省管国企':item.address}}
                 </div>
             </div>
         </div>
@@ -229,7 +229,6 @@ export default {
             this.activeIndex=index;
             if(index==1){
                 this.listenerFunction();
-
                 api.centralEnterprseChild().then(res=>{
                     if(res.code==200){
                         if(res.data.list.length>0){
@@ -259,6 +258,7 @@ export default {
                         }
                         this.localList1 = res.data.list;
                         this.localList1Total = res.data.total;
+                        this.childList = [{address:'管国企'}].concat(this.localList1)
                     }
                 })
             }else if(index==3){
@@ -282,18 +282,12 @@ export default {
 				document.addEventListener('scroll', this.handleScroll, true);
 			}
 		},
-        offsetHeightFn(){
-            let arr = []
-            for(var i in this.childList){
-                arr.push(document.getElementById(this.childList[i].type).offsetHeight)
-            }
-            return arr
-        },
         handleScroll() {
             for(var i in this.childList){
-                if (window.scrollY > document.getElementById(this.childList[i].type).offsetTop+144) {
+                if(this.childList[i].type&&window.scrollY > document.getElementById(this.childList[i].type).offsetTop+144||window.scrollY > document.getElementById(this.childList[i].address).offsetTop+244){
                     this.anchorIndex = i
                 }
+                
             }
         },
         anchorTopFn(i) {
@@ -302,12 +296,15 @@ export default {
         		if (document.getElementById(this.childList[j].type)) {
                     top = document.getElementById(this.childList[j].type).offsetHeight
         		}
+        		if (document.getElementById(this.childList[j].address)) {
+                    top = document.getElementById(this.childList[j].address).offsetHeight
+        		}
         	}
         	return top
         },
         anchorClick(i) {
             this.anchorIndex = i
-            var a = document.getElementById(this.childList[i].type)
+            var a = document.getElementById(this.childList[i].type)||document.getElementById(this.childList[i].address)
             if (a) {
             	a.scrollIntoView()
                 document.body.scrollTop += -56
@@ -592,6 +589,9 @@ export default {
 				}
 			}
 		}
+        .anchor_box1{
+            top:386px;
+        }
         ::v-deep .el-divider{
             width: calc(100% - 107px);
             margin-top: 12px;