Переглянути джерело

chore: 更改unit3D图例顺序

TwoKe945 1 рік тому
батько
коміт
2760c3d703

+ 7 - 0
app/src/api/index.js

@@ -232,3 +232,10 @@ export function getHzzbSxzbYoy(params) {
     params
   })
 }
+export function getJumpList(data) {
+  return request({
+    url: '/system/bjxx/jumpList',
+    method: 'POST',
+    data
+  })
+}

+ 1 - 1
app/src/components/unit3D.vue

@@ -311,7 +311,7 @@ function getPie3D(pieData, internalDiameterRatio) {
     color: ["#1162fe", "#3fc865", "#a8fce3", "#5ef8c9", "#5ed3f8", "#5e92f8"],
     legend: {
       // type: "scroll",
-      data: legendData,
+      data: ["有管理单位(物业)", "有管理单位(非物业)", "居民自主管理", "街道社区代管", "其他管理形式", "无管理主体"],
       icon: "roundRect",
       orient: "vertical",
       padding: 5,

+ 32 - 12
app/src/views/Home/components/AlarmingSituationDynamics/AlaemList.vue

@@ -1,14 +1,13 @@
 <template>
 	<div class="maintenance-supervision">
 		<div class="maintenance-supervision_header">
-			<div>
-        <el-select clearable style="width: 100px;" v-model="value" placeholder="选择警情类型">
+			<div class="item__top">
+        <el-select clearable style="width: 160px;" v-model="value" placeholder="选择警情类型">
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
-        
         <el-date-picker
-          v-model="value1"
+          v-model="times"
           type="daterange"
           size="size"
           range-separator="至"
@@ -16,9 +15,10 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </div>
-      <div>
-        <el-input v-model="search" placeholder="请输入建筑名"></el-input>
+      <div class="item__bottom">
+        <el-input v-model="search"  placeholder="请输入建筑名"></el-input>
         <el-button style="width: 100px; margin: 0;" @click="searchTab">搜索</el-button>
+        <el-button style="width: 100px; margin: 0;" @click="resetData">重置</el-button>
       </div>
 		</div>
 		<div>
@@ -58,14 +58,15 @@
 </template>
 <script>
 	import {
-		getBjxx
-	} from '@/api/jqdt.js'
+		getJumpList
+	} from '@/api/index.js'
+  import moment from 'moment';
 	export default {
 		name: "MaintenanceSupervision",
 		data() {
 			return {
 				value: "",
-				value1: "",
+				times: "",
 				type: "",
 				search: '',
 				id: null,
@@ -116,15 +117,21 @@
 		props: ['list', 'pId'],
 		methods: {
 			searchTab() {
+        let tempTimes = []
+        if (this.times[0] === this.times[1]) {
+          tempTimes = [moment(this.times[0]).format('YYYY-MM-DD')]
+        } else {
+          tempTimes = this.times.map(item => moment(item).format('YYYY-MM-DD'))
+        }
+
 				const params = {
 					pageSize: 100,
 					pageNum: 1,
 					ddmc: this.search,
 					zqlx: this.value,
-					ajzt: this.value1,
-          // id: ['2023-06-16','2023-06-23']
+          times: tempTimes
 				}
-				getBjxx(params).then(res => {
+				getJumpList(params).then(res => {
 					console.log(res, '报警信息');
 					this.czztList = res.data.rows
 				})
@@ -184,6 +191,10 @@
 			color: #fff;
 		}
 
+    ::v-deep(.el-range-input) {
+      color: '#fff';
+    }
+
 		::v-deep(.el-button) {
 			border: none;
 			background: linear-gradient(360deg, #0094ff90 0%, #0094ff10 100%);
@@ -192,12 +203,21 @@
 
 		.maintenance-supervision_header {
 			display: flex;
+      flex-direction: column;
 			justify-content: space-around;
 			border-bottom: 1px solid #154956;
 			padding-bottom: 2px;
 			margin-top: 15px;
 			font-size: 12px;
 			color: rgb(79, 149, 186);
+      .item__top {
+        display: flex;
+        gap: 20px;
+      }
+      .item__bottom {
+        display: flex;
+        gap: 20px;
+      }
 		}
 
 		.warp {