增加普适型

src/static/js/global.js

@@ -1,5 +1,5 @@
-// const server = "http://lq.ailishi.org:4032/bms/api/operate/";
-const server = "http://localhost:8081/bms/api/operate/";
+const server = "http://lq.ailishi.org:4032/bms/api/operate/";
+// const server = "http://localhost:8081/bms/api/operate/";
 
 const URL = {
 	//登录

src/views/devices/lp.vue

@@ -147,9 +147,13 @@
 			 */
 			getGroupList() {
 				this.$http.Get(this.$global.group.listAll, {}).then(res => {
-					this.groups = res.data.map(item => {
-						return item.code;
+					const arr = [];
+					this.groups = res.data.forEach(item => {
+						if (item.type == 'lupai') {
+							arr.push(item.code)
+						}
 					});
+					this.groups = arr;
 				})
 			}
 		}

src/views/devices/ubi.vue

@@ -23,10 +23,14 @@
 				</el-table-column>
 				<el-table-column prop="groupId" label="设备组" min-width="120" />
 				<el-table-column prop="createTime" label="创建时间" min-width="180" />
+				<el-table-column prop="freq" label="上传频率(秒)" min-width="120" />
 				<el-table-column prop="powerVolt" label="电池电压" min-width="100" />
 				<el-table-column prop="signal4g" label="4G信号" min-width="80" />
 				<el-table-column prop="oemType" label="板卡类型" min-width="100" />
 				<el-table-column prop="version" label="软件版本号" min-width="100" />
+				<el-table-column prop="lon" label="经度" min-width="120" />
+				<el-table-column prop="lat" label="纬度" min-width="120" />
+				<el-table-column prop="satNum" label="卫星颗数" min-width="80" />
 				<el-table-column label="状态" min-width="100">
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.status===1" size="small">在线</el-tag>
@@ -34,11 +38,11 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="updateTime" label="最近通讯时间" min-width="180" />
-				<el-table-column label="操作" min-width="80">
-					<template #default="scope">
-						<el-button @click="detailHandler(scope.row.openNum)" type="text" size="small">详情</el-button>
-					</template>
-				</el-table-column>
+<!--				<el-table-column label="操作" min-width="80">-->
+<!--					<template #default="scope">-->
+<!--						<el-button @click="detailHandler(scope.row.openNum)" type="text" size="small">详情</el-button>-->
+<!--					</template>-->
+<!--				</el-table-column>-->
 			</el-table>
 			<el-pagination class="zy-table-pagination" background layout="prev, pager, next"
 				:current-page="page.current" :total="page.total" :page-size="page.size" @current-change="pagination" />
@@ -47,20 +51,6 @@
 		<el-dialog title="设备详情" v-model="detailDialog" width="500px">
 			<el-descriptions :column="2" border>
 				<el-descriptions-item label="设备码:">{{detail.openNum}}</el-descriptions-item>
-				<el-descriptions-item label="唤醒间隔:">{{detail.wakeInt}}</el-descriptions-item>
-				<el-descriptions-item label="阈值:">{{detail.thresh}}</el-descriptions-item>
-				<el-descriptions-item label="温度:">{{detail.temp}}</el-descriptions-item>
-				<el-descriptions-item label="电量:">{{detail.battery}}</el-descriptions-item>
-				<el-descriptions-item label="信号:">{{detail.s4g}}</el-descriptions-item>
-				<el-descriptions-item label="上传类型:">{{detail.dataType}}</el-descriptions-item>
-				<el-descriptions-item label="X:">{{detail.x}}</el-descriptions-item>
-				<el-descriptions-item label="Y:">{{detail.y}}</el-descriptions-item>
-				<el-descriptions-item label="Z:">{{detail.z}}</el-descriptions-item>
-				<el-descriptions-item label="angleX:">{{detail.anglex}}</el-descriptions-item>
-				<el-descriptions-item label="angleY:">{{detail.angley}}</el-descriptions-item>
-				<el-descriptions-item label="angleZ:">{{detail.anglexz}}</el-descriptions-item>
-				<el-descriptions-item label="经度:">{{detail.lon}}</el-descriptions-item>
-				<el-descriptions-item label="纬度:">{{detail.lat}}</el-descriptions-item>
 				<el-descriptions-item label="定位模式:">{{detail.mode==1?'GPS':'基站'}}</el-descriptions-item>
 			</el-descriptions>
 		</el-dialog>
@@ -138,8 +128,9 @@
 			getDeviceDetail: function(openNum) {
 				const params = {
 					openNum: openNum
-				}
+				};
 				this.$http.Get(this.$global.ubi.detail, params).then(res => {
+					console.log(res.data);
 					this.detail = res.data;
 				})
 			},

src/views/system/group.vue

@@ -16,6 +16,7 @@
 			<el-table :data="page.records" max-height="800" stripe size="small"
 				header-cell-class-name="zy-table-header-cell" cell-class-name='zy-table-cell'>
 				<el-table-column prop="code" label="设备组编号" width="100" />
+				<el-table-column prop="type" label="所属设备类型" width="100" />
 				<el-table-column prop="name" label="设备组名称" width="120" />
 				<el-table-column prop="item" label="所属项目" width="150" />
 				<el-table-column label="备注" min-width="500">
@@ -44,6 +45,13 @@
 					<el-input v-model="addForm.name" maxlength="30"></el-input>
 				</el-form-item>
 
+                <el-form-item label="设备类型:" prop="type">
+                    <el-select v-model="addForm.type" size="mini" placeholder="请选择">
+                        <el-option label="普适型" value="gnss"/>
+                        <el-option label="路牌" value="lupai"/>
+                    </el-select>
+                </el-form-item>
+
 				<el-form-item label="备注:">
 					<el-input type="textarea" v-model="addForm.remark" maxlength="100"></el-input>
 				</el-form-item>
@@ -67,6 +75,13 @@
 					<el-input v-model="updateForm.name" maxlength="30"></el-input>
 				</el-form-item>
 
+                <el-form-item label="设备类型:" prop="type">
+                    <el-select v-model="updateForm.type" size="mini" placeholder="请选择">
+                        <el-option label="普适型" value="gnss"/>
+                        <el-option label="路牌" value="lupai"/>
+                    </el-select>
+                </el-form-item>
+
 				<el-form-item label="备注:">
 					<el-input type="textarea" v-model="updateForm.remark" maxlength="100"></el-input>
 				</el-form-item>
@@ -98,6 +113,7 @@
 				addForm: { //添加表单
 					code: null,
 					name: null,
+					type: null,
 					remark: null
 				},
 				rules: {
@@ -106,7 +122,11 @@
 						message: '项目编号必填',
 						trigger: 'blur'
 					}],
-
+                    type: [{
+                        required: true,
+                        message: '所属设备类型必选',
+                        trigger: 'change'
+                    }],
 				}
 			};
 		},
@@ -155,8 +175,10 @@
 					id: obj.id,
 					code: obj.code,
 					name: obj.name,
+					type: obj.type,
 					remark: obj.remark
-				}
+				};
+				console.log(this.updateForm);
 				this.updateDialog = true;
 			},
 
@@ -182,7 +204,6 @@
 					if (!valid) return false;
 					//提交表单
 					this.$http.Post(this.$global.group.update, this.updateForm).then(res => {
-						console.log(res.data);
 						this.$message.success("修改成功!");
 						this.refresh();
 					})
@@ -199,7 +220,7 @@
 					key: this.query.key,
 					current: this.page.current,
 					size: this.page.size,
-				}
+				};
 				this.getListPage(params);
 			}
 		}