修改

dsk-operate-ui/src/api/detail/groupAccount/groupAccount.js

@@ -92,3 +92,52 @@ export function exportBid(data) {
     data: data
   })
 }
+
+// 集团施工项目最新招标
+export function recentlyBid(data) {
+  return request({
+    url: '/marketAnalysis/combine/recentlyBid',
+    method: 'post',
+    data: data
+  })
+}
+// 集团施工项目年度招标
+export function bidByYear(data) {
+  return request({
+    url: '/marketAnalysis/combine/bidByYear',
+    method: 'post',
+    data: data
+  })
+}
+// 集团施工项目发包金额统计
+export function groupByMoney(data) {
+  return request({
+    url: '/marketAnalysis/combine/groupByMoney',
+    method: 'post',
+    data: data
+  })
+}
+// 集团施工项目发包类型统计
+export function groupByType(data) {
+  return request({
+    url: '/marketAnalysis/combine/groupByType',
+    method: 'post',
+    data: data
+  })
+}
+// 施工项目下浮率统计
+export function groupByLowerRate(data) {
+  return request({
+    url: '/marketAnalysis/combine/groupByLowerRate',
+    method: 'post',
+    data: data
+  })
+}
+// 历史发包项目金额Top10
+export function peojectTop(data) {
+  return request({
+    url: '/marketAnalysis/combine/peojectTop',
+    method: 'post',
+    data: data
+  })
+}

dsk-operate-ui/src/api/detail/party-a/opport.js

@@ -9,7 +9,7 @@ export function bidNoticePage(data) {
   })
 }
 
-// 招标公告招标类别
+// 招标公告招标阶段
 export function bidNoticeTenderStage(data) {
   return request({
     url: '/enterpriseProject/bidNoticeTenderStage',
@@ -17,6 +17,14 @@ export function bidNoticeTenderStage(data) {
     data: data
   })
 }
+// 招标公告项目类别
+export function bidNoticeProjectCategory(data) {
+  return request({
+    url: '/enterpriseProject/bidNoticeProjectCategory',
+    method: 'post',
+    data: data
+  })
+}
 
 // 招标公告地区
 export function bidNoticeArea(data) {

dsk-operate-ui/src/assets/styles/index.scss

@@ -348,7 +348,7 @@ ul, li {
       //box-shadow:none;
       //-webkit-box-shadow: 2px 0px 1px -2px #C3CBD5;
       box-shadow: 2px 0 8px -7px #202020;
-      border-right: 1px solid #C3CBD5;
+      //border-right: 1px solid #C3CBD5;
       height: auto !important;
       bottom: 16px !important;
     }

dsk-operate-ui/src/router/index.js

@@ -209,7 +209,7 @@ export const constantRoutes = [
     children: [
       {
         path: '/biddetail/:id(\\d+)',
-        component: () => import('@/views/detail//biddetail/index'),
+        component: () => import('@/views/detail/biddetail/index'),
         name: 'Biddetail',
         meta: { title: '中标业绩详情',icon: 'enterprise'}
       }

dsk-operate-ui/src/views/detail/groupAccount/component/zbxmmx.vue

@@ -103,7 +103,7 @@
   import { getDictType } from '@/api/main'
   export default {
     name: 'qualifications',
-    props: ['customerId','combineName'],
+    props: ['customerId'],
     mixins: [mixin],
     components:{CustomTimeSelect,CustomMoneySelect},
     data(){

dsk-operate-ui/src/views/detail/groupAccount/component/zhaobiao.vue

@@ -8,8 +8,8 @@
         </el-tabs>
       </div>
     </div>
-    <Zbxmfx v-if="activeName === 'first'"></Zbxmfx>
-    <Zbxmmx v-if="activeName === 'second'"></Zbxmmx>
+    <Zbxmfx v-if="activeName === 'first'" :customer-id="id"></Zbxmfx>
+    <Zbxmmx v-if="activeName === 'second'" :customer-id="id"></Zbxmmx>
   </div>
 </template>
 
@@ -18,10 +18,12 @@
   import Zbxmmx from './zbxmmx'
   export default {
     name: 'qualifications',
+    props: ['customerId'],
     components:{Zbxmfx,Zbxmmx},
     data(){
       return{
-        activeName: 'first'
+        activeName: 'first',
+        id:this.customerId
       }
     },
     created() {
@@ -37,7 +39,7 @@
 
 <style lang="scss" scoped>
   .zhaobiao{
-    height: 100%;
+    /*height: 100%;*/
     background: #F5F5F5;
     .header{
       justify-content: space-between;

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

@@ -273,11 +273,13 @@ export default {
           cityIds: [this.companyInfo.cityId],
         }
         urbanInvestmentPage(data).then(res => {
+          if(res.code==200){
             if(res.data.totalCount<1){
               let arr = JSON.parse(JSON.stringify(this.$refs.sidebar.sideRoute))
               arr[4].children[2].disabled = true;
               this.$refs.sidebar.sideRoute = arr
             }
+          }
         })
         if(this.companyInfo && this.companyInfo.companyName){
           this.$nextTick(()=>{

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

@@ -37,7 +37,7 @@
 <script>
 import mixin from '../mixins/mixin'
 import skeleton from '@/views/project/projectList/component/skeleton'
-import {bidNoticeArea, bidNoticeTenderStage, bidNoticePage} from '@/api/detail/party-a/opport'
+import {bidNoticeArea, bidNoticeTenderStage,bidNoticeProjectCategory, bidNoticePage} from '@/api/detail/party-a/opport'
 export default {
   name: 'Announcement',
   props: ['companyId'],
@@ -59,6 +59,7 @@ export default {
         {label: '项目名称', prop: 'projectName', minWidth: '300', slot: true, fixed: true},
         {label: '发布日期', prop: 'issueTime', sortable: 'custom', descending: '3', ascending: '4', width: '120'},
         {label: '预算金额（万元）', prop: 'projectAmount', sortable: 'custom', descending: '1', ascending: '2', width: '140'},
+        {label: '项目类型', prop: 'projectCategory', width: '110'},
         {label: '项目地区', prop: 'province', width: '120', slot: true},
         {label: '招标阶段', prop: 'tenderStage', width: '90'},
         {label: '招采单位联系人', prop: 'contact', width: '120'},
@@ -70,7 +71,8 @@ export default {
       ],
       formData: [
         { type: 7, fieldName: 'province', value: '',props: {multiple: true}, placeholder: '项目地区', options: []},
-        { type: 4, fieldName: 'tenderStage', value: '', placeholder: '项目类型', options: []},
+        { type: 4, fieldName: 'projectCategory', value: '', placeholder: '项目类型', options: []},
+        { type: 4, fieldName: 'tenderStage', value: '', placeholder: '招标阶段', options: []},
         { type: 3, fieldName: 'keys', value: '', placeholder: '输入关键词查询', options: []}
       ],
       //列表
@@ -87,9 +89,10 @@ export default {
   },
   methods: {
     async handleOption(){
-      let [area, tender] = await Promise.all([
+      let [area, tender,project] = await Promise.all([
         bidNoticeArea({cid: this.companyId}),
-        bidNoticeTenderStage({cid: this.companyId})
+        bidNoticeTenderStage({cid: this.companyId}),
+        bidNoticeProjectCategory({cid: this.companyId}),
       ])
       if(area.code==200){
         let region = area.data.map(item => {
@@ -121,6 +124,13 @@ export default {
         })
         this.setFormData('tenderStage', tenderStage)
       }
+      if(project.code==200){
+        let projectCategory = project.data.map(item => {
+          let it = {name:item.projectCategory+'('+item.count+')',value:item.projectCategory}
+          return it
+        })
+        this.setFormData('projectCategory', projectCategory)
+      }
     },
     async handleQuery(params) {
       this.tableLoading = true