Skip to content

Z
zh-baseversion-project
Commit 42222754 authored by 纪泽龙's avatar 纪泽龙
Browse files
Options

Merge branch 'jzl'

parents 36ae861c 4880be16
Show whitespace changes
Inline Side-by-side
Showing with 459 additions and 104 deletions
zh-baseversion-web/public/index.html
View file @ 42222754
......@@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<!-- <title><%= webpackConfig.name %></title> -->
<title>.</title>
<title>...</title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<script>
window._AMapSecurityConfig = {
......
zh-baseversion-web/src/utils/mapClass/mapLoca.js
View file @ 42222754
......@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2024-07-30 15:09:53
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2024-07-31 17:28:44
* @LastEditTime: 2024-08-02 14:08:42
* @FilePath: /zh-baseversion-web/src/utils/mapClass/mapLoca.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -69,7 +69,7 @@ export class LocalLine {
// console.log('this.loca.add', this.layer)
this.loca.add(layer);
this.star();
this.start();
});
}
show() {
......@@ -98,7 +98,7 @@ export class LocalLine {
this.loca.animate.stop();
}
star() {
start() {
this.loca.animate.start();
}
}
zh-baseversion-web/src/views/bigWindow/index.vue
View file @ 42222754
<!--
* @Author: your name
* @Date: 2022-01-11 13:44:17
* @LastEditTime: 2024-08-02 09:45:26
* @LastEditTime: 2024-08-02 14:09:08
* @LastEditors: 纪泽龙 jizelong@qq.com
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/views/Home.vue
......@@ -53,7 +53,7 @@
alt=""
/>
<img v-else src="../../assets/images/20230805152711.png" alt="" /> -->
{{$store.state.user.systemSetting.large_screen_header_city_name}}
{{ $store.state.user.systemSetting.large_screen_header_city_name }}
</div>
<!-- 左边 -->
......@@ -65,7 +65,11 @@
<!-- 右边 -->
<div class="rightbar" :style="changeRightBarStyle">
<div class="goSystem" @click="$router.push('/index')">进入管理系统</div>
<PipeColor :b="true" @showAnimate="showAnimate" />
<PipeColor
v-if="lineData.length > 0"
:b="true"
@showAnimate="showAnimate"
/>
<rightBar ref="mychild"></rightBar>
</div>
......@@ -278,6 +282,8 @@ export default {
// 报警轮询timer
alarmTimer: null,
geoJsonArr: [],
// 管道数据
lineData: [],
};
},
......@@ -544,8 +550,10 @@ export default {
let num = 1;
if (!bool) {
num = 1;
this.LocalLine.stop();
} else {
num = 0.1;
this.LocalLine.start();
}
this.map.piprOpacityChange(num);
},
......@@ -589,6 +597,7 @@ export default {
return httpFunc().then((res) => {
// 给用户加icontype
console.log("管道", res.data);
this.lineData = res.data;
// if (res.data && !res.data[0].iconType) {
res.data.forEach((item) => {
item.iconType = 1;
......
zh-baseversion-web/src/views/index.vue
View file @ 42222754
......@@ -21,38 +21,134 @@
</div>-->
<div class="div-col1">
<el-card>
<div style="width: 50%;height: 100%;text-align: center;float: left;font-size: 15px;">
<img src="../assets/taskDistribution.png" width="15%" style="margin-top: 2.5rem;">
<div
style="
width: 50%;
height: 100%;
text-align: center;
float: left;
font-size: 15px;
"
>
<img
src="../assets/taskDistribution.png"
width="15%"
style="margin-top: 2.5rem"
/>
<p>巡检巡查任务</p>
</div>
<div style="width: 50%;height: 100%;text-align: center;line-height: 8rem;float: right;font-size: 2.5rem;font-family: 'UnidreamLED';">{{totalObj.taskTotal}}</div>
<div
style="
width: 50%;
height: 100%;
text-align: center;
line-height: 8rem;
float: right;
font-size: 2.5rem;
font-family: 'UnidreamLED';
"
>
{{ totalObj.taskTotal }}
</div>
</el-card>
</div>
<div class="div-col1">
<el-card>
<div style="width: 50%;height: 100%; text-align: center;float: left;font-size: 15px;">
<img src="../assets/taskFeedback.png" width="15%" style="margin-top: 2.5rem;">
<div
style="
width: 50%;
height: 100%;
text-align: center;
float: left;
font-size: 15px;
"
>
<img
src="../assets/taskFeedback.png"
width="15%"
style="margin-top: 2.5rem"
/>
<p>入户安检任务</p>
</div>
<div style="width: 50%;height: 100%;text-align: center;line-height: 8rem;float: right;font-size: 2.5rem;font-family: 'UnidreamLED';">{{totalObj.taskFeedbackTotal}}</div>
<div
style="
width: 50%;
height: 100%;
text-align: center;
line-height: 8rem;
float: right;
font-size: 2.5rem;
font-family: 'UnidreamLED';
"
>
{{ totalObj.taskFeedbackTotal }}
</div>
</el-card>
</div>
<div class="div-col1">
<el-card>
<div style="width: 50%;height: 100%; text-align: center;float: left;font-size: 15px;">
<img src="../assets/complaint.png" width="15%" style="margin-top: 2.5rem;">
<div
style="
width: 50%;
height: 100%;
text-align: center;
float: left;
font-size: 15px;
"
>
<img
src="../assets/complaint.png"
width="15%"
style="margin-top: 2.5rem"
/>
<p>投诉处置</p>
</div>
<div style="width: 50%;height: 100%;text-align: center;line-height: 8rem;float: right;font-size: 2.5rem;font-family: 'UnidreamLED';">{{totalObj.complaintTotal}}</div>
<div
style="
width: 50%;
height: 100%;
text-align: center;
line-height: 8rem;
float: right;
font-size: 2.5rem;
font-family: 'UnidreamLED';
"
>
{{ totalObj.complaintTotal }}
</div>
</el-card>
</div>
<div class="div-col1">
<el-card>
<div style="width: 50%;height: 100%; text-align: center;float: left;font-size: 15px;">
<img src="../assets/complaintFeedback.png" width="15%" style="margin-top: 2.5rem;">
<div
style="
width: 50%;
height: 100%;
text-align: center;
float: left;
font-size: 15px;
"
>
<img
src="../assets/complaintFeedback.png"
width="15%"
style="margin-top: 2.5rem"
/>
<p>投诉反馈</p>
</div>
<div style="width: 50%;height: 100%;text-align: center;line-height: 8rem;float: right;font-size: 2.5rem;font-family: 'UnidreamLED';">{{totalObj.complaintFeedbackTotal}}</div>
<div
style="
width: 50%;
height: 100%;
text-align: center;
line-height: 8rem;
float: right;
font-size: 2.5rem;
font-family: 'UnidreamLED';
"
>
{{ totalObj.complaintFeedbackTotal }}
</div>
</el-card>
</div>
</div>
......@@ -60,88 +156,243 @@
<div clss="div-row">
<div class="div-col1">
<el-card>
<div style="width: 50%;height: 100%; text-align: center;float: left;font-size: 15px;">
<img src="../assets/video.png" width="15%" style="margin-top: 2.5rem;">
<div
style="
width: 50%;
height: 100%;
text-align: center;
float: left;
font-size: 15px;
"
>
<img
src="../assets/video.png"
width="15%"
style="margin-top: 2.5rem"
/>
<p>视频监控</p>
</div>
<div style="width: 50%;height: 100%;text-align: center;line-height: 8rem;float: right;font-size: 2.5rem;font-family: 'UnidreamLED';">{{totalObj.videoTotal}}</div>
<div
style="
width: 50%;
height: 100%;
text-align: center;
line-height: 8rem;
float: right;
font-size: 2.5rem;
font-family: 'UnidreamLED';
"
>
{{ totalObj.videoTotal }}
</div>
</el-card>
</div>
<div class="div-col1">
<el-card>
<div style="width: 50%;height: 100%; text-align: center;float: left;font-size: 15px;">
<img src="../assets/equipment.png" width="15%" style="margin-top: 2.5rem;">
<div
style="
width: 50%;
height: 100%;
text-align: center;
float: left;
font-size: 15px;
"
>
<img
src="../assets/equipment.png"
width="15%"
style="margin-top: 2.5rem"
/>
<p>安全装置</p>
</div>
<div style="width: 50%;height: 100%;text-align: center;line-height: 8rem;float: right;font-size: 2.5rem;font-family: 'UnidreamLED';">{{totalObj.equipmentTotal}}</div>
<div
style="
width: 50%;
height: 100%;
text-align: center;
line-height: 8rem;
float: right;
font-size: 2.5rem;
font-family: 'UnidreamLED';
"
>
{{ totalObj.equipmentTotal }}
</div>
</el-card>
</div>
<div class="div-col1">
<el-card>
<div style="width: 50%;height: 100%; text-align: center;float: left;font-size: 15px;">
<img src="../assets/trouble.png" width="15%" style="margin-top: 2.5rem;">
<div
style="
width: 50%;
height: 100%;
text-align: center;
float: left;
font-size: 15px;
"
>
<img
src="../assets/trouble.png"
width="15%"
style="margin-top: 2.5rem"
/>
<p>燃气事故</p>
</div>
<div style="width: 50%;height: 100%;text-align: center;line-height: 8rem;float: right;font-size: 2.5rem;font-family: 'UnidreamLED';">{{totalObj.troubleTotal}}</div>
<div
style="
width: 50%;
height: 100%;
text-align: center;
line-height: 8rem;
float: right;
font-size: 2.5rem;
font-family: 'UnidreamLED';
"
>
{{ totalObj.troubleTotal }}
</div>
</el-card>
</div>
<div class="div-col1">
<el-card>
<div style="width: 50%;height: 100%; text-align: center;float: left;font-size: 15px;">
<img src="../assets/hidden.png" width="15%" style="margin-top: 2.5rem;">
<div
style="
width: 50%;
height: 100%;
text-align: center;
float: left;
font-size: 15px;
"
>
<img
src="../assets/hidden.png"
width="15%"
style="margin-top: 2.5rem"
/>
<p>隐患整治</p>
</div>
<div style="width: 50%;height: 100%;text-align: center;line-height: 8rem;float: right;font-size: 2.5rem;font-family: 'UnidreamLED';">{{totalObj.hiddenTotal}}</div>
<div
style="
width: 50%;
height: 100%;
text-align: center;
line-height: 8rem;
float: right;
font-size: 2.5rem;
font-family: 'UnidreamLED';
"
>
{{ totalObj.hiddenTotal }}
</div>
</el-card>
</div>
</div>
<div clss="div-row">
<div :class="'-2' == this.$store.state.user.enterpriseId?'div-col2':'div-col2-en'" @click="$router.push('/operationMonitor/monitorData')" v-if="'-2' == this.$store.state.user.enterpriseId">
<div
:class="
'-2' == this.$store.state.user.enterpriseId
? 'div-col2'
: 'div-col2-en'
"
@click="$router.push('/operationMonitor/monitorData')"
v-if="'-2' == this.$store.state.user.enterpriseId"
>
<el-card>
<img src="../assets/dataMonitor.png" width="20%"/>
<img src="../assets/dataMonitor.png" width="20%" />
<p>数据监控</p>
</el-card>
</div>
<div :class="'-2' == this.$store.state.user.enterpriseId?'div-col2':'div-col2-en'" @click="$router.push('/emergency/eventInfo')" v-if="'-2' == this.$store.state.user.enterpriseId">
<div
:class="
'-2' == this.$store.state.user.enterpriseId
? 'div-col2'
: 'div-col2-en'
"
@click="$router.push('/emergency/eventInfo')"
v-if="'-2' == this.$store.state.user.enterpriseId"
>
<el-card>
<img src="../assets/emergency.png" width="20%"/>
<img src="../assets/emergency.png" width="20%" />
<p>应急处置</p>
</el-card>
</div>
<div :class="'-2' == this.$store.state.user.enterpriseId?'div-col2':'div-col2-en'" @click="$router.push('/regulation/info')" v-if="'-2' == this.$store.state.user.enterpriseId">
<div
:class="
'-2' == this.$store.state.user.enterpriseId
? 'div-col2'
: 'div-col2-en'
"
@click="$router.push('/regulation/info')"
v-if="'-2' == this.$store.state.user.enterpriseId"
>
<el-card>
<img src="../assets/enterprise.png" width="20%"/>
<img src="../assets/enterprise.png" width="20%" />
<p>燃气企业</p>
</el-card>
</div>
<div :class="'-2' == this.$store.state.user.enterpriseId?'div-col2':'div-col2-en'" @click="$router.push('/regulation/gasuser')">
<div
:class="
'-2' == this.$store.state.user.enterpriseId
? 'div-col2'
: 'div-col2-en'
"
@click="$router.push('/regulation/gasuser')"
>
<el-card>
<img src="../assets/user.png" width="20%"/>
<img src="../assets/user.png" width="20%" />
<p>燃气用户</p>
</el-card>
</div>
<div :class="'-2' == this.$store.state.user.enterpriseId?'div-col2':'div-col2-en'" @click="$router.push('/regulation/station')">
<div
:class="
'-2' == this.$store.state.user.enterpriseId
? 'div-col2'
: 'div-col2-en'
"
@click="$router.push('/regulation/station')"
>
<el-card>
<img src="../assets/station.png" width="20%"/>
<img src="../assets/station.png" width="20%" />
<p>场站信息</p>
</el-card>
</div>
<div :class="'-2' == this.$store.state.user.enterpriseId?'div-col2':'div-col2-en'" @click="$router.push('/regulation/pipe')">
<div
:class="
'-2' == this.$store.state.user.enterpriseId
? 'div-col2'
: 'div-col2-en'
"
@click="$router.push('/regulation/pipe')"
>
<el-card>
<img src="../assets/pipe.png" width="20%"/>
<img src="../assets/pipe.png" width="20%" />
<p>管道信息</p>
</el-card>
</div>
<div :class="'-2' == this.$store.state.user.enterpriseId?'div-col2':'div-col2-en'" @click="$router.push('/regulation/device')">
<div
:class="
'-2' == this.$store.state.user.enterpriseId
? 'div-col2'
: 'div-col2-en'
"
@click="$router.push('/regulation/device')"
>
<el-card>
<img src="../assets/device.png" width="20%"/>
<img src="../assets/device.png" width="20%" />
<p>设备信息</p>
</el-card>
</div>
<div :class="'-2' == this.$store.state.user.enterpriseId?'div-col2':'div-col2-en'" @click="$router.push('/standingBook/equipment')">
<div
:class="
'-2' == this.$store.state.user.enterpriseId
? 'div-col2'
: 'div-col2-en'
"
@click="$router.push('/standingBook/equipment')"
>
<el-card>
<img src="../assets/addDetector.png" width="20%"/>
<img src="../assets/addDetector.png" width="20%" />
<p>用户加装安全装置</p>
</el-card>
</div>
......@@ -156,11 +407,30 @@
</div>-->
<div slot="header">
<span>巡检巡查任务</span>
<span v-if="'-2' == this.$store.state.user.enterpriseId" class="div-header" style="cursor: pointer; float: right;" @click="$router.push('/inspectionWork/workOrderInspectionAndPatrol')">更多>></span>
<span v-else class="div-header" style="cursor: pointer; float: right;" @click="$router.push('/inspectionWork/PatrolTask')">更多>></span>
<span
v-if="'-2' == this.$store.state.user.enterpriseId"
class="div-header"
style="cursor: pointer; float: right"
@click="
$router.push('/inspectionWork/workOrderInspectionAndPatrol')
"
>更多>></span
>
<span
v-else
class="div-header"
style="cursor: pointer; float: right"
@click="$router.push('/inspectionWork/PatrolTask')"
>更多>></span
>
</div>
<div class="body">
<el-table v-loading="orderLoading" :data="orderList" height="354" style="width: 100%; border: 1px solid #e6ebf5;">
<el-table
v-loading="orderLoading"
:data="orderList"
height="354"
style="width: 100%; border: 1px solid #e6ebf5"
>
<!-- <el-table-column label="序号" type="index" align="center"/>
<el-table-column label="任务类型" align="center" prop="workType" width="90">
<template slot-scope="scope">
......@@ -180,19 +450,54 @@
<span v-if="scope.row.workStatus == 3" style="color: #30B46B">已归档</span>
</template>
</el-table-column>-->
<el-table-column label="任务标题" align="center" prop="taskTitle" width="200" :show-overflow-tooltip="true"/>
<el-table-column label="任务类型" align="center" prop="taskType" :formatter="taskTypeFormatter"/>
<el-table-column label="任务状态" align="center" prop="status" :formatter="taskStatusFormatter"/>
<el-table-column label="所属单位" align="center" prop="createEnterpriseId" :formatter="enterpriseFormatter"/>
<el-table-column label="开始时间" align="center" prop="createTime" width="180">
<el-table-column
label="任务标题"
align="center"
prop="taskTitle"
width="200"
:show-overflow-tooltip="true"
/>
<el-table-column
label="任务类型"
align="center"
prop="taskType"
:formatter="taskTypeFormatter"
/>
<el-table-column
label="任务状态"
align="center"
prop="status"
:formatter="taskStatusFormatter"
/>
<el-table-column
label="所属单位"
align="center"
prop="createEnterpriseId"
:formatter="enterpriseFormatter"
/>
<el-table-column
label="开始时间"
align="center"
prop="createTime"
width="180"
>
<template slot-scope="scope">
<span v-if="scope.row.createTime">{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<span v-if="scope.row.createTime">{{
parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}:{s}")
}}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="截止时间" align="center" prop="endTime" width="180">
<el-table-column
label="截止时间"
align="center"
prop="endTime"
width="180"
>
<template slot-scope="scope">
<span v-if="scope.row.endTime">{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<span v-if="scope.row.endTime">{{
parseTime(scope.row.endTime, "{y}-{m}-{d} {h}:{i}:{s}")
}}</span>
<span v-else>-</span>
</template>
</el-table-column>
......@@ -204,18 +509,54 @@
<el-card>
<div slot="header">
<span>投诉处置</span>
<span class="div-header" style="cursor: pointer; float: right;" @click="$router.push('/complainDeal')">更多>></span>
<span
class="div-header"
style="cursor: pointer; float: right"
@click="$router.push('/complainDeal')"
>更多>></span
>
</div>
<div class="body">
<el-table v-loading="complainLoading" :data="complainList" height="355" style="width: 100%; border: 1px solid #e6ebf5;">
<el-table-column label="序号" type="index" align="center"/>
<el-table-column label="投诉事项" align="left" prop="complainMatter"/>
<el-table-column label="投诉时间" align="center" prop="createTime" width="200"/>
<el-table-column label="状态" align="center" prop="complainStatus" width="100">
<el-table
v-loading="complainLoading"
:data="complainList"
height="355"
style="width: 100%; border: 1px solid #e6ebf5"
>
<el-table-column label="序号" type="index" align="center" />
<el-table-column
label="投诉事项"
align="left"
prop="complainMatter"
/>
<el-table-column
label="投诉时间"
align="center"
prop="createTime"
width="200"
/>
<el-table-column
label="状态"
align="center"
prop="complainStatus"
width="100"
>
<template slot-scope="scope">
<span v-if="scope.row.complainStatus == '1'" style="color: #ff7272">派发中</span>
<span v-if="scope.row.complainStatus == '2'" style="color: #1890ff">已反馈</span>
<span v-if="scope.row.complainStatus == '3'" style="color: #30B46B">已归档</span>
<span
v-if="scope.row.complainStatus == '1'"
style="color: #ff7272"
>派发中</span
>
<span
v-if="scope.row.complainStatus == '2'"
style="color: #1890ff"
>已反馈</span
>
<span
v-if="scope.row.complainStatus == '3'"
style="color: #30b46b"
>已归档</span
>
</template>
</el-table-column>
</el-table>
......@@ -251,20 +592,22 @@ export default {
orderParams: {
pageNum: 1,
pageSize: 10,
isDel: '0'
isDel: "0",
},
complainParams: {
pageNum: 1,
pageSize: 10,
isDel: '0'
isDel: "0",
},
workTaskType: [],
workTaskStatus: []
workTaskStatus: [],
};
},
created(){
created() {
// 默认配置
console.log(this.$store.state.settings)
console.log(this.$store.state.settings);
document.title =this.$store.state.user.systemSetting.large_screen_header_city_name;
},
mounted() {
this.getEnterpriseLists();
......@@ -276,9 +619,9 @@ export default {
},
methods: {
getStatiData() {
homepageStatistic().then(response => {
homepageStatistic().then((response) => {
this.totalObj = response.data;
console.log("this.totalObj",this.totalObj)
console.log("this.totalObj", this.totalObj);
});
},
getOrderList() {
......@@ -288,18 +631,18 @@ export default {
this.orderTotal = response.total;
this.orderLoading = false;
});*/
if('-2' != this.$store.state.user.enterpriseId){
if ("-2" != this.$store.state.user.enterpriseId) {
this.orderParams.taskType = 1;
}
listTask(this.orderParams).then(res =>{
listTask(this.orderParams).then((res) => {
this.orderList = res.rows.slice(0, 7);
this.orderTotal = res.total;
this.orderLoading = false;
})
});
},
getComplainDealList() {
this.complainLoading = true;
listComplainDeal(this.complainParams).then(response => {
listComplainDeal(this.complainParams).then((response) => {
this.complainList = response.rows.slice(0, 7);
this.complainTotal = response.total;
this.complainLoading = false;
......@@ -308,32 +651,34 @@ export default {
goTarget(href) {
window.open(href, "_blank");
},
getWorkTaskType(){
this.getDicts("t_work_task_type").then(response => {
getWorkTaskType() {
this.getDicts("t_work_task_type").then((response) => {
this.workTaskType = response.data;
});
},
getWorkTaskStatus(){
this.getDicts("t_work_task_status").then(response => {
getWorkTaskStatus() {
this.getDicts("t_work_task_status").then((response) => {
this.workTaskStatus = response.data;
});
},
//任务类型
taskTypeFormatter(row){
taskTypeFormatter(row) {
return this.selectDictLabel(this.workTaskType, row.taskType);
},
//任务状态
taskStatusFormatter(row){
taskStatusFormatter(row) {
return this.selectDictLabel(this.workTaskStatus, row.status);
},
enterpriseFormatter(row){
let info = this.enterprises.find(item => item.enterpriseId == row.createEnterpriseId);
return info?info.enterpriseName:"-";
enterpriseFormatter(row) {
let info = this.enterprises.find(
(item) => item.enterpriseId == row.createEnterpriseId
);
return info ? info.enterpriseName : "-";
},
getEnterpriseLists(){
enterpriseLists().then(response => {
getEnterpriseLists() {
enterpriseLists().then((response) => {
this.enterprises = response.rows;
this.enterprises.push({enterpriseId:-2,enterpriseName:"政府部门"})
this.enterprises.push({ enterpriseId: -2, enterpriseName: "政府部门" });
});
},
},
......@@ -380,7 +725,7 @@ export default {
float: left;
text-align: center;
cursor: pointer;
img{
img {
width: 11%;
}
}
......@@ -392,9 +737,8 @@ export default {
}
.div-header:hover {
text-decoration:underline;
text-decoration: underline;
color: #1890ff;
}
}
</style>
zh-baseversion-web/src/views/login.vue
View file @ 42222754
......@@ -132,6 +132,8 @@ export default {
this.loginForm.uuid = res.uuid;
this.cityName = res.cityName;
document.title = this.cityName;
});
},
getCookie() {
......
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