Skip to content

L
lbs-gpsbd-web
Commit 84859b65 authored by yangkaiyi's avatar yangkaiyi
Browse files
Options

把“设备”替换成 “重要有害植物”，格式化代码，无其他改动

parent 753ab675
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 759 additions and 730 deletions
src/api/api.js
View file @ 84859b65
......@@ -15,17 +15,17 @@ export const userAdd = (params) => {
return axios.post(`users`, params, true).then((res) => res.data);
};
// 新增设备
// 新增重要有害植物
export const deviceAdd = (params) => {
return axios.post(`devices`, params).then((res) => res.data);
};
// 删除设备
// 删除重要有害植物
export const delDevice = (deviceId) => {
return axios.delete(`devices/` + deviceId).then((res) => res.data);
};
// 更新设备
// 更新重要有害植物
export const updateDevice = (params) => {
return axios.put(`devices/` + params.id, params).then((res) => res.data);
};
......@@ -187,7 +187,7 @@ export const getCommonRoles = (params) => {
return axios.get(`common/roles`).then((res) => res.data);
};
// 获取分组设备的树形机构
// 获取分组重要有害植物的树形机构
export const getDevicesTree = (params) => {
return axios.get(`devices/tree`).then((res) => res.data);
};
......@@ -226,19 +226,19 @@ export const getGeofenceIdsByGroupId = (id) => {
return axios.get(`groups/geofenceids/` + id).then((res) => res.data);
};
// 获取设备信息
// 获取重要有害植物信息
export const getDeviceInfo = (id) => {
return axios.get(`devices/` + id).then((res) => res.data);
};
// 统计设备信息
// 统计重要有害植物信息
export const getStatisticsDevice = (params) => {
return axios
.get(`statistics/device`, { params: params })
.then((res) => res.data);
};
// 移动分组设备
// 移动分组重要有害植物
export const moveGroup = (params) => {
return axios.put(`groups/move`, params).then((res) => res.data);
};
......@@ -278,7 +278,7 @@ export const permissionSort = (params) => {
return axios.put(`permissions/sort`, params).then((res) => res.data);
};
// 管理员获取设备列表
// 管理员获取重要有害植物列表
export const getAllDevices = (params) => {
return axios.get(`devices/all`, { params: params }).then((res) => res.data);
};
......@@ -348,14 +348,14 @@ export const updatePoi = (params) => {
return axios.put(`pois`, params).then((res) => res.data);
};
// 管理员获取设备列表
// 管理员获取重要有害植物列表
export const getCmdRecords = (params) => {
return axios
.get(`command/records`, { params: params })
.then((res) => res.data);
};
// 获取设备的媒体信息
// 获取重要有害植物的媒体信息
export const getMedias = (params) => {
return axios.get(`medias`, { params: params }).then((res) => res.data);
};
......@@ -375,7 +375,7 @@ export const installThird = (params) => {
return axios.post(`install/third`, params).then((res) => res.data);
};
// 获取设备的停留记录
// 获取重要有害植物的停留记录
export const getStatisticsStops = (params) => {
return axios
.get(`statistics/stop`, { params: params })
......@@ -387,7 +387,7 @@ export const getConfigGlobal = (params) => {
return axios.get(`config/global`, { params: params }).then((res) => res.data);
};
// 获取统计的在线用户和设备
// 获取统计的在线用户和重要有害植物
export const getStatisticsOnline = (params) => {
return axios.get(`statistics/online`).then((res) => res.data);
};
......@@ -405,7 +405,7 @@ export const getDriving = (params) => {
return axios.get(`api/driving`, { params: params }).then((res) => res.data);
};
// 获取所有设备的最后位置
// 获取所有重要有害植物的最后位置
export const getAllPositions = (params) => {
return axios.get(`positions/all`).then((res) => res.data);
};
......@@ -437,7 +437,7 @@ export const getVideoSessions = (params) => {
return axios.get(`session/video`).then((res) => res.data);
};
// 添加设备类型指令
// 添加重要有害植物类型指令
export const typeCommandBind = (params) => {
return axios.post(`devicetypes/bind`, params).then((res) => res.data);
};
......@@ -532,7 +532,7 @@ export const getTaskDetail = (params) => {
.then((res) => res.data);
};
// 转移设备
// 转移重要有害植物
export const transferDevices = (params) => {
return axios.put(`devices/transfer`, params).then((res) => res.data);
};
......@@ -564,12 +564,12 @@ export const getChildrens = (params) => {
.then((res) => res.data);
};
// 获取设备列表
// 获取重要有害植物列表
export const getDevicesById = (params) => {
return axios.get(`devices/list`, { params: params }).then((res) => res.data);
};
// 批量转移设备
// 批量转移重要有害植物
export const moveDevices = (params) => {
return axios.put(`devices/move`, params).then((res) => res.data);
};
......@@ -579,7 +579,7 @@ export const moveUser = (params) => {
return axios.put(`users/move`, params).then((res) => res.data);
};
// 搜索设备
// 搜索重要有害植物
export const searchDevices = (params) => {
return axios
.get(`devices/search`, { params: params })
......
src/assets/images/Main.vue
View file @ 84859b65
......@@ -21,19 +21,19 @@
<li>
<b class="animation-1"></b><b class="animation-2"></b
><b class="animation-3"></b>
<p>在线设备</p>
<p>在线重要有害植物</p>
<strong>3174</strong>
</li>
<li>
<b class="animation-1"></b><b class="animation-2"></b
><b class="animation-3"></b>
<p>离线设备</p>
<p>离线重要有害植物</p>
<strong>6445</strong>
</li>
<li>
<b class="animation-1"></b><b class="animation-2"></b
><b class="animation-3"></b>
<p>报警设备</p>
<p>报警重要有害植物</p>
<strong>6783</strong>
</li>
<li>
......
src/components/FlvPlayer/index.vue
View file @ 84859b65
......@@ -200,7 +200,7 @@ export default {
<style scoped>
/**
设备支持子码流（分辨率 352 * 288）与主码流（分辨率 1280 * 720）
重要有害植物支持子码流（分辨率 352 * 288）与主码流（分辨率 1280 * 720）
**/
.lbs-video-context {
position: sticky;
......
src/i18n/langs/zh_CN.js
View file @ 84859b65
......@@ -8,12 +8,12 @@ const zh_CN = {
edit: "编辑",
delete: "删除",
clean: "清除",
device: "设备",
device: "重要有害植物",
type: "类型",
deviceType: "设备类型",
deviceImei: "设备IMEI",
deviceName: "设备名称",
deviceSim: "设备卡号",
deviceType: "重要有害植物类型",
deviceImei: "重要有害植物IMEI",
deviceName: "重要有害植物名称",
deviceSim: "重要有害植物卡号",
time: "时间",
personal: "个人用户",
enterprise: "企业用户",
......@@ -40,11 +40,11 @@ const zh_CN = {
endTime: "结束时间",
stopTime: "停留时间",
address: "地址",
bindDevice: "绑定设备",
bindDevice: "绑定重要有害植物",
bindGeofence: "绑定围栏",
serverPort: "地址端口",
mobilePhone: "手机号码",
searchDevice: "搜索设备",
searchDevice: "搜索重要有害植物",
online: "在线",
inActive: "未激活",
speedLimit: "限速",
......@@ -80,9 +80,9 @@ const zh_CN = {
password2: "确认密码",
},
map: {
menuDeviceList: "设备列表",
menuDeviceAdd: "新增设备",
menuDeviceEdit: "编辑设备",
menuDeviceList: "重要有害植物列表",
menuDeviceAdd: "新增重要有害植物",
menuDeviceEdit: "编辑重要有害植物",
menuOperation: "操作",
menuOperHistory: "历史轨迹",
menuOperGeofence: "地理围栏",
......@@ -103,7 +103,7 @@ const zh_CN = {
toolMessage: "消息",
toolFullScreen: "全屏",
toolExitFullScreen: "退出全屏",
userDeviceStatistics: "设备统计",
userDeviceStatistics: "重要有害植物统计",
userGroupManage: "分组管理",
userUpdatePass: "修改密码",
userUserManual: "用户手册",
......@@ -135,7 +135,7 @@ const zh_CN = {
eventFenceEnter: "进入围栏",
eventFenceExit: "离开围栏",
eventOverSpeed: "超速",
eventAlarm: "设备报警",
eventAlarm: "重要有害植物报警",
deviceAlarm: {
overspeed: "超速报警",
sos: "求救",
......@@ -162,9 +162,9 @@ const zh_CN = {
createMainGroup: "创建顶级分组",
},
deviceStatistics: {
title: "设备统计",
title: "重要有害植物统计",
selectTime: "选择日期",
selectDevices: "选择设备",
selectDevices: "选择重要有害植物",
},
},
tools: {
......@@ -182,14 +182,15 @@ const zh_CN = {
tips: "提示",
signOut: "确认退出系统?",
roadOperation: "道路作业 1",
bind: "如果设备所在分组已经绑定此围栏，设备可不用单独绑定。",
bind:
"如果重要有害植物所在分组已经绑定此围栏，重要有害植物可不用单独绑定。",
installApp1: "1、手机扫码安装定位APP",
installApp2: "2、添加手机号码到系统中",
installApp3: "3、使用手机号码登录App",
remarks: "请输入备注内容",
unlimitedSpeed: "不限速",
total: "总共 ",
theDevice: " 个设备",
theDevice: " 个重要有害植物",
content: "反馈内容",
},
system: {},
......
src/utils/defineSteps.js
View file @ 84859b65
......@@ -2,27 +2,27 @@ const steps = [
{
element: ".steps-addDevice",
popover: {
title: "创建设备",
title: "创建重要有害植物",
description:
"在这里添加各种类型设备，如果是手机APP定位(GPSBDTracker)<br>1.扫码下载APP<br><img src=http://base.gpsbd.com/down/gpsbd_tracker.png width=120 />，<br>2.将你的手机号码添加到系统中<br>3.使用手机号码登录下载的APP并启动即可定位<br>",
"在这里添加各种类型重要有害植物，如果是手机APP定位(GPSBDTracker)<br>1.扫码下载APP<br><img src=http://base.gpsbd.com/down/gpsbd_tracker.png width=120 />，<br>2.将你的手机号码添加到系统中<br>3.使用手机号码登录下载的APP并启动即可定位<br>",
position: "bottom",
},
},
{
element: ".steps-updateDevice",
popover: {
title: "修改设备",
title: "修改重要有害植物",
description:
"在这里修改编辑设备的基本信息，先需要选中菜单中的设备然后可激活该按钮",
"在这里修改编辑重要有害植物的基本信息，先需要选中菜单中的重要有害植物然后可激活该按钮",
position: "bottom",
},
},
{
element: ".steps-delDevice",
popover: {
title: "删除设备",
title: "删除重要有害植物",
description:
"删除设备，请慎重操作，将一并清理设备的所有轨迹和其他关联信息",
"删除重要有害植物，请慎重操作，将一并清理重要有害植物的所有轨迹和其他关联信息",
position: "bottom",
},
},
......@@ -39,7 +39,7 @@ const steps = [
popover: {
title: "跟踪开关",
description:
"点击此按钮可对设备实时跟踪，保持设备处于地图的中央位置，再次点击可关闭",
"点击此按钮可对重要有害植物实时跟踪，保持重要有害植物处于地图的中央位置，再次点击可关闭",
position: "bottom",
},
},
......@@ -90,7 +90,7 @@ const steps = [
popover: {
title: "地理围栏",
description:
"点击展开和在地图上看到围栏的信息，支持围栏多态形式、并可通过这里创建 修改 删除维护，绑定围栏和设备的关联关系",
"点击展开和在地图上看到围栏的信息，支持围栏多态形式、并可通过这里创建 修改 删除维护，绑定围栏和重要有害植物的关联关系",
position: "bottom",
},
},
......@@ -99,7 +99,7 @@ const steps = [
popover: {
title: "事件消息",
description:
"这里展示所有设备发生的一些事件和报警信息，并在地图上通过动态圈圈显示发生的地理位置",
"这里展示所有重要有害植物发生的一些事件和报警信息，并在地图上通过动态圈圈显示发生的地理位置",
position: "bottom",
},
},
......
src/views/distributor/components/TabDevices.vue
View file @ 84859b65
......@@ -8,7 +8,7 @@
<el-table-column type="selection"></el-table-column>
<el-table-column
prop="name"
label="设备名称"
label="重要有害植物名称"
width="180"
></el-table-column>
<el-table-column prop="imei" label="IMEI" width="180"></el-table-column>
......@@ -69,13 +69,13 @@
<el-col :span="24">
<el-button type="success" @click="goTrack()">监控</el-button>
<el-button type="primary" @click="addVisible = true"
>创建设备</el-button
>创建重要有害植物</el-button
>
<el-button
type="primary"
@click="moveVisible = true"
:disabled="selectDevices.length == 0"
>转移设备</el-button
>转移重要有害植物</el-button
>
<el-pagination
layout="total, sizes, prev, pager, next"
......@@ -90,12 +90,15 @@
</el-col>
</el-row>
<el-dialog title="创建设备" width="50%" :visible.sync="addVisible">
<el-dialog title="创建重要有害植物" width="50%" :visible.sync="addVisible">
<el-form label-width="80px" :model="addForm" ref="addForm">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="设备类型" prop="typeId">
<el-select v-model="addForm.typeId" placeholder="设备类型">
<el-form-item label="重要有害植物类型" prop="typeId">
<el-select
v-model="addForm.typeId"
placeholder="重要有害植物类型"
>
<el-option
v-for="item in this.$store.state.user.dict.deviceTypes"
:key="item.id"
......@@ -110,7 +113,11 @@
label="IMEI"
prop="imei"
:rules="[
{ required: true, message: '请输入设备号', trigger: 'blur' },
{
required: true,
message: '请输入重要有害植物号',
trigger: 'blur',
},
{
min: 10,
max: 16,
......@@ -125,7 +132,7 @@
auto-complete="off"
></el-input>
</el-form-item>
<el-form-item label="设备名称" prop="name">
<el-form-item label="重要有害植物名称" prop="name">
<el-input
type="text"
v-model="addForm.name"
......@@ -148,7 +155,7 @@
</div>
</el-dialog>
<el-dialog title="转移设备" width="50%" :visible.sync="moveVisible">
<el-dialog title="转移重要有害植物" width="50%" :visible.sync="moveVisible">
<UserTree mode="move" @onClickUser="onClickUser"></UserTree>
<div slot="footer" class="dialog-footer">
<el-button @click.native="moveVisible = false">取消</el-button>
......@@ -156,12 +163,15 @@
</div>
</el-dialog>
<el-dialog title="编辑设备" width="50%" :visible.sync="editVisible">
<el-dialog title="编辑重要有害植物" width="50%" :visible.sync="editVisible">
<el-form label-width="80px" :model="editForm" ref="editForm">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="设备类型" prop="typeId">
<el-select v-model="editForm.typeId" placeholder="设备类型">
<el-form-item label="重要有害植物类型" prop="typeId">
<el-select
v-model="editForm.typeId"
placeholder="重要有害植物类型"
>
<el-option
v-for="item in this.$store.state.user.dict.deviceTypes"
:key="item.id"
......@@ -176,7 +186,11 @@
label="IMEI"
prop="imei"
:rules="[
{ required: true, message: '请输入设备号', trigger: 'blur' },
{
required: true,
message: '请输入重要有害植物号',
trigger: 'blur',
},
{
min: 10,
max: 16,
......@@ -191,7 +205,7 @@
auto-complete="off"
></el-input>
</el-form-item>
<el-form-item label="设备名称" prop="name">
<el-form-item label="重要有害植物名称" prop="name">
<el-input
type="text"
v-model="editForm.name"
......@@ -291,7 +305,7 @@ export default {
});
},
handleDelete(row) {
this.$confirm("你确定要删除该设备吗?", "提示", {
this.$confirm("你确定要删除该重要有害植物吗?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
......
src/views/distributor/search.vue
View file @ 84859b65
......@@ -4,7 +4,7 @@
<el-table-column type="selection"></el-table-column>
<el-table-column
prop="name"
label="设备名称"
label="重要有害植物名称"
width="120"
></el-table-column>
<el-table-column prop="imei" label="IMEI" width="180"></el-table-column>
......
src/views/distributor/userinfo.vue
View file @ 84859b65
......@@ -64,7 +64,7 @@
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane label="设备" name="devices">
<el-tab-pane label="重要有害植物" name="devices">
<TabDevices
:visible="currentTab == 'devices'"
:user="userInfo"
......@@ -77,8 +77,8 @@
</div>
</template>
<script>
import TabDevices from "./components/TabDevices"; //用户设备
import TabUsers from "./components/TabUsers"; //用户设备
import TabDevices from "./components/TabDevices"; //用户重要有害植物
import TabUsers from "./components/TabUsers"; //用户重要有害植物
import { getNodeUserInfo, updateUser, deleteUser } from "@/api/api";
import util from "@/utils/util";
export default {
......
src/views/map/components/menu/Device.vue
View file @ 84859b65
......@@ -12,7 +12,10 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item :label="$t('common.deviceType')" prop="typeId">
<el-select v-model="addForm.typeId" placeholder="设备类型">
<el-select
v-model="addForm.typeId"
placeholder="重要有害植物类型"
>
<el-option
v-for="item in this.$store.state.user.dict.deviceTypes"
:key="item.id"
......@@ -48,7 +51,11 @@
"
prop="imei"
:rules="[
{ required: true, message: '请输入设备号', trigger: 'blur' },
{
required: true,
message: '请输入重要有害植物号',
trigger: 'blur',
},
{
min: 10,
max: 16,
......@@ -76,7 +83,7 @@
filterable
allow-create
default-first-option
placeholder="请选择设备视频通道"
placeholder="请选择重要有害植物视频通道"
>
<el-option
v-for="item in options"
......@@ -160,7 +167,7 @@
filterable
allow-create
default-first-option
placeholder="请选择设备视频通道"
placeholder="请选择重要有害植物视频通道"
>
<el-option
v-for="item in options"
......@@ -197,7 +204,10 @@
></el-input>
</el-form-item>
<el-form-item :label="$t('common.deviceType')" prop="typeId">
<el-select v-model="editForm.typeId" placeholder="设备类型">
<el-select
v-model="editForm.typeId"
placeholder="重要有害植物类型"
>
<el-option
v-for="item in this.$store.state.user.dict.deviceTypes"
:key="item.id"
......@@ -273,7 +283,7 @@
</template>
<script>
import GroupTree from "./GroupTree"; //设备新增
import GroupTree from "./GroupTree"; //重要有害植物新增
import { deviceAdd, updateDevice } from "@/api/api";
export default {
......@@ -335,7 +345,7 @@ export default {
{ key: "deviceAddForm", value: false },
]);
this.$refs.addForm.resetFields();
this.$store.dispatch("initData"); //初始化设备数据
this.$store.dispatch("initData"); //初始化重要有害植物数据
});
}
});
......
src/views/map/components/menu/Menu.vue
View file @ 84859b65
......@@ -5,9 +5,9 @@
<template slot="title"> &nbsp;&nbsp;&nbsp;&nbsp; 用户列表 </template>
<UserTree mode="mapUserTree" @onClickUser="onClickUser"></UserTree>
</el-collapse-item>
<el-collapse-item title="设备列表" name="1">
<el-collapse-item title="重要有害植物列表" name="1">
<template slot="title">
&nbsp;&nbsp;&nbsp;&nbsp; 设备列表
&nbsp;&nbsp;&nbsp;&nbsp; 重要有害植物列表
<div class="online-state">
<el-tooltip
class="item"
......@@ -57,7 +57,7 @@
<el-tooltip
class="item"
effect="dark"
content="设备维护"
content="重要有害植物维护"
placement="top-start"
>
<el-button
......@@ -279,7 +279,7 @@
<script>
import "@/styles/gps-menu.scss";
import util from "@/utils/util";
import DeviceBox from "./Device"; //设备新增
import DeviceBox from "./Device"; //重要有害植物新增
import Binds from "../common/Binds"; //绑定围栏
import CommandView from "../command/CommandView"; //命令下发发送界面
import Records from "../command/Records";
......@@ -303,7 +303,7 @@ export default {
activeIndex: "1",
activeName: "1",
filterDeviceName: "",
selectDevice: {}, //选中的列表中的设备,
selectDevice: {}, //选中的列表中的重要有害植物,
optionsMenu: [
{
value: "history",
......@@ -409,7 +409,7 @@ export default {
]);
} else {
this.$message({
message: "请先选择设备",
message: "请先选择重要有害植物",
type: "error",
});
}
......@@ -417,12 +417,12 @@ export default {
case "del":
if (!this.$store.state.user.devices.selectId) {
this.$message({
message: "请先选择设备",
message: "请先选择重要有害植物",
type: "error",
});
return;
}
this.$confirm("你确定要删除该设备吗?", "提示", {
this.$confirm("你确定要删除该重要有害植物吗?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
......@@ -430,7 +430,7 @@ export default {
})
.then(() => {
delDevice(this.$store.state.user.devices.selectId).then((res) => {
this.$store.dispatch("initData"); //初始化设备数据
this.$store.dispatch("initData"); //初始化重要有害植物数据
});
})
.catch(() => {});
......@@ -453,7 +453,7 @@ export default {
onClickButton(item) {
if (this.$store.state.user.devices.selectId == 0) {
this.$message({
message: "请先选择设备",
message: "请先选择重要有害植物",
type: "error",
});
return;
......@@ -740,7 +740,7 @@ export default {
});
} else if (device.status == 1) {
this.$message({
message: "未定位，请尝试将设备移至户外空旷区域",
message: "未定位，请尝试将重要有害植物移至户外空旷区域",
type: "error",
});
}
......@@ -823,7 +823,7 @@ export default {
// generateToken(id).then(data => {
// let monitorUser = {account:'anon',token:data}
// localStorage.monitorUser = JSON.stringify(monitorUser);
// this.$store.dispatch('initData'); //初始化设备数据
// this.$store.dispatch('initData'); //初始化重要有害植物数据
//
// })
},
......
src/views/map/components/playback/Control.vue
View file @ 84859b65
......@@ -353,7 +353,7 @@ export default {
downLoad() {
import("@/vendor/Export2Excel").then((excel) => {
const tHeader = [
"设备",
"重要有害植物",
"经度",
"纬度",
"速度 km/h",
......
src/views/map/components/tools/Geofence.vue
View file @ 84859b65
......@@ -229,7 +229,7 @@ export default {
deviceMsgData: {},
bindGeoVisible: false,
districtGeoVisible: false,
by: 0, // 0围栏绑定设备 1设备绑定围栏
by: 0, // 0围栏绑定重要有害植物 1重要有害植物绑定围栏
geofenceList: [],
page: 1,
total: 0,
......
src/views/map/components/tools/Message.vue
View file @ 84859b65
......@@ -255,7 +255,7 @@ export default {
downLoad() {
import("@/vendor/Export2Excel").then((excel) => {
const tHeader = [
"设备号",
"重要有害植物号",
"事件",
"地址",
"围栏",
......
src/views/map/components/user/DeviceStatistics.vue
View file @ 84859b65
......@@ -10,7 +10,7 @@
<el-row :gutter="20">
<el-col :span="4">
<el-input
placeholder="请输入搜索的设备名称"
placeholder="请输入搜索的重要有害植物名称"
v-model="filterDeviceName"
>
</el-input>
......@@ -190,7 +190,7 @@ export default {
this.times = util.getDayAll(start, end);
if (deviceIds.length == 0) {
this.$message({
message: "请至少选择一个设备",
message: "请至少选择一个重要有害植物",
type: "warning",
});
return;
......
src/views/map/components/user/Groups.vue
View file @ 84859b65
......@@ -26,7 +26,7 @@
</el-tree>
</el-dialog>
<el-dialog title="分组绑定围栏" :visible.sync="dialogVisible" width="40%">
<el-alert title="等价于分组里所有设备绑定此围栏" type="warning">
<el-alert title="等价于分组里所有重要有害植物绑定此围栏" type="warning">
</el-alert
><br />
<el-transfer
......@@ -252,7 +252,7 @@ export default {
message: "移动成功！",
type: "success",
});
this.$store.dispatch("initData"); //初始化设备数据
this.$store.dispatch("initData"); //初始化重要有害植物数据
});
},
},
......
src/views/map/components/user/StopsStatistics.vue
View file @ 84859b65
......@@ -10,7 +10,11 @@
<el-row type="flex" class="row-bg">
<el-col :span="24">
<el-form :inline="true">
<el-select v-model="deviceId" filterable placeholder="请选择设备">
<el-select
v-model="deviceId"
filterable
placeholder="请选择重要有害植物"
>
<el-option
v-for="item in $store.state.user.devices.list"
:key="item.id"
......
src/views/map/index.vue
View file @ 84859b65
......@@ -470,7 +470,7 @@ export default {
this.$store.dispatch("setVisblesFlag", [{ key: "login", value: true }]);
return;
} else {
this.$store.dispatch("initData"); //初始化设备数据
this.$store.dispatch("initData"); //初始化重要有害植物数据
this.$store.dispatch("setVisblesFlag", [
{ key: "deviceMenu", value: true },
]);
......@@ -503,7 +503,7 @@ export default {
visible: true,
});
} else if (nv == 1 && ov == 2) {
//轨迹回放-->跟踪设备
//轨迹回放-->跟踪重要有害植物
this.$store.dispatch("removeHistoryPositions");
this.$store.dispatch("setDeviceMarkersVisible", {
......
src/views/system/components/InDevice.vue
View file @ 84859b65
<template>
<el-dialog
title="导入设备"
title="导入重要有害植物"
:visible.sync="visible"
:before-close="handleClose"
:lock-scroll="false"
......@@ -41,7 +41,7 @@
<el-col :span="24">
<el-select
v-model="typeId"
placeholder="设备类型"
placeholder="重要有害植物类型"
@change="deviceTypeChange"
>
<el-option
......
src/views/system/components/PanelGroup.vue
View file @ 84859b65
......@@ -51,7 +51,7 @@
<svg-icon icon-class="device" class-name="card-panel-icon" />
</div>
<div class="card-panel-description">
<div class="card-panel-text">在线/设备总数</div>
<div class="card-panel-text">在线/重要有害植物总数</div>
<count-to
class="card-panel-num"
:startVal="0"
......
src/views/system/components/PieChart.vue
View file @ 84859b65
......@@ -53,7 +53,7 @@ export default {
formatter: "{a} <br/>{b} : {c} ({d}%)",
},
title: {
text: "设备统计",
text: "重要有害植物统计",
textStyle: {
color: "#000",
},
......
src/views/system/components/TransferDevice.vue
View file @ 84859b65
<template>
<el-dialog
title="转移设备"
title="转移重要有害植物"
:visible.sync="visible"
:before-close="handleClose"
:lock-scroll="false"
......@@ -12,7 +12,7 @@
<el-table-column type="index" width="40"> </el-table-column>
<el-table-column prop="imei" label="IMEI" width="160">
</el-table-column>
<el-table-column prop="name" label="设备名称" width="120">
<el-table-column prop="name" label="重要有害植物名称" width="120">
</el-table-column>
</el-table>
</el-col>
......
src/views/system/dashboard.vue
View file @ 84859b65
......@@ -40,7 +40,7 @@ import {
import moment from "moment";
const lineChartData = {
online: {
legendData: ["在线设备", "在线用户"],
legendData: ["在线重要有害植物", "在线用户"],
xAxisData: ["7:00", "8:00", "9:00", "10:00", "11:00", "12:00", "13:00"],
greenData: [100, 120, 161, 134, 105, 160, 165],
redData: [120, 82, 91, 154, 162, 140, 145],
......
src/views/system/devices.vue
View file @ 84859b65
This diff is collapsed.
src/views/system/system/devicetypes.vue
View file @ 84859b65
......@@ -64,7 +64,7 @@
</el-row>
<el-dialog
title="创建设备类型"
title="创建重要有害植物类型"
:visible.sync="addDialogVisible"
width="30%"
>
......@@ -122,7 +122,7 @@
</el-dialog>
<el-dialog
title="修改设备类型"
title="修改重要有害植物类型"
:visible.sync="editDialogVisible"
width="30%"
>
......
src/views/system/system/session.vue
View file @ 84859b65
......@@ -47,7 +47,7 @@
>
<el-table-column label="序号" width="95" type="index">
</el-table-column>
<el-table-column label="设备通道" prop="video">
<el-table-column label="重要有害植物通道" prop="video">
</el-table-column>
<el-table-column label="Token" prop="token">
<template slot-scope="scope">
......
src/views/system/users.vue
View file @ 84859b65
This diff is collapsed.
src/vuex/actions.js
View file @ 84859b65
......@@ -205,7 +205,7 @@ export default {
offline: 0,
notactive: 0,
};
//获取所有设备
//获取所有重要有害植物
getDevices().then((data) => {
var devices = {
selectId: 0,
......@@ -240,7 +240,7 @@ export default {
devices: devices,
onlineState: onlineState,
});
// 获取设备位置
// 获取重要有害植物位置
getLastPosition().then((res) => {
if (res.length > 0) {
let position = res[0];
......@@ -253,7 +253,7 @@ export default {
commit(types.USER_UPDATE_DEVICE_POSITION, res);
});
//初始化设备树形菜单
//初始化重要有害植物树形菜单
getDevicesTree().then((data) => {
let checkedKeys = [];
// if(localStorage.checkedKeys){
......
src/vuex/modules/user.js
View file @ 84859b65
......@@ -3,11 +3,11 @@
**/
export const moduleUser = {
state: {
selectId: 0, //选中的设备ID
selectId: 0, //选中的重要有害植物ID
devices: {
selectId: 0, //选中的设备ID
selectId: 0, //选中的重要有害植物ID
index: {}, //索引
list: [], //设备数组
list: [], //重要有害植物数组
},
bubble: {
//气泡内容
......@@ -36,9 +36,9 @@ export const moduleUser = {
},
},
visibles: {
deviceMenu: false, //设备列表
deviceAddForm: false, //添加设备
deviceEditForm: false, //编辑设备
deviceMenu: false, //重要有害植物列表
deviceAddForm: false, //添加重要有害植物
deviceEditForm: false, //编辑重要有害植物
updatePassDialog: false, //密码修改
districtGeoDialog: false, //行政区域围栏
groupAddForm: false, //添加分组
......@@ -54,7 +54,7 @@ export const moduleUser = {
videoPlayBackDialog: false, //视频回放对话框
intercomDialog: false, //对讲机对话框
},
//selectDeviceId:0,//选中的设备ID
//selectDeviceId:0,//选中的重要有害植物ID
map: {
type: localStorage.map ? JSON.parse(localStorage.map).type : "google",
types: [],
......@@ -94,7 +94,7 @@ export const moduleUser = {
removing: "拆除报警",
fault: "fault",
}, //报警字典
deviceStates: { stop: "停", clockwise: "顺", inverse: "反" }, //设备运转状态
deviceStates: { stop: "停", clockwise: "顺", inverse: "反" }, //重要有害植物运转状态
playAlarmSound: false, //播放报警声音
control: {
begin: false,
......@@ -122,12 +122,12 @@ export const moduleUser = {
editable: false,
},
message: {
eventCount: 0, //未读设备消息
eventCount: 0, //未读重要有害植物消息
},
dict: {
commandViews: {}, //命令格式视图数据
commandIdsByType: {}, //设备类型对应的命令
deviceTypes: [], //设备类型字典
commandIdsByType: {}, //重要有害植物类型对应的命令
deviceTypes: [], //重要有害植物类型字典
deviceType: {},
},
onlineState: {
......@@ -139,7 +139,7 @@ export const moduleUser = {
menuTreeData: {
nodes: [], //节点数据
checkedKeys: [], //选中的节点
}, //分组设备树形菜单
}, //分组重要有害植物树形菜单
events: [],
customLayers: {
......@@ -204,13 +204,13 @@ export const moduleUser = {
],
videoRes: [], //视频历史资源
currentPlayBack: {
//当前正在播放历史视频的设备
//当前正在播放历史视频的重要有害植物
device: {},
channel: 0,
loading: false,
},
currentIntercom: {
//当前正在播对讲的设备
//当前正在播对讲的重要有害植物
device: {},
channel: 0,
},
......
src/vuex/mutation-types.js
View file @ 84859b65
......@@ -8,19 +8,19 @@ export const COMMON_INIT_SYSTEM = "COMMON_INIT_SYSTEM"; //初始化系统版本
export const COMMON_INIT_CONFIG = "COMMON_INIT_CONFIG"; //初始化系统配置
//前端用户存储方法
export const USER_UPDATE_DEVICE_STATUS = "USER_UPDATE_DEVICE_STATUS"; //更新设备状态
export const USER_UPDATE_DEVICE_POSITION = "USER_UPDATE_DEVICE_POSITION"; //更新设备位置
export const USER_RESPONSE_DEVICE_COMMAND = "USER_RESPONSE_DEVICE_COMMAND"; //响应设备命令
export const USER_INIT_DEVICES = "USER_INIT_DEVICES"; //初始化设备状态和位置
export const USER_UPDATE_DEVICE_STATUS = "USER_UPDATE_DEVICE_STATUS"; //更新重要有害植物状态
export const USER_UPDATE_DEVICE_POSITION = "USER_UPDATE_DEVICE_POSITION"; //更新重要有害植物位置
export const USER_RESPONSE_DEVICE_COMMAND = "USER_RESPONSE_DEVICE_COMMAND"; //响应重要有害植物命令
export const USER_INIT_DEVICES = "USER_INIT_DEVICES"; //初始化重要有害植物状态和位置
export const USER_IS_SHOW_BUBBLE = "USER_IS_SHOW_BUBBLE"; //是否显示气泡
export const USER_SET_VISIBLES_FLAG = "USER_SET_VISIBLES_FLAG"; //设置隐藏显示属性
export const USER_SET_SELECT_DEVICE_ID = "USER_SET_SELECT_DEVICE_ID"; //设置选中的设备ID
export const USER_SET_SELECT_DEVICE_ID = "USER_SET_SELECT_DEVICE_ID"; //设置选中的重要有害植物ID
export const USER_IS_TRACK_CENTER = "USER_IS_TRACK_CENTER"; //是否画面跟随
export const USER_ADD_DEVICE = "USER_ADD_DEVICE"; //添加设备
export const USER_ADD_DEVICE = "USER_ADD_DEVICE"; //添加重要有害植物
export const USER_SET_PLAY_ALARM_SOUND = "USER_SET_PLAY_ALARM_SOUND"; //设置播放报警声音
export const USER_SET_MAP_VALUES = "USER_SET_MAP_VALUES"; //设置map地图属性值
export const USER_SET_DEVICE_MARKERS_VISIBLE =
"USER_SET_DEVICE_MARKERS_VISIBLE"; //设置设备maker是否可见
"USER_SET_DEVICE_MARKERS_VISIBLE"; //设置重要有害植物maker是否可见
export const USER_SET_CONTROL_VALUE = "USER_SET_CONTROL_VALUE"; //设置轨迹回放控制按钮属性
export const USER_REMOVE_HISTORY_POSITIONS = "USER_REMOVE_HISTORY_POSITIONS"; //清理历史轨迹
export const USER_GET_HISTORY_POSITIONS = "USER_GET_HISTORY_POSITIONS"; //获取历史轨迹
......@@ -38,12 +38,12 @@ export const USER_DELETE_SELECT_GEOFENCE = "USER_DELETE_SELECT_GEOFENCE"; //删
export const USER_SET_MEASURE_ENABLE = "USER_SET_MEASURE_ENABLE"; //设置开启 关闭绘制围栏事件
export const USER_SET_MESSAGE_VALUE = "USER_SET_MESSAGE_VALUE"; //设置消息的条数
//export const USER_UPDATE_DEVICE_STATE='USER_UPDATE_DEVICE_STATE';//更新设备状态属性
//export const USER_UPDATE_DEVICE_STATE='USER_UPDATE_DEVICE_STATE';//更新重要有害植物状态属性
export const USER_INIT_STATIC_DATA = "USER_INIT_STATIC_DATA"; //初始化静态数据
export const USER_SET_MARKER_VISIBLE = "USER_SET_MARKER_VISIBLE"; //设置设备marker是否可见
export const USER_SET_MARKER_VISIBLE = "USER_SET_MARKER_VISIBLE"; //设置重要有害植物marker是否可见
export const USER_INIT_GROUPS = "USER_INIT_GROUPS"; //初始化分组数据
export const USER_INIT_TREE_DATA = "USER_INIT_TREE_DATA"; //初始化分组设备属性数据
export const USER_LOOK_DEVICES_MOTION_STATE = "USER_LOOK_DEVICES_MOTION_STATE"; ////定时检查设备运动状态
export const USER_INIT_TREE_DATA = "USER_INIT_TREE_DATA"; //初始化分组重要有害植物属性数据
export const USER_LOOK_DEVICES_MOTION_STATE = "USER_LOOK_DEVICES_MOTION_STATE"; ////定时检查重要有害植物运动状态
export const USER_GET_EVENTS = "USER_GET_EVENTS"; //获取事件
export const USER_INIT_CUSTOMLAYERS = "USER_INIT_CUSTOMLAYERS"; //初始化自定义图层
export const USER_SET_CUSTOMLAYER_VALUE = "USER_SET_CUSTOMLAYER_VALUE"; //设置图层值
......@@ -61,7 +61,7 @@ export const USER_CLOSE_VIDEO = "USER_CLOSE_VIDEO"; //关闭视频
export const USER_ADD_VIDEO = "USER_ADD_VIDEO"; //添加视频
export const USER_INIT_LAYERS = "USER_INIT_LAYERS"; //初始化自定义GIS图层
export const USER_SET_LAYER_VALUE = "USER_SET_LAYER_VALUE"; //设置GIS图层值
export const USER_SET_CURRENT_PLASYBACK = "USER_SET_CURRENT_PLASYBACK"; //设置当前回放的视频设备通道
export const USER_SET_CURRENT_PLASYBACK = "USER_SET_CURRENT_PLASYBACK"; //设置当前回放的视频重要有害植物通道
export const USER_DELETE_VIDEO_RES = "USER_DELETE_VIDEO_RES"; //清除历史视频记录
export const USER_SET_CURRENT_INTERCOM = "USER_SET_CURRENT_INTERCOM"; //设置当前对讲备通道
......
src/vuex/mutations.js
View file @ 84859b65
......@@ -29,7 +29,7 @@ export default {
});
},
[types.USER_INIT_DEVICES](state, vals) {
console.log("初始化设备");
console.log("初始化重要有害植物");
state.user.devices = vals.devices;
state.user.onlineState = vals.onlineState;
// state.user.deviceIndexHash = vals.deviceIndexHash;
......@@ -113,7 +113,7 @@ export default {
} else {
state.user.devices.list[index].motion = 1;
}
//更新跟踪设备的气泡信息
//更新跟踪重要有害植物的气泡信息
if (state.user.devices.selectId == devstatus.id) {
state.user.popup.content = util.popupContent(
state.user.devices.list[index]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment