diff --git a/src/api/demand.js b/src/api/demand.js
index 60e07be..30bb5ef 100644
--- a/src/api/demand.js
+++ b/src/api/demand.js
@@ -1,9 +1,16 @@
+/*
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-01-27 15:54:17
+ * @LastEditors: wally
+ * @LastEditTime: 2021-02-02 09:24:21
+ */
import request from '@/utils/request'
const demand = 'enterprise/demand'
const demandPublish = 'enterprise/demandPublish'
export function demandQuery(data) {
return request({
- url: `/gateway${demand}/demandQuery`,
+ url: `/gateway/${demand}/demandQuery`,
method: 'post',
data: {
param: {
@@ -16,7 +23,7 @@ export function demandQuery(data) {
export function updateDemandStatus(data) {
return request({
- url: `/gateway${demand}/updateDemandStatus`,
+ url: `/gateway/${demand}/updateDemandStatus`,
method: 'post',
data: {
param: {
@@ -26,17 +33,17 @@ export function updateDemandStatus(data) {
}
})
}
-
+
export function demandPublishAdd(data) {
return request({
- url: `/gateway${demandPublish}/demandPublishAdd`,
+ url: `/gateway/${demandPublish}/demandPublishAdd`,
method: 'post',
data: {
-
+
content: data.content,
demandId: data.id,
type: data.type
-
+
}
})
- }
\ No newline at end of file
+ }
diff --git a/src/api/policy.js b/src/api/policy.js
index 4c871df..b6483ab 100644
--- a/src/api/policy.js
+++ b/src/api/policy.js
@@ -7,6 +7,7 @@ export function PolicyDetail(data) {
method: 'post',
data: {
param: {
+ title: data.title,
auditStatus: data.auditStatus,
pageNum: data.pageNum,
pageSize: data.pageSize,
@@ -25,6 +26,7 @@ export function PolicyUpdate(data) {
auditStatus: data.auditStatus,
content: data.content,
id: data.id,
+ labels: data.projectLabels ? data.projectLabels : null,
imgUrl: data.imgUrl,
intro: data.intro,
title: data.title,
diff --git a/src/router/index.js b/src/router/index.js
index 3a9714a..3fdbe88 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -115,75 +115,75 @@ export const constantRoutes = [
]
},
- {
- path: '/nested',
- component: Layout,
- redirect: '/nested/menu1',
- name: 'Nested',
- meta: {
- title: 'Nested',
- icon: 'nested'
- },
- children: [
- {
- path: 'menu1',
- component: () => import('@/views/nested/menu1/index'), // Parent router-view
- name: 'Menu1',
- meta: { title: 'Menu1' },
- children: [
- {
- path: 'menu1-1',
- component: () => import('@/views/nested/menu1/menu1-1'),
- name: 'Menu1-1',
- meta: { title: 'Menu1-1' }
- },
- {
- path: 'menu1-2',
- component: () => import('@/views/nested/menu1/menu1-2'),
- name: 'Menu1-2',
- meta: { title: 'Menu1-2' },
- children: [
- {
- path: 'menu1-2-1',
- component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'),
- name: 'Menu1-2-1',
- meta: { title: 'Menu1-2-1' }
- },
- {
- path: 'menu1-2-2',
- component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'),
- name: 'Menu1-2-2',
- meta: { title: 'Menu1-2-2' }
- }
- ]
- },
- {
- path: 'menu1-3',
- component: () => import('@/views/nested/menu1/menu1-3'),
- name: 'Menu1-3',
- meta: { title: 'Menu1-3' }
- }
- ]
- },
- {
- path: 'menu2',
- component: () => import('@/views/nested/menu2/index'),
- name: 'Menu2',
- meta: { title: 'menu2' }
- }
- ]
- },
+ // {
+ // path: '/nested',
+ // component: Layout,
+ // redirect: '/nested/menu1',
+ // name: 'Nested',
+ // meta: {
+ // title: 'Nested',
+ // icon: 'nested'
+ // },
+ // children: [
+ // {
+ // path: 'menu1',
+ // component: () => import('@/views/nested/menu1/index'), // Parent router-view
+ // name: 'Menu1',
+ // meta: { title: 'Menu1' },
+ // children: [
+ // {
+ // path: 'menu1-1',
+ // component: () => import('@/views/nested/menu1/menu1-1'),
+ // name: 'Menu1-1',
+ // meta: { title: 'Menu1-1' }
+ // },
+ // {
+ // path: 'menu1-2',
+ // component: () => import('@/views/nested/menu1/menu1-2'),
+ // name: 'Menu1-2',
+ // meta: { title: 'Menu1-2' },
+ // children: [
+ // {
+ // path: 'menu1-2-1',
+ // component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'),
+ // name: 'Menu1-2-1',
+ // meta: { title: 'Menu1-2-1' }
+ // },
+ // {
+ // path: 'menu1-2-2',
+ // component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'),
+ // name: 'Menu1-2-2',
+ // meta: { title: 'Menu1-2-2' }
+ // }
+ // ]
+ // },
+ // {
+ // path: 'menu1-3',
+ // component: () => import('@/views/nested/menu1/menu1-3'),
+ // name: 'Menu1-3',
+ // meta: { title: 'Menu1-3' }
+ // }
+ // ]
+ // },
+ // {
+ // path: 'menu2',
+ // component: () => import('@/views/nested/menu2/index'),
+ // name: 'Menu2',
+ // meta: { title: 'menu2' }
+ // }
+ // ]
+ // },
- {
- path: 'external-link',
- component: Layout,
- children: [
- {
- path: 'https://panjiachen.github.io/vue-element-admin-site/#/',
- meta: { title: 'External Link', icon: 'link' }
- }
- ]
- },
+ // {
+ // path: 'external-link',
+ // component: Layout,
+ // children: [
+ // {
+ // path: 'https://panjiachen.github.io/vue-element-admin-site/#/',
+ // meta: { title: 'External Link', icon: 'link' }
+ // }
+ // ]
+ // },
// 404 page must be placed at the end !!!
{ path: '*', redirect: '/404', hidden: true }
diff --git a/src/views/enterprise/demand.vue b/src/views/enterprise/demand.vue
index 76d9f26..413d892 100644
--- a/src/views/enterprise/demand.vue
+++ b/src/views/enterprise/demand.vue
@@ -1,18 +1,35 @@
-
-
-
+
+
+
{{ row.contactPhone }}
-
-
+
+
{{ row.contacts }}
-
+
{{ row.content }}
@@ -21,9 +38,16 @@
{{ row.createdAt }}
-->
-
-
- {{ row.dealStatus }}
+
+
+ 待处理
+ 已完成
+ 已发榜
-
+
{{ row.name }}
-
- {{ row.type }}
+
+ 技术转移转化
+ 工业设计咨询
+ 科技金融建设
+ 政策项目咨询
+ 知识产权咨询
+ 创新体系建设
+ 创新创业咨询
+ 信息技术服务
+ 协同创新服务
-
-
- 修改处理状态
- 发榜
+
+
+ 修改处理状态
+ 发榜
-
+
@@ -63,7 +110,7 @@
@@ -72,15 +119,17 @@
-
+
-
diff --git a/src/views/enterprise/enterprise.vue b/src/views/enterprise/enterprise.vue
index f0922ad..80439c6 100644
--- a/src/views/enterprise/enterprise.vue
+++ b/src/views/enterprise/enterprise.vue
@@ -1,46 +1,66 @@
-
+
-
+
搜索
-
+
-
+
{{ row.id }}
-
+
{{ row.name }}
-
+
{{ row.incubator }}
-
+
{{ row.contacts }}
-
+
{{ row.contactPhone }}
-
+
{{ row.theTaxNo }}
@@ -52,28 +72,51 @@
-->
-
+
{{ row.name }}
-
+
{{ row.incubator }}
-
-
- 企业测评详情
- 企业详细信息
- 企业标签
+
+
+ 企业测评详情
+ 企业详细信息
+ 企业标签
-
+
-
+
{{ row.category }}
-
-
+
-
{{ detaillist.id }}
+
{{ detaillist.id }}
-
-
{{ detaillist.name }}
+
+
{{ detaillist.name }}
-
-
{{ detaillist.dishonestEnterprise }}
+
+
{{
+ detaillist.dishonestEnterprise
+ }}
-
-
{{ detaillist.forbidProduct }}
+
+
{{
+ detaillist.forbidProduct
+ }}
-
-
{{ detaillist.grossSalesOne }}
+
+
{{
+ detaillist.grossSalesOne
+ }}
-
-
{{ detaillist.grossSalesThree }}
+
+
{{
+ detaillist.grossSalesThree
+ }}
-
-
{{ detaillist.grossSalesTwo }}
+
+
{{
+ detaillist.grossSalesTwo
+ }}
-
-
{{ detaillist.highNewTechnologyEnterprise }}
+
+
{{
+ detaillist.highNewTechnologyEnterprise
+ }}
-
-
{{ detaillist.highNewTechnologyFee }}
+
+
{{
+ detaillist.highNewTechnologyFee
+ }}
-
-
{{ detaillist.illegalAct }}
+
+
{{
+ detaillist.illegalAct
+ }}
-
-
{{ detaillist.intellectualPropertyRightI }}
+
+
{{
+ detaillist.intellectualPropertyRightI
+ }}
-
-
{{ detaillist.intellectualPropertyRightII }}
+
+
{{
+ detaillist.intellectualPropertyRightII
+ }}
-
-
{{ detaillist.mainProductTechnology }}
+
+
{{
+ detaillist.mainProductTechnology
+ }}
-
-
{{ detaillist.organization }}
+
+
{{
+ detaillist.organization
+ }}
-
-
{{ detaillist.rdexpensesOne }}
+
+
{{
+ detaillist.rdexpensesOne
+ }}
-
-
{{ detaillist.rdexpensesThree }}
+
+
{{
+ detaillist.rdexpensesThree
+ }}
-
-
{{ detaillist.rdexpensesTwo }}
+
+
{{
+ detaillist.rdexpensesTwo
+ }}
-
-
{{ detaillist.standard }}
+
+
{{
+ detaillist.standard
+ }}
-
-
{{ detaillist.technicians }}
+
+
{{
+ detaillist.technicians
+ }}
-
-
{{ detaillist.technologyAwards }}
+
+
{{
+ detaillist.technologyAwards
+ }}
-
-
{{ detaillist.totalAssets }}
+
+
{{
+ detaillist.totalAssets
+ }}
-
-
{{ detaillist.totalCostExpensesOne }}
+
+
{{
+ detaillist.totalCostExpensesOne
+ }}
-
-
{{ detaillist.totalCostExpensesThree }}
+
+
{{
+ detaillist.totalCostExpensesThree
+ }}
-
-
{{ detaillist.totalCostExpensesTwo }}
+
+
{{
+ detaillist.totalCostExpensesTwo
+ }}
-
-
{{ detaillist.workforce }}
+
+
{{
+ detaillist.workforce
+ }}
-
-
-
+
- {{ enterpriseScore.id }}
+ {{ enterpriseScore.id }}
- {{ enterpriseScore.createdAt }}
+ {{
+ enterpriseScore.createdAt
+ }}
- 通过
- 未通过
+ 通过
+ 未通过
- {{ enterpriseScore.reason }}
+ {{ enterpriseScore.reason }}
- 科小
- 高企
+ 科小
+ 高企
-
+
@@ -315,7 +555,7 @@ export default {
async getList() {
const that = this
that.listLoading = true
- await api.enterpriseQueryAll(that.data).then((res) => {
+ await api.enterpriseQueryAll(that.data).then(res => {
that.enterpriselist = res.list
that.total = res.total - 0
setTimeout(() => {
@@ -342,7 +582,7 @@ export default {
that.detaillist[key] = ''
}
that.listLoading = true
- await api.enterpriseAdditionalQueryById(id).then((res) => {
+ await api.enterpriseAdditionalQueryById(id).then(res => {
if (res) {
that.detaillist = res
}
@@ -357,7 +597,7 @@ export default {
const that = this
that.listLoading = true
- await api.enterpriseCategoryQueryAll(id).then((res) => {
+ await api.enterpriseCategoryQueryAll(id).then(res => {
that.categoryList = res.list
that.dialogFormVisible3 = true
that.listLoading = false
@@ -366,7 +606,7 @@ export default {
async scoreDetail(id) {
const that = this
that.listLoading = true
- await api.enterpriseScoreQueryById(id).then((res) => {
+ await api.enterpriseScoreQueryById(id).then(res => {
that.enterpriseScore = res
setTimeout(() => {
that.listLoading = false
@@ -379,6 +619,4 @@ export default {
-
diff --git a/src/views/firstPages/notice.vue b/src/views/firstPages/notice.vue
index db27763..f39a30f 100644
--- a/src/views/firstPages/notice.vue
+++ b/src/views/firstPages/notice.vue
@@ -2,42 +2,80 @@
-
-
+
+
-
+
搜索
-
+
添加
-
-
+
-
+
{{ row.id }}
-
-
+
+
{{ row.createdAt }}
-
+
{{ row.content }}
-
+
{{ incubator[row.type] }}
-
-
+
+
修改
@@ -51,68 +89,105 @@
-
+
-
-
+
-
-
+
+
-
-
+
-
+
{{ row.enterpriseName }}
-
+
{{ row.contacts }}
-
+
{{ row.contactPhone }}
-
+
{{ row.remark }}
-
+
-
-
+
-
+
@@ -120,19 +195,24 @@
-
-
+
+
-
@@ -159,8 +239,18 @@ export default {
type: ''
},
polictList: [],
- typeList: { '线上': 0, '线下': 1 },
- incubator: ['技术转移转化', '工业设计咨询', '科技金融建设', '政策项目咨询', '知识产权咨询', '创新体系建设', '创新创业咨询', '信息技术服务', '协同创新服务'],
+ typeList: { 线上: 0, 线下: 1 },
+ incubator: [
+ '技术转移转化',
+ '工业设计咨询',
+ '科技金融建设',
+ '政策项目咨询',
+ '知识产权咨询',
+ '创新体系建设',
+ '创新创业咨询',
+ '信息技术服务',
+ '协同创新服务'
+ ],
policyType: undefined,
policyType1: undefined,
policyType2: undefined,
@@ -186,9 +276,7 @@ export default {
}
},
computed: {
- ...mapGetters([
- 'name'
- ])
+ ...mapGetters(['name'])
},
async created() {
this.getList()
@@ -203,7 +291,7 @@ export default {
that.data.type = i
}
}
- await api.QueryDemandPublish(that.data).then((res) => {
+ await api.QueryDemandPublish(that.data).then(res => {
that.polictList = res.list
that.total = res.total - 0
that.listLoading = false
@@ -211,7 +299,7 @@ export default {
return
} else {
that.data.type = ''
- await api.QueryDemandPublish(that.data).then((res) => {
+ await api.QueryDemandPublish(that.data).then(res => {
that.polictList = res.list
that.total = res.total - 0
that.listLoading = false
@@ -222,7 +310,7 @@ export default {
async getList() {
const that = this
that.listLoading = true
- await api.QueryDemandPublish(that.data).then((res) => {
+ await api.QueryDemandPublish(that.data).then(res => {
that.polictList = res.list
that.total = res.total - 0
@@ -249,7 +337,7 @@ export default {
that.temp.type = i
}
}
- await api.demandPublishUpdate(that.temp).then((res) => {
+ await api.demandPublishUpdate(that.temp).then(res => {
this.getList()
that.dialogFormVisible = false
})
@@ -259,7 +347,7 @@ export default {
that.listLoading = true
that.dialogFormVisible2 = true
that.showid = id
- await api.demandCandidateAll(id).then((res) => {
+ await api.demandCandidateAll(id).then(res => {
console.log(res)
that.total1 = res.total - 0
that.enrollList = res.list
@@ -270,7 +358,7 @@ export default {
const that = this
that.listLoading = true
that.data1.id = that.showid
- await api.demandCandidateAll(that.data1.id).then((res) => {
+ await api.demandCandidateAll(that.data1.id).then(res => {
that.total1 = res.total - 0
that.enrollList = res.list
@@ -280,7 +368,7 @@ export default {
})
},
async handleDelete(id) {
- await api.demandPublishDelete(id).then((res) => {
+ await api.demandPublishDelete(id).then(res => {
this.getList()
})
},
@@ -304,7 +392,7 @@ export default {
return
}
}
- await api.demandPublishAdd(that.addCarousel).then((res) => {
+ await api.demandPublishAdd(that.addCarousel).then(res => {
that.dialogFormVisible1 = false
that.getList()
})
diff --git a/src/views/firstPages/policy.vue b/src/views/firstPages/policy.vue
index b1f81c2..b21a5f6 100644
--- a/src/views/firstPages/policy.vue
+++ b/src/views/firstPages/policy.vue
@@ -2,74 +2,152 @@
-
-
+
+
+
-
-
+
+
-
+
搜索
-
+
添加
-
+
-
+
{{ row.id }}
-
+
{{ row.title }}
-
+
{{ row.publishTime }}
-
+
{{ row.publishDepart }}
-
+
点击此处跳转
-
-
+
+
-
+
刚入库
审核通过
-
+
审核不通过
-
-
+
+
修改
-
+
通过
-
+
未通过
-
+
通过
@@ -79,11 +157,22 @@
-
+
-
-
+
@@ -99,7 +188,21 @@
- '
+
+ '
+
@@ -108,42 +211,74 @@
-
+ 添加标签
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
+
@@ -157,22 +292,32 @@
- '
+
+ '
+
-
@@ -193,18 +338,20 @@ export default {
total: 0,
listLoading: true,
data: {
+ title: '',
auditStatus: '',
pageNum: 1,
pageSize: 20,
type: ''
},
polictList: [],
- typeList: { '申报通知': 0, '公告公示': 1, '政策动态': 2, '申报指南': 3 },
+ typeList: { 申报通知: 0, 公告公示: 1, 政策动态: 2, 申报指南: 3 },
+ policyTitle: '',
policyType: undefined,
policyType1: undefined,
policyStatus: undefined,
policyStatus1: undefined,
- status: { '刚入库': 0, '审核通过': 1, '审核不通过': 2 },
+ status: { 刚入库: 0, 审核通过: 1, 审核不通过: 2 },
textMap: {
update: 'Edit',
create: 'Create'
@@ -224,9 +371,7 @@ export default {
}
},
computed: {
- ...mapGetters([
- 'name'
- ])
+ ...mapGetters(['name'])
},
created() {
this.getList()
@@ -235,10 +380,14 @@ export default {
async Search() {
const that = this
that.listLoading = true
- if (that.typeList[`${that.policyType}`] === undefined && that.status[`${that.policyStatus}`] === undefined) {
+ that.data.title = that.policyTitle
+ if (
+ that.typeList[`${that.policyType}`] === undefined &&
+ that.status[`${that.policyStatus}`] === undefined
+ ) {
that.data.type = ''
that.data.auditStatus = ''
- await api.PolicyDetail(this.data).then((res) => {
+ await api.PolicyDetail(this.data).then(res => {
that.polictList = res.list
that.total = res.total - 0
that.listLoading = false
@@ -246,7 +395,7 @@ export default {
} else if (that.typeList[`${that.policyType}`] === undefined) {
that.data.type = ''
that.data.auditStatus = that.status[`${that.policyStatus}`]
- await api.PolicyDetail(this.data).then((res) => {
+ await api.PolicyDetail(this.data).then(res => {
that.polictList = res.list
that.total = res.total - 0
that.listLoading = false
@@ -254,7 +403,7 @@ export default {
} else if (that.status[`${that.policyStatus}`] === undefined) {
that.data.type = that.typeList[`${that.policyType}`]
that.data.auditStatus = ''
- await api.PolicyDetail(this.data).then((res) => {
+ await api.PolicyDetail(this.data).then(res => {
that.polictList = res.list
that.total = res.total - 0
that.listLoading = false
@@ -263,8 +412,7 @@ export default {
that.data.pageNum = 1
that.data.type = that.typeList[`${that.policyType}`]
that.data.auditStatus = that.status[`${that.policyStatus}`]
-
- await api.PolicyDetail(this.data).then((res) => {
+ await api.PolicyDetail(that.data).then(res => {
that.polictList = res.list
that.total = res.total - 0
that.listLoading = false
@@ -274,7 +422,8 @@ export default {
async getList() {
const that = this
that.listLoading = true
- await api.PolicyDetail(that.data).then((res) => {
+ await api.PolicyDetail(that.data).then(res => {
+ console.log(that.data)
that.polictList = res.list
that.total = res.total - 0
@@ -307,7 +456,13 @@ export default {
const that = this
that.temp.type = that.typeList[`${that.policyType1}`]
that.temp.auditStatus = that.status[`${that.policyStatus1}`]
- await api.PolicyUpdate(that.temp).then((res) => {
+ for (let i = 0; i < that.temp.projectLabels.length; i++) {
+ if (that.temp.projectLabels[i] === '') {
+ that.temp.projectLabels.splice(i, 1)
+ i -= 1
+ }
+ }
+ await api.PolicyUpdate(that.temp).then(res => {
this.getList()
that.dialogFormVisible = false
})
@@ -315,12 +470,12 @@ export default {
async handleModifyStatus(detail, num) {
this.listLoading = true
detail.auditStatus = num
- await api.PolicyUpdate(detail).then((res) => {
+ await api.PolicyUpdate(detail).then(res => {
this.listLoading = false
})
},
async handleDelete(id) {
- await api.PolicyDelete(id).then((res) => {
+ await api.PolicyDelete(id).then(res => {
this.getList()
})
},
@@ -345,9 +500,13 @@ export default {
return
}
}
- api.PolicyAdd(that.addPolicy).then((res) => {
+ api.PolicyAdd(that.addPolicy).then(res => {
that.dialogFormVisible1 = false
})
+ },
+ addLabel() {
+ this.temp.projectLabels = this.temp.projectLabels.concat([''])
+ console.log(this.temp.projectLabels)
}
}
}
diff --git a/src/views/firstPages/rotation.vue b/src/views/firstPages/rotation.vue
index 8caaae1..327e964 100644
--- a/src/views/firstPages/rotation.vue
+++ b/src/views/firstPages/rotation.vue
@@ -2,71 +2,125 @@
-
-
+
+
-
+
搜索
-
+
添加
-
-
+
-
+
{{ row.id }}
-
+
-
+
-
+
{{ row.jumpUrl }}
-
+
{{ row.param }}
-
-
+
+
不跳转
H5
发榜详情
培训通知
-
-
+
+
{{ row.createdAt }}
-
+
正常
- 禁用
+ 禁用
已删除
-
-
+
+
修改
-
+
禁用
-
+
启用
@@ -76,18 +130,50 @@
-
+
-
-
+
-
-
-
-
+