Merge remote-tracking branch 'origin/master'

jwtech-pc-page/src/api/creditStatistics.js

@@ -9,7 +9,7 @@ export function creditGetGood(data) {
   })
 }
 
-// 企业良好行为
+// 企业不良行为
 export function getBadLimit() {
   return request({
     url: '/enterprise/credit/getBadLimit',
@@ -23,4 +23,13 @@ export function getGuangDong() {
     url: '/xzqh/xzqh/getGuangDong',
     method: 'GET',
   })
+}
+
+// 获取不良条件-带条件
+export function creditGetBad(data) {
+  return request({
+    url: '/enterprise/credit/getBad',
+    method: 'POST',
+    data: data
+  })
 }

jwtech-pc-page/src/api/enterpriseInformation.js

@@ -51,3 +51,29 @@ export function behaviorList(data) {
   })
 }
 
+// 综合信息
+export function zhxxList(data) {
+  return request({
+    url: '/enterprise/zhxx/list',
+    method: 'POST',
+    data: data
+  })
+}
+
+// 不良公告
+export function getBadAll(data) {
+  return request({
+    url: '/enterprise/credit/getBadAll',
+    method: 'POST',
+    data: data
+  })
+}
+
+// 不良公告
+export function getParent(enterpriseId) {
+  return request({
+    url: '/enterprise/qualifications/getParent/'+ enterpriseId,
+    method: 'GET',
+  })
+}
+

jwtech-pc-page/src/router/index.js

@@ -84,6 +84,11 @@ const router = new Router({
           component: () => import('@/views/summarizedInformation/index.vue'),
           name: 'summarizedInformation',
         },
+        {
+          path: '/summarizedDetail',
+          component: () => import('@/views/summarizedInformation/summarizedDetail.vue'),
+          name: 'summarizedDetail',
+        },
         {
           path: '/announcement',
           component: () => import('@/views/announcement/index.vue'),
@@ -350,7 +355,8 @@ const router = new Router({
 router.beforeEach((to, from, next) => {
   if (to.path === '/') {
     router.push({
-      name: 'login'
+      // name: 'login'
+      name: 'home'
     })
   } else {
     document.body.scrollTop = 0;

jwtech-pc-page/src/views/announcement/actionAnnouncementDetail.vue

@@ -4,23 +4,23 @@
             <div class="header-wrap">
                 <el-breadcrumb separator-class="el-icon-arrow-right">
                     <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
-                    <el-breadcrumb-item>公告</el-breadcrumb-item>
+                    <el-breadcrumb-item :to="{ path: '/announcement' }">公告</el-breadcrumb-item>
                     <el-breadcrumb-item>不良行为公告详情</el-breadcrumb-item>
                 </el-breadcrumb>
             </div>
         </div>
         <div class="basic-main">
             <div class="main-wrap">
-                <announcementBasicTable />
+                <announcementBasicTable :enterpriseObj="enterpriseObj" :bonusPointsAll="bonusPointsAll" />
                 <div class="descriptions-wrap">
-                    <misconductTable title="企业不良行为1" />
-                    <misconductTable title="企业不良行为2" />
+                    <misconductTable :title="'企业不良行为' + (index + 1)" v-for="(item, index) in badList" :key="(item, index)" :itemObj="item"/>
                 </div>
             </div>
         </div>
     </div>
 </template>
 <script>
+import { getBadAll } from "@/api/enterpriseInformation"
 import announcementBasicTable from "./components/announcementBasicTable"
 import misconductTable from "./components/misconductTable"
 export default {
@@ -31,9 +31,29 @@ export default {
     data() {
         return {
             activeName: "first",
+            enterpriseObj: {},
+            enterpriseBadForm: {
+                enterpriseId: "",
+                type: "0",
+            },
+            badList: [],
+            bonusPointsAll: 0
         }
     },
+    mounted() {
+        this.enterpriseBadForm.enterpriseId = this.$route.query.enterpriseId
+        this.getCreditBadList()
+    },
     methods: {
+        getCreditBadList() {
+            getBadAll(this.enterpriseBadForm).then(res => {
+                this.enterpriseObj = res.data.data[0]
+                this.badList = res.data.data
+                this.badList.forEach(item => {
+                    this.bonusPointsAll += Number(item.bonusPoints)
+                })
+            })
+        },
         handleClick(tab, event) {
             // console.log(tab, event);
         },

jwtech-pc-page/src/views/announcement/components/announcementBasicTable.vue

@@ -2,28 +2,40 @@
     <div class="descriptions-table">
         <el-descriptions class="margin-top" :column="1" border :content-style="rowCenter" :label-style="labelRowCenter">
             <el-descriptions-item label="企业名称">
-                kooriookami
+                {{ enterpriseObj.enterpriseName }}
             </el-descriptions-item>
             <el-descriptions-item label="资质类别">
-                kooriookami
+                {{ enterpriseObj.qualificationCategory || "-" }}
             </el-descriptions-item>
             <el-descriptions-item label="项目名称">
-                kooriookami
+                {{ enterpriseObj.projectName || "-" }}
             </el-descriptions-item>
             <el-descriptions-item label="扣分值">
-                kooriookami
+                {{ bonusPointsAll || "-" }}
             </el-descriptions-item>
             <el-descriptions-item label="发布时间">
-                kooriookami
+                {{ enterpriseObj.noticeBeginTime || "-" }}
             </el-descriptions-item>
             <el-descriptions-item label="发布单位">
-                kooriookami
+                {{ enterpriseObj.publishUnit || "-" }}
             </el-descriptions-item>
         </el-descriptions>
     </div>
 </template>
 <script>
 export default {
+    props:{
+        enterpriseObj:{
+            type:Object,
+            default: ()=>{
+                return []
+            }
+        },
+        bonusPointsAll:{
+            type:Number,
+            default: 0
+        }
+    },
     data() {
         return {
             rowCenter: {

jwtech-pc-page/src/views/announcement/components/misconductTable.vue

@@ -2,23 +2,23 @@
     <div class="descriptions-table">
         <span>{{ title }}</span>
         <el-descriptions class="margin-top" :column="1" border :content-style="rowCenter" :label-style="labelRowCenter">
-            <el-descriptions-item label="企业名称">
-                kooriookami
+            <el-descriptions-item label="不良行为">
+                {{ itemObj.badBehavior || "-" }}
             </el-descriptions-item>
-            <el-descriptions-item label="资质类别">
-                kooriookami
-            </el-descriptions-item>
-            <el-descriptions-item label="项目名称">
-                kooriookami
+            <el-descriptions-item label="等级">
+                {{ itemObj.commendationLevel || "-" }}
             </el-descriptions-item>
             <el-descriptions-item label="扣分值">
-                kooriookami
+                {{ itemObj.bonusPoints || "-" }}
             </el-descriptions-item>
-            <el-descriptions-item label="发布时间">
-                kooriookami
+            <el-descriptions-item label="有效期">
+                {{ itemObj.validityPeriod || "-" }}
             </el-descriptions-item>
-            <el-descriptions-item label="发布单位">
-                kooriookami
+            <!-- <el-descriptions-item label="扣分起止时间">
+                {{ itemObj.noticeBeginTime || "-" }}
+            </el-descriptions-item> -->
+            <el-descriptions-item label="扣分依据">
+                {{ itemObj.attachment || "-" }}
             </el-descriptions-item>
         </el-descriptions>
     </div>
@@ -29,6 +29,12 @@ export default {
         title: {
             type: String,
             default: ""
+        },
+        itemObj:{
+            type:Object,
+            default: ()=>{
+                return []
+            }
         }
     },
     data() {

jwtech-pc-page/src/views/announcement/index.vue

@@ -11,34 +11,44 @@
             <div class="list-wrap">
                 <el-form :inline="true" label-width="80px" :model="queryForm">
                     <el-form-item label="企业名称">
-                        <el-input class="name-inp-search" placeholder="请输入关键字" v-model="queryForm.firmName"></el-input>
+                        <el-input class="name-inp-search" placeholder="请输入关键字" v-model="queryForm.enterpriseName"></el-input>
                     </el-form-item>
                     <el-form-item label="企业类型">
-                        <el-input class="name-inp-search" placeholder="请输入关键字" v-model="queryForm.firmName"></el-input>
+                        <el-select v-model="queryForm.qualificationCategory" clearable placeholder="请选择企业类型">
+                            <el-option v-for="item in categoryList" :key="item.dictValue" :label="item.dictLabel"
+                                :value="item.dictValue">
+                            </el-option>
+                        </el-select>
                     </el-form-item>
                     <el-form-item>
-                        <el-button type="mini" icon="el-icon-search" @click="searchList()">查询</el-button>
+                        <el-button type="mini" icon="el-icon-search" @click="getResult()">查询</el-button>
                         <el-button type="mini" icon="el-icon-refresh" @click="resetForm()">重置</el-button>
                     </el-form-item>
                 </el-form>
                 <el-table :data="tableData" style="width: 100%">
-                    <el-table-column prop="enterpriseName" label="企业名称" width="600" align="center">
+                    <el-table-column prop="enterpriseName" label="企业名称" width="400" align="center">
                         <template slot-scope="scope">
-                            <span style="color: #005EB7;cursor: pointer;font-size: 16px !important;" @click="toDetail()">{{ scope.row.enterpriseName
+                            <span style="color: #005EB7;cursor: pointer;font-size: 16px !important;" @click="toDetail(scope.row)">{{ scope.row.enterpriseName
                             }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="projectName" label="项目名称" align="center">
                     </el-table-column>
-                    <el-table-column prop="certification" label="企业资质" align="center">
+                    <el-table-column prop="qualificationCategory" label="企业资质" align="center">
+                        <template slot-scope="scope">
+                            <div v-for="(cateTtem, index) in categoryList" :key="(cateTtem, index)">
+                                <div v-if="cateTtem.dictValue == scope.row.qualificationCategory">{{
+                                    cateTtem.dictLabel }}</div>
+                            </div>
+                        </template>
                     </el-table-column>
-                    <el-table-column prop="certification" label="信用分数" align="center">
+                    <el-table-column prop="dynamicCreditScore" label="信用分数" align="center">
                     </el-table-column>
-                    <el-table-column prop="certification" label="扣分值" align="center">
+                    <el-table-column prop="bonusPoints" label="扣分值" align="center">
                     </el-table-column>
-                    <el-table-column prop="certification" label="发布单位" align="center">
+                    <el-table-column prop="publishUnit" label="发布单位" align="center">
                     </el-table-column>
-                    <el-table-column prop="certification" label="公告时间" align="center">
+                    <el-table-column prop="noticeTime" label="公告时间" align="center">
                     </el-table-column>
                 </el-table>
                 <pagination :total="total" :page.sync="apidata.pageNum" :limit.sync="apidata.pageSize"
@@ -48,7 +58,7 @@
     </div>
 </template>
 <script>
-import { getBadLimit } from "@/api/creditStatistics"
+import { creditGetBad } from "@/api/creditStatistics"
 export default {
     data() {
         return {
@@ -59,27 +69,46 @@ export default {
             },
             pageSizes: [10, 20, 30, 50],
             queryForm: {
-                firmName: "",
-                area: ""
+                enterpriseName: "",
+                qualificationCategory:"",
+                pageNum: 1,
+                pageSize: 10,
             },
-            tableData: []
+            tableData: [],
+            categoryList:[]
         }
     },
     mounted(){
 this.getResult()
+this.getDicts("qualification_type").then(res => {
+            this.categoryList = res.data.data
+        })
     },
     methods: {
         getResult() {
-            getBadLimit().then(res=>{
-                this.tableData=res.data.data
+            creditGetBad(this.queryForm).then(res=>{
+                this.tableData=res.data.records
+                this.total=res.data.total
             })
         },
         handleClick(tab, event) {
             // console.log(tab, event);
         },
-        toDetail(){
+        resetForm(){
+this.queryForm={
+                enterpriseName: "",
+                qualificationCategory:"",
+                pageNum: 1,
+                pageSize: 10,
+            }
+this.getResult()
+        },
+        toDetail(row){
             this.$router.push({
-                path:"/actionAnnouncementDetail"
+                path:"/actionAnnouncementDetail",
+                query:{
+                    enterpriseId:row.enterpriseId
+                }
             })
         }
     }

jwtech-pc-page/src/views/creditStatistics/components/certificationTable.vue

@@ -13,13 +13,16 @@
                 <span>所在区域</span>
                 <span>信用分数</span>
             </div>
-            <div class="table-list">
+            <div class="table-list" v-if="tableList.length>0">
                 <div class="table-item" v-for="(item, index) in tableList" :key="(item, index)">
-                    <span>{{ item.enterpriseName }}</span>
+                    <span @click="toDetail(item)">{{ item.enterpriseName }}</span>
                     <span>{{ functionArea(item) }}</span>
                     <span>{{ item.dynamicCreditScore }}</span>
                 </div>
             </div>
+            <div class="table-list" v-else style="text-align: center;margin-top: 20px;">
+                暂无数据！
+            </div>
         </div>
     </div>
 </template>
@@ -73,6 +76,14 @@ export default {
                 }
             }
         },
+        toDetail(item) {
+            this.$router.push({
+                path: '/enterpriseInDetail',
+                query:{
+                    enterpriseId:item.enterpriseId
+                }
+            })
+        },
         toMore() {
             this.$router.push({
                 path: "/certificationPage",

jwtech-pc-page/src/views/enterpriseInformation/components/realTimeCredit.vue

@@ -2,14 +2,14 @@
     <div class="credit-wrap">
         <el-form :inline="true" :model="queryForm">
             <el-form-item>
-                <el-select v-model="queryForm.area" clearable placeholder="请选择所有区域">
-                    <!-- <el-option v-for="item in dict.type.lang_type" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option> -->
+                <el-select v-model="queryForm.qualificationCategory" clearable placeholder="" @change="selectVal">
+                    <el-option v-for="item in selectData" :key="item.qualificationCategory"
+                        :label="item.qualificationCategoryLabel" :value="item.qualificationCategory">
+                    </el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="实时信用分数:" label-width="110px">
-                <span>招标代理资质 100</span>
+                <span style="font-size: 35px;display: block;font-style:italic; font-style:oblique;color: red;">{{ qualificationCategoryLabel }} {{ dynamicCreditScore }}</span>
             </el-form-item>
         </el-form>
         <div class="time-wrap">
@@ -31,6 +31,7 @@
     </div>
 </template>
 <script>
+import { getParent } from "@/api/enterpriseInformation"
 import lineCredit from "./lineCredit"
 export default {
     components: {
@@ -38,13 +39,52 @@ export default {
     },
     data() {
         return {
-            queryForm: {},
+            queryForm: {
+                enterpriseId: "",
+                qualificationCategory: ""
+            },
+            categoryList: [],
+            selectData: [],
+            dynamicCreditScore: "",
+            qualificationCategoryLabel: ""
         }
     },
     mounted() {
+        this.queryForm.enterpriseId = this.$route.query.enterpriseId
         this.getTime()
+        this.getDicts("qualification_type").then(res => {
+            this.categoryList = res.data.data
+            this.getParentData()
+        })
     },
     methods: {
+        getParentData() {
+            getParent(this.queryForm.enterpriseId).then(res => {
+                let dataArr = []
+                this.categoryList.forEach(item => {
+                    res.data.data.forEach(item2 => {
+                        if (item.dictValue == item2.qualificationCategory) {
+                            dataArr.push({
+                                ...item2,
+                                qualificationCategoryLabel: item.dictLabel
+                            })
+                        }
+                    })
+                })
+                this.selectData = dataArr
+                this.queryForm.qualificationCategory = this.selectData[0].qualificationCategory
+                this.dynamicCreditScore = this.selectData[0].dynamicCreditScore
+                this.qualificationCategoryLabel = this.selectData[0].qualificationCategoryLabel
+            })
+        },
+        selectVal(val){
+            this.selectData.forEach(item=>{
+                if(item.qualificationCategory==val){
+                this.dynamicCreditScore = item.dynamicCreditScore
+                this.qualificationCategoryLabel = item.qualificationCategoryLabel
+                }
+            })
+        },
         getTime() {
             var vWeek = ["星期天", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
             var now = new Date();
@@ -116,7 +156,8 @@ export default {
     .tabs-line {
         margin-top: 20px;
     }
-    .list-wrap{
+
+    .list-wrap {
         margin-top: 20px;
     }
 }

jwtech-pc-page/src/views/enterpriseInformation/index.vue

@@ -14,7 +14,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="企业类型">
-                        <el-select v-model="queryForm.qualificationCategory" clearable placeholder="请选择所有区域">
+                        <el-select v-model="queryForm.qualificationCategory" clearable placeholder="请选择企业类型">
                             <el-option v-for="item in categoryList" :key="item.dictValue" :label="item.dictLabel"
                                 :value="item.dictValue">
                             </el-option>

jwtech-pc-page/src/views/home/components/enterpriseBasic.vue

@@ -8,7 +8,7 @@
                 <span>法定代表人</span>
             </div>
             <div class="table-list">
-                <div class="table-item" v-for="(item, index) in enterpriseList" :key="(item, index)">
+                <div class="table-item" v-for="(item, index) in enterpriseList" :key="(item, index)" @click="toDetail(item)">
                     <div class="enterpriseName">{{ item.enterpriseName }}</div>
                     <div class="qualificationCategory">
                         <div v-for="(cateTtem, index) in categoryList" :key="(cateTtem, index)">
@@ -43,6 +43,14 @@ export default {
                 this.enterpriseList = res.data.data
             })
         },
+        toDetail(item) {
+            this.$router.push({
+                path: '/enterpriseInDetail',
+                query:{
+                    enterpriseId:item.enterpriseId
+                }
+            })
+        },
     }
 }
 </script>

jwtech-pc-page/src/views/home/components/enterpriseInformation.vue

@@ -5,7 +5,7 @@
             <span>企业信息</span>
         </div>
         <div class="enterprise-select">
-            <div class="select-item" v-for="(item,index) in enterpriseList" :key="(item,index)">
+            <div class="select-item" v-for="(item,index) in enterpriseList" :key="(item,index)" @click="toPage(item)">
                 <img :src="item.url" alt="">
             </div>
         </div>
@@ -31,19 +31,38 @@ export default {
         return {
             enterpriseList: [{
                 url: require("@/assets/image/img_zizhixinxi.png"),
-                name: ""
+                path: "/certificationPage",
             }, {
                 url: require("@/assets/image/img_xmyjxx.png"),
                 name: ""
             }, {
                 url: require("@/assets/image/img_lhxwjl.png"),
-                name: ""
+                path: "/creditStatistics",
             }, {
                 url: require("@/assets/image/img_rylhxwjl.png"),
                 name: ""
             }]
         }
+    },
+    methods: {
+    toPage(item) {
+      if (item.path && item.path !== '') {
+        if (item.path == "/certificationPage") {
+          this.$router.push({
+            path: item.path,
+            query:{
+              codeText:"allCertification",
+              qualificationCategory:""
+            }
+          })
+        } else {
+          this.$router.push({
+            path: item.path
+          })
+        }
+      }
     }
+  },
 }
 </script>
 <style lang="less" scoped>

jwtech-pc-page/src/views/home/components/informationDisclosure.vue

@@ -11,7 +11,7 @@
             </div>
             <div class="table-list">
                 <div class="table-item" v-for="(item, index) in informationList" :key="(item, index)">
-                    <div class="enterpriseName" @click="toDetail()">{{ item.enterpriseName }}</div>
+                    <div class="enterpriseName" @click="toDetail(item)">{{ item.enterpriseName }}</div>
                     <div class="qualificationCategory">
                         <div v-for="(cateTtem, index) in categoryList" :key="(cateTtem, index)">
                             <div v-if="cateTtem.dictValue == item.qualificationCategory">{{
@@ -46,14 +46,21 @@ export default {
                 this.informationList = res.data.data
             })
         },
-        toDetail() {
+        toDetail(item) {
             this.$router.push({
-                path: '/enterpriseInDetail'
+                path: '/enterpriseInDetail',
+                query:{
+                    enterpriseId:item.enterpriseId
+                }
             })
         },
         toMore() {
             this.$router.push({
-                path: '/certificationPage'
+                path: '/certificationPage',
+                query:{
+              codeText:"allCertification",
+              qualificationCategory:""
+            }
             })
         }
     }

jwtech-pc-page/src/views/home/index.vue

@@ -27,9 +27,15 @@
     </div>
     <div class="synthesize-wrap">
       <div class="synthesize-btns">
-        <img src="@/assets/image/img_zhaobiaoxinxi.png" alt="">
-        <img src="@/assets/image/zh.png" alt="">
-        <img src="@/assets/image/img_gonggao.png" alt="">
+        <router-link :to="{ path: '/biddingInformation' }">
+          <img src="@/assets/image/img_zhaobiaoxinxi.png" alt="">
+        </router-link>
+        <router-link :to="{ path: '/summarizedInformation' }">
+          <img src="@/assets/image/zh.png" alt="">
+        </router-link>
+        <router-link :to="{ path: '/announcement' }">
+          <img src="@/assets/image/img_gonggao.png" alt="">
+        </router-link>
       </div>
     </div>
   </div>
@@ -54,7 +60,7 @@ export default {
         path: "/creditStatistics",
       }, {
         url: require("@/assets/image/img_qiyezizhi.png"),
-        name: "",
+        path: "/certificationPage",
       }, {
         url: require("@/assets/image/img_ryjbxx.png"),
         name: "",
@@ -74,10 +80,20 @@ export default {
   },
   methods: {
     toPage(item) {
-      if(item.path&&item.path!==''){
-        this.$router.push({
-        path: item.path
-      })
+      if (item.path && item.path !== '') {
+        if (item.path == "/certificationPage") {
+          this.$router.push({
+            path: item.path,
+            query: {
+              codeText: "allCertification",
+              qualificationCategory: ""
+            }
+          })
+        } else {
+          this.$router.push({
+            path: item.path
+          })
+        }
       }
     }
   },

jwtech-pc-page/src/views/summarizedInformation/index.vue

@@ -15,21 +15,21 @@
             <div class="list-wrap">
                 <el-form :inline="true" label-width="80px" :model="queryForm">
                     <el-form-item label="关键字">
-                        <el-input class="name-inp-search" placeholder="请输入关键字" v-model="queryForm.firmName"></el-input>
+                        <el-input class="name-inp-search" placeholder="请输入关键字" v-model="queryForm.cv.value"></el-input>
                     </el-form-item>
                     <el-form-item>
-                        <el-button type="mini" icon="el-icon-search" @click="searchList()">查询</el-button>
+                        <el-button type="mini" icon="el-icon-search" @click="getResult()">查询</el-button>
                         <el-button type="mini" icon="el-icon-refresh" @click="resetForm()">重置</el-button>
                     </el-form-item>
                 </el-form>
                 <el-table :data="tableData" style="width: 100%">
-                    <el-table-column prop="firmName" label="标题" width="700" align="center">
+                    <el-table-column prop="title" label="标题" width="700" align="center">
                         <template slot-scope="scope">
-                            <span style="color: #005EB7;cursor: pointer;font-size: 16px !important;">{{ scope.row.firmName
+                            <span style="color: #005EB7;cursor: pointer;font-size: 16px !important;" @click="toDetail(scope.row)">{{ scope.row.title
                             }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="certification" label="发布时间" align="center">
+                    <el-table-column prop="publishTime" label="发布时间" align="center">
                     </el-table-column>
                 </el-table>
                 <pagination :total="total" :page.sync="apidata.pageNum" :limit.sync="apidata.pageSize"
@@ -39,6 +39,7 @@
     </div>
 </template>
 <script>
+import { zhxxList } from "@/api/enterpriseInformation"
 export default {
     data() {
         return {
@@ -50,35 +51,30 @@ export default {
             pageSizes: [10, 20, 30, 50],
             activeName: "first",
             queryForm: {
-                firmName: "",
-                area: ""
+                cv: {
+                    name: "title",
+                    type: "like",
+                    value:""
+                },
+                pageNum: 1,
+                pageSize: 10,
             },
-            tableData: [{
-                firmName: '广东润航建设集团有限公司',
-                certification: '施工资质',
-                area: '广州市',
-                creditScore: '132',
-            }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-            }]
+            tableData: []
         }
     },
+    mounted() {
+        this.getResult()
+    },
     methods: {
         getResult() {
+            zhxxList(this.queryForm).then(res => {
+                this.tableData = res.data.records
+                this.total = res.data.total
+            })
         },
         handleClick(tab, event) {
             // console.log(tab, event);
-            if (tab.name !== "first" && tab.name !== "second" && tab.name !== "third" && tab.name !== "fourth5") {
+            if (tab.name == "third") {
                 this.resetActivePosition(this.$refs.tabcs.$el);
             }
         },
@@ -90,9 +86,30 @@ export default {
                 const pl = style.paddingLeft.match(/\d+/)[0] * 1;
                 lineEl.style.transform =
                     'translateX(' + (activeEl.offsetLeft + 40) + 'px)';
-                console.log(activeEl.offsetLeft, pl);
+                // console.log(activeEl.offsetLeft, pl);
             });
         },
+        resetForm() {
+            this.queryForm = {
+                cv: {
+                    name: "title",
+                    type: "like",
+                    value:""
+                },
+                pageNum: 1,
+                pageSize: 10,
+            }
+            this.getResult()
+        },
+        toDetail(row){
+            this.$router.push({
+                path:"/summarizedDetail",
+                query:{
+                    id:row.id,
+                title:row.title
+                }
+            })
+        }
     }
 }
 </script>
@@ -161,7 +178,7 @@ export default {
                     border: 10px solid transparent;
                     border-bottom: 10px solid #005EB7;
                     background: none;
-                    left: 20px;
+                    left: 5px;
                 }
             }
         }

jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue

@@ -0,0 +1,78 @@
+<template>
+    <div class="pdf-wrap">
+        <div class="pdf-header">
+            <div class="header-wrap">
+                <el-breadcrumb separator-class="el-icon-arrow-right">
+                    <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
+                    <el-breadcrumb-item :to="{ path: '/summarizedInformation' }">综合信息</el-breadcrumb-item>
+                    <el-breadcrumb-item>综合信息详情</el-breadcrumb-item>
+                </el-breadcrumb>
+            </div>
+        </div>
+        <div class="pdf-main">
+            <div class="main-wrap">
+                <span>{{ title }}</span>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return {
+title:""
+        }
+    },
+    mounted(){
+        this.title=this.$route.query.title
+    }
+}
+
+</script>
+<style lang="less" scoped>
+.pdf-wrap{
+    .pdf-header {
+        height: 40px;
+        background: #EBF4FE;
+
+        .header-wrap {
+            width: 1200px;
+            margin: 0 auto;
+            display: flex;
+            align-items: center;
+
+            /deep/.el-breadcrumb {
+                margin-top: 10px;
+
+                .el-breadcrumb__item {
+                    .el-breadcrumb__inner {
+                        font-size: 16px;
+                        color: #005EB7 !important;
+                    }
+
+                    .el-breadcrumb__separator {
+                        font-size: 16px;
+                        color: #005EB7 !important;
+                    }
+                }
+            }
+        }
+    }
+    .pdf-main{
+        width: 1200px;
+        margin: 0 auto;
+        padding: 20px;
+        .main-wrap{
+            border: 1px solid #0055A6;
+            min-height: 500px;
+            padding: 20px;
+            span{
+        font-size: 20px;
+        font-weight: 600;
+        color: #0055A6;
+    }
+        }
+
+    }
+}
+</style>