From fb1d57f4bce31fe4f8147a144f8ef4afbca0a4cd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 21 二月 2023 13:48:29 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/disposal/casepool/learn/index.vue | 98 ++++++++++++++++++++++++++++++-------------------
1 files changed, 60 insertions(+), 38 deletions(-)
diff --git a/src/views/operate/disposal/casepool/learn/index.vue b/src/views/operate/disposal/casepool/learn/index.vue
index 436fab7..1c0ae10 100644
--- a/src/views/operate/disposal/casepool/learn/index.vue
+++ b/src/views/operate/disposal/casepool/learn/index.vue
@@ -1,29 +1,30 @@
<template>
<div class="userList">
<header>
- <div class="headerContent">
- <div class="search">
- <span>绛涢�夋潯浠�:</span>
- <div class="option">
- <el-select
- v-model="resource"
- placeholder="杩濊"
- @change="setMystatus"
- >
- <el-option
- v-for="item in resourceList"
- :key="item.label"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </div>
- <div class="findBtn">
- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>
- </div>
- </div>
- </div>
+ <MyHeader @getUserList ="getUserList"></MyHeader>
+<!-- <div class="headerContent">-->
+<!-- <div class="search">-->
+<!-- <span>绛涢�夋潯浠�:</span>-->
+<!-- <div class="option">-->
+<!-- <el-select-->
+<!-- v-model="resource"-->
+<!-- placeholder="杩濊"-->
+<!-- @change="setMystatus"-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in resourceList"-->
+<!-- :key="item.label"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- >-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </div>-->
+<!-- <div class="findBtn">-->
+<!-- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
</header>
<main>
<div class="mainContent">
@@ -214,13 +215,14 @@
import helper from "@/utils/mydate";
import { RESOURCE_OPTIONS } from "@/utils/helper";
import basecase from "@/api/operate/basecase";
-
+import MyHeader from "@/components/seachHeader";
export default {
components: {
uploadVio,
uploadIll,
MyDetail,
MyIllDetail,
+ MyHeader
},
data() {
return {
@@ -355,21 +357,41 @@
.catch((_) => {});
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
- getUserList() {
- const params = {
- current: this.currentPage,
- state: this.statusArr[0] ?? null,
- size: this.pageSize,
- resource: this.resource,
- type: this.statusArr[1] ?? null,
- };
+ getUserList(seachData) {
+ // console.log(seachData.seachData.resource)
+ let params
+ if (seachData){
+ params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ resource: seachData.seachData.resource ==undefined ?null:seachData.seachData.resource,
+ region:seachData.seachData.region ==undefined?null:seachData.seachData.region,
+ type: this.statusArr[1] ?? null,
+ code:seachData.seachData.code ==undefined?null:seachData.seachData.code,
+ categoryBig:seachData.seachData.categoryBig ==undefined?null:seachData.seachData.categoryBig,
+ categorySmall:seachData.seachData.categorySmall ==undefined?null:seachData.seachData.categorySmall,
+ site:seachData.seachData.site ==undefined?null:seachData.seachData.site,
+ street:seachData.seachData.street ==undefined?null:seachData.seachData.street,
+ alarmTime:seachData.seachData.alarmTime ==undefined?null:seachData.seachData.alarmTime,
+ };
+ }else {
+
+ params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ type: this.statusArr[1] ?? null,
+ };
+ }
+
basecase
- .baseCasePoolList(params)
- .then(({ records, total }) => {
- this.tableData = records;
- this.totalNum = total;
- })
- .catch((err) => this.$message.error(err));
+ .baseCasePoolList(params)
+ .then(({ records, total }) => {
+ this.tableData = records;
+ this.totalNum = total;
+ })
+ .catch((err) => this.$message.error(err));
},
// 鏇存敼杩濊/杩濆缓
changeTypeChecked(idx) {
--
Gitblit v1.8.0