From 7c4b47852e921718259c3e27421f44f8d2edb7fc Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 26 Apr 2021 16:45:52 +0800
Subject: [PATCH] 冲突合并
---
vue.config.js | 2
src/views/realTimePolice/realHistory.vue | 2
src/views/resource/oss.vue | 2
src/views/feedback/feedback.vue | 2
src/views/regions/regions.vue | 2
src/views/task/task.vue | 2
src/views/realTimePolice/real.vue | 2
src/views/work/claim.vue | 2
src/views/report/reportlist copy.vue | 2
src/views/work/done.vue | 2
src/views/taskfeedback/taskfeedback.vue | 2
src/views/resource/attach.vue | 2
src/views/zc/zc.vue | 3
src/views/system/topmenu.vue | 2
src/views/monitor/log/error.vue | 2
src/views/alarm/alarm.vue | 2
src/views/flow/follow.vue | 2
src/views/depl/depl.vue | 263 +++++++++++++++++++++
src/views/suser/suser.vue | 2
src/views/desk/notice.vue | 2
src/views/survey/survey.vue | 2
src/views/work/send.vue | 2
src/views/clientManagement/clientManagement.vue | 144 +++++++----
src/views/duty/duty.vue | 2
src/views/district/district.vue | 2
src/views/enclosure/enclosure.vue | 2
src/views/system/client.vue | 2
src/views/wj/wj.vue | 2
src/views/healthcode/healthcode.vue | 2
src/views/trajectory/trajectory.vue | 2
src/views/position/position.vue | 2
src/views/system/user.vue | 2
src/views/system/tenant.vue | 2
src/views/report/reportlist.vue | 2
src/views/reported/reported.vue | 2
src/views/flow/manager.vue | 2
src/views/xlfeedback/xlfeedback.vue | 2
src/views/monitor/log/usual.vue | 2
src/views/flow/model.vue | 2
src/views/system/cs.vue | 45 +++
src/views/routein/routein.vue | 2
src/views/dj/dj.vue | 2
src/views/deploy/deploy.vue | 2
src/views/street/street.vue | 2
src/views/security/security.vue | 2
src/views/tool/code.vue | 2
src/views/parcel/parcel.vue | 2
src/page/index/logo.vue | 87 ++----
src/views/resource/sms.vue | 2
src/views/parcel/parcelKind.vue | 2
src/views/system/post.vue | 2
src/views/animalHeat/animalHeat.vue | 2
src/views/visitrecord/visitrecord.vue | 2
src/views/work/start.vue | 2
src/api/depl/depl.js | 50 ++++
src/views/equipment/equipment.vue | 2
src/views/monitor/log/api.vue | 2
src/views/work/todo.vue | 2
src/views/policeInformationDistribution/index.vue | 2
src/views/tool/datasource.vue | 2
src/views/clientManagement/clientManagement_copy.vue | 2
61 files changed, 527 insertions(+), 175 deletions(-)
diff --git a/src/api/depl/depl.js b/src/api/depl/depl.js
new file mode 100644
index 0000000..eef182a
--- /dev/null
+++ b/src/api/depl/depl.js
@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+ return request({
+ url: '/api/blade-depl/depl/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const getDetail = (id) => {
+ return request({
+ url: '/api/blade-depl/depl/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
+
+export const remove = (ids) => {
+ return request({
+ url: '/api/blade-depl/depl/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+export const add = (row) => {
+ return request({
+ url: '/api/blade-depl/depl/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const update = (row) => {
+ return request({
+ url: '/api/blade-depl/depl/submit',
+ method: 'post',
+ data: row
+ })
+}
+
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index b2d1408..bb26f87 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -347,71 +347,52 @@
};
},
created() {
- // this.getData();
this.websocketStart();
},
computed: {
...mapGetters(["website", "keyCollapse"]),
},
methods: {
- getData() {
+ layerRealtime(jid) {
var that = this;
axios({
- url: "/api/blade-jfpts/alarm/alarm/getLimit",
+ url: "/api/blade-jfpts/alarm/alarm/page",
method: "get",
+ params: {
+ id: jid,
+ },
}).then(function (response) {
- if (response.data.data.length > 0) {
- that.deviceId = response.data.data[0].id;
- } else {
- that.deviceId = 0;
- }
- //获得最新ID，开启实时报警循环
- that.layerRealtime();
- });
- },
- layerRealtime() {
- var that = this;
- window.clearTimeout(window.realTimeQuery);
- // that.deviceId = 334; // 测试用
- window.realTimeQuery = setInterval(function () {
- axios({
- url: "/api/blade-jfpts/alarm/alarm/selecttx?id=" + that.deviceId,
- method: "post",
- }).then(function (response) {
- var userId = JSON.parse(
- window.localStorage.getItem("物联网安保云服务平台-userInfo")
- ).content.user_id;
+ var userId = JSON.parse(
+ window.localStorage.getItem("物联网安保云服务平台-userInfo")
+ ).content.user_id;
- if (response.data.data.length > 0) {
- that.deviceId = response.data.data[0].id;
- that.form = response.data.data[0];
+ if (response.data.data.records.length > 0) {
+ that.form = response.data.data.records[0];
+ if (
+ response.data.data.records[0].waringType == "紧急求救" &&
+ response.data.data.records[0].alarmId == userId
+ ) {
+ response.data.data.records[0].waringType = "一键求助";
- if (
- response.data.data[0].waringType == "紧急求救" &&
- response.data.data[0].alarmId == userId
- ) {
- response.data.data[0].waringType = "一键求助";
+ that.peopleList = [
+ { label: that.form.oneContacts, value: that.form.onePhone },
+ { label: that.form.twoContacts, value: that.form.twoPhone },
+ { label: that.form.threeContacts, value: that.form.threePhone },
+ ];
+ that.peopleName = that.form.oneContacts;
+ that.peoplePhone = that.form.onePhone;
+ that.dialogTableVisible = true;
- that.peopleList = [
- { label: that.form.oneContacts, value: that.form.onePhone },
- { label: that.form.twoContacts, value: that.form.twoPhone },
- { label: that.form.threeContacts, value: that.form.threePhone },
- ];
- that.peopleName = that.form.oneContacts;
- that.peoplePhone = that.form.onePhone;
- that.dialogTableVisible = true;
+ that.ofX = null;
+ that.ofY = null;
- that.ofX = null;
- that.ofY = null;
+ window.addEventListener("mousemove", that.handleMousemove);
- window.addEventListener("mousemove", that.handleMousemove);
-
- that.$refs.realAudio.src = "./realVideo/audio.mp3";
- that.$refs.realAudio.play();
- }
+ that.$refs.realAudio.src = "./realVideo/audio.mp3";
+ that.$refs.realAudio.play();
}
- });
- }, 5000);
+ }
+ });
},
closeDialog() {
//关闭窗口回调，关闭警报
@@ -756,7 +737,6 @@
jid: that.form.id,
},
}).then((resdata) => {
- console.log(resdata);
});
newCallAxios
@@ -811,9 +791,12 @@
window.socket = new WebSocket("wss://web.byisf.com/wss/websocket/");
//http
- // window.socket = new WebSocket("ws://localhost:9034/websocket");
+ //window.socket = new WebSocket("ws://localhost:9034/websocket");
- window.socket.onmessage = function (event) {};
+ window.socket.onmessage = function (event) {
+ // alert(event.data)
+ that.layerRealtime(event.data);
+ };
window.socket.onopen = function (event) {};
diff --git a/src/views/alarm/alarm.vue b/src/views/alarm/alarm.vue
index 38e6f80..de942c0 100644
--- a/src/views/alarm/alarm.vue
+++ b/src/views/alarm/alarm.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index 13b0626..f0b7561 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -92,7 +92,7 @@
option: {
menu:false,
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
border: false,
stripe:true,
tip: false,
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index e4f38fb..11e5167 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -44,7 +44,6 @@
</span>
</template>
-
<template slot-scope="{ row }" slot="devicestate">
<el-tag>{{
row.devicestate == "0" ? "撤防" : row.devicestate == "1" ? "布防" : "无"
@@ -198,10 +197,12 @@
<script>
import {getList, remove, update, add, getclient, getDeptLazyTree, getAll, updates,getBaTree} from "@/api/client/client";
+ // import {getDeptTree} from "@/api/system/dept";
import {mapGetters} from "vuex";
import axios from "axios";
import Legend from '../../components/liu-legend/Legend'
import AvueMap from "avue-plugin-map";
+ import website from '@/config/website';
export default {
components:{
@@ -268,9 +269,9 @@
option: {
height: 'auto',
indexLabel: '序号',
- calcHeight: 80,
+ calcHeight: 54,
labelWidth: '125',
- dialogWidth: 960,
+ dialogWidth: 1150,
menuWidth: 150,
align:"center",
size: "mini",
@@ -335,13 +336,18 @@
},
{
label: "使用方",
+ prop: "deptName",
+ display: false
+ },
+ {
+ label: "使用方",
prop: "deptId",
width: 200,
- type: "tree",
+ type: "cascader",
dicUrl: "/api/blade-system/dept/trees",
- multiple: true,
dicData: [],
checkStrictly:true,
+ hide:true,
props: {
label: "title"
},
@@ -360,6 +366,7 @@
// type: "cascader",
// dicUrl: "/api/blade-system/dept/trees",
// multiple: true,
+ // checkStrictly:true,
// dicData: [],
// props: {
// label: "title"
@@ -443,14 +450,24 @@
prop: "reason",
addDisplay: false,
editDisplay: false
+ },{
+ label: "心跳时间",
+ prop: "heartbeat",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ width: 130,
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
},
-
{
label: "省份",
prop: "province",
search: true,
searchSpan: 2,
- labelWidth: '112',
+ labelWidth: '110',
searchLabelWidth: 45,
placeholder: "省份",
type: "select",
@@ -460,7 +477,7 @@
},
cascaderItem: ["city", "district"],
dicUrl: "/api/blade-system/region/select",
- span: 6,
+ span: 8,
className: "city1",
hide: true,
addDisplay: true,
@@ -481,7 +498,7 @@
value: "code"
},
dicUrl: "/api/blade-system/region/select?code={{key}}",
- span: 3,
+ span: 2,
labelWidth: "0",
className: "city2",
hide: true,
@@ -503,7 +520,7 @@
value: "code"
},
dicUrl: "/api/blade-system/region/select?code={{key}}",
- span: 3,
+ span: 2,
labelWidth: "0",
className: "city3",
hide: true,
@@ -513,10 +530,7 @@
}, {
label: "地址",
prop: "street",
- // type:"map",
span:10,
- labelWidth: '142',
- width:100,
hide: true,
},
{
@@ -535,6 +549,8 @@
hide: true,
prop: "jd",
searchSpan:2,
+ width:"100",
+ labelWidth: "120",
formatter: (row,value,label,column)=>{
return value = value.substring(0,11);
},
@@ -542,7 +558,7 @@
},
{
label: "纬度",
- labelWidth:50,
+ labelWidth: "45",
hide: true,
prop: "wd",
formatter: (row,value,label,column) => {
@@ -550,20 +566,9 @@
},
span:5,
},
- {
- label: "心跳时间",
- prop: "heartbeat",
- type: "datetime",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- width: 130,
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- },
+
{
- label: "负责人1",
+ label: "主要负责人",
prop: "oneId",
type: "tree",
dicUrl: "/api/blade-system/dept/Batrees",
@@ -577,12 +582,12 @@
viewDisplay: true,
rules: [{
required: true,
- message: "请选择负责人",
+ message: "请选择主要负责人",
trigger: "blur"
}],
},
{
- label: "负责人1电话",
+ label: "主要负责人电话",
prop: "onePhone",
width: 110,
hide: true,
@@ -595,7 +600,7 @@
trigger: "blur"
}],
}, {
- label: "负责人2",
+ label: "负责人1",
prop: "twoId",
type: "tree",
dicUrl: "/api/blade-system/dept/Batrees",
@@ -609,7 +614,7 @@
viewDisplay: true,
},
{
- label: "负责人2电话",
+ label: "负责人1电话",
prop: "twoPhone",
width: 110,
hide: true,
@@ -617,7 +622,7 @@
editDisplay: true,
viewDisplay: true,
}, {
- label: "负责人3",
+ label: "负责人2",
prop: "threeId",
type: "tree",
dicUrl: "/api/blade-system/dept/Batrees",
@@ -631,7 +636,7 @@
viewDisplay: true,
},
{
- label: "负责人3电话",
+ label: "负责人2电话",
prop: "threePhone",
width: 110,
hide: true,
@@ -679,22 +684,26 @@
// form是表单或者表格绑定的数据集，v-model='form'
handler(val) {
if (val) {
- console.log(val,111);
- this.form.wd = val.latitude.toString().substring(0,10);
- this.form.jd = val.longitude.toString().substring(0,11);
- //地址截取，从县/区开始截取,并且取从县区第一个出现的位置开始
- var address = val.formattedAddress.toString();
- if(address.search("县") != -1){
- this.form.street = address.substring(address.indexOf("县")+1,address.length);
- }
- if(address.search("区") != -1){
- this.form.street = address.substring(address.indexOf("区")+1,address.length);
- }
-
- // this.form.province = val.addressComponent.province;
- // console.log( val.addressComponent.city,123456)
- // this.form.city = val.addressComponent.city;
- // this.form.district = val.addressComponent.district;
+ var that = this;
+ //重新加载一次页面详情数据，解决新的省市区无法写入问题
+ getclient(this.form.id).then(res => {
+ this.form = res.data.data;
+ //经纬度替换
+ this.form.wd = val.latitude;
+ this.form.jd = val.longitude;
+ //地址截取，从县/区开始截取,并且取从县区第一个出现的位置开始
+ var address = val.formattedAddress.toString();
+ if(address.search("县") != -1){
+ this.form.street = address.substring(address.indexOf("县")+1,address.length);
+ }
+ if(address.search("区") != -1){
+ this.form.street = address.substring(address.indexOf("区")+1,address.length);
+ }
+ //写入新的省市区
+ that.form.province = val.addressComponent.province;
+ that.form.city = val.addressComponent.city;
+ that.form.district = val.addressComponent.district;
+ });
}
},
immediate: true,
@@ -737,7 +746,14 @@
});
}
},
- }
+ },
+
+ //随意一个
+ // 'form.deviceName'() {
+ // if (this.initFlag) {
+ // this.initData();
+ // }
+ // }
},
computed: {
@@ -758,6 +774,11 @@
return ids.join(",");
}
},
+ mounted(){
+ // 租户模式默认加载管理组数据
+ // var that = this;
+ //that.tenantId = website.tenantId;
+ },
methods: {
generate(row) {
updates(row.expireTime, row.deviceNumber).then(() => {
@@ -772,12 +793,20 @@
window.console.log(error);
});
},
+
+ //初始化数据
+ // initData() {
+ // //部门tree数据
+ // getDeptTree().then(res => {
+ // const column = this.findObject(this.option.column, "deptId");
+ // column.dicData = res.data.data;
+ // });
+ // },
handleClick(row) {
this.form = row;
this.dialogTableVisible = true;
this.realjf = true;
-
},
nodeClick(data) {
this.treeDeptId = data.id;
@@ -798,10 +827,10 @@
});
},
rowUpdate(row, index, done, loading) {
- debugger;
- row.jd=row.map.latitude;
- row.wd=row.map.longitude;
+ // row.jd=row.map.latitude;
+ // row.wd=row.map.longitude;
update(row).then(() => {
+ // this.initFlag = false;
this.onLoad(this.page);
this.$message({
type: "success",
@@ -872,11 +901,13 @@
});
},
beforeOpen(done, type) {
+ debugger;
if (["edit", "view"].includes(type)) {
getclient(this.form.id).then(res => {
this.form = res.data.data;
});
}
+ // this.initFlag = true;
done();
},
currentChange(currentPage) {
@@ -919,11 +950,6 @@
this.loading = true;
getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(res => {
- // debugger;
- console.log(page.currentPage)
- console.log(page.pageSize)
- console.log(values)
- console.log(this.treeDeptId)
const data = res.data.data;
this.page.total = data.total;
diff --git a/src/views/clientManagement/clientManagement_copy.vue b/src/views/clientManagement/clientManagement_copy.vue
index bb24e5e..808f5e7 100644
--- a/src/views/clientManagement/clientManagement_copy.vue
+++ b/src/views/clientManagement/clientManagement_copy.vue
@@ -234,7 +234,7 @@
option: {
height: 'auto',
indexLabel: '序号',
- calcHeight: 80,
+ calcHeight: 54,
labelWidth: '100',
dialogWidth: 950,
menuWidth: 250,
diff --git a/src/views/depl/depl.vue b/src/views/depl/depl.vue
new file mode 100644
index 0000000..d53451a
--- /dev/null
+++ b/src/views/depl/depl.vue
@@ -0,0 +1,263 @@
+<template>
+ <basic-container>
+ <avue-crud :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad">
+ <template slot="menuLeft">
+ <el-button type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ v-if="permission.depl_delete"
+ @click="handleDelete">删 除
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+ import {getList, getDetail, add, update, remove} from "@/api/depl/depl";
+ import {mapGetters} from "vuex";
+
+ export default {
+ data() {
+ return {
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ selectionList: [],
+ option: {
+ height:'auto',
+ calcHeight: 30,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ column: [
+ {
+ label: "",
+ prop: "id",
+ rules: [{
+ required: true,
+ message: "请输入",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "设备编码",
+ prop: "devicenumber",
+ rules: [{
+ required: true,
+ message: "请输入设备编码",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "安装人员",
+ prop: "contacts",
+ rules: [{
+ required: true,
+ message: "请输入安装人员",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "电话",
+ prop: "call",
+ rules: [{
+ required: true,
+ message: "请输入电话",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "图片地址",
+ prop: "paddress",
+ rules: [{
+ required: true,
+ message: "请输入图片地址",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "部署时间",
+ prop: "deploymenttime",
+ rules: [{
+ required: true,
+ message: "请输入部署时间",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "设备名称",
+ prop: "devicename",
+ rules: [{
+ required: true,
+ message: "请输入设备名称",
+ trigger: "blur"
+ }]
+ },
+ ]
+ },
+ data: []
+ };
+ },
+ computed: {
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.depl_add, false),
+ viewBtn: this.vaildData(this.permission.depl_view, false),
+ delBtn: this.vaildData(this.permission.depl_delete, false),
+ editBtn: this.vaildData(this.permission.depl_edit, false)
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ }
+ },
+ methods: {
+ rowSave(row, done, loading) {
+ add(row).then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ done();
+ }, error => {
+ loading();
+ window.console.log(error);
+ });
+ },
+ rowUpdate(row, index, done, loading) {
+ update(row).then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ done();
+ }, error => {
+ loading();
+ console.log(error);
+ });
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ });
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getDetail(this.form.id).then(res => {
+ this.form = res.data.data;
+ });
+ }
+ done();
+ },
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ currentChange(currentPage){
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize){
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ }
+ }
+ };
+</script>
+
+<style>
+</style>
diff --git a/src/views/deploy/deploy.vue b/src/views/deploy/deploy.vue
index 4a2a35d..db8cd45 100644
--- a/src/views/deploy/deploy.vue
+++ b/src/views/deploy/deploy.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index b459232..b8e478e 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -53,7 +53,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
dialogWidth: 950,
tip: false,
searchShow: true,
diff --git a/src/views/district/district.vue b/src/views/district/district.vue
index 984c235..c4a28e9 100644
--- a/src/views/district/district.vue
+++ b/src/views/district/district.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/dj/dj.vue b/src/views/dj/dj.vue
index b823a0a..f744624 100644
--- a/src/views/dj/dj.vue
+++ b/src/views/dj/dj.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/duty/duty.vue b/src/views/duty/duty.vue
index 3b10bee..bc6b7ad 100644
--- a/src/views/duty/duty.vue
+++ b/src/views/duty/duty.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/enclosure/enclosure.vue b/src/views/enclosure/enclosure.vue
index 6db749e..52f6330 100644
--- a/src/views/enclosure/enclosure.vue
+++ b/src/views/enclosure/enclosure.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/equipment/equipment.vue b/src/views/equipment/equipment.vue
index 66a4452..b7d45a9 100644
--- a/src/views/equipment/equipment.vue
+++ b/src/views/equipment/equipment.vue
@@ -61,7 +61,7 @@
option: {
lazy: true,
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tree: true,
tip: false,
searchShow: true,
diff --git a/src/views/feedback/feedback.vue b/src/views/feedback/feedback.vue
index 5ce473f..05802b7 100644
--- a/src/views/feedback/feedback.vue
+++ b/src/views/feedback/feedback.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/flow/follow.vue b/src/views/flow/follow.vue
index fbaa282..a42b393 100644
--- a/src/views/flow/follow.vue
+++ b/src/views/flow/follow.vue
@@ -64,7 +64,7 @@
deleteReason: '',
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/flow/manager.vue b/src/views/flow/manager.vue
index 060a941..8cc95c5 100644
--- a/src/views/flow/manager.vue
+++ b/src/views/flow/manager.vue
@@ -141,7 +141,7 @@
}],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/flow/model.vue b/src/views/flow/model.vue
index 89a45d0..a9505f2 100644
--- a/src/views/flow/model.vue
+++ b/src/views/flow/model.vue
@@ -193,7 +193,7 @@
flowUrl: '',
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index a936c29..ae02016 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -80,7 +80,7 @@
option: {
menu:false,
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
border: false,
stripe:true,
tip: false,
diff --git a/src/views/monitor/log/api.vue b/src/views/monitor/log/api.vue
index bef4765..44e83ab 100644
--- a/src/views/monitor/log/api.vue
+++ b/src/views/monitor/log/api.vue
@@ -36,7 +36,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/monitor/log/error.vue b/src/views/monitor/log/error.vue
index 3196839..4b71241 100644
--- a/src/views/monitor/log/error.vue
+++ b/src/views/monitor/log/error.vue
@@ -36,7 +36,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/monitor/log/usual.vue b/src/views/monitor/log/usual.vue
index 329f77b..94272d8 100644
--- a/src/views/monitor/log/usual.vue
+++ b/src/views/monitor/log/usual.vue
@@ -36,7 +36,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index ad92577..ca1be49 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -87,7 +87,7 @@
option: {
menu:false,
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index b910a61..98481e5 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/src/views/parcel/parcelKind.vue
@@ -88,7 +88,7 @@
option: {
menu:false,
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 4,
diff --git a/src/views/policeInformationDistribution/index.vue b/src/views/policeInformationDistribution/index.vue
index 56b96d8..aa81d43 100644
--- a/src/views/policeInformationDistribution/index.vue
+++ b/src/views/policeInformationDistribution/index.vue
@@ -109,7 +109,7 @@
option: {
height: "auto",
indexLabel: "序号",
- calcHeight: 30,
+ calcHeight: 54,
labelWidth: "100",
size: "mini",
dialogWidth: 950,
diff --git a/src/views/position/position.vue b/src/views/position/position.vue
index cdf105c..33d2209 100644
--- a/src/views/position/position.vue
+++ b/src/views/position/position.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 8442089..74dedae 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -174,7 +174,7 @@
option: {
height: "auto",
indexLabel: "序号",
- calcHeight: 30,
+ calcHeight: 54,
labelWidth: "100",
size: "mini",
border: false,
diff --git a/src/views/realTimePolice/realHistory.vue b/src/views/realTimePolice/realHistory.vue
index 0ef6bbc..fe4caff 100644
--- a/src/views/realTimePolice/realHistory.vue
+++ b/src/views/realTimePolice/realHistory.vue
@@ -113,7 +113,7 @@
option: {
height: "auto",
indexLabel: "序号",
- calcHeight: 30,
+ calcHeight: 54,
menuWidth: 240,
size: "mini",
border: false,
diff --git a/src/views/regions/regions.vue b/src/views/regions/regions.vue
index 88b5568..86f6299 100644
--- a/src/views/regions/regions.vue
+++ b/src/views/regions/regions.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/report/reportlist copy.vue b/src/views/report/reportlist copy.vue
index b33c12b..993e43a 100644
--- a/src/views/report/reportlist copy.vue
+++ b/src/views/report/reportlist copy.vue
@@ -66,7 +66,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/report/reportlist.vue b/src/views/report/reportlist.vue
index e6d6756..c729d65 100644
--- a/src/views/report/reportlist.vue
+++ b/src/views/report/reportlist.vue
@@ -66,7 +66,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/reported/reported.vue b/src/views/reported/reported.vue
index 30c534a..c5b2b6e 100644
--- a/src/views/reported/reported.vue
+++ b/src/views/reported/reported.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/resource/attach.vue b/src/views/resource/attach.vue
index 88e80a6..f9fab85 100644
--- a/src/views/resource/attach.vue
+++ b/src/views/resource/attach.vue
@@ -74,7 +74,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/resource/oss.vue b/src/views/resource/oss.vue
index f51480e..63f5283 100644
--- a/src/views/resource/oss.vue
+++ b/src/views/resource/oss.vue
@@ -79,7 +79,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/resource/sms.vue b/src/views/resource/sms.vue
index 3f34af1..77a453c 100644
--- a/src/views/resource/sms.vue
+++ b/src/views/resource/sms.vue
@@ -79,7 +79,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/routein/routein.vue b/src/views/routein/routein.vue
index 2f286ff..be2c98a 100644
--- a/src/views/routein/routein.vue
+++ b/src/views/routein/routein.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index 981313f..7787fd2 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -70,7 +70,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/street/street.vue b/src/views/street/street.vue
index bd8c67f..23528d6 100644
--- a/src/views/street/street.vue
+++ b/src/views/street/street.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/survey/survey.vue b/src/views/survey/survey.vue
index 0a3e2ce..a819697 100644
--- a/src/views/survey/survey.vue
+++ b/src/views/survey/survey.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/suser/suser.vue b/src/views/suser/suser.vue
index 625718c..7d42a99 100644
--- a/src/views/suser/suser.vue
+++ b/src/views/suser/suser.vue
@@ -48,7 +48,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
border: true,
diff --git a/src/views/system/client.vue b/src/views/system/client.vue
index 0b6fe17..22200fa 100644
--- a/src/views/system/client.vue
+++ b/src/views/system/client.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/system/cs.vue b/src/views/system/cs.vue
index ab34427..aa0c4b8 100644
--- a/src/views/system/cs.vue
+++ b/src/views/system/cs.vue
@@ -268,7 +268,7 @@
},
option: {
height: "auto",
- calcHeight: 80,
+ calcHeight: 54,
size: "mini",
tip: false,
searchShow: true,
@@ -384,24 +384,38 @@
labelWidth: "0",
className: "cityClass3",
},
- {
- label: "地址",
- prop: "map",
- hide: true,
- span: 24,
- component: "AvueMap",
- },
+ {
+ label: "地址",
+ prop: "address",
+ span:10,
+ // labelWidth: '60',
+ hide: true,
+ },
+ {
+ label: null,
+ prop: "map",
+ labelWidth: "0",
+ searchSpan:0,
+ maxlength:0,
+ hide: true,
+ span: 2,
+ // display:false,
+ component: "AvueMap"
+ },
{
label: "纬度",
hide: true,
addDisplay: false,
prop: "wd",
+ span:6
},
{
label: "经度",
+ labelWidth: "50",
hide: true,
addDisplay: false,
prop: "jd",
+ span:5
},
{
label: "账号额度",
@@ -720,8 +734,23 @@
// form是表单或者表格绑定的数据集，v-model='form'
handler(val) {
if (val) {
+ getDetail(this.form.id).then((res) => {
+ this.form = res.data.data;
+ })
this.form.wd = val.latitude;
this.form.jd = val.longitude;
+ //地址截取，从县/区开始截取,并且取从县区第一个出现的位置开始
+ var address = val.formattedAddress.toString();
+ if(address.search("县") != -1){
+ this.form.address = address.substring(address.indexOf("县")+1,address.length);
+ }
+ if(address.search("区") != -1){
+ this.form.address = address.substring(address.indexOf("区")+1,address.length);
+ }
+ //写入新的省市区
+ that.form.province = val.addressComponent.province;
+ that.form.city = val.addressComponent.city;
+ that.form.district = val.addressComponent.district;
}
},
immediate: true,
diff --git a/src/views/system/post.vue b/src/views/system/post.vue
index 3add06b..2e49c97 100644
--- a/src/views/system/post.vue
+++ b/src/views/system/post.vue
@@ -54,7 +54,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue
index 702f8c4..d0eb9ad 100644
--- a/src/views/system/tenant.vue
+++ b/src/views/system/tenant.vue
@@ -89,7 +89,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/system/topmenu.vue b/src/views/system/topmenu.vue
index fdb6388..75a5b0d 100644
--- a/src/views/system/topmenu.vue
+++ b/src/views/system/topmenu.vue
@@ -91,7 +91,7 @@
menuTreeObj: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 3dd9d22..8debe4a 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -261,7 +261,7 @@
},
option: {
height: 'auto',
- calcHeight: 80,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/task/task.vue b/src/views/task/task.vue
index b71c841..e722ee2 100644
--- a/src/views/task/task.vue
+++ b/src/views/task/task.vue
@@ -53,7 +53,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/taskfeedback/taskfeedback.vue b/src/views/taskfeedback/taskfeedback.vue
index b734535..66239f7 100644
--- a/src/views/taskfeedback/taskfeedback.vue
+++ b/src/views/taskfeedback/taskfeedback.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/tool/code.vue b/src/views/tool/code.vue
index 7bfdfd2..1655ac5 100644
--- a/src/views/tool/code.vue
+++ b/src/views/tool/code.vue
@@ -64,7 +64,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
dialogWidth: 900,
tip: false,
searchShow: true,
diff --git a/src/views/tool/datasource.vue b/src/views/tool/datasource.vue
index 47e8d00..bb6e0e4 100644
--- a/src/views/tool/datasource.vue
+++ b/src/views/tool/datasource.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
dialogWidth: 900,
tip: false,
searchShow: true,
diff --git a/src/views/trajectory/trajectory.vue b/src/views/trajectory/trajectory.vue
index 1d0f7bc..e3b7fa3 100644
--- a/src/views/trajectory/trajectory.vue
+++ b/src/views/trajectory/trajectory.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/visitrecord/visitrecord.vue b/src/views/visitrecord/visitrecord.vue
index 2ebc6f2..ded9947 100644
--- a/src/views/visitrecord/visitrecord.vue
+++ b/src/views/visitrecord/visitrecord.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/wj/wj.vue b/src/views/wj/wj.vue
index 935f1b4..526a595 100644
--- a/src/views/wj/wj.vue
+++ b/src/views/wj/wj.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/work/claim.vue b/src/views/work/claim.vue
index 916fe50..cdde81d 100644
--- a/src/views/work/claim.vue
+++ b/src/views/work/claim.vue
@@ -87,7 +87,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
simplePage: true,
searchShow: true,
diff --git a/src/views/work/done.vue b/src/views/work/done.vue
index 57c5a24..af0416c 100644
--- a/src/views/work/done.vue
+++ b/src/views/work/done.vue
@@ -81,7 +81,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/work/send.vue b/src/views/work/send.vue
index 9c2d96d..9709fb5 100644
--- a/src/views/work/send.vue
+++ b/src/views/work/send.vue
@@ -85,7 +85,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/work/start.vue b/src/views/work/start.vue
index baf0262..ebf9a9e 100644
--- a/src/views/work/start.vue
+++ b/src/views/work/start.vue
@@ -100,7 +100,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/work/todo.vue b/src/views/work/todo.vue
index 975736c..c4308c7 100644
--- a/src/views/work/todo.vue
+++ b/src/views/work/todo.vue
@@ -87,7 +87,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
simplePage: true,
searchShow: true,
diff --git a/src/views/xlfeedback/xlfeedback.vue b/src/views/xlfeedback/xlfeedback.vue
index 8127740..1c8470f 100644
--- a/src/views/xlfeedback/xlfeedback.vue
+++ b/src/views/xlfeedback/xlfeedback.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/zc/zc.vue b/src/views/zc/zc.vue
index 620642d..27628a1 100644
--- a/src/views/zc/zc.vue
+++ b/src/views/zc/zc.vue
@@ -62,7 +62,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -131,6 +131,7 @@
{
label: "角色",
prop: "parentId",
+ hide: true,
dicData: [],
type: "tree",
props: {
diff --git a/vue.config.js b/vue.config.js
index 35901e5..07942d8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,7 @@
proxy: {
'/api': {
//本地服务接口地址
- // target: 'http://192.168.0.109:82/',
+ //target: 'http://192.168.0.109:82/',
target: 'https://web.byisf.com/api/',
//远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.vip/api',
--
Gitblit v1.9.3