ccsens_fe
/
check-work
forked from TALL/check-work
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

细节修改

master
aBin 5 years ago
parent
394e924385 90f194d377
commit
027da5937f
8 changed files with 185 additions and 27 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/components/Index/IndexNewList.vue
  2. 6
      src/router/index.js
  3. 24
      src/views/Activity/ActDetails.vue
  4. 24
      src/views/IncubationPlatform/Children/place/EntitySpace.vue
  5. 133
      src/views/ItInformation/ItDetails.vue
  6. 2
      src/views/ItInformation/ItInformation.vue
  7. 17
      src/views/NewPlatform/components/NewModel.vue
  8. 4
      src/views/Policy/components/PolicyList.vue

2
src/components/Index/IndexNewList.vue
View File

@ -80,7 +80,7 @@ export default {
// 跳转到详情界面
jumpDetails(item) {
this.setActDetail(item);
this.$router.push('/ActDetails');
this.$router.push('/ItDetails');
},
},
};

6
src/router/index.js
View File

@ -93,6 +93,12 @@ const routes = [
name: 'ItInformation',
component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/ItInformation/ItInformation.vue'),
},
// 行业资讯详情界面
{
path: '/ItDetails',
name: 'ItDetails',
component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/ItInformation/ItDetails.vue'),
},
// 活动公告界面
{
path: '/Activity',

24
src/views/Activity/ActDetails.vue
View File

@ -15,7 +15,10 @@
</span>
</div>
<div class="policy-content" v-dompurify-html="actDetail.content"></div>
<enroll :act-name="actDetail.title" :activity-id="actDetail.activityId" style="margin: 50px 25px" />
<a-button disabled style="margin: 50px 25px" v-if="actDetail.releaseTime && Date.parse(actDetail.releaseTime) < Date.parse(nowData)">
报名已结束
</a-button>
<enroll :act-name="actDetail.title" :activity-id="actDetail.activityId" style="margin: 50px 25px" v-else />
</div>
</div>
</template>
@ -27,11 +30,26 @@ export default {
name: 'ActDetails',
components: { Enroll },
data() {
return {};
return { nowData: '' };
},
computed: mapState('home', ['actDetail']),
created() {
console.log(this.actDetail);
// 获取当前时间
var aData = new Date();
console.log(aData); //Wed Aug 21 2019 10:00:58 GMT+0800 (中国标准时间)
this.nowData =
aData.getFullYear() +
'-' +
(aData.getMonth() + 1) +
'-' +
aData.getDate() +
' ' +
aData.getHours() +
':' +
aData.getMinutes() +
':' +
aData.getSeconds();
console.log(this.nowData); //2019-8-20
},
methods: {},
};

24
src/views/IncubationPlatform/Children/place/EntitySpace.vue
View File

@ -6,9 +6,9 @@
</div>
<div class="top-box">
<banner :show-page="49" />
<add-model :value="2" class="add-mol" style="height: 32px" />
<!-- <settled-model :type-num="1" class="set-mol" /> -->
<a-button type="primary" class="set-mol">统计信息填报</a-button>
<!-- <add-model :value="2" class="add-mol" style="height: 32px" /> -->
<settled-model :type-num="1" class="set-mol" />
<a-button class="set-mol" type="primary">统计信息填报</a-button>
<!-- <div class="top-title">实体众创空间</div>
<div class="top-content">
@ -47,7 +47,9 @@
食品检测、食用菌、肠道微生物等方面的科学实验、检验检测、小试中试等技术服务与科研成果转化。
</div>
<div class="center-img">
<img src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210120/eb472126971a47438a3227df967ed2cb.png" />
<img
src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210120/eb472126971a47438a3227df967ed2cb.png"
/>
</div>
</div>
<!-- 中试基地 -->
@ -58,16 +60,16 @@
</div>
<div class="center-content d-flex flex-column">
<div>发酵工程中试基地位于山西维尔乳制品有限公司，基地具有发酵乳制品等生产加工条件，可提供微生物发酵实验及相关中试。</div>
<div>
超高压食品加工中试基地位于太原市小店区正阳街43号的山西力德福科技有限公司。基地具有非热杀菌保鲜生产线、超高压设备制造生产线及中试车间，可提供超高压加工实验及相关中试和产业化服务。
</div>
<div>超高压食品加工中试基地位于太原市小店区正阳街43号的山西力德福科技有限公司。基地具有非热杀菌保鲜生产线、超高压设备制造生产线及中试车间，可提供超高压加工实验及相关中试和产业化服务。</div>
<div>
干果精深加工中试基地位于吕梁的交城天娇红农业科技有限公司
，拥有300余万元的先进分析检测仪器设备及免洗干枣生产车间、浓缩枣汁生产车间等生产加工条件，可提供相关中试研究。
</div>
</div>
<div class="center-img">
<img src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210120/d80b7f22aabc4c7194324b0f93793a41.png" />
<img
src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210120/d80b7f22aabc4c7194324b0f93793a41.png"
/>
</div>
</div>
<!-- 加入流程 -->
@ -118,15 +120,15 @@
<script>
import HNav from '../../components/HNav.vue';
import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
import AddModel from './../../components/AddModel.vue';
// import SettledModel from 'components/Introduce/SettledModel.vue';
// import AddModel from './../../components/AddModel.vue';
import SettledModel from 'components/Introduce/SettledModel.vue';
import Banner from 'components/Banner/Banner.vue';
import SettledEnterprise from 'components/SettledEnterprise/SettledEnterprise.vue';
import { searchEnt } from 'config/api';
export default {
name: 'EntitySpace',
components: { HNav, BreadCrumb, AddModel, Banner, SettledEnterprise },
components: { HNav, BreadCrumb, SettledModel, Banner, SettledEnterprise },
data() {
return {
title: '实体众创空间',

133
src/views/ItInformation/ItDetails.vue
View File

@ -0,0 +1,133 @@
<template>
<div class="box">
<div>
<div class="policy-title">
<span>{{ actDetail.title }}</span>
</div>
<div class="policy-info">
<span>
<a-icon
class="baseColor"
style="font-size: 14px; margin-right: 10px"
type="clock-circle"
/>
<span>{{ $moment(+actDetail.time * 1000).format('YYYY-MM-DD HH:mm:ss') }}</span>
</span>
<span style="margin-left: 60px">
<a-icon class="baseColor" style="margin-right: 10px" type="environment" />
<span>{{ actDetail.site }}</span>
</span>
</div>
<div class="policy-content" v-dompurify-html="actDetail.content"></div>
</div>
</div>
</template>
<script>
import { mapState } from 'vuex';
export default {
name: 'ItDetails',
data() {
return { nowData: '' };
},
computed: mapState('home', ['actDetail']),
created() {
// 获取当前时间
var aData = new Date();
console.log(aData); //Wed Aug 21 2019 10:00:58 GMT+0800 (中国标准时间)
this.nowData =
aData.getFullYear() +
'-' +
(aData.getMonth() + 1) +
'-' +
aData.getDate() +
' ' +
aData.getHours() +
':' +
aData.getMinutes() +
':' +
aData.getSeconds();
console.log(this.nowData); //2019-8-20
},
methods: {},
};
</script>
<style lang="stylus" scoped>
.box {
width: 1260px;
position: relative;
margin: 80px auto;
background: #fff;
min-height: 1037px;
overflow: hidden;
opacity: 1;
padding-bottom: 480px;
}
.back-btn {
width: 80px;
position: absolute;
right: 0;
}
.policy-title {
height: 120px;
font-size: 24px;
font-family: Microsoft YaHei;
font-weight: 400;
color: rgba(0, 0, 0, 0.85);
opacity: 1;
text-align: center;
display: flex;
align-items: center;
justify-content: center;
padding: 0 150px;
border-bottom: 1px solid #707070;
}
.policy-info {
height: 76px;
line-height: 76px;
text-align: center;
}
.policy-content {
padding: 0 25px;
font-size: 16px;
color: rgba(0, 0, 0, 0.65);
font-weight: 400;
font-family: Microsoft YaHei;
}
.coms-style {
height: 480px;
padding: 25px 0;
border-top: 2px solid #ccc;
position: absolute;
bottom: 0;
width: 100%;
}
.coms-top {
height: 280px;
padding: 0 25px;
overflow: auto;
box-shadow: 0 0 5px #ccc;
}
.coms-btm {
margin-top: 20px;
padding: 0 10px;
}
.coms-content {
background: rgba(19, 172, 196, 0.1);
}
.sub {
position: absolute;
right: 20px;
bottom: 20px;
}
</style>

2
src/views/ItInformation/ItInformation.vue
View File

@ -86,7 +86,7 @@ export default {
// 跳转到详情界面
jumpDetails(item) {
this.setActDetail(item);
this.$router.push('/ActDetails');
this.$router.push('/ItDetails');
},
},
};

17
src/views/NewPlatform/components/NewModel.vue
View File

@ -25,12 +25,16 @@
<a-input placeholder="请输入单位性质..." v-model.trim="platform.companyType " />
</a-form-item>
<a-form-item
:label-col="formItemLayoutA.labelCol"
:wrapper-col="formItemLayoutA.wrapperCol"
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
class="fill-width"
label="社会信用代码或组织机构代码"
>
<a-input class="flex-1" placeholder="请输入社会信用代码或组织机构代码..." v-model.trim="platform.code " />
<span class="title-color" style="margin-left:5%;">社会信用代码或组织机构代码：</span>
<a-input
placeholder="请输入社会信用代码或组织机构代码..."
style="margin-left:27.5%;"
v-model.trim="platform.code "
/>
</a-form-item>
<a-form-item
:label-col="formItemLayout.labelCol"
@ -155,10 +159,6 @@
import { mapState, mapActions } from 'vuex';
import { CreatingPlatformAdd, upload } from 'config/api';
const formItemLayoutA = {
labelCol: { span: 8 },
wrapperCol: { span: 15 },
};
const formItemLayout = {
labelCol: { span: 5 },
wrapperCol: { span: 18 },
@ -177,7 +177,6 @@ export default {
title: '协同创新中心加入申请',
str: '申请加入',
formItemLayout,
formItemLayoutA,
formTailLayout,
confirmLoading: false,
platform: {

4
src/views/Policy/components/PolicyList.vue
View File

@ -39,8 +39,8 @@
<p class="date-mon">{{ monthEnglish[item.publishTime.split('-')[1] - 1] }}.</p>
<p class="date-day">{{ item.publishTime.split('-')[2] }}</p>
</div>
<p class="item-title">{{ item.title }}</p>
<p class="item-content">{{ item.intro }}</p>
<p @click="LookSource(item.id)" class="item-title pointer">{{ item.title }}</p>
<p @click="LookSource(item.id)" class="item-content pointer">{{ item.intro }}</p>
<!-- <p class="item-content" v-html="item.content"></p> -->
<p class="source-time">
<span

Write Preview
Loading…
Cancel
Save