diff --git a/sample-form-client-ui/admin/src/App.vue b/sample-form-client-ui/admin/src/App.vue index 89063021d907fd9cc31cef8d2553210fa00e126b..d5d85e60ad2d759a3f2cad1de4cd85401c1db9a5 100644 --- a/sample-form-client-ui/admin/src/App.vue +++ b/sample-form-client-ui/admin/src/App.vue @@ -80,10 +80,9 @@ export default { getInfo() { let routeQuery = this.urlGet(); if (JSON.stringify(routeQuery) !== "{}") { - let { devicenum, deviceInfo } = routeQuery; + let { devicenum } = routeQuery; this.devicenum = devicenum; local.setLocal("devicenum", devicenum); - local.setLocal("siteId", deviceInfo.siteId); } }, // 鑾峰彇棣栭〉淇℃伅 diff --git a/sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue b/sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue index 6c3e5e715b1688c6ed2bcb463cbff2a8f3c4c856..38094d362f69ae67f8af0ae2eedd35450230ec9c 100644 --- a/sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue +++ b/sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue @@ -55,12 +55,12 @@ </span> </div> <!-- 鐢宠缂栧彿 --> - <div class="apply-num tac" v-ellipsis="'340px'"> + <!-- <div class="apply-num tac" v-ellipsis="'340px'"> 鐢宠缂栧彿锛欴X123456789 - </div> + </div> --> <!-- 浜嬮」鍚嶇О --> <div class="matter-name tac" v-ellipsis="'340px'"> - {{ matterInfo.matterName }} + {{ matterName }} </div> <!-- 鏉愭枡鍒楄〃 --> <div class="materails-list scroll3"> @@ -110,7 +110,8 @@ export default { data() { return { api: local.getLocal("serverUrl") + "/", - matterInfo: this.$route.query, + matterInfo: {}, + matterName: "", // 浜嬮」鍚嶇О materailsList: [], active: 0, scale: 100, @@ -134,7 +135,7 @@ export default { let res = await getMaterialsList({ page: 1, size: -1, - matterId: this.matterInfo.matterId, + matterId: this.$route.query.matterId, }); let { data } = res.data.data; data.forEach((v) => { @@ -145,6 +146,9 @@ export default { }; }); this.materailsList = data; + this.matterName = this.$route.query.matterName + ? this.$route.query.matterName + : data[0].matterName; let id = this.$route.query.id; this.active = this.materailsList.findIndex((v) => v.id == id); },