.

src/main/jmrh/src/components/message/msgPopups.vue

@@ -69,7 +69,8 @@ export default {
         // background: cadetblue;
     }
     .info {
-        width: 780px;
+        // width: 780px;
+        width: 90%;
         margin-left: 8px;
         height: auto;
         display: flex;
@@ -82,8 +83,9 @@ export default {
         }
         p {
             margin: 0px;
-            width: 600px;
+            // width: 600px;
             // height: 22px;
+            width: 100%;
             font-size: 14px;
 
             color: #c8c9cc;

src/main/jmrh/src/components/resource/financingRelease.vue

@@ -93,15 +93,15 @@ export default {
         }
     },
     methods: {
-        getType(type, id) {
-            if ('dataType' === type) {
-                this.query.dataType.id = id;
-            }
-            if ('applicationField' === type) {
-                this.query.applicationField.id = id;
-            }
-            this.getData();
-        },
+        // getType(type, id) {
+        //     if ('dataType' === type) {
+        //         this.query.dataType.id = id;
+        //     }
+        //     if ('applicationField' === type) {
+        //         this.query.applicationField.id = id;
+        //     }
+        //     this.getData();
+        // },
         beforeGetData() {
             if (this.search || this.query) {
                 return { search: this.search, query: this.query };
@@ -136,7 +136,7 @@ export default {
     mounted() {
         if (this.$route.query.tabId) {
             let tabId = this.$route.query.tabId;
-            this.query.dataType.id = tabId;
+            this.show.dataType.id = tabId;
         }
     }
 };

src/main/jmrh/src/components/resource/financingRequire.vue

@@ -148,7 +148,7 @@ export default {
     mounted() {
         if (this.$route.query.tabId) {
             let tabId = this.$route.query.tabId;
-            this.query.dataType.id = tabId;
+            this.show.industryType.id = tabId;
         }
     }
 };

src/main/jmrh/src/components/resource/productRequire.vue

@@ -121,9 +121,6 @@ export default {
                     type: 'warning'
                 });
             }
-        },
-        getType(res) {
-            console.log(res);
         }
     },
     created() {

src/main/jmrh/src/components/resource/recommendToU.vue

@@ -3,7 +3,9 @@
         <div class="rec_card_title">为你推荐</div>
         <div class="rec_card_line"></div>
         <div class="rec_card" @click="Go">
-            <img :src="list[0] ? list[0].pic : null" />
+            <!-- <img :src="list[this.index] ? list[this.index].images : null" />
+            <div class="rec_card_name">{{ list[this.index] ? list[this.index].name : null }}</div> -->
+            <img :src="list[0] ? list[0].images : null" />
             <div class="rec_card_name">{{ list[0] ? list[0].name : null }}</div>
         </div>
     </div>
@@ -19,12 +21,13 @@ export default {
             url: '',
 
             list: []
+            // index: 0
         };
     },
 
     methods: {
         Go() {
-            if (this.type === 3) {
+            if (this.type === 'FINANCING_DEMAND') {
                 this.$router.push({
                     name: 'resourceFanceDetail',
                     query: { id: this.list[0].id, type: this.type }
@@ -35,19 +38,21 @@ export default {
         },
         getData() {
             this.type;
+            console.log(this.type);
             this.dataType;
-            if (this.type == 1) {
-                this.url = '/artNeed/all';
-            } else if (this.type == 2) {
-                this.url = '/productNeed/all';
-            } else if (this.type == 3) {
-                this.url = '/financingNeeds/all';
-            }
-            this.query.dataType.id = this.dataType;
+            // if (this.type == 'TECH_DEMAND') {
+            //     // this.url = '/artNeed/all';
+            // } else if (this.type == 'PRODUCT_DEMAND') {
+            //     // this.url = '/productNeed/all';
+            // } else if (this.type == 'FINANCING_DEMAND') {
+            //     // this.url = '/financingNeeds/all';
+            // }
+            // this.query.dataType.id = this.dataType;
             this.$http
-                .get(this.url, this.query)
+                .get('/resourceSupplyAndDemand/all', { query: { type: this.type } })
                 .then(res => {
                     this.list = res.content;
+                    // this.index = Math.floor(Math.random() * (this.list.length - 0) + 0);
                 })
                 .catch(e => {
                     console.log(e);

src/main/jmrh/src/components/resource/techRequire.vue

@@ -84,7 +84,7 @@ export default {
         return {
             search: '',
             url: '/resourceSupplyAndDemand/all',
-            query: { type: 'TECH_DEMAND', resSnDPropertyList: '', contact: '' },
+            query: { type: 'TECH_DEMAND', resSnDPropertyList: '' },
             // resSnDPropertyList:[]
             // applicationField: { id: 0 }, dataType: { id: 0 }
             pageSize: 5,

src/main/jmrh/src/router/index.js

@@ -52,6 +52,15 @@ const routes = [
                     menu: 'policy'
                 }
             },
+            {
+                path: '/policyArticle',
+                name: 'policyArticle',
+                component: () => import(/* webpackChunkName: "policy" */ '@/views/policyArticle.vue'),
+                meta: {
+                    menu: 'policy'
+                }
+            },
+
             {
                 path: '/article',
                 name: 'article',

src/main/jmrh/src/views/article.vue

@@ -42,6 +42,8 @@ export default {
                 this.breadcrumb = '新闻动态';
             } else if (this.$route.query.typeId == 1108) {
                 this.breadcrumb = '通知通告';
+            } else if (this.$route.query.typeId == 1076) {
+                this.breadcrumb = '国家政策法规';
             } else {
                 this.breadcrumb = '新闻咨询';
             }

src/main/jmrh/src/views/home.vue

@@ -311,18 +311,24 @@ background: linear-gradient(180deg, #FFFFFF 0%, #F7F8FA 100%);padding:50px 0 20p
                     </div>
                 </div>
                 <div class="res_bottom">
-                    <div class="res_img" @click="$router.push({ name: 'resource', query: { myTab: 5, tabId: 11419 } })">
+                    <div
+                        class="res_img"
+                        @click="$router.push({ name: 'resource', query: { myTab: 5, tabId: '实验设备' } })"
+                    >
                         <img src="../assets/home_img_ziyuan_shiyanshebei.png" />
                         <p>实验设备</p>
                     </div>
                     <div
                         class="res_img"
-                        @click="$router.push({ name: 'resource', query: { myTab: 5, tabId: 1142319 } })"
+                        @click="$router.push({ name: 'resource', query: { myTab: 5, tabId: '计量器具' } })"
                     >
                         <img src="../assets/home_img_ziyuan_jiliang.png" />
                         <p>计量器具</p>
                     </div>
-                    <div class="res_img" @click="$router.push({ name: 'resource', query: { myTab: 5, tabId: 12319 } })">
+                    <div
+                        class="res_img"
+                        @click="$router.push({ name: 'resource', query: { myTab: 5, tabId: '科研仪器' } })"
+                    >
                         <img src="../assets/home_img_ziyuan_keyan.png" />
                         <p>科研仪器</p>
                     </div>
@@ -342,13 +348,16 @@ background: linear-gradient(180deg, #FFFFFF 0%, #F7F8FA 100%);padding:50px 0 20p
                     </div>
                 </div>
                 <div class="res_bottom">
-                    <div class="res_img" @click="$router.push({ name: 'resource', query: { myTab: 2, tabId: 11411 } })">
+                    <div
+                        class="res_img"
+                        @click="$router.push({ name: 'resource', query: { myTab: 2, tabId: '债务融资' } })"
+                    >
                         <img src="../assets/home_img_rongzi_zhaiwu.png" />
                         <p>债务融资</p>
                     </div>
                     <div
                         class="res_img"
-                        @click="$router.push({ name: 'resource', query: { myTab: 2, tabId: 114101 } })"
+                        @click="$router.push({ name: 'resource', query: { myTab: 2, tabId: '权益融资' } })"
                     >
                         <img src="../assets/home_img_rongzi_quanyi.png" />
                         <p>权益融资</p>
@@ -481,7 +490,7 @@ export default {
             this.bannerIndex = e;
         },
         getNews() {
-            this.$http.get('/article/all', { query: { typeId: this.tab }, size: 4 }).then(res => {
+            this.$http.get('/article/all', { query: { typeId: this.tab }, size: 7 }).then(res => {
                 this.news = res.content;
                 this.typeId = this.tab;
             });

src/main/jmrh/src/views/policy.vue

@@ -39,7 +39,9 @@
                                 class="item"
                                 v-for="item in tableData"
                                 :key="item.id"
-                                @click="$router.push({ name: 'article', query: { id: item.id } })"
+                                @click="
+                                    $router.push({ name: 'policyArticle', query: { id: item.id, typeId: item.typeId } })
+                                "
                             >
                                 <img class="cover" :src="item.cover" />
                                 <div class="info">
@@ -98,7 +100,8 @@ export default {
             query: {
                 type: {
                     keyType: 'zcfg'
-                }
+                },
+                typeId: 1067
             },
             current: 0,
             barTitle: '政策法规',

src/main/jmrh/src/views/policyArticle.vue

@@ -0,0 +1,99 @@
+<template>
+    <div class="article">
+        <div class="container">
+            <!-- 面包屑 -->
+            <el-row>
+                <el-col :span="24">
+                    <el-breadcrumb separator="/">
+                        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+                        <el-breadcrumb-item :to="{ path: '/policy' }">政策法规</el-breadcrumb-item>
+                        <el-breadcrumb-item>{{ breadcrumb }}</el-breadcrumb-item>
+                    </el-breadcrumb>
+                </el-col>
+            </el-row>
+            <div class="title">
+                {{ article.title }}
+            </div>
+            <div class="time">发布日期：{{ article.createdAt }}</div>
+            <div class="divider"></div>
+            <div class="article-content" v-html="article.content"></div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'article',
+    data() {
+        return {
+            article: {},
+            breadcrumb: ''
+        };
+    },
+    created() {
+        if (this.$route.query.id) {
+            this.$http.get(`/article/get/${this.$route.query.id}`).then(res => {
+                this.article = res;
+            });
+        }
+        if (this.$route.query.typeId) {
+            if (this.$route.query.typeId == 1067) {
+                this.breadcrumb = '国家政策法规';
+            } else if (this.$route.query.typeId == 1068) {
+                this.breadcrumb = '部改委政策法规';
+            } else if (this.$route.query.typeId == 1069) {
+                this.breadcrumb = '军方政策法规';
+            } else if (this.$route.query.typeId == 1070) {
+                this.breadcrumb = '创新委政策法规';
+            } else if (this.$route.query.typeId == 1071) {
+                this.breadcrumb = '地方委政策法规';
+            } else if (this.$route.query.typeId == 1072) {
+                this.breadcrumb = '其他政策法规';
+            }
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.el-breadcrumb {
+    height: 60px;
+    line-height: 60px;
+    /deep/.el-breadcrumb__inner {
+        font-size: 12px;
+        color: #000 !important;
+    }
+}
+.container {
+    width: 1200px;
+    margin: auto;
+    padding: 30px 100px;
+    padding-top: 0px;
+    box-sizing: border-box;
+}
+.article {
+    // padding: 30px 100px;
+    background: white;
+}
+.title {
+    font-size: 24px;
+    font-weight: 500;
+    color: black;
+    line-height: 33px;
+    text-align: center;
+}
+.time {
+    text-align: center;
+    color: black;
+    font-size: 14px;
+    margin-top: 20px;
+}
+.divider {
+    height: 1px;
+    background: @border;
+    margin-top: 20px;
+}
+.article-content {
+    font-size: 14px;
+    line-height: 1.5;
+    margin-top: 20px;
+}
+</style>

src/main/jmrh/src/views/search/search.vue

@@ -70,7 +70,7 @@
                     class="notice"
                     v-for="item in tableData"
                     :key="item.id"
-                    @click="$router.push({ name: 'article', query: { id: item.id } })"
+                    @click="$router.push({ name: 'article', query: { id: item.id, typeId: item.typeId } })"
                 >
                     <div class="notice_con">
                         <i></i>
@@ -87,7 +87,7 @@
                     class="policy"
                     v-for="item in tableData"
                     :key="item.id"
-                    @click="$router.push({ name: 'article', query: { id: item.id } })"
+                    @click="$router.push({ name: 'policyArticle', query: { id: item.id, typeId: item.typeId } })"
                 >
                     <div class="policy_info">
                         <img :src="item.cover" />
@@ -102,13 +102,16 @@
             <!--需求信息 -->
             <div v-if="current === 2 || current === 3 || current === 4" class="content">
                 <div class="supply" v-for="(item, index) in tableData" :key="item.id" @click="needsGo(index)">
-                    <img :src="item.pic" />
+                    <img :src="item.images" />
                     <div class="supply_info">
                         <div class="supply_tit">
-                            <i>正在对接</i><span>{{ item.name }}</span>
+                            <!-- <i>正在对接</i><span>{{ item.name }}</span> -->
+                            <i class="wait" v-if="item.conversationStatus === 'AWAIT'"> 等待对接 </i>
+                            <i v-if="item.conversationStatus === 'CONDUCTED'"> 正在对接</i>
+                            <span>{{ item.name }}</span>
                         </div>
                         <p>
-                            {{ item.needInfo }}
+                            {{ item.description }}
                         </p>
                         <span class="supply_time">{{ item.createdAt }}</span>
                     </div>
@@ -117,10 +120,13 @@
             <!-- 供应信息 -->
             <div v-if="current === 5 || current === 6 || current === 7">
                 <div class="supply" v-for="(item, index) in tableData" :key="item.id" @click="needsGo(index)">
-                    <img :src="item.picList ? item.picList[0].url : null" />
+                    <img :src="item.images ? item.images[0] : null" />
                     <div class="supply_info">
                         <div class="supply_tit">
-                            <i>正在对接</i><span>{{ item.name }}</span>
+                            <!-- <i>正在对接</i><span>{{ item.name }}</span> -->
+                            <i class="wait" v-if="item.conversationStatus === 'AWAIT'"> 等待对接 </i>
+                            <i v-if="item.conversationStatus === 'CONDUCTED'"> 正在对接</i>
+                            <span>{{ item.name }}</span>
                         </div>
                         <p>
                             {{ item.description }}
@@ -135,20 +141,18 @@
                     <span class="title">{{ item.title }}</span>
                     <span class="name">{{ item.name }}</span>
                     <span class="num"
-                        >回复&nbsp;<span style="color:#939599">{{
-                            item.commentList ? item.commentList.length : 0
-                        }}</span></span
+                        >回复&nbsp;<span style="color:#939599">{{ item.commentNum }}</span></span
                     >
                     <span class="time">{{ item.createdAt }}</span>
                 </div>
             </div>
             <!-- 政民互动 -->
             <div v-if="current === 8">
-                <div class="interactive" v-for="(item, index) in tableData" :key="item[0]" @click="needsGo(index)">
-                    <span class="title">{{ item[1] }}</span>
+                <div class="interactive" v-for="(item, index) in tableData" :key="item.id" @click="needsGo(index)">
+                    <span class="title">{{ item.title }}</span>
                     <!-- <span class="name">{{ item.name }}</span> -->
-                    <span class="num">{{ item[3] ? '已回复' : '未回复' }}</span>
-                    <span class="time">{{ item[2] }}</span>
+                    <span class="num">{{ item.commentNum >= 0 ? '已回复' : '未回复' }}</span>
+                    <span class="time">{{ item.createdAt }}</span>
                 </div>
             </div>
         </div>
@@ -261,18 +265,22 @@ export default {
             }
         },
         resShow() {
+            this.url = '/resourceSupplyAndDemand/all';
             if (this.resIndex === 5) {
-                this.url = '/product/all';
+                // this.url = '/product/all';
+                this.query = { type: 'PRODUCT_SUPPLY' };
                 this.search = this.title;
                 this.pageSize = 5;
                 this.getData();
             } else if (this.resIndex === 6) {
-                this.url = '/artProduct/all';
+                // this.url = '/artProduct/all';
+                this.query = { type: 'TECH_SUPPLY' };
                 this.search = this.title;
                 this.pageSize = 5;
                 this.getData();
             } else if (this.resIndex === 7) {
-                this.url = '/tresource/all';
+                // this.url = '/tresource/all';
+                this.query = { type: 'RES_SUPPLY' };
                 this.search = this.title;
                 this.pageSize = 5;
                 this.getData();
@@ -280,21 +288,24 @@ export default {
             this.current = this.resIndex;
         },
         needShow() {
+            this.url = '/resourceSupplyAndDemand/all';
             if (this.needIndex === 2) {
-                this.url = '/artNeed/all';
-                this.query = {};
+                // this.url = '/artNeed/all';
+                // this.query = {};
+                // this.search = this.title;
+                // this.pageSize = 5;
+                // this.getData();
+                this.query = { type: 'TECH_DEMAND' };
                 this.search = this.title;
                 this.pageSize = 5;
                 this.getData();
             } else if (this.needIndex === 3) {
-                this.url = '/productNeed/all';
-                this.query = {};
+                this.query = { type: 'PRODUCT_DEMAND' };
                 this.search = this.title;
                 this.pageSize = 5;
                 this.getData();
             } else if (this.needIndex === 4) {
-                this.url = '/financingNeeds/all';
-                this.query = {};
+                this.query = { type: 'FINANCING_DEMAND' };
                 this.search = this.title;
                 this.pageSize = 5;
                 this.getData();
@@ -302,22 +313,20 @@ export default {
             this.current = this.needIndex;
         },
         civilShow() {
+            this.url = '/post/allDTO';
             if (this.civilIndex === 8) {
-                this.url = '/question/getAll';
-                this.query = {};
+                this.query = { type: 'OFFICIAL' };
                 this.search = this.title;
                 this.pageSize = 5;
                 this.getData();
             } else if (this.civilIndex === 9) {
-                this.url = '/topic/all';
-                this.query = { type: 1 };
+                this.query = { type: 'TOPIC' };
                 this.search = this.title;
                 this.pageSize = 5;
                 this.getData();
             } else if (this.civilIndex === 10) {
-                this.url = '/topic/all';
                 this.search = this.title;
-                this.query = { type: 2 };
+                this.query = { type: 'QA' };
                 this.pageSize = 5;
                 this.getData();
             }
@@ -336,27 +345,52 @@ export default {
                 this.search = this.title;
                 this.query = { type: { keyType: 'zcfg' } };
                 this.pageSize = 10;
+                this.getData();
             }
         },
         needsGo(index) {
             if (this.current === 2) {
-                this.$router.push({ name: 'resourceDetail', query: { id: this.tableData[index].id, type: 1 } });
+                this.$router.push({
+                    name: 'resourceDetail',
+                    query: { id: this.tableData[index].id, type: 'TECH_DEMAND' }
+                });
             } else if (this.current === 3) {
-                this.$router.push({ name: 'resourceDetail', query: { id: this.tableData[index].id, type: 2 } });
+                this.$router.push({
+                    name: 'resourceDetail',
+                    query: { id: this.tableData[index].id, type: 'PRODUCT_DEMAND' }
+                });
             } else if (this.current === 4) {
-                this.$router.push({ name: 'resourceFanceDetail', query: { id: this.tableData[index].id, type: 3 } });
+                this.$router.push({
+                    name: 'resourceFanceDetail',
+                    query: { id: this.tableData[index].id, type: 'FINANCING_DEMAND' }
+                });
             } else if (this.current === 5) {
-                this.$router.push({ name: 'resourceRelease', query: { id: this.tableData[index].id, type: 1 } });
+                this.$router.push({
+                    name: 'resourceRelease',
+                    query: { id: this.tableData[index].id, type: 'PRODUCT_SUPPLY' }
+                });
             } else if (this.current === 6) {
-                this.$router.push({ name: 'resourceRelease', query: { id: this.tableData[index].id, type: 2 } });
+                this.$router.push({
+                    name: 'resourceRelease',
+                    query: { id: this.tableData[index].id, type: 'TECH_SUPPLY' }
+                });
             } else if (this.current === 7) {
-                this.$router.push({ name: 'resourceRelease', query: { id: this.tableData[index].id, type: 3 } });
+                this.$router.push({
+                    name: 'resourceRelease',
+                    query: { id: this.tableData[index].id, type: 'RES_SUPPLY' }
+                });
             } else if (this.current === 8) {
+                console.log(this.tableData[index]);
+                this.$router.push({
+                    name: 'interactDetail',
+                    query: { id: this.tableData[index].id, type: 'OFFICIAL' }
+                });
+            } else if (this.current === 9) {
                 // console.log(this.tableData[index]);
-                this.$router.push({ name: 'interactDetail', query: { id: this.tableData[index][0] } });
-            } else if (this.current === 9 || this.current === 10) {
+                this.$router.push({ name: 'interactDetail2', query: { id: this.tableData[index].id, type: 'TOPIC' } });
+            } else if (this.current === 10) {
                 // console.log(this.tableData[index]);
-                this.$router.push({ name: 'interactDetail2', query: { id: this.tableData[index].id } });
+                this.$router.push({ name: 'interactDetail2', query: { id: this.tableData[index].id, type: 'QA' } });
             }
         }
     }
@@ -537,9 +571,14 @@ export default {
                 padding: 5px 3px;
                 margin-right: 6px;
             }
+            .wait {
+                background-color: #ffebe8;
+                color: #ff4a33;
+            }
             span {
                 font-size: 14px;
                 color: #000;
+                font-weight: 500;
             }
         }
         p {