From fc4fa3c9db663e143cc7bdd46c9cf4e5d194718c Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 30 Dec 2022 14:54:39 +0800
Subject: [PATCH] 1
---
public/img/icon/police-people-btn.png | 0
src/styles/media/index.scss | 4 --
src/views/police/index.vue | 6 ++
vue.config.js | 4 +-
src/components/map/index.vue | 2
src/views/home/components/rightContainer.vue | 30 ++++----------
public/img/icon/car-btn.png | 0
src/styles/element-ui/element-ui.scss | 15 ++++---
8 files changed, 25 insertions(+), 36 deletions(-)
diff --git a/public/img/icon/car-btn.png b/public/img/icon/car-btn.png
new file mode 100644
index 0000000..488fbe9
--- /dev/null
+++ b/public/img/icon/car-btn.png
Binary files differ
diff --git a/public/img/icon/police-people-btn.png b/public/img/icon/police-people-btn.png
new file mode 100644
index 0000000..a50d2a6
--- /dev/null
+++ b/public/img/icon/police-people-btn.png
Binary files differ
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 4db100e..0cd4702 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-08-18 17:00:30
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2022-12-28 10:24:21
+ * @LastEditTime: 2022-12-30 13:59:43
* @FilePath: \srs-police-affairs\src\components\map\index.vue
* @Description: 公用地图组件
*
diff --git a/src/styles/element-ui/element-ui.scss b/src/styles/element-ui/element-ui.scss
index cda3c60..5918479 100644
--- a/src/styles/element-ui/element-ui.scss
+++ b/src/styles/element-ui/element-ui.scss
@@ -70,14 +70,14 @@
// ------------------------------------------------------------------
.el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $table-body-tr-n-color;
+ background-color: #184fca;
color: #ffffff !important;
}
.el-pagination.is-background .btn-next,
.el-pagination.is-background .btn-prev,
.el-pagination.is-background .el-pager li {
- background-color: rgba(0, 92, 169, 1.0);
+ background-color: #184fca;
color: #fff;
}
@@ -106,6 +106,7 @@
.el-select-dropdown {
// border: 1px solid rgba(0, 92, 169, 1.0);
border: 1px solid $table-body-tr-n-color;
+ background: transparent !important;
}
.el-select-dropdown__item {
@@ -113,7 +114,7 @@
color: #fff;
font-weight: 200;
// background-color: $table-body-tr-n-color!important;
- background-color: rgba(9, 53, 182, 0.93) !important;
+ background-color: rgba(8, 56, 185, .9) !important;
}
.el-select-dropdown__list {
@@ -130,12 +131,12 @@
}
.el-select-dropdown__item:hover {
- background-color: rgba(0, 92, 169, 0.3) !important;
+ background-color: #2d5cc8 !important;
}
.el-select-dropdown__item:onBlur {
// background-color: rgba(0, 92, 169, 0.3);
- background-color: $table-body-tr-n-color;
+ background-color: #2d5cc8 !important;
}
.el-select-dropdown__empty {
@@ -156,7 +157,7 @@
/* 日历样式 */
.el-picker-panel {
- background-color: rgba(8, 56, 185, 1);
+ background-color: rgba(8, 56, 185, .9);
color: #ffffff;
border: 1px solid #93bee7 !important;
}
@@ -172,7 +173,7 @@
}
.el-picker-panel .el-input__inner {
- background-color: #19466f;
+ background-color: rgba(8, 56, 185, .9);
border: #75ebf2;
color: #e8fdff;
}
diff --git a/src/styles/media/index.scss b/src/styles/media/index.scss
index 1b0a7aa..9132b55 100644
--- a/src/styles/media/index.scss
+++ b/src/styles/media/index.scss
@@ -2297,10 +2297,6 @@
color: #409EFF;
}
- .option-css:hover {
- background-color: rgba(0, 92, 169, 0.3) !important;
- }
-
.el-select-dropdown__wrap {
max-height: countSizeVh(200);
}
diff --git a/src/views/home/components/rightContainer.vue b/src/views/home/components/rightContainer.vue
index 47a88d0..44324fd 100644
--- a/src/views/home/components/rightContainer.vue
+++ b/src/views/home/components/rightContainer.vue
@@ -5,15 +5,10 @@
<div>值班信息(当日)</div>
</div>
<div class="table-box">
- <el-table
- size="small"
- :height="tableHeight"
- :data="schedulingList"
- style="width: 100%"
+ <el-table size="small" :height="tableHeight" :data="schedulingList" style="width: 100%"
:header-cell-style="{ 'text-align': 'center' }"
:cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
- :row-class-name="tableRowClassName"
- >
+ :row-class-name="tableRowClassName">
<el-table-column prop="station" label="岗位"></el-table-column>
<el-table-column prop="name" label="姓名"></el-table-column>
<el-table-column prop="contact" label="联系方式"></el-table-column>
@@ -25,16 +20,9 @@
<div class="title">
案件统计
<div class="timer">
- <el-date-picker
- v-model="eventTime"
- type="daterange"
- align="right"
- unlink-panels
- range-separator="至"
- start-placeholder="开始日期"
- end-placeholder="结束日期"
- :picker-options="pickerOptions"
- ></el-date-picker>
+ <el-date-picker v-model="eventTime" type="daterange" align="right" unlink-panels range-separator="至"
+ start-placeholder="开始日期" end-placeholder="结束日期"
+ :picker-options="pickerOptions"></el-date-picker>
</div>
</div>
<div id="EventChangeEcharts" class="echarts-box"></div>
@@ -200,12 +188,12 @@
if ('carCount' in params.data) {
tipHtml = `${params.marker} <strong style="color: ${params.color}">${params.data.name} ${params.data.value}台</strong><br /><strong style="margin-left:10px;color:#5c7bd9">占比：${params.percent}%</strong><br /><span style="color:#5470c6">警车：${params.data.carCount}台</span><br /><span style="margin-left:10px;color:#91cc75">监控：${params.data.monitorCount}台</span><br /><span style="color:#fac858">手台：${params.data.phoneCount}台</span><br /><span style="margin-left:10px;color:#ee6666">手持记录仪：${params.data.recorderCount}台</span>`
} else {
- tipHtml = `${params.marker} <strong style="color: ${params.color}">${params.data.name} ${params.data.value}台</strong><br /><span style="color:#4caf50">正常：${params.data.working}台</span><br /><span style="color:#2979ff">故障：${params.data.fault}台</span><br /><span style="margin-left:10px;color:#5c7bd9">设备故障率：${Math.floor(params.data.fault / (params.data.working + params.data.fault) * 100)}%</span><br />`
+ tipHtml = `${params.marker} <strong style="color: ${params.color}">${params.data.name} ${params.data.value}台</strong><br /><span style="color:#4caf50">正常：${params.data.working}台</span><br /><span style="color:#ccc">故障：${params.data.fault}台</span><br /><span style="margin-left:10px;color:#ccc">设备故障率：${Math.floor(params.data.fault / (params.data.working + params.data.fault) * 100)}%</span><br />`
}
return tipHtml
},
- backgroundColor: 'rgba(9, 40, 199, 0.9)',
- borderColor: 'rgba(9, 40, 199, 0.9)',
+ backgroundColor: 'rgba(8, 56, 185, 0.9)',
+ borderColor: 'rgba(8, 56, 185, 0.9)',
textStyle: {
fontSize: fontSize(14)
}
@@ -740,7 +728,7 @@
background: $sub-tab-bg-color;
cursor: pointer;
- & > div {
+ &>div {
height: 26px;
line-height: 26px;
}
diff --git a/src/views/police/index.vue b/src/views/police/index.vue
index a982de3..c3026da 100644
--- a/src/views/police/index.vue
+++ b/src/views/police/index.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-08-18 16:18:17
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2022-12-28 10:21:32
+ * @LastEditTime: 2022-12-29 16:23:30
* @FilePath: \srs-police-affairs\src\views\police\index.vue
* @Description: 辖区管理
*
@@ -13,6 +13,7 @@
<div class="police-page container">
<div v-show="boxShow" class="container-content">
<div class="switch-box">
+ 资源类别：
<el-select v-model="typeValue" @change="navClick" placeholder="请选择" class="type-select-css">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"
class="option-css"></el-option>
@@ -21,6 +22,7 @@
<div class="list-show" ref="tableBox" v-show="!detailFlag">
<div class="search-box" ref="tableSearchBox">
+ 资源名称：
<input v-model="searchValue" @input="searchChange" type="text" placeholder="请输入搜索条件" />
<button @click="searchClick" class="el-icon-search"></button>
</div>
@@ -712,6 +714,7 @@
padding: 6px;
// background: blue;
display: flex;
+ align-items: center;
justify-content: space-around;
&>div {
@@ -728,6 +731,7 @@
padding-top: 0;
height: 46px;
display: flex;
+ align-items: center;
input {
flex: 1;
diff --git a/vue.config.js b/vue.config.js
index 4014d22..b46600a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-09-07 09:37:07
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2022-12-29 11:38:33
+ * @LastEditTime: 2022-12-30 08:44:25
* @FilePath: \srs-police-affairs\vue.config.js
* @Description:
*
@@ -153,7 +153,7 @@
proxy: {
"/api": {
// target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
- target: "http://192.168.0.107:82",
+ target: "http://192.168.0.125:82",
// ws: true, //启用webSocket
changeOrigin: true, //开启代理跨域
pathRewrite: {
--
Gitblit v1.9.3