Commit 3996c299 by liudx

修改

parent c5c37576
...@@ -1238,7 +1238,8 @@ export default { ...@@ -1238,7 +1238,8 @@ export default {
exportword({ exportword({
report_data: e.target.result, report_data: e.target.result,
email: email, email: email,
name:name name:name,
f_type:'enterprise'
}).then((res) => { }).then((res) => {
if (res.code == 0) { if (res.code == 0) {
message.success(res.msg); message.success(res.msg);
......
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
<script> <script>
import dayjs from "dayjs"; import dayjs from "dayjs";
import arealist from "../../utils/map.js"; import arealist from "../../utils/map.js";
import { userFollow,cancelFollow } from "../../utils/userAPI"; import { userFollow, cancelFollow } from "../../utils/userAPI";
import { import {
enterpriseList, enterpriseList,
industryType, industryType,
...@@ -262,7 +262,7 @@ export default { ...@@ -262,7 +262,7 @@ export default {
ent_or_pat_id: id, ent_or_pat_id: id,
}); });
if (cancelRes.code == 0) { if (cancelRes.code == 0) {
this.$router.go(0); this.Filter();
message.success(cancelRes.msg); message.success(cancelRes.msg);
} else { } else {
message.error(cancelRes.msg); message.error(cancelRes.msg);
...@@ -276,13 +276,13 @@ export default { ...@@ -276,13 +276,13 @@ export default {
name: company_name, name: company_name,
}); });
if (Follow.code == 0) { if (Follow.code == 0) {
this.$router.go(0)
message.success(Follow.msg); message.success(Follow.msg);
this.Filter();
} else { } else {
message.error(Follow.msg); message.error(Follow.msg);
} }
// this.Filter() // this.Filter()
}, },
disabledDate(current) { disabledDate(current) {
return current && current > dayjs().endOf("day"); return current && current > dayjs().endOf("day");
...@@ -386,6 +386,8 @@ export default { ...@@ -386,6 +386,8 @@ export default {
}; };
this.industryvalue = []; this.industryvalue = [];
this.filter = []; this.filter = [];
this.currentPage = 1;
this.keyword = "";
this.Filter(); this.Filter();
}, },
//点击筛选 //点击筛选
...@@ -444,6 +446,7 @@ export default { ...@@ -444,6 +446,7 @@ export default {
//企业结果 //企业结果
this.companylist = []; this.companylist = [];
let params = { let params = {
page: this.currentPage, page: this.currentPage,
size: 10, size: 10,
...@@ -481,7 +484,7 @@ export default { ...@@ -481,7 +484,7 @@ export default {
this.filter = filter; this.filter = filter;
//请求接口 //请求接口
enterpriseSelect({ ...params }).then((res) => { enterpriseSelect({ ...params }).then((res) => {
// console.log(res);
if (res.code == 0) { if (res.code == 0) {
this.companylist = res.data.list; this.companylist = res.data.list;
this.total = res.data.total; this.total = res.data.total;
...@@ -548,6 +551,8 @@ export default { ...@@ -548,6 +551,8 @@ export default {
this.valueInnovation = searchValue.valueInnovation; this.valueInnovation = searchValue.valueInnovation;
this.keyword = searchValue.keyword; this.keyword = searchValue.keyword;
this.Filter(); this.Filter();
} else {
this.Filter();
} }
}, },
}; };
...@@ -655,7 +660,7 @@ export default { ...@@ -655,7 +660,7 @@ export default {
.follow { .follow {
position: absolute; position: absolute;
right: 30px; right: 30px;
top: 30px; top: 30px;
width: 112px; width: 112px;
height: 32px; height: 32px;
......
...@@ -108,7 +108,7 @@ export default { ...@@ -108,7 +108,7 @@ export default {
this.dataHistory = res.data; this.dataHistory = res.data;
this.total = res.total; this.total = res.total;
this.dataHistory.forEach((item, index) => { this.dataHistory.forEach((item, index) => {
item.index = index + 1; item.index = (this.currentPage-1) * 10 + index+1;
item.follow_time = item.follow_time.replace(/T/g, " "); item.follow_time = item.follow_time.replace(/T/g, " ");
}); });
} else { } else {
...@@ -200,11 +200,15 @@ export default { ...@@ -200,11 +200,15 @@ export default {
background-color: #fff; background-color: #fff;
padding: 20px; padding: 20px;
height: 92%; height: 92%;
text-align: center; text-align: center;
} }
:deep(.ant-modal-footer) { :deep(.ant-modal-footer) {
text-align: center !important; text-align: center !important;
} }
:deep(.ant-table-tbody){
cursor: pointer;
}
} }
</style> </style>
...@@ -223,7 +223,7 @@ export default { ...@@ -223,7 +223,7 @@ export default {
this.dataHistory = res.data.data; this.dataHistory = res.data.data;
this.total = res.data.total; this.total = res.data.total;
this.dataHistory.forEach((item, index) => { this.dataHistory.forEach((item, index) => {
item.index = index + 1; item.index = (this.currentPage-1) * 10 + index+1;
}); });
} else { } else {
message.error(res.msg); message.error(res.msg);
...@@ -255,5 +255,8 @@ export default { ...@@ -255,5 +255,8 @@ export default {
text-align: center; text-align: center;
// height: 600px; // height: 600px;
} }
:deep(.ant-table-tbody){
cursor: pointer;
}
} }
</style> </style>
...@@ -699,6 +699,7 @@ export default { ...@@ -699,6 +699,7 @@ export default {
report_data: e.target.result, report_data: e.target.result,
email: email, email: email,
name: name, name: name,
f_type:'patent'
}).then((res) => { }).then((res) => {
if (res.code == 0) { if (res.code == 0) {
message.success(res.msg); message.success(res.msg);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment