Commit b12a1888 authored by “yiyousong”'s avatar “yiyousong”

perf: 修改首页点击热门事项获取材料的方式

parent 15bc5cb9
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,7 @@ export default {
serverUrl: "http://192.168.0.98:11078/", serverUrl: "http://192.168.0.98:11078/",
}, },
// devicenum: "18-93-7F-C0-AD-B5", // devicenum: "18-93-7F-C0-AD-B5",
devicenum: "B8-13-32-86-9F-04", devicenum: "B8-13-32-87-37-82",
}; };
local.setLocal("devicenum", obj.devicenum); local.setLocal("devicenum", obj.devicenum);
local.setLocal("deviceInfo", obj.deviceInfo); local.setLocal("deviceInfo", obj.deviceInfo);
...@@ -140,24 +140,25 @@ export default { ...@@ -140,24 +140,25 @@ export default {
this.SET_homeInfo(data); this.SET_homeInfo(data);
let datumList = []; let datumList = [];
let matterList = []; let matterList = [];
// if (data.hotDatumList) { if (data.hotDatumList) {
// datumList = this.removeDuplication( // datumList = this.removeDuplication(
// [...data.hotDatumList, ...data.datumList], // [...data.hotDatumList, ...data.datumList],
// "id" // "id"
// ).slice(0, 7); // ).slice(0, 7);
// } else { datumList = data.hotDatumList.slice(0, 7);
// datumList = data.datumList.slice(0, 7); } else {
// } datumList = data.datumList.slice(0, 7);
// if (data.hotMatterList) { }
// matterList = this.removeDuplication( if (data.hotMatterList) {
// [...data.hotMatterList, ...data.matterList], // matterList = this.removeDuplication(
// "id" // [...data.hotMatterList, ...data.matterList],
// ).slice(0, 5); // "id"
// } else { // ).slice(0, 5);
// matterList = data.matterList.slice(0, 5); matterList = data.hotMatterList.slice(0, 5);
// } } else {
datumList = data.datumList.slice(0, 7); matterList = data.matterList.slice(0, 5);
matterList = data.matterList.slice(0, 5); }
this.SET_datumList(datumList); this.SET_datumList(datumList);
this.SET_matterList(matterList); this.SET_matterList(matterList);
} }
......
...@@ -245,6 +245,7 @@ ...@@ -245,6 +245,7 @@
// import { getHomeInfo } from "@/api"; // import { getHomeInfo } from "@/api";
import MateralsList from "@/components/MateralsList.vue"; import MateralsList from "@/components/MateralsList.vue";
import { mapState, mapMutations } from "vuex"; import { mapState, mapMutations } from "vuex";
import { getMaterialsList } from "@/api";
export default { export default {
components: { components: {
MateralsList, MateralsList,
...@@ -342,9 +343,11 @@ export default { ...@@ -342,9 +343,11 @@ export default {
this.search = ""; this.search = "";
}, },
// 查看材料列表 // 查看材料列表
checkMatter(row) { async checkMatter(row) {
let time = this.$moment().format("YYYY-MM-DD HH:mm:ss"); let time = this.$moment().format("YYYY-MM-DD HH:mm:ss");
this.SET_operTime(time); this.SET_operTime(time);
let matterDatumList = await this.getMaterialsList(row.matterId);
row.matterDatumList = matterDatumList;
this.matterInfo = row; this.matterInfo = row;
this.visible = true; this.visible = true;
}, },
...@@ -359,6 +362,19 @@ export default { ...@@ -359,6 +362,19 @@ export default {
}, },
}); });
}, },
async getMaterialsList(matterId) {
let arr = [];
let res = await getMaterialsList({
page: 1,
size: -1,
matterId,
});
if (res.data.code == 1) {
let { data } = res.data.data;
arr = data;
}
return arr;
},
}, },
}; };
</script> </script>
......
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