.

src/main/zhi-rong-web/src/components/newsDynamic.vue

@@ -74,7 +74,7 @@ export default {
                 },
                 {
                     name: '发布年份',
-                    key: 'year',
+                    key: 'issuedAt',
                     type: 'date'
                 },
                 {

src/main/zhi-rong-web/src/components/newsDynamics.vue

@@ -72,7 +72,7 @@ export default {
                 },
                 {
                     name: '发布年份',
-                    key: 'year',
+                    key: 'issuedAt',
                     type: 'date'
                 },
                 {

src/main/zhi-rong-web/src/components/newsField.vue

@@ -91,7 +91,7 @@ export default {
                 },
                 {
                     name: '发布年份',
-                    key: 'year',
+                    key: 'issuedAt',
                     type: 'date'
                 },
                 {

src/main/zhi-rong-web/src/views/Home.vue

@@ -262,7 +262,7 @@
                                             class="intellectual_property_one_left_img"
                                             v-if="actives === '专家'"
                                         ></el-image>
-                                        <div>
+                                        <div v-if="actives === '知产'">
                                             <div class="intellectual_property_one_left_name">{{ i.name }}</div>
                                             <div class="intellectual_property_one_left_content">
                                                 <div class="intellectual_property_one_left_content_con">
@@ -279,7 +279,75 @@
                                                 </div>
                                             </div>
                                             <div class="intellectual_property_one_left_own">
-                                                发明人：&nbsp;{{ i.owner }}
+                                                发明人：&nbsp;{{ i.inventor.join(';') }}
+                                            </div>
+                                        </div>
+                                        <div v-if="actives === '技术'">
+                                            <div class="intellectual_property_one_left_name">{{ i.name }}</div>
+                                            <div class="intellectual_property_one_left_content">
+                                                <div class="intellectual_property_one_left_content_con">
+                                                    行业领域：&nbsp;{{ i.fieldName }}
+                                                </div>
+                                                <div class="intellectual_property_one_left_content_con_one">
+                                                    技术所属人：&nbsp;{{ i.owner }}
+                                                </div>
+                                                <div class="intellectual_property_one_left_content_con">
+                                                    申请日：&nbsp;{{ formatTime(i.createdAt, 'YYYY-MM-DD') }}
+                                                </div>
+                                            </div>
+                                            <div class="intellectual_property_one_left_own">
+                                                技术区分：&nbsp;{{ i.settingName }}
+                                            </div>
+                                        </div>
+                                        <div v-if="actives === '产品'">
+                                            <div class="intellectual_property_one_left_name">{{ i.name }}</div>
+                                            <div class="intellectual_property_one_left_content">
+                                                <div class="intellectual_property_one_left_content_con">
+                                                    行业领域：&nbsp;{{ i.fieldName }}
+                                                </div>
+                                                <div class="intellectual_property_one_left_content_con_one">
+                                                    产品所属人：&nbsp;{{ i.owner }}
+                                                </div>
+                                                <div class="intellectual_property_one_left_content_con">
+                                                    申请日：&nbsp;{{ formatTime(i.createdAt, 'YYYY-MM-DD') }}
+                                                </div>
+                                            </div>
+                                            <div class="intellectual_property_one_left_own">
+                                                产品区分：&nbsp;{{ i.settingName }}
+                                            </div>
+                                        </div>
+                                        <div v-if="actives === '企业'">
+                                            <div class="intellectual_property_one_left_name">{{ i.name }}</div>
+                                            <div class="intellectual_property_one_left_content">
+                                                <div class="intellectual_property_one_left_content_con">
+                                                    行业领域：&nbsp;{{ i.fieldName }}
+                                                </div>
+                                                <div class="intellectual_property_one_left_content_con_one">
+                                                    所属地区：&nbsp;{{ i.owner }}
+                                                </div>
+                                                <div class="intellectual_property_one_left_content_con">
+                                                    申请日：&nbsp;{{ formatTime(i.createdAt, 'YYYY-MM-DD') }}
+                                                </div>
+                                            </div>
+                                            <div class="intellectual_property_one_left_own">
+                                                企业性质：&nbsp;{{ i.settingName }}
+                                            </div>
+                                        </div>
+                                        <div v-if="actives === '专家'">
+                                            <div class="intellectual_property_one_left_name">{{ i.name }}</div>
+                                            <div class="intellectual_property_one_left_content">
+                                                <div class="go">
+                                                    擅长领域：
+                                                    <span
+                                                        v-for="(item, index) in i.fieldName"
+                                                        :key="index"
+                                                        class="go_field"
+                                                        >{{ item }}</span
+                                                    >
+                                                </div>
+                                            </div>
+                                            <div class="intellectual_property_one_left_own">
+                                                申请日：&nbsp;{{ formatTime(i.createdAt, 'YYYY-MM-DD') }}
                                             </div>
                                         </div>
                                     </div>
@@ -1250,6 +1318,38 @@ export default {
                     white-space: nowrap;
                     text-overflow: ellipsis;
                 }
+                .intellectual_property_one_left_content_con_one {
+                    width: 450px;
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                    margin-right: 60px;
+                }
+                .go {
+                    // text-align: center;
+                    font-size: 13px;
+                    color: #878d99;
+                    line-height: 22px;
+                    display: flex;
+                    flex-wrap: wrap;
+                    // height: 64px;
+                    overflow-y: auto;
+                    .go_field {
+                        height: 22px;
+                        background: rgba(64, 92, 255, 0.08);
+                        border-radius: 1px;
+                        padding: 0px 6px;
+                        box-sizing: border-box;
+                        color: #405cff;
+                        line-height: 22px;
+                        margin-right: 10px;
+                        margin-bottom: 10px;
+                    }
+                    // margin-top: 6px;
+                    // height: 48px;
+                    // .ellipsis();
+                    // max-width: 100%;
+                }
             }
             .intellectual_property_one_left_own {
                 font-size: 13px;
@@ -1707,3 +1807,4 @@ export default {
     padding: 50px 0 50px;
 }
 </style>
+

src/main/zhi-rong-web/src/views/market/Index.vue

@@ -74,7 +74,7 @@ export default {
 
 <style lang="less" scoped>
 .container {
-    background-color: @bg;
+    background: #FFFFFF;
 }
 .center-content {
     width: 100%;