xuesinan
/
ts-program
forked from TALL/check-work
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of dd.tall.wiki:binbin0314/green.v0.3

master
lucky 5 years ago
parent
647328348e 64bcbf36b5
commit
41e07912e6
3 changed files with 130 additions and 102 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/About/Children/Organ.vue
  2. 92
      src/views/NewPlatform/Children/AchDet.vue
  3. 138
      src/views/NewPlatform/Children/ShareChild/InsDet.vue

2
src/views/About/Children/Organ.vue
View File

@ -103,7 +103,7 @@ export default {
align: 'left',
},
},
expandAndCollapse: true,
expandAndCollapse: false,
animationDuration: 550,
animationDurationUpdate: 750,
},

92
src/views/NewPlatform/Children/AchDet.vue
View File

@ -1,45 +1,50 @@
<template>
<div class="inner equ-box">
<div class="equ-info d-flex">
<img :src="obj.visitLocation" />
<div class="equ-info-box mb-5">
<p class="equ-name">{{ obj.name }}</p>
<div class="d-flex flex-wrap">
<div class="equ-info-left" style="width: 200px">
<p>成果名字：</p>
<p>专利类型：</p>
<p>专利号：</p>
<p>联系人：</p>
<p>联系方式：</p>
<div>
<div class="inner" style="margin-top: 40px">
<bread-crumb :arr="arr" />
</div>
<div class="inner equ-box">
<div class="equ-info d-flex">
<img :src="obj.visitLocation" />
<div class="equ-info-box mb-5">
<p class="equ-name">{{ obj.name }}</p>
<div class="d-flex flex-wrap">
<div class="equ-info-left" style="width: 200px">
<p>成果名字：</p>
<p>专利类型：</p>
<p>专利号：</p>
<p>联系人：</p>
<p>联系方式：</p>
</div>
<div style="width: 500px">
<p>{{ obj.registerName }}</p>
<p>{{ obj.style }}</p>
<p>{{ obj.registerNum }}</p>
<p>
<span :key="index" v-for="(item, index) in obj.selPeoList">
{{ item.contactsName }}
<span v-if="index < obj.selPeoList.length - 1">,</span>
</span>
</p>
<p>
<span :key="index" v-for="(item, index) in obj.selPeoList">
{{ item.contactsPhone }}
<span v-if="index < obj.selPeoList.length - 1">,</span>
</span>
</p>
</div>
</div>
<div style="width: 500px">
<p>{{ obj.registerName }}</p>
<p>{{ obj.style }}</p>
<p>{{ obj.registerNum }}</p>
<p>
<span :key="index" v-for="(item, index) in obj.selPeoList">
{{ item.contactsName }}
<span v-if="index < obj.selPeoList.length - 1">,</span>
</span>
</p>
<p>
<span :key="index" v-for="(item, index) in obj.selPeoList">
{{ item.contactsPhone }}
<span v-if="index < obj.selPeoList.length - 1">,</span>
</span>
</p>
<div class="equ-btn">
<!-- <a-button style="margin-right: 20px">转化意向</a-button> -->
<intention-model :type-data="typeData" style="margin-right: 20px; float: left" />
<!-- <a-button type="primary">加入购物车</a-button> -->
<add-shopping :type-data="typeData" style="margin-right: 20px; float: right" />
</div>
</div>
<div class="equ-btn">
<!-- <a-button style="margin-right: 20px">转化意向</a-button> -->
<intention-model :type-data="typeData" style="margin-right: 20px; float: left" />
<!-- <a-button type="primary">加入购物车</a-button> -->
<add-shopping :type-data="typeData" style="margin-right: 20px; float: right" />
</div>
</div>
</div>
<div class="content-box">
<div v-dompurify-html="obj.content"></div>
<div class="content-box">
<div v-dompurify-html="obj.content"></div>
</div>
</div>
</div>
</template>
@ -49,11 +54,20 @@ import { mapState } from 'vuex';
import { selResMes } from 'config/api';
import IntentionModel from 'components/Introduce/IntentionModel.vue';
import AddShopping from 'components/Introduce/AddShopping.vue';
import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
export default {
name: 'AchDet',
components: { IntentionModel, AddShopping },
components: { IntentionModel, AddShopping, BreadCrumb },
data() {
return {
typeOfPlatform: '成果详情',
arr: [
{ name: '创新平台', url: '/NewPlatform/NewCore' },
{ name: '创新资源平台', url: '/NewPlatform/News' },
{ name: '知识产权与技术转移转化服务平台', url: '/NewPlatform/Transfer' },
{ name: '成果详情', url: '' },
],
obj: {},
typeData: {
type: 2,
@ -88,7 +102,7 @@ export default {
.equ-box {
background: #fff;
padding: 20px;
margin: 60px auto;
margin: 30px auto;
}
.equ-info {

138
src/views/NewPlatform/Children/ShareChild/InsDet.vue
View File

@ -1,68 +1,73 @@
<template>
<div class="inner equ-box">
<div class="equ-info d-flex">
<img :src="obj.visitLocation" />
<!-- <img :src="obj.visitLocation" alt v-if="listState === 3" /> -->
<div class="equ-info-box">
<p class="equ-name">{{ obj.name }}</p>
<div style="margin-top: 20px" class="d-flex flex-wrap" v-if="listState === 1">
<div class="equ-info-left" style="width: 200px">
<p>仪器名字：</p>
<p>制造商：</p>
<p>型号：</p>
<p>规格：</p>
<p>性能指标：</p>
<p>联系人：</p>
<p>联系方式：</p>
</div>
<div style="width: 500px">
<p>{{ obj.name }}</p>
<p>{{ obj.manufactor }}</p>
<p>{{ obj.model }}</p>
<p>{{ obj.specifications }}</p>
<p>{{ obj.performance }}</p>
<p>
<span :key="index" v-for="(item, index) in obj.selPeoList">
{{ item.contactsName }}
<span v-if="index !== obj.selPeoList.length - 1">、</span>
</span>
</p>
<p>
<span :key="index" v-for="(item, index) in obj.selPeoList">
{{ item.contactsPhone }}
<span v-if="index !== obj.selPeoList.length - 1">、</span>
</span>
</p>
</div>
</div>
<div style="margin-top: 20px" class="d-flex flex-wrap" v-if="listState === 3">
<div class="equ-info-left" style="width: 200px">
<p>公司名称：</p>
<p>产品编号：</p>
<p>联系人：</p>
<div>
<div class="inner" style="margin-top: 40px">
<bread-crumb :arr="arr" />
</div>
<div class="inner equ-box">
<div class="equ-info d-flex">
<img :src="obj.visitLocation" />
<!-- <img :src="obj.visitLocation" alt v-if="listState === 3" /> -->
<div class="equ-info-box">
<p class="equ-name">{{ obj.name }}</p>
<div style="margin-top: 20px" class="d-flex flex-wrap" v-if="listState === 1">
<div class="equ-info-left" style="width: 200px">
<!-- <p>仪器名字：</p> -->
<p>制造商：</p>
<p>型号：</p>
<p>规格：</p>
<p>性能指标：</p>
<p>联系人：</p>
<p>联系方式：</p>
</div>
<div>
<!-- <p>{{ obj.name }}</p> -->
<p>{{ obj.manufactor }}</p>
<p>{{ obj.model }}</p>
<p>{{ obj.specifications }}</p>
<p>{{ obj.performance }}</p>
<p>
<span :key="index" v-for="(item, index) in obj.selPeoList">
{{ item.contactsName }}
<span v-if="index !== obj.selPeoList.length - 1">、</span>
</span>
</p>
<p>
<span :key="index" v-for="(item, index) in obj.selPeoList">
{{ item.contactsPhone }}
<span v-if="index !== obj.selPeoList.length - 1">、</span>
</span>
</p>
</div>
</div>
<div style="width: 500px">
<p>{{ obj.companyname }}</p>
<p>{{ obj.identifier }}</p>
<p>
<span :key="index" v-for="(item, index) in obj.selPeoList">
{{ item.contactsName }}
<span v-if="index !== obj.selPeoList.length - 1">、</span>
</span>
</p>
<div style="margin-top: 20px" class="d-flex flex-wrap" v-if="listState === 3">
<div class="equ-info-left" style="width: 200px">
<p>公司名称：</p>
<p>产品编号：</p>
<p>联系人：</p>
</div>
<div style="width: 500px">
<p>{{ obj.companyname }}</p>
<p>{{ obj.identifier }}</p>
<p>
<span :key="index" v-for="(item, index) in obj.selPeoList">
{{ item.contactsName }}
<span v-if="index !== obj.selPeoList.length - 1">、</span>
</span>
</p>
</div>
</div>
<p class="equ-btn">
<intention-model :type-data="listState === 1 ? typeData : typeProductData" style="margin-right: 20px; float: left" />
<!-- <a-button style="margin-right: 20px">转化意向</a-button> -->
<!-- <a-button type="primary">加入购物车</a-button> -->
<add-shopping :type-data="typeData" style="margin-right: 20px; float: right" />
</p>
</div>
<p class="equ-btn">
<intention-model :type-data="listState === 1 ? typeData : typeProductData" style="margin-right: 20px; float: left" />
<!-- <a-button style="margin-right: 20px">转化意向</a-button> -->
<!-- <a-button type="primary">加入购物车</a-button> -->
<add-shopping :type-data="typeData" style="margin-right: 20px; float: right" />
</p>
</div>
</div>
<div class="content-box">
<div v-dompurify-html="obj.purpose" v-if="listState === 1"></div>
<div v-dompurify-html="obj.details" v-if="listState === 3"></div>
<div class="content-box">
<div v-dompurify-html="obj.purpose" v-if="listState === 1"></div>
<div v-dompurify-html="obj.details" v-if="listState === 3"></div>
</div>
</div>
</div>
</template>
@ -72,11 +77,20 @@ import { mapState } from 'vuex';
import { selInstrumentMes, selProductMes } from 'config/api';
import IntentionModel from 'components/Introduce/IntentionModel.vue';
import AddShopping from 'components/Introduce/AddShopping.vue';
import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
export default {
name: 'InsDet',
components: { IntentionModel, AddShopping },
components: { IntentionModel, AddShopping, BreadCrumb },
data() {
return {
typeOfPlatform: '设备详情',
arr: [
{ name: '创新平台', url: '/NewPlatform/NewCore' },
{ name: '创新资源平台', url: '/NewPlatform/News' },
{ name: '科技资源开放共享服务平台', url: '/NewPlatform/Share' },
{ name: '设备详情', url: '' },
],
obj: {},
typeData: {
type: 1,
@ -137,7 +151,7 @@ export default {
.equ-box {
background: #fff;
padding: 20px;
margin: 60px auto;
margin: 30px auto;
}
.equ-info {

Write Preview
Loading…
Cancel
Save