Commit 3f89f195f7f70eed9b0d2a7d30a86e4f89bd221c

Authored by fengtao
1 parent 9dad8a6d

fix:修改摄像头组织管理捕获错误弹窗,修改摄像头边框10px,修改摄像头分页捕获错误弹窗

@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <view class="u-flex org-contact"><text class="text">组织关系</text></view> 7 <view class="u-flex org-contact"><text class="text">组织关系</text></view>
8 <view class="u-flex org-device"> 8 <view class="u-flex org-device">
9 <image class="device-image" src="../../../static/org.png"></image> 9 <image class="device-image" src="../../../static/org.png"></image>
10 - <text class="device-text">设备数:{{ deviceTotal }}</text> 10 + <text class="device-text">摄像头数:{{ cameraTotal }}</text>
11 </view> 11 </view>
12 </view> 12 </view>
13 <view class="org-item"><image class="image" src="../../../static/arrow-right.png"></image></view> 13 <view class="org-item"><image class="image" src="../../../static/arrow-right.png"></image></view>
@@ -54,7 +54,7 @@ export default { @@ -54,7 +54,7 @@ export default {
54 auto: false // 不自动加载 54 auto: false // 不自动加载
55 }, 55 },
56 current: 0, 56 current: 0,
57 - deviceTotal: 0, 57 + cameraTotal: 0,
58 list: [], 58 list: [],
59 ordId: '' 59 ordId: ''
60 }; 60 };
@@ -72,7 +72,7 @@ export default { @@ -72,7 +72,7 @@ export default {
72 onLoad() { 72 onLoad() {
73 // 隐藏原生的tabbar 73 // 隐藏原生的tabbar
74 uni.hideTabBar(); 74 uni.hideTabBar();
75 - this.getDeviceTotalData(); 75 + this.getcameraTotalData();
76 }, 76 },
77 methods: { 77 methods: {
78 /*下拉刷新的回调 */ 78 /*下拉刷新的回调 */
@@ -98,6 +98,7 @@ export default { @@ -98,6 +98,7 @@ export default {
98 .then(res => { 98 .then(res => {
99 uni.stopPullDownRefresh(); 99 uni.stopPullDownRefresh();
100 this.mescroll.endByPage(res.items.length, res.total); 100 this.mescroll.endByPage(res.items.length, res.total);
  101 + this.cameraTotal = res.total;
101 if (pageNo == 1) { 102 if (pageNo == 1) {
102 this.list = res.items; 103 this.list = res.items;
103 } else { 104 } else {
@@ -105,7 +106,6 @@ export default { @@ -105,7 +106,6 @@ export default {
105 } 106 }
106 }) 107 })
107 .catch(e => { 108 .catch(e => {
108 - uni.$u.toast(e.data?.message);  
109 //联网失败, 结束加载 109 //联网失败, 结束加载
110 this.mescroll.endErr(); 110 this.mescroll.endErr();
111 }); 111 });
@@ -113,22 +113,6 @@ export default { @@ -113,22 +113,6 @@ export default {
113 hideImageUrl(item, index) { 113 hideImageUrl(item, index) {
114 this.current = index; 114 this.current = index;
115 }, 115 },
116 - getDeviceTotalData() {  
117 - let httpData = {  
118 - page: 1,  
119 - pageSize: 10  
120 - };  
121 - uni.$u.http  
122 - .get('/yt/device', { params: httpData, custom: { load: false } })  
123 - .then(res => {  
124 - if (res) {  
125 - this.deviceTotal = res.total;  
126 - }  
127 - })  
128 - .catch(e => {  
129 - uni.$u.toast(e.data?.message);  
130 - });  
131 - },  
132 openCameraDetail(e) { 116 openCameraDetail(e) {
133 console.log(e); 117 console.log(e);
134 }, 118 },
@@ -41,9 +41,7 @@ export default { @@ -41,9 +41,7 @@ export default {
41 this.tree = list; 41 this.tree = list;
42 } 42 }
43 }) 43 })
44 - .catch(e => {  
45 - uni.$u.toast(e.data.message);  
46 - }); 44 + .catch(e => {});
47 }, 45 },
48 confirm(val) { 46 confirm(val) {
49 this.id = val[0].id; 47 this.id = val[0].id;
@@ -67,11 +67,11 @@ @@ -67,11 +67,11 @@
67 width: 330rpx; 67 width: 330rpx;
68 height: 200rpx; 68 height: 200rpx;
69 background-color: #fff; 69 background-color: #fff;
70 - border-radius: 20px; 70 + border-radius: 10px;
71 margin-left: 25rpx; 71 margin-left: 25rpx;
72 margin-right: 21rpx; 72 margin-right: 21rpx;
73 .video { 73 .video {
74 - border-radius: 20px; 74 + border-radius: 10px;
75 width: 330rpx; 75 width: 330rpx;
76 height: 200rpx; 76 height: 200rpx;
77 } 77 }
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 .image { 92 .image {
93 width: 330rpx; 93 width: 330rpx;
94 height: 200rpx; 94 height: 200rpx;
95 - border-radius: 20px; 95 + border-radius: 10px;
96 } 96 }
97 } 97 }
98 } 98 }