弹框底图修改、个人信息对接

Lvtianfang
吕天方 1 year ago
parent 37afdb9888
commit 84fd95cd5e

@ -2,7 +2,7 @@
# @Author: 张涛 # @Author: 张涛
# @Date: 2023-11-09 18:29:41 # @Date: 2023-11-09 18:29:41
# @LastEditors: JC9527 # @LastEditors: JC9527
# @LastEditTime: 2024-01-23 13:54:49 # @LastEditTime: 2024-01-26 16:18:44
# @FilePath: \JiangningUrbanManagePc\.env.development # @FilePath: \JiangningUrbanManagePc\.env.development
### ###
# 页面标题 # 页面标题
@ -17,7 +17,7 @@ ENV = 'development'
VUE_APP_BASE_API = 'https://t-jn-bjh-admin-server.jsszkd.com' VUE_APP_BASE_API = 'https://t-jn-bjh-admin-server.jsszkd.com'
VUE_APP_BASE_API1 = 'https://t-kd-process-server.jsszkd.com' VUE_APP_BASE_API1 = 'https://t-kd-process-server.jsszkd.com'
VUE_APP_BASE_API2 = 'https://t-jn-development-manager-server.jsszkd.com/api/webapp' VUE_APP_BASE_API2 = 'https://t-jn-development-manager-server.jsszkd.com/api/webapp'
# VUE_APP_BASE_API = 'http://192.168.0.104:9037' # VUE_APP_BASE_API = 'http://192.168.0.106:9037'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

@ -187,3 +187,21 @@ export function listZhzz(query) {
params: query params: query
}) })
} }
// 根据imei查询人员信息
export function getUserByImei(params){
return request({
url: '/jn/dwgj/getUserByImei',
method: 'get',
params
})
}
// 根据手机号和人员名称查询
export function dwgjList(params){
return request({
url: '/jn/dwgj/list',
method: 'get',
params
})
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 442 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 965 B

@ -15,7 +15,7 @@
.event-popup { .event-popup {
width: 252px; width: 252px;
height: 224px; height: 224px;
background-image: url("../images/popup/bg2.png"); background-image: url("../images/popup/popup.png");
background-size: 100% 100%; background-size: 100% 100%;
z-index: 600; z-index: 600;
@ -44,8 +44,8 @@
} }
.mask { .mask {
width: 13px; width: 15px;
height: 13px; height: 15px;
cursor: pointer; cursor: pointer;
} }
} }
@ -110,7 +110,7 @@
// width: 242px; // width: 242px;
width: 470px; width: 470px;
height: 244px; height: 244px;
background-image: url("../images/popup/bg1.png"); background-image: url("../images/popup/popup.png");
background-size: 100% 100%; background-size: 100% 100%;
z-index: 600; z-index: 600;
@ -141,8 +141,8 @@
.mask { .mask {
// width: 13px; // width: 13px;
width: 35px; width: 15px;
height: 13px; height: 15px;
cursor: pointer; cursor: pointer;
} }
} }
@ -219,7 +219,7 @@
.car-popup { .car-popup {
width: 262px; width: 262px;
height: 138px; height: 138px;
background-image: url("../images/popup/bg3.png"); background-image: url("../images/popup/popup.png");
background-size: 100% 100%; background-size: 100% 100%;
z-index: 600; z-index: 600;
@ -248,8 +248,8 @@
} }
.mask { .mask {
width: 13px; width: 15px;
height: 13px; height: 15px;
cursor: pointer; cursor: pointer;
} }
} }
@ -308,7 +308,7 @@
width: 282px; width: 282px;
// height: 230px; // height: 230px;
// height: 220px; // height: 220px;
background-image: url("../images/popup/bg4.png"); background-image: url("../images/popup/popup.png");
background-size: 100% 100%; background-size: 100% 100%;
z-index: 600; z-index: 600;
@ -338,8 +338,8 @@
} }
.mask { .mask {
width: 13px; width: 15px;
height: 13px; height: 15px;
cursor: pointer; cursor: pointer;
} }
} }
@ -509,7 +509,7 @@
} }
.travel { .travel {
background-image: url("../images/dialogbg/792@2x.png"); background-image: url("../images/dialogbg/dialog1.png");
background-size: 100% 100%; background-size: 100% 100%;
background-color: transparent; background-color: transparent;
.el-dialog__header { .el-dialog__header {
@ -549,10 +549,10 @@
} }
} }
} }
.close { .closeimg {
position: absolute; position: absolute;
width: 50px; width: 20px;
height: 50px; height: 20px;
right: 0px; right: 0px;
top: 6px; top: 6px;
cursor: pointer; cursor: pointer;

@ -4,7 +4,7 @@
* @Author: JC9527 * @Author: JC9527
* @Date: 2023-08-14 14:40:02 * @Date: 2023-08-14 14:40:02
* @LastEditors: JC9527 * @LastEditors: JC9527
* @LastEditTime: 2024-01-12 23:43:59 * @LastEditTime: 2024-01-23 17:53:57
--> -->
<template> <template>
<div class="pc-container"> <div class="pc-container">
@ -98,7 +98,7 @@ export default {
this.rightAnimation = !this.rightAnimation; this.rightAnimation = !this.rightAnimation;
}, },
changeBackground(id){ changeBackground(id){
console.log(id); // console.log(id);
this.backgroundId = id; this.backgroundId = id;
} }
// getcodeImg(){ // getcodeImg(){

File diff suppressed because it is too large Load Diff

@ -4,19 +4,10 @@
* @Author: JC9527 * @Author: JC9527
* @Date: 2023-08-16 14:19:37 * @Date: 2023-08-16 14:19:37
* @LastEditors: JC9527 * @LastEditors: JC9527
* @LastEditTime: 2024-01-15 16:32:33 * @LastEditTime: 2024-01-23 15:44:59
--> -->
<template> <template>
<el-dialog <!-- :custom-class="
:visible.sync="dialogVisible"
:show-close="false"
:destroy-on-close="true"
:close-on-click-modal="false"
:close-on-press-escape="false"
:width="width"
:style="heightStyle"
append-to-body
:custom-class="
type == 1 type == 1
? 'dialog-boxed' ? 'dialog-boxed'
: type == 2 : type == 2
@ -28,14 +19,26 @@
: type == 10 : type == 10
? 'dialog-boxed10' ? 'dialog-boxed10'
: '' : ''
" " -->
<el-dialog
:visible.sync="dialogVisible"
:show-close="false"
:destroy-on-close="true"
:close-on-click-modal="false"
:close-on-press-escape="false"
:width="width"
:style="heightStyle"
append-to-body
> >
<template slot="title"> <template slot="title">
<div class="closeClick"> <div class="closeClick">
<div class="headline" text="title123kmalskdnj"> <div class="headline" text="title123kmalskdnj">
<div class="headlinetitle" :text="title">{{ title }}</div> <div class="headlinetitle" :text="title">{{ title }}</div>
<!-- <img src="@/assets/images/dialogbg/close.png" class="closeimg" @click="Close" alt="" /> -->
</div> </div>
<div class="close" @click="Close"></div> <img src="@/assets/images/dialogbg/close.png" class="closeimg" @click="Close" alt="" />
<!-- <div class="close" @click="Close"></div> -->
</div> </div>
</template> </template>
<slot> </slot> <slot> </slot>
@ -85,7 +88,7 @@ export default {
// width: vw(878); // width: vw(878);
// height: 520px; // height: 520px;
// border: 1px solid red; // border: 1px solid red;
background-image: url("../../../assets/images/dialogbg.png"); background-image: url("../../../assets/images/dialogbg/dialog1.png");
background-size: 100% 100%; background-size: 100% 100%;
background-color: transparent; background-color: transparent;
.el-dialog__header { .el-dialog__header {
@ -124,11 +127,14 @@ export default {
text-shadow: none; text-shadow: none;
} }
} }
} }
.close { .closeimg {
// width: 20px;
// height: 20px;
position: absolute; position: absolute;
width: 50px; width: 20px;
height: 50px; height: 20px;
right: 0px; right: 0px;
top: 6px; top: 6px;
cursor: pointer; cursor: pointer;
@ -142,16 +148,16 @@ export default {
::v-deep .dialog-boxed { ::v-deep .dialog-boxed {
background-image: url("../../../assets/images/dialogbg/dialog13.png"); background-image: url("../../../assets/images/dialogbg/dialog13.png");
.el-dialog__header { .el-dialog__header {
.closeClick { // .closeClick {
.close { // .close {
position: absolute; // position: absolute;
width: 27px; // width: 27px;
height: 23px; // height: 23px;
right: 10px; // right: 10px;
top: 18px; // top: 18px;
cursor: pointer; // cursor: pointer;
} // }
} // }
} }
} }
::v-deep .dialog-boxed2 { ::v-deep .dialog-boxed2 {
@ -160,46 +166,46 @@ export default {
::v-deep .dialog-boxed3 { ::v-deep .dialog-boxed3 {
background-image: url("../../../assets/images/dialogbg/792@2x.png"); background-image: url("../../../assets/images/dialogbg/792@2x.png");
.el-dialog__header { .el-dialog__header {
.closeClick { // .closeClick {
.close { // .close {
position: absolute; // position: absolute;
width: 20px; // width: 20px;
height: 18px; // height: 18px;
right: 17px; // right: 17px;
top: 8px; // top: 8px;
cursor: pointer; // cursor: pointer;
} // }
} // }
} }
} }
::v-deep .dialog-boxed9 { ::v-deep .dialog-boxed9 {
background-image: url("../../../assets/images/dialogbg/792@2x.png"); background-image: url("../../../assets/images/dialogbg/792@2x.png");
.el-dialog__header { .el-dialog__header {
.closeClick { // .closeClick {
.close { // .close {
position: absolute; // position: absolute;
width: 27px; // width: 27px;
height: 25px; // height: 25px;
right: 20px; // right: 20px;
top: 12px; // top: 12px;
cursor: pointer; // cursor: pointer;
} // }
} // }
} }
} }
::v-deep .dialog-boxed10 { ::v-deep .dialog-boxed10 {
background-image: url("../../../assets/images/dialogbg/792@2x.png"); background-image: url("../../../assets/images/dialogbg/792@2x.png");
.el-dialog__header { .el-dialog__header {
.closeClick { // .closeClick {
.close { // .close {
position: absolute; // position: absolute;
width: 27px; // width: 27px;
height: 27px; // height: 27px;
right: 20px; // right: 20px;
top: 15px; // top: 15px;
cursor: pointer; // cursor: pointer;
} // }
} // }
} }
} }
</style> </style>

@ -71,6 +71,8 @@
<section> <section>
<el-table <el-table
class="exporttable" class="exporttable"
v-loading="TabLoading"
element-loading-background="rgba(11, 34, 72, 0.8)"
:data="tableData" :data="tableData"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
:header-cell-style="tableHeaderCellStyle" :header-cell-style="tableHeaderCellStyle"
@ -78,29 +80,32 @@
:cell-style="{padding:0+'px'}" :cell-style="{padding:0+'px'}"
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column
prop="date" prop="rand_number"
label="事件流水号" label="事件流水号"
header-align="center" header-align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="eventName" prop="name"
label="事件名称" label="事件名称"
:show-overflow-tooltip="true"
header-align="center" header-align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="eventType" prop="type"
header-align="center" header-align="center"
:show-overflow-tooltip="true"
label="事件类型"> label="事件类型">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="eventAddress" prop="address"
header-align="center" header-align="center"
:show-overflow-tooltip="true"
label="事件地址"> label="事件地址">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="eventDate" prop="open_time"
header-align="center" header-align="center"
label="事件发生时间"> label="事件发生时间">
</el-table-column> </el-table-column>
@ -137,7 +142,7 @@ export default {
components:{diaLog}, components:{diaLog},
data() { data() {
return { return {
total:20, total:0,
title:"任务派发", title:"任务派发",
taskForm:{ taskForm:{
task:"", task:"",
@ -149,56 +154,8 @@ export default {
] ]
}, },
info:null, info:null,
tableData: [{ tableData: [],
date: '20240120084248951', TabLoading:false,
eventName: '事件名称',
eventType: '事件类型',
eventAddress: '地址',
eventDate:"2019-04-12"
}, {
date: '20240120084248951',
eventName: '事件名称',
eventType: '事件类型',
eventAddress: '地址',
eventDate:"2019-04-12"
}, {
date: '20240120084248951',
eventName: '事件名称',
eventType: '事件类型',
eventAddress: '地址',
eventDate:"2019-04-12"
}, {
date: '20240120084248951',
eventName: '事件名称',
eventType: '事件类型',
eventAddress: '地址',
eventDate:"2019-04-12"
}, {
date: '20240120084248951',
eventName: '事件名称',
eventType: '事件类型',
eventAddress: '地址',
eventDate:"2019-04-12"
}, {
date: '20240120084248951',
eventName: '事件名称',
eventType: '事件类型',
eventAddress: '地址',
eventDate:"2019-04-12"
}, {
date: '20240120084248951',
eventName: '事件名称',
eventType: '事件类型',
eventAddress: '地址',
eventDate:"2019-04-12"
}, {
date: '20240120084248951',
eventName: '事件名称',
eventType: '事件类型',
eventAddress: '地址',
eventDate:"2019-04-12"
}
]
} }
}, },
mounted() { mounted() {
@ -208,21 +165,19 @@ export default {
open(info){ open(info){
this.info = info; this.info = info;
this.$refs.taskDialog.open(); this.$refs.taskDialog.open();
// this.getViewListPageList();
}, },
getViewListPageList(){ getViewListPageList(page){
let data = {'queryValue' : [], "myInstanceClassify" : "all"} this.TabLoading = true;
ViewListPage({viewCode:'event-all-list',pageNo:"1",pageSize:"50"}, data).then(res => { let data = {'queryValue' : [], "myInstanceClassify" : "all", "parameterValue":[], fks: []}
console.log(res,"获取的事件列表"); ViewListPage({viewCode:'shi_jian_shou_li_list_page', pageNo: page || 1, pageSize:10}, data).then(res => {
if(res.code == 200) { if(res.code == 200) {
res.result.records.forEach(item => { this.total = res.result.total;
let obj = {}; this.tableData = res.result.records;
obj["label"] = item.name;
obj["value"] = item.id;
this.options.push(obj);
})
} }
this.TabLoading = false;
}).catch(err =>{
this.TabLoading = false;
}) })
}, },
@ -238,15 +193,18 @@ export default {
}, },
zhipai(row){ zhipai(row){
console.log("事件触发了"); console.log("事件触发了");
this.taskForm.task = row.name
this.$refs.eventDialog.Close();
}, },
// //
select(){ select(){
this.$refs.eventDialog.open() this.$refs.eventDialog.open()
this.getViewListPageList();
}, },
// //
cancel(refForm){ cancel(refForm){
this.$refs[refForm].resetFields(); this.$refs[refForm].resetFields();
this.$refs.dialog5.Close(); this.$refs.taskDialog.Close();
}, },
// //
confirm(refForm){ confirm(refForm){
@ -265,7 +223,8 @@ export default {
}, },
// //
pageChange(pages) { pageChange(pages) {
console.log(pages); // console.log(pages);
this.getViewListPageList(pages);
} }
}, },
} }
@ -513,6 +472,8 @@ export default {
height: 0px; height: 0px;
} }
.btns { .btns {
display: flex;
justify-content: center;
.btn { .btn {
width: 91px; width: 91px;
height: 35px; height: 35px;

Loading…
Cancel
Save