|
|
@@ -64,10 +64,10 @@
|
|
|
<u--text class="timetext" :text="item.readTime"></u--text>
|
|
|
</u-col>
|
|
|
</u-row>
|
|
|
- <view v-if="colums[TabCur + '_monitor'] != null">
|
|
|
+ <view v-if="colums[TabCur + '_detail'] != null">
|
|
|
<view
|
|
|
class="datacard"
|
|
|
- v-for="(showitem, index) in colums[TabCur + '_monitor']"
|
|
|
+ v-for="(showitem, index) in colums[TabCur + '_detail']"
|
|
|
:key="index"
|
|
|
v-show="
|
|
|
showitem.appShow == 1 &&
|
|
|
@@ -307,24 +307,25 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
openNewPage(params) {
|
|
|
- // const reqData = {
|
|
|
- // id: params.deviceID,
|
|
|
- // name: params.strinstallpos,
|
|
|
- // type: this.TabCur,
|
|
|
- // };
|
|
|
- // const reqparams = uni.$u.queryParams(reqData);
|
|
|
- // this.getShowList(this.TabCur).then(() => {
|
|
|
- // if (this.typeList.length > 0) {
|
|
|
- // this.$destroy();
|
|
|
- // uni.navigateTo({
|
|
|
- // url: `/pages/home/detail/autodoor/autodoor${reqparams}`,
|
|
|
- // });
|
|
|
- // }
|
|
|
- // });
|
|
|
- this.$destroy();
|
|
|
- uni.navigateTo({
|
|
|
- url: `/pages/home/detail/autodoor/autodoor?id=${params.deviceID}&name=${params.strinstallpos}&type=${this.TabCur}`,
|
|
|
+ const reqData = {
|
|
|
+ id: params.deviceID,
|
|
|
+ name: params.strinstallpos,
|
|
|
+ type: this.TabCur,
|
|
|
+ };
|
|
|
+ const reqparams = uni.$u.queryParams(reqData);
|
|
|
+ this.getShowList(this.TabCur).then(() => {
|
|
|
+ if (this.typeList.length > 0) {
|
|
|
+ this.$destroy();
|
|
|
+ uni.navigateTo({
|
|
|
+ url: `/pages/home/detail/autodoor/autodoor${reqparams}`,
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
+ // this.$destroy();
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: `/pages/home/detail/autodoor/autodoor?id=${params.deviceID}&name=${params.strinstallpos}&type=${this.TabCur}`,
|
|
|
+ // });
|
|
|
+ // },
|
|
|
},
|
|
|
},
|
|
|
destroyed() {
|
