Merge branch 'feixian' of http://123.132.248.154:10000/xujingliang/Fei_Xian_Lin_Ye_Fang_Huo into feixian
commit
792d33810b
|
|
@ -1,135 +1,233 @@
|
|||
<template>
|
||||
<div class="site-content">
|
||||
|
||||
<sticky :className="'sub-navbar'">
|
||||
<div class="filter-container">
|
||||
|
||||
<el-input @keyup.enter.native="handleFilter" size="mini" prefix-icon="el-icon-search"
|
||||
style="width: 200px;margin-bottom: 0;margin:0px 12px;" class="filter-item" :placeholder="'名称'"
|
||||
v-model="listQuery.name">
|
||||
<el-input
|
||||
@keyup.enter.native="handleFilter"
|
||||
size="mini"
|
||||
prefix-icon="el-icon-search"
|
||||
style="width: 200px; margin-bottom: 0; margin: 0px 12px"
|
||||
class="filter-item"
|
||||
:placeholder="'名称'"
|
||||
v-model="listQuery.name"
|
||||
>
|
||||
</el-input>
|
||||
|
||||
<el-button type="primary" size="mini" @click="getList()">查询</el-button>
|
||||
<el-button type="primary" size="mini" @click="getList()"
|
||||
>查询</el-button
|
||||
>
|
||||
<!-- <el-button type="primary" size="mini" @click="add()">添加</el-button> -->
|
||||
<el-button type="warning" size="mini" @click="react()">编辑</el-button>
|
||||
<el-button type="danger" size="mini" @click="del()">删除</el-button>
|
||||
|
||||
<permission-btn moduleName='modulemanager' :size="'mini'" v-on:btn-event="onBtnClicked"></permission-btn>
|
||||
|
||||
<permission-btn
|
||||
moduleName="modulemanager"
|
||||
:size="'mini'"
|
||||
v-on:btn-event="onBtnClicked"
|
||||
></permission-btn>
|
||||
</div>
|
||||
</sticky>
|
||||
<div class="app-container flex-item">
|
||||
<div class="fh">
|
||||
<div class="flex jc-sb" style="height:calc(100% - 60px)">
|
||||
<div class="mr-1 max-h" style="width:500px">
|
||||
<el-table ref="mainTable" :key='tableKey' :data="tableData" v-loading="listLoading" border fit
|
||||
highlight-current-row style="width: 100%;" height="100%" @row-click="rowClick"
|
||||
@selection-change="handleSelectionChange">
|
||||
<div class="flex jc-sb" style="height: calc(100% - 60px)">
|
||||
<div class="mr-1 max-h" style="width: 500px">
|
||||
<el-table
|
||||
ref="mainTable"
|
||||
:key="tableKey"
|
||||
:data="tableData"
|
||||
v-loading="listLoading"
|
||||
border
|
||||
fit
|
||||
highlight-current-row
|
||||
style="width: 100%"
|
||||
height="100%"
|
||||
@row-click="rowClick"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" align="center" width="55">
|
||||
</el-table-column>
|
||||
<el-table-column prop="Account" label="账号" show-overflow-tooltip align="center">
|
||||
<el-table-column
|
||||
prop="Account"
|
||||
label="账号"
|
||||
show-overflow-tooltip
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column prop="Name" label="姓名" show-overflow-tooltip align="center">
|
||||
<el-table-column
|
||||
prop="Name"
|
||||
label="姓名"
|
||||
show-overflow-tooltip
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="性别" show-overflow-tooltip align="center">
|
||||
<el-table-column
|
||||
label="性别"
|
||||
show-overflow-tooltip
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
{{scope.row.Sex == 0 ? '男' : '女'}}
|
||||
{{ scope.row.Sex == 0 ? "男" : "女" }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="mr-1" style="background: rgba(0, 9, 34, 0.6);width:350px;">
|
||||
<div style="height:40px;align-items:baseline" class="flex">
|
||||
<el-input @keyup.enter.native="handleFilter" size="mini" prefix-icon="el-icon-search"
|
||||
style="width: 150px;margin-bottom: 0;margin:0px 12px;" class="filter-item" :placeholder="'打卡点名称'"
|
||||
v-model="clockInName">
|
||||
<div
|
||||
class="mr-1"
|
||||
style="background: rgba(0, 9, 34, 0.6); width: 350px"
|
||||
>
|
||||
<div style="height: 40px; align-items: baseline" class="flex">
|
||||
<el-input
|
||||
@keyup.enter.native="handleFilter"
|
||||
size="mini"
|
||||
prefix-icon="el-icon-search"
|
||||
style="width: 150px; margin-bottom: 0; margin: 0px 12px"
|
||||
class="filter-item"
|
||||
:placeholder="'打卡点名称'"
|
||||
v-model="clockInName"
|
||||
>
|
||||
</el-input>
|
||||
<el-button type="primary" size="mini" @click="getClockInList()">搜索</el-button>
|
||||
<el-button type="primary" size="mini" @click="getClockInList()"
|
||||
>搜索</el-button
|
||||
>
|
||||
</div>
|
||||
<div class="forestlistbox">
|
||||
<div class="forestUl cursor" v-for="(item,index) in clockInList" :key="index" @click="gofly(item)">
|
||||
<div
|
||||
class="forestUl cursor"
|
||||
v-for="(item, index) in clockInList"
|
||||
:key="index"
|
||||
@click="gofly(item)"
|
||||
>
|
||||
<div class="flex max-h jc-sb ai-c">
|
||||
<div class="flex-1 fc-w fz-16">
|
||||
<div>{{ item.pointname }}</div>
|
||||
<div class="fz-14 mt-1">责任人：{{ item.usernames }}</div>
|
||||
</div>
|
||||
<div class="flex column jc-c ai-c" style="height:70px">
|
||||
<div class="flex column jc-c ai-c" style="height: 70px">
|
||||
<span>
|
||||
<el-button type="danger" size="mini" @click.stop="delItem(item)">删除</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
size="mini"
|
||||
@click.stop="delItem(item)"
|
||||
>删除</el-button
|
||||
>
|
||||
</span>
|
||||
<el-button type="success" class="mt-1" size="mini" @click.stop="editClock(item)">编辑</el-button>
|
||||
<el-button
|
||||
type="success"
|
||||
class="mt-1"
|
||||
size="mini"
|
||||
@click.stop="editClock(item)"
|
||||
>编辑</el-button
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex-1 max-w" style="position: relative;overflow: hidden;">
|
||||
<DItu class="max-w" :rowkey="rowdataKey" :lnglat="clocklnglat" :flyCenter="flyCenter" ref="dituevent" @getLocation="getLocation"></DItu>
|
||||
<div
|
||||
class="flex-1 max-w"
|
||||
style="position: relative; overflow: hidden"
|
||||
>
|
||||
<DItu
|
||||
class="max-w"
|
||||
:rowkey="rowdataKey"
|
||||
:lnglat="clocklnglat"
|
||||
:flyCenter="flyCenter"
|
||||
ref="dituevent"
|
||||
@rightClick="rightClick"
|
||||
></DItu>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<pagination v-show="total>0" :total="total" :page.sync="listQuery.pageIndex" :limit.sync="listQuery.pageSize"
|
||||
@pagination="handleCurrentChange" />
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
:total="total"
|
||||
:page.sync="listQuery.pageIndex"
|
||||
:limit.sync="listQuery.pageSize"
|
||||
@pagination="handleCurrentChange"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-dialog width="40%" height="60%" top=" calc(50vh - 340px)" class="dialog-mini body-small addWindow"
|
||||
v-el-drag-dialog :title="titleStr" :close-on-click-modal="false" :close-on-press-escape="false"
|
||||
:visible.sync="addServiceVisible">
|
||||
<AddForm v-if="addServiceVisible" @addSuccess="addSuccess" :detailInfo="detailInfo" @close="addServiceVisible = false"></AddForm>
|
||||
<el-dialog
|
||||
width="40%"
|
||||
height="60%"
|
||||
top=" calc(50vh - 340px)"
|
||||
class="dialog-mini body-small addWindow"
|
||||
v-el-drag-dialog
|
||||
:title="titleStr"
|
||||
:close-on-click-modal="false"
|
||||
:close-on-press-escape="false"
|
||||
:visible.sync="addServiceVisible"
|
||||
>
|
||||
<AddForm
|
||||
v-if="addServiceVisible"
|
||||
@addSuccess="addSuccess"
|
||||
:detailInfo="detailInfo"
|
||||
@close="addServiceVisible = false"
|
||||
></AddForm>
|
||||
</el-dialog>
|
||||
<!-- 添加打卡 -->
|
||||
<el-dialog width="40%" height="60%" top=" calc(50vh - 340px)" class="dialog-mini"
|
||||
v-el-drag-dialog title="打卡" :close-on-click-modal="false" :close-on-press-escape="false"
|
||||
:visible.sync="clockInVisible ">
|
||||
<clockInDia :lnglat="clocklnglat" :clockdata="clockDetail" @clockInSuccess="clockInSuccess" @close="clockInVisible = false" v-if="clockInVisible"></clockInDia>
|
||||
<el-dialog
|
||||
width="40%"
|
||||
height="60%"
|
||||
top=" calc(50vh - 340px)"
|
||||
class="dialog-mini"
|
||||
v-el-drag-dialog
|
||||
title="打卡"
|
||||
:close-on-click-modal="false"
|
||||
:close-on-press-escape="false"
|
||||
:visible.sync="clockInVisible"
|
||||
>
|
||||
<clockInDia
|
||||
:lnglat="clocklnglat"
|
||||
:clockdata="clockDetail"
|
||||
@clockInSuccess="clockInSuccess"
|
||||
@close="clockInVisible = false"
|
||||
v-if="clockInVisible"
|
||||
></clockInDia>
|
||||
</el-dialog>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import DItu from "./widget/ditu.vue";
|
||||
import AppConfigInfo from '/public/config/app.json'
|
||||
import Pagination from '@/components/Pagination'
|
||||
import { listToTreeSelect } from '@/utils'
|
||||
import extend from "@/extensions/delRows.js"
|
||||
import * as modules from '@/api/modules'
|
||||
import * as login from '@/api/login'
|
||||
import Treeselect from '@riophae/vue-treeselect'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
import waves from '@/directive/waves' // 水波纹指令
|
||||
import permissionBtn from '@/components/PermissionBtn'
|
||||
import elDragDialog from '@/directive/el-dragDialog'
|
||||
import iconData from '@/assets/public/css/comIconfont/iconfont/iconfont.json'
|
||||
import { getMethodCommon, postMethodCommon } from "@/api/common";
|
||||
import AddForm from './widget/AddForm';
|
||||
import clockInDia from './widget/clockIn';
|
||||
import Sticky from '@/components/Sticky'
|
||||
import DItu from "./widget/ditu.vue";
|
||||
import AppConfigInfo from "/public/config/app.json";
|
||||
import Pagination from "@/components/Pagination";
|
||||
import { listToTreeSelect } from "@/utils";
|
||||
import extend from "@/extensions/delRows.js";
|
||||
import * as modules from "@/api/modules";
|
||||
import * as login from "@/api/login";
|
||||
import Treeselect from "@riophae/vue-treeselect";
|
||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||
import waves from "@/directive/waves"; // 水波纹指令
|
||||
import permissionBtn from "@/components/PermissionBtn";
|
||||
import elDragDialog from "@/directive/el-dragDialog";
|
||||
import iconData from "@/assets/public/css/comIconfont/iconfont/iconfont.json";
|
||||
import { getMethodCommon, postMethodCommon } from "@/api/common";
|
||||
import AddForm from "./widget/AddForm";
|
||||
import clockInDia from "./widget/clockIn";
|
||||
import Sticky from "@/components/Sticky";
|
||||
|
||||
export default {
|
||||
name: 'module',
|
||||
export default {
|
||||
name: "module",
|
||||
components: {
|
||||
permissionBtn,
|
||||
Pagination,
|
||||
AddForm,
|
||||
Sticky,
|
||||
DItu,
|
||||
clockInDia
|
||||
clockInDia,
|
||||
},
|
||||
mixins: [extend],
|
||||
directives: {
|
||||
waves,
|
||||
elDragDialog
|
||||
elDragDialog,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
rowdata: {},
|
||||
tableKey: 0,
|
||||
titleStr: '添加',
|
||||
titleStr: "添加",
|
||||
tableData: [],
|
||||
addServiceVisible: false,
|
||||
total: 0,
|
||||
|
|
@ -139,238 +237,238 @@
|
|||
pageSize: 20,
|
||||
name: null,
|
||||
},
|
||||
detailInfo:[],
|
||||
clocklnglat: '',
|
||||
clockInList:[],
|
||||
clockInName: '',
|
||||
detailInfo: [],
|
||||
clocklnglat: "",
|
||||
clockInList: [],
|
||||
clockInName: "",
|
||||
clockInVisible: false,
|
||||
rowdataKey: 1,
|
||||
flyCenter:[],
|
||||
clockDetail:{}
|
||||
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
|
||||
},
|
||||
filters: {
|
||||
|
||||
flyCenter: [],
|
||||
clockDetail: {},
|
||||
};
|
||||
},
|
||||
computed: {},
|
||||
filters: {},
|
||||
created() {
|
||||
this.getList()
|
||||
this.getClockInList()
|
||||
},
|
||||
mounted() {
|
||||
|
||||
this.getList();
|
||||
this.getClockInList();
|
||||
},
|
||||
mounted() {},
|
||||
methods: {
|
||||
getLocation(e){
|
||||
console.log('getLocation',e)
|
||||
this.clockInVisible = true
|
||||
this.clocklnglat = e
|
||||
this.clockDetail = null
|
||||
rightClick(e) {
|
||||
console.log("rightClick", e);
|
||||
this.clockInVisible = true;
|
||||
this.clocklnglat = e;
|
||||
this.clockDetail = null;
|
||||
},
|
||||
editClock(e){
|
||||
console.log('223311',e)
|
||||
this.clockDetail = e
|
||||
this.clockInVisible = true
|
||||
editClock(e) {
|
||||
console.log("223311", e);
|
||||
this.clockDetail = e;
|
||||
this.clockInVisible = true;
|
||||
},
|
||||
gofly(item){
|
||||
console.log('iii',item)
|
||||
this.flyCenter = [item.lng,item.lat]
|
||||
gofly(item) {
|
||||
console.log("iii", item);
|
||||
this.flyCenter = [item.lng, item.lat];
|
||||
},
|
||||
delItem(item){
|
||||
console.log('123',item)
|
||||
delItem(item) {
|
||||
console.log("123", item);
|
||||
let param = {
|
||||
id: item.id
|
||||
}
|
||||
this.$confirm('确定删除本条数据?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
postMethodCommon("/FireGrid/DeleteCheckPoint?id="+param.id).then(res => {
|
||||
id: item.id,
|
||||
};
|
||||
this.$confirm("确定删除本条数据?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning",
|
||||
})
|
||||
.then(() => {
|
||||
postMethodCommon("/FireGrid/DeleteCheckPoint?id=" + param.id).then(
|
||||
(res) => {
|
||||
if (res.code == 200) {
|
||||
this.$message({
|
||||
type: "success",
|
||||
message: "删除成功",
|
||||
})
|
||||
});
|
||||
}
|
||||
this.rowdataKey++
|
||||
this.getClockInList()
|
||||
this.rowdataKey++;
|
||||
this.getClockInList();
|
||||
}
|
||||
);
|
||||
})
|
||||
}).catch(() => {
|
||||
.catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消删除'
|
||||
type: "info",
|
||||
message: "已取消删除",
|
||||
});
|
||||
});
|
||||
|
||||
},
|
||||
clockInSuccess(){
|
||||
console.log('231321')
|
||||
this.rowdataKey++
|
||||
this.getClockInList()
|
||||
clockInSuccess() {
|
||||
console.log("231321");
|
||||
this.rowdataKey++;
|
||||
this.getClockInList();
|
||||
},
|
||||
getClockInList(){
|
||||
getClockInList() {
|
||||
let param = {
|
||||
name: this.clockInName
|
||||
}
|
||||
getMethodCommon("/FireGrid/GetTotalCheckPoint",param).then(res =>{
|
||||
this.clockInList = res.result
|
||||
})
|
||||
name: this.clockInName,
|
||||
};
|
||||
getMethodCommon("/FireGrid/GetTotalCheckPoint", param).then((res) => {
|
||||
this.clockInList = res.result;
|
||||
});
|
||||
},
|
||||
add() {
|
||||
this.addServiceVisible = true;
|
||||
this.detailInfo=[]
|
||||
this.titleStr = '添加'
|
||||
this.detailInfo = [];
|
||||
this.titleStr = "添加";
|
||||
},
|
||||
addSuccess() {
|
||||
this.addServiceVisible = false;
|
||||
this.getList();
|
||||
},
|
||||
del() {
|
||||
var _this = this
|
||||
if(this.multipleSelection.length != 1){
|
||||
var _this = this;
|
||||
if (this.multipleSelection.length != 1) {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '请选择一条数据进行删除'
|
||||
type: "info",
|
||||
message: "请选择一条数据进行删除",
|
||||
});
|
||||
return;
|
||||
}
|
||||
this.$confirm('确定删除所选数据?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
postMethodCommon("/FireCodeApp/DeleteForestryUser?Id=" + _this.multipleSelection[0].id, {}).then(res => {
|
||||
this.$confirm("确定删除所选数据?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning",
|
||||
})
|
||||
.then(() => {
|
||||
postMethodCommon(
|
||||
"/FireCodeApp/DeleteForestryUser?Id=" +
|
||||
_this.multipleSelection[0].id,
|
||||
{}
|
||||
).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.$message({
|
||||
type: "success",
|
||||
message: "删除成功",
|
||||
})
|
||||
});
|
||||
}
|
||||
_this.getList();
|
||||
});
|
||||
})
|
||||
}).catch(() => {
|
||||
.catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消删除'
|
||||
type: "info",
|
||||
message: "已取消删除",
|
||||
});
|
||||
});
|
||||
|
||||
},
|
||||
react() {
|
||||
if(this.multipleSelection.length != 1){
|
||||
if (this.multipleSelection.length != 1) {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '请选择一条数据进行编辑'
|
||||
type: "info",
|
||||
message: "请选择一条数据进行编辑",
|
||||
});
|
||||
return;
|
||||
}
|
||||
this.detailInfo = this.multipleSelection
|
||||
this.detailInfo = this.multipleSelection;
|
||||
this.addServiceVisible = true;
|
||||
this.titleStr = '编辑'
|
||||
this.titleStr = "编辑";
|
||||
},
|
||||
rowClick(row) {
|
||||
this.$refs.mainTable.clearSelection()
|
||||
this.$refs.mainTable.toggleRowSelection(row)
|
||||
this.$refs.mainTable.clearSelection();
|
||||
this.$refs.mainTable.toggleRowSelection(row);
|
||||
},
|
||||
handleSelectionChange(val) {
|
||||
this.multipleSelection = val
|
||||
this.multipleSelection = val;
|
||||
},
|
||||
onBtnClicked: function (domId) {
|
||||
console.log('you click:' + domId)
|
||||
console.log("you click:" + domId);
|
||||
switch (domId) {
|
||||
case 'btnAdd':
|
||||
case "btnAdd":
|
||||
this.addServiceVisible = true;
|
||||
break
|
||||
case 'btnEdit':
|
||||
break;
|
||||
case "btnEdit":
|
||||
if (this.multipleSelection.length != 1) {
|
||||
this.$message({
|
||||
message: '只能选中一个进行编辑',
|
||||
type: 'error'
|
||||
})
|
||||
return
|
||||
message: "只能选中一个进行编辑",
|
||||
type: "error",
|
||||
});
|
||||
return;
|
||||
}
|
||||
this.handleUpdate()
|
||||
break
|
||||
case 'btnDel':
|
||||
this.handleUpdate();
|
||||
break;
|
||||
case "btnDel":
|
||||
if (this.multipleSelection.length < 1) {
|
||||
this.$message({
|
||||
message: '至少删除一个',
|
||||
type: 'error'
|
||||
})
|
||||
return
|
||||
message: "至少删除一个",
|
||||
type: "error",
|
||||
});
|
||||
return;
|
||||
}
|
||||
this.handleDelete()
|
||||
break
|
||||
case 'btnAddMenu':
|
||||
this.handleAddMenu()
|
||||
break
|
||||
case 'btnEditMenu':
|
||||
this.handleDelete();
|
||||
break;
|
||||
case "btnAddMenu":
|
||||
this.handleAddMenu();
|
||||
break;
|
||||
case "btnEditMenu":
|
||||
if (this.selectMenus.length !== 1) {
|
||||
this.$message({
|
||||
message: '只能选中一个进行编辑',
|
||||
type: 'error'
|
||||
})
|
||||
return
|
||||
message: "只能选中一个进行编辑",
|
||||
type: "error",
|
||||
});
|
||||
return;
|
||||
}
|
||||
this.handleEditMenu(this.selectMenus[0])
|
||||
break
|
||||
case 'btnDelMenu':
|
||||
this.handleEditMenu(this.selectMenus[0]);
|
||||
break;
|
||||
case "btnDelMenu":
|
||||
if (this.selectMenus.length < 1) {
|
||||
this.$message({
|
||||
message: '至少删除一个',
|
||||
type: 'error'
|
||||
})
|
||||
return
|
||||
message: "至少删除一个",
|
||||
type: "error",
|
||||
});
|
||||
return;
|
||||
}
|
||||
this.handleDelMenus(this.selectMenus)
|
||||
break
|
||||
this.handleDelMenus(this.selectMenus);
|
||||
break;
|
||||
default:
|
||||
break
|
||||
break;
|
||||
}
|
||||
},
|
||||
getList() {
|
||||
this.listLoading = true
|
||||
getMethodCommon("/FireCodeApp/GetForestryUser", this.listQuery).then(res => {
|
||||
this.listLoading = true;
|
||||
getMethodCommon("/FireCodeApp/GetForestryUser", this.listQuery).then(
|
||||
(res) => {
|
||||
if (res.code == 200) {
|
||||
console.log(res)
|
||||
this.tableData = res.data
|
||||
console.log(res);
|
||||
this.tableData = res.data;
|
||||
|
||||
this.total = res.count
|
||||
this.listLoading = false
|
||||
this.total = res.count;
|
||||
this.listLoading = false;
|
||||
}
|
||||
})
|
||||
}
|
||||
);
|
||||
},
|
||||
handleFilter() {
|
||||
this.listQuery.pageIndex = 1
|
||||
this.getList()
|
||||
this.listQuery.pageIndex = 1;
|
||||
this.getList();
|
||||
},
|
||||
handleSizeChange(val) {
|
||||
this.listQuery.pageSize = val
|
||||
this.getList()
|
||||
this.listQuery.pageSize = val;
|
||||
this.getList();
|
||||
},
|
||||
handleCurrentChange(val) {
|
||||
this.listQuery.pageIndex = val.page
|
||||
this.listQuery.pageSize = val.limit
|
||||
this.getList()
|
||||
this.listQuery.pageIndex = val.page;
|
||||
this.listQuery.pageSize = val.limit;
|
||||
this.getList();
|
||||
},
|
||||
|
||||
|
||||
handleUpdate() {
|
||||
this.editForm = this.multipleSelection[0];
|
||||
this.editServiceVisible = true;
|
||||
},
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.el-table {
|
||||
.el-table {
|
||||
::v-deep .el-table__body-wrapper::-webkit-scrollbar {
|
||||
width: 10px;
|
||||
/*滚动条宽度*/
|
||||
|
|
@ -398,57 +496,52 @@
|
|||
|
||||
/*滚动条的背景颜色*/
|
||||
}
|
||||
}
|
||||
::v-deep .el-pagination__jump{
|
||||
}
|
||||
::v-deep .el-pagination__jump {
|
||||
color: #fff;
|
||||
}
|
||||
::v-deep .sticky {
|
||||
}
|
||||
::v-deep .sticky {
|
||||
background: rgba(0, 9, 34, 0.6);
|
||||
}
|
||||
}
|
||||
|
||||
::v-deep .dialog-mini .el-dialog__header {
|
||||
::v-deep .dialog-mini .el-dialog__header {
|
||||
background: rgba(10, 39, 78, 1);
|
||||
}
|
||||
}
|
||||
|
||||
::v-deep .dialog-mini .el-dialog__header .el-dialog__title {
|
||||
::v-deep .dialog-mini .el-dialog__header .el-dialog__title {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
::v-deep .el-descriptions__body {
|
||||
::v-deep .el-descriptions__body {
|
||||
background: rgba(0, 9, 34, 1);
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
::v-deep .el-descriptions-item__label.is-bordered-label {
|
||||
::v-deep .el-descriptions-item__label.is-bordered-label {
|
||||
background: rgba(0, 9, 34, 0.6);
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
::v-deep .el-dialog {
|
||||
::v-deep .el-dialog {
|
||||
background: rgba(10, 39, 78, 1);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
::v-deep .el-loading-mask {
|
||||
::v-deep .el-loading-mask {
|
||||
background: rgba(0, 9, 34, 0.9);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.filter-container {
|
||||
.filter-container {
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
|
||||
.site-container {
|
||||
.site-container {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-image: url(/img/gridman/bg.png);
|
||||
background-size: 100% 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.site-header {
|
||||
.site-header {
|
||||
width: 100%;
|
||||
height: 99px;
|
||||
background-image: url(/img/gridman/header.png);
|
||||
|
|
@ -458,99 +551,97 @@
|
|||
line-height: 90px;
|
||||
font-size: 36px;
|
||||
letter-spacing: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
.header-btn {
|
||||
.header-btn {
|
||||
width: 100px;
|
||||
height: 50px;
|
||||
position: absolute;
|
||||
top: 4%;
|
||||
left: 2%;
|
||||
}
|
||||
}
|
||||
|
||||
.site-content {
|
||||
.site-content {
|
||||
width: 100%;
|
||||
height: 94%;
|
||||
background: rgba(0, 9, 34, 0.6);
|
||||
}
|
||||
}
|
||||
|
||||
.app-container {
|
||||
.app-container {
|
||||
height: 100%;
|
||||
background: rgba(0, 9, 34, 0.6);
|
||||
}
|
||||
}
|
||||
|
||||
::v-deep .el-table {
|
||||
::v-deep .el-table {
|
||||
background: rgba(0, 9, 34, 0.6);
|
||||
border-left: 1px solid #00EDE8;
|
||||
}
|
||||
border-left: 1px solid #00ede8;
|
||||
}
|
||||
|
||||
::v-deep .el-table .el-table__body tr:hover td {
|
||||
::v-deep .el-table .el-table__body tr:hover td {
|
||||
background: rgba(24, 77, 143, 0.4) !important;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
||||
::v-deep .el-table .el-table__body tr.current-row td {
|
||||
::v-deep .el-table .el-table__body tr.current-row td {
|
||||
cursor: pointer;
|
||||
background: rgba(24, 77, 143, 0.4) !important;
|
||||
}
|
||||
}
|
||||
|
||||
::v-deep .el-table tr {
|
||||
::v-deep .el-table tr {
|
||||
background: rgba(0, 9, 34, 0.6);
|
||||
border: none;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
::v-deep .el-table th.el-table__cell {
|
||||
::v-deep .el-table th.el-table__cell {
|
||||
background: rgba(0, 9, 34, 0.6);
|
||||
color: #fff;
|
||||
border: 1px solid #00EDE8;
|
||||
border: 1px solid #00ede8;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
::v-deep .el-pagination__total,
|
||||
.el-pagination__jump {
|
||||
::v-deep .el-pagination__total,
|
||||
.el-pagination__jump {
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
::v-deep .el-table td.el-table__cell,
|
||||
.el-table th.el-table__cell.is-leaf {
|
||||
border-bottom: 1px solid #00EDE8;
|
||||
}
|
||||
::v-deep .el-table td.el-table__cell,
|
||||
.el-table th.el-table__cell.is-leaf {
|
||||
border-bottom: 1px solid #00ede8;
|
||||
}
|
||||
|
||||
::v-deep .el-table--border .el-table__cell,
|
||||
.el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
|
||||
border-right: 1px solid #00EDE8;
|
||||
}
|
||||
::v-deep .el-table--border .el-table__cell,
|
||||
.el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
|
||||
border-right: 1px solid #00ede8;
|
||||
}
|
||||
|
||||
::v-deep .pagination-container {
|
||||
::v-deep .pagination-container {
|
||||
background: rgba(0, 9, 34, 0.6) !important;
|
||||
border: none;
|
||||
}
|
||||
}
|
||||
|
||||
.text {
|
||||
.text {
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
|
||||
.item {
|
||||
.item {
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
}
|
||||
|
||||
.clearfix:before,
|
||||
.clearfix:after {
|
||||
.clearfix:before,
|
||||
.clearfix:after {
|
||||
display: table;
|
||||
content: '';
|
||||
}
|
||||
content: "";
|
||||
}
|
||||
|
||||
.clearfix:after {
|
||||
.clearfix:after {
|
||||
clear: both;
|
||||
}
|
||||
}
|
||||
|
||||
.el-card__header {
|
||||
.el-card__header {
|
||||
padding: 12px 20px;
|
||||
}
|
||||
}
|
||||
|
||||
.selectIcon-box {
|
||||
.selectIcon-box {
|
||||
text-align: center;
|
||||
border: 1px solid #eeeeee;
|
||||
border-right: 0;
|
||||
|
|
@ -563,7 +654,7 @@
|
|||
|
||||
&.active {
|
||||
.iconfont {
|
||||
color: #409EFF;
|
||||
color: #409eff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -572,51 +663,53 @@
|
|||
cursor: pointer;
|
||||
font-size: 20px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.custom-icon-input::before {
|
||||
.custom-icon-input::before {
|
||||
font-size: 18px;
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
top: 0;
|
||||
}
|
||||
.forestlistbox{
|
||||
}
|
||||
.forestlistbox {
|
||||
height: calc(100% - 30px);
|
||||
padding: 10px;
|
||||
overflow: auto;
|
||||
}
|
||||
.forestUl{
|
||||
}
|
||||
.forestUl {
|
||||
margin-bottom: 10px;
|
||||
background: #071e4a;
|
||||
padding: 10px 20px;
|
||||
}
|
||||
::-webkit-scrollbar {
|
||||
}
|
||||
::-webkit-scrollbar {
|
||||
height: 10px;
|
||||
width: 10px;
|
||||
background: transparent;
|
||||
border-radius: 5px
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb {
|
||||
padding-top: 100px;
|
||||
-webkit-box-shadow: inset 1px 1px 0 rgba(0, 0, 0, .1), inset -1px -1px 0 rgba(0, 0, 0, .07);
|
||||
-webkit-box-shadow: inset 1px 1px 0 rgba(0, 0, 0, 0.1),
|
||||
inset -1px -1px 0 rgba(0, 0, 0, 0.07);
|
||||
background-color: #797979;
|
||||
min-height: 28px;
|
||||
border-radius: 4px;
|
||||
background-clip: padding-box
|
||||
background-clip: padding-box;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track, ::-webkit-scrollbar-thumb {
|
||||
border: 0
|
||||
::-webkit-scrollbar-track,
|
||||
::-webkit-scrollbar-thumb {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
-webkit-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, .25);
|
||||
background-color: rgba(0, 0, 0, .4)
|
||||
-webkit-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.25);
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb:active {
|
||||
-webkit-box-shadow: inset 1px 1px 3px rgba(0, 0, 0, .35);
|
||||
background-color: rgba(0, 0, 0, .5)
|
||||
-webkit-box-shadow: inset 1px 1px 3px rgba(0, 0, 0, 0.35);
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
</style>
|
||||
|
|
@ -14,13 +14,13 @@ export default {
|
|||
return {
|
||||
map: null,
|
||||
clockInList: [],
|
||||
markerArr:[]
|
||||
markerArr: [],
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
rowkey: function (e) {
|
||||
console.log('123',e)
|
||||
this.getClockInList()
|
||||
console.log("123", e);
|
||||
this.getClockInList();
|
||||
},
|
||||
lnglat: function (e) {},
|
||||
flyCenter: function (e) {
|
||||
|
|
@ -51,7 +51,7 @@ export default {
|
|||
});
|
||||
},
|
||||
addPointLayer() {
|
||||
let _this = this
|
||||
let _this = this;
|
||||
this.clockInList.forEach((item) => {
|
||||
console.log("iii", item);
|
||||
let el = document.createElement("img"); //这里可以是任意标签
|
||||
|
|
@ -63,11 +63,15 @@ export default {
|
|||
// console.log('123item',item)
|
||||
// _this.$emit("editClock",item)
|
||||
// }
|
||||
|
||||
console.log(item)
|
||||
const popup = new mapboxgl.Popup({ offset: 25 }).setHTML(`${item.pointname }<br />${item.usernames}`);
|
||||
// 添加自定义标记点
|
||||
let marker = new mapboxgl.Marker(el).setLngLat([item.lng, item.lat]).addTo(this.map);
|
||||
this.markerArr.push(marker)
|
||||
|
||||
let marker = new mapboxgl.Marker(el)
|
||||
.setLngLat([item.lng, item.lat])
|
||||
.setPopup(popup)
|
||||
.addTo(this.map);
|
||||
marker
|
||||
this.markerArr.push(marker);
|
||||
});
|
||||
},
|
||||
initMap(url, jwd) {
|
||||
|
|
@ -91,6 +95,9 @@ export default {
|
|||
this.map.on("click", (e) => {
|
||||
this.$emit("getLocation", e);
|
||||
});
|
||||
this.map.on("contextmenu", (e) => {
|
||||
this.$emit("rightClick", e);
|
||||
});
|
||||
},
|
||||
|
||||
loadMengban() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue