Commit 693aac283aace14dbc4847ac4ef3053943d89a8a
1 parent
a522d097
调整界面布局
Showing
2 changed files
with
29 additions
and
12 deletions
web_src/src/components/devicePosition.vue
| @@ -181,10 +181,17 @@ export default { | @@ -181,10 +181,17 @@ export default { | ||
| 181 | self.total = res.data.length; | 181 | self.total = res.data.length; |
| 182 | self.mobilePositionList = res.data; | 182 | self.mobilePositionList = res.data; |
| 183 | console.log(self.mobilePositionList); | 183 | console.log(self.mobilePositionList); |
| 184 | - // 防止出现表格错位 | ||
| 185 | - self.$nextTick(() => { | ||
| 186 | - self.showMarkPoints(self); | ||
| 187 | - }); | 184 | + if (self.total == 0) { |
| 185 | + self.$message({ | ||
| 186 | + showClose: true, | ||
| 187 | + message: '未找到符合条件的移动位置信息', | ||
| 188 | + type: 'error' | ||
| 189 | + }); | ||
| 190 | + } else { | ||
| 191 | + self.$nextTick(() => { | ||
| 192 | + self.showMarkPoints(self); | ||
| 193 | + }); | ||
| 194 | + } | ||
| 188 | }) | 195 | }) |
| 189 | .catch(function (error) { | 196 | .catch(function (error) { |
| 190 | console.log(error); | 197 | console.log(error); |
| @@ -201,10 +208,17 @@ export default { | @@ -201,10 +208,17 @@ export default { | ||
| 201 | self.total = res.data.length; | 208 | self.total = res.data.length; |
| 202 | self.mobilePositionList.push(res.data); | 209 | self.mobilePositionList.push(res.data); |
| 203 | console.log(self.mobilePositionList); | 210 | console.log(self.mobilePositionList); |
| 204 | - // 防止出现表格错位 | ||
| 205 | - self.$nextTick(() => { | ||
| 206 | - self.showMarkPoints(self); | ||
| 207 | - }); | 211 | + if (self.total == 0) { |
| 212 | + self.$message({ | ||
| 213 | + showClose: true, | ||
| 214 | + message: '未找到符合条件的移动位置信息', | ||
| 215 | + type: 'error' | ||
| 216 | + }); | ||
| 217 | + } else { | ||
| 218 | + self.$nextTick(() => { | ||
| 219 | + self.showMarkPoints(self); | ||
| 220 | + }); | ||
| 221 | + } | ||
| 208 | }) | 222 | }) |
| 209 | .catch(function (error) { | 223 | .catch(function (error) { |
| 210 | console.log(error); | 224 | console.log(error); |
web_src/src/components/videoList.vue
| @@ -51,10 +51,13 @@ | @@ -51,10 +51,13 @@ | ||
| 51 | 51 | ||
| 52 | <el-table-column label="操作" width="360" align="center" fixed="right"> | 52 | <el-table-column label="操作" width="360" align="center" fixed="right"> |
| 53 | <template slot-scope="scope"> | 53 | <template slot-scope="scope"> |
| 54 | - <el-button size="mini" :ref="scope.row.deviceId + 'refbtn' " icon="el-icon-refresh" @click="refDevice(scope.row)">刷新通道</el-button> | ||
| 55 | - <el-button size="mini" icon="el-icon-s-open" v-bind:disabled="scope.row.online==0" type="primary" @click="showChannelList(scope.row)">查看通道</el-button> | ||
| 56 | - <el-button size="mini" icon="el-icon-s-open" v-bind:disabled="scope.row.online==0" type="primary" @click="showDevicePosition(scope.row)">移动位置</el-button> | ||
| 57 | - </template> | 54 | + <el-button size="mini" :ref="scope.row.deviceId + 'refbtn' " icon="el-icon-refresh" @click="refDevice(scope.row)">刷新</el-button> |
| 55 | + <el-button-group> | ||
| 56 | + <el-button size="mini" icon="el-icon-video-camera-solid" v-bind:disabled="scope.row.online==0" type="primary" @click="showChannelList(scope.row)">通道</el-button> | ||
| 57 | + <el-button size="mini" icon="el-icon-location" v-bind:disabled="scope.row.online==0" type="primary" @click="showDevicePosition(scope.row)">定位</el-button> | ||
| 58 | + <el-button size="mini" icon="el-icon-s-tools" v-bind:disabled="scope.row.online==0" type="primary">控制</el-button> | ||
| 59 | + </el-button-group> | ||
| 60 | + </template> | ||
| 58 | </el-table-column> | 61 | </el-table-column> |
| 59 | </el-table> | 62 | </el-table> |
| 60 | <el-pagination | 63 | <el-pagination |