Merge remote-tracking branch 'origin/master'

sample-form-client-ui/admin/src/App.vue

@@ -67,7 +67,7 @@ export default {
           serverUrl: "http://192.168.0.98:11078/",
         },
         // 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("deviceInfo", obj.deviceInfo);
@@ -138,14 +138,27 @@ export default {
         data.hotWords = data.hotWords.map((v) => v.hotwords);
         this.homeInfo = data;
         this.SET_homeInfo(data);
-        let datumList = this.removeDuplication(
-          [...data.hotDatumList, ...data.datumList],
-          "id"
-        ).slice(0, 7);
-        let matterList = this.removeDuplication(
-          [...data.hotMatterList, ...data.matterList],
-          "id"
-        ).slice(0, 5);
+        let datumList = [];
+        let matterList = [];
+        if (data.hotDatumList) {
+          // datumList = this.removeDuplication(
+          //   [...data.hotDatumList, ...data.datumList],
+          //   "id"
+          // ).slice(0, 7);
+          datumList = data.hotDatumList.slice(0, 7);
+        } else {
+          datumList = data.datumList.slice(0, 7);
+        }
+        if (data.hotMatterList) {
+          // matterList = this.removeDuplication(
+          //   [...data.hotMatterList, ...data.matterList],
+          //   "id"
+          // ).slice(0, 5);
+          matterList = data.hotMatterList.slice(0, 5);
+        } else {
+          matterList = data.matterList.slice(0, 5);
+        }
+
         this.SET_datumList(datumList);
         this.SET_matterList(matterList);
       }

sample-form-client-ui/admin/src/pages/home/Home.vue

@@ -245,6 +245,7 @@
 // import { getHomeInfo } from "@/api";
 import MateralsList from "@/components/MateralsList.vue";
 import { mapState, mapMutations } from "vuex";
+import { getMaterialsList } from "@/api";
 export default {
   components: {
     MateralsList,
@@ -342,9 +343,11 @@ export default {
       this.search = "";
     },
     // 查看材料列表
-    checkMatter(row) {
+    async checkMatter(row) {
       let time = this.$moment().format("YYYY-MM-DD HH:mm:ss");
       this.SET_operTime(time);
+      let matterDatumList = await this.getMaterialsList(row.matterId);
+      row.matterDatumList = matterDatumList;
       this.matterInfo = row;
       this.visible = true;
     },
@@ -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>