five-groups
/
five-cloud-ui
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: five-groups:5f232b131a20eb509047615848e6bc13c7a99da1
Branches Tags
five-groups:server_ui_fufanrui
five-groups:server_five_ui
five-groups:server_ui_liuyunhu
five-groups:server_ui_dongxiaodong
...
compare: five-groups:a07da38465e619cb2313dd299d1e0579af87d531
Branches Tags
five-groups:server_ui_fufanrui
five-groups:server_five_ui
five-groups:server_ui_liuyunhu
five-groups:server_ui_dongxiaodong

6 Commits
5f232b131a ... a07da38465

Author SHA1 Message Date
ffr a07da38465 付凡芮commit 2024-04-09 08:42:03 +08:00
lijiayao be530fe9fa Merge branch 'server_ui_fufanrui' of https://gitea.qinmian.online/five-groups/five-cloud-ui into server_five_ui 2024-04-08 21:58:21 +08:00
lijiayao 5bfea79048 Merge branch 'server_ui_fufanrui' of https://gitea.qinmian.online/five-groups/five-cloud-ui into server_five_ui 2024-04-08 21:25:00 +08:00
lijiayao 91769874b8 Merge branch 'server_ui_fufanrui' of https://gitea.qinmian.online/five-groups/five-cloud-ui into server_five_ui 2024-04-08 08:55:36 +08:00
lijiayao 3278370356 Merge remote-tracking branch 'origin/server_ui_fufanrui' into server_ui_xiaoyao 2024-04-05 20:18:07 +08:00
lijiayao 5ce70109f5 perf: 优化编辑功能 2024-04-05 20:04:04 +08:00
4 changed files with 72 additions and 50 deletions
Show Stats Expand all files Collapse all files

2
src/views/couplet/fence/container.vue
View File

@ -112,7 +112,7 @@ export default {
this.$message("覆盖物对象绘制完成"); this.$message("覆盖物对象绘制完成");
fenceUpdate(this.drawnPoints).then(res=>{ fenceUpdate(this.drawnPoints).then(res=>{
this.$message.success("编辑成功") this.$message.success("编辑成功")
this.$router.push({path: '/business/fence/fence'}) this.$router.push({path: '/couplet/fence/fence'})
}) })
} }
}, },

23
src/views/couplet/fence/index.html
View File

@ -1,23 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta
name="viewport"
content="initial-scale=1.0, user-scalable=no, width=device-width"
/>
<title>HELLO, AMAP!</title>
<style>
html,
body,
#container {
width: 100%;
height: 100%;
}
</style>
</head>
<body>
<div id="container"></div>
</body>
</html>

91
src/views/couplet/fence/index.vue
View File

@ -52,17 +52,17 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="维护人" prop="maintainerName" width="100"/> <el-table-column label="维护人" prop="maintainerName" width="100"/>
<el-table-column
label="出行状态">
<template slot-scope="scope">
<span style="margin-left: 10px" v-if="scope.row.fenceCondition == 0">驶入</span>
<span style="margin-left: 10px" v-if="scope.row.fenceCondition == 1">驶出</span>
</template>
</el-table-column>
<el-table-column label="围栏标识" prop="logoName" width="100"/> <el-table-column label="围栏标识" prop="logoName" width="100"/>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作"> <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button
v-hasPermi="['business:fence:fenceUpdate']"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleQueryFence(scope.row)"
>查询围栏
</el-button>
<el-button <el-button
v-hasPermi="['business:fence:fenceUpdate']" v-hasPermi="['business:fence:fenceUpdate']"
icon="el-icon-edit" icon="el-icon-edit"
@ -97,6 +97,14 @@
@click="handleFenceDelete(scope.row)" @click="handleFenceDelete(scope.row)"
>删除 >删除
</el-button> </el-button>
<el-button
v-hasPermi="['business:fence:fenceDelete']"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleUpdate(scope.row)"
>修改电子围栏
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -111,6 +119,8 @@
:total="400"> :total="400">
</el-pagination> </el-pagination>
</div> </div>
<!-- Form --> <!-- Form -->
<el-dialog title="新增电子围栏" :visible.sync="dialogFormVisible"> <el-dialog title="新增电子围栏" :visible.sync="dialogFormVisible">
<el-form :model="fenceInsertRequest"> <el-form :model="fenceInsertRequest">
@ -127,7 +137,6 @@
<template> <template>
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox> <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
<div style="margin: 15px 0;"></div> <div style="margin: 15px 0;"></div>
<el-checkbox-group v-model="fenceInsertRequest.logoIds" @change="handleChange"> <el-checkbox-group v-model="fenceInsertRequest.logoIds" @change="handleChange">
<el-checkbox v-for="item in logo" :key="item.logoId" :label="item.logoId" >{{item.logoName}}</el-checkbox> <el-checkbox v-for="item in logo" :key="item.logoId" :label="item.logoId" >{{item.logoName}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
@ -138,30 +147,46 @@
<el-button type="primary" @click="addFence">确 定</el-button> <el-button type="primary" @click="addFence">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="修改电子围栏" :visible.sync="dialogFormVisible">
<el-form :model="fenceInsertRequest">
<el-form-item label="围栏名称" :label-width="formLabelWidth">
<el-input v-model="fenceInsertRequest.fenceName" autocomplete="off"></el-input>
</el-form-item>
<el-dialog title="修改电子围栏" :visible.sync="dialogFormVisible2">
<el-form :model="fenceUpdateRequest">
<el-form-item label="围栏编号" :label-width="formLabelWidth">
<el-input v-model="fenceUpdateRequest.fenceId" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="围栏名称" :label-width="formLabelWidth">
<el-input v-model="fenceUpdateRequest.fenceName" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="经纬度" :label-width="formLabelWidth">
<el-input v-model="fenceUpdateRequest.fenceLongitudeLatitude" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="电子围栏描述信息" :label-width="formLabelWidth"> <el-form-item label="电子围栏描述信息" :label-width="formLabelWidth">
<el-input v-model="fenceInsertRequest.fenceDescription" autocomplete="off"></el-input> <el-input v-model="fenceUpdateRequest.fenceDescription" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="电子围栏创建时间" :label-width="formLabelWidth">
<el-input v-model="fenceUpdateRequest.createTime" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="电子围栏修改时间" :label-width="formLabelWidth">
<el-input v-model="fenceUpdateRequest.updateTime" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="维护负责人" :label-width="formLabelWidth"> <el-form-item label="维护负责人" :label-width="formLabelWidth">
<el-input v-model="fenceInsertRequest.maintainerName" autocomplete="off"></el-input> <el-input v-model="fenceUpdateRequest.maintainerName" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="状态" :label-width="formLabelWidth">
<el-input v-model="fenceUpdateRequest.fenceState" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="运行状态" :label-width="formLabelWidth">
<el-select v-model="fenceUpdateRequest.fenceCondition" placeholder="请选择运行状态">
<el-option label="驶入" value="0"></el-option>
<el-option label="驶出" value="1"></el-option>
</el-select>
</el-form-item> </el-form-item>
<template>
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
<div style="margin: 15px 0;"></div>
<el-checkbox-group v-model="fenceInsertRequest.logoIds" @change="handleChange">
<el-checkbox v-for="item in logo" :key="item.logoId" :label="item.logoId" >{{item.logoName}}</el-checkbox>
</el-checkbox-group>
</template>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button> <el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="addFence">确 定</el-button> <el-button type="primary" @click="updateFence">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -170,7 +195,7 @@
</template> </template>
<script> <script>
import {fenceList, changeFenceStatus, queryByLogo, fenceDelete, fenceAdd} from "@/api/couplet/fence"; import {fenceList, changeFenceStatus, queryByLogo, fenceDelete, fenceAdd, fenceUpdate} from "@/api/couplet/fence";
import path from "path"; import path from "path";
export default { export default {
components: {}, components: {},
@ -184,6 +209,7 @@ export default {
logoIds:[] logoIds:[]
}, },
dialogFormVisible: false, dialogFormVisible: false,
dialogFormVisible2: false,
formLabelWidth: '120px', formLabelWidth: '120px',
checkAll: false, checkAll: false,
logo: [ logo: [
@ -321,8 +347,21 @@ export default {
handleFenceUpdate(row){ handleFenceUpdate(row){
this.$router.push({path: '/business/fence/container', query: {drawGraph: row}}) this.$router.push({path: '/business/fence/container', query: {drawGraph: row}})
}, },
handleQueryFence(){ handleUpdate(row){
this.dialogFormVisible2=true;
this.fenceUpdateRequest=row
},
/**
* 修改电子围栏
*/
updateFence(){
fenceUpdate(this.fenceUpdateRequest).then(
res=>{
this.$message.success("修改成功")
this.dialogFormVisible2=false;
}
)
} }
}, },
created() { created() {

6
src/views/couplet/monitorinData/index.vue
View File

@ -326,6 +326,9 @@ export default {
} }
) )
}, },
refreshTableData() {
this.getList();
}
}, },
//生命周期 - 创建完成（可以访问当前this实例）", //生命周期 - 创建完成（可以访问当前this实例）",
created() { created() {
@ -333,6 +336,9 @@ export default {
}, },
//生命周期 - 挂载完成（可以访问DOM元素）", //生命周期 - 挂载完成（可以访问DOM元素）",
mounted() { mounted() {
setInterval(() => {
this.refreshTableData();
}, 4000);
}, },
beforeCreate() { beforeCreate() {
}, //生命周期 - 创建之前", }, //生命周期 - 创建之前",