From dcb848136f44817701498a25bc07d12c10984d98 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期一, 20 二月 2023 11:48:08 +0800
Subject: [PATCH] 2023/2/20 肖辉 修改事项处理管理查询条件

---
 src/views/operate/disposal/casepool/pool/index.vue       |  169 ++++++++-----
 src/views/operate/disposal/casepool/learn/index.vue      |   98 +++++---
 src/views/operate/disposal/casepool/escalation/index.vue |   86 ++++--
 src/views/operate/disposal/casepool/notDeal/index.vue    |   98 +++++---
 src/views/systemSetting/platform/cockpitManage/index.vue |    2 
 src/components/seachHeader/index.vue                     |  133 +++++++++++
 src/views/operate/disposal/casepool/dispatch/index.vue   |   89 ++++--
 src/views/operate/images/updateUser/index.vue            |    9 
 8 files changed, 469 insertions(+), 215 deletions(-)

diff --git a/src/components/seachHeader/index.vue b/src/components/seachHeader/index.vue
new file mode 100644
index 0000000..7ce454d
--- /dev/null
+++ b/src/components/seachHeader/index.vue
@@ -0,0 +1,133 @@
+<template>
+<div class="header">
+  <el-form :inline="true" :model="seachData" class="demo-form-inline">
+    <el-form-item label="浜嬩欢缂栧彿">
+      <el-input v-model="seachData.code" placeholder="浜嬩欢缂栧彿"></el-input>
+    </el-form-item>
+    <el-form-item label="鏉ユ簮鏌ヨ">
+      <el-select v-model="seachData.resource" placeholder="璇烽�夋嫨鏉ユ簮">
+        <el-option
+            v-for="item in eventSourceOptions"
+            :key="item.label"
+            :label="item.label"
+            :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="澶х被鍚嶇О">
+        <el-input v-model="seachData.categoryBig" placeholder="澶х被鍚嶇О"></el-input>
+    </el-form-item>
+    <el-form-item label="灏忕被鍚嶇О">
+        <el-input v-model="seachData.categorySmall" placeholder="灏忕被鍚嶇О"></el-input>
+    </el-form-item>
+    <el-form-item label="鎶ヨ鐐逛綅">
+      <el-input v-model="seachData.site" placeholder="鎶ヨ鐐逛綅"></el-input>
+    </el-form-item>
+    <el-form-item label="鎵�灞炲尯鍩�">
+      <el-input v-model="seachData.street" placeholder="鎵�灞炲尯鍩�"></el-input>
+    </el-form-item>
+    <el-form-item label="鎶ヨ鏃堕棿">
+      <el-date-picker
+          v-model="seachData.alarmTime"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="鑷�"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+          :picker-options="pickerOptions">
+      </el-date-picker>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="getUserList">鏌ヨ</el-button>
+      <el-button
+          v-if="addData"
+          class="addBtn button-addition"
+          type="primary"
+          @click="dialogCreate()"
+      >娣诲姞</el-button
+      >
+    </el-form-item>
+  </el-form>
+<!--      <div>-->
+<!--        <el-button type="primary" @click="getUserList">鏌ヨ</el-button>-->
+<!--        <el-button-->
+<!--            class="addBtn button-addition"-->
+<!--            type="primary"-->
+<!--            @click="dialogCreate()"-->
+<!--        >娣诲姞</el-button-->
+<!--        >-->
+<!--      </div>-->
+</div>
+</template>
+
+<script>
+import {RESOURCE_OPTIONS} from "@/utils/helper";
+
+export default {
+  data(){
+    return{
+      eventSourceOptions: RESOURCE_OPTIONS,
+      seachData:{
+
+      },
+      addData:false,
+      alarmTime:'',
+      pickerOptions: {
+        shortcuts: [{
+          text: '鏈�杩戜竴鍛�',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '鏈�杩戜竴涓湀',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '鏈�杩戜笁涓湀',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]},
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.getPool()
+  },
+  methods:{
+    getPool(){
+      console.log(this.$route.name);
+      let name = this.$route.name
+      this.addData = name == 'pool';
+    },
+    onSubmit(){
+
+    },
+    getUserList(){
+      this.$emit('getUserList', {seachData:this.seachData})
+    },
+    dialogCreate(){
+      this.$emit('dialogCreatepro')
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+  .header{
+    line-height: normal;
+  }
+</style>
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index 539b6f7..bf22c48 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -1,25 +1,26 @@
 <template>
   <div class="userList">
     <header>
-      <div class="headerContent">
-        <div class="search">
-          <span>绛涢�夋潯浠�:</span>
-          <div class="option">
-            <el-select v-model="resource" placeholder="璇烽�夋嫨">
-              <el-option
-                v-for="item in resourceOptions"
-                :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="璇烽�夋嫨">-->
+<!--              <el-option-->
+<!--                v-for="item in resourceOptions"-->
+<!--                :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">
@@ -224,6 +225,7 @@
 import helper from "@/utils/mydate";
 import basecase from "@/api/operate/basecase";
 import { RESOURCE_OPTIONS } from "@/utils/helper";
+import MyHeader from "@/components/seachHeader";
 
 export default {
   components: {
@@ -231,6 +233,7 @@
     uploadIll,
     MyDetail,
     MyIllDetail,
+    MyHeader
   },
   data() {
     return {
@@ -369,21 +372,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) {
diff --git a/src/views/operate/disposal/casepool/escalation/index.vue b/src/views/operate/disposal/casepool/escalation/index.vue
index 33d9299..1b0ad26 100644
--- a/src/views/operate/disposal/casepool/escalation/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/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="mystatus"
-              placeholder="杩濊"
-            >
-              <el-option
-                v-for="item in resourceOptions"
-                :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>
+      <MyHeader @getUserList ="getUserList"></MyHeader>
+<!--      <div class="headerContent">-->
+<!--        <div class="search">-->
+<!--          <span>鏉ユ簮鏌ヨ:</span>-->
+<!--          <div class="option">-->
+<!--            <el-select-->
+<!--              v-model="mystatus"-->
+<!--              placeholder="杩濊"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in resourceOptions"-->
+<!--                :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>
+<!--      </div>-->
     </header>
     <main>
       <div class="mainContent">
@@ -132,10 +133,12 @@
 import { RESOURCE_OPTIONS, EVENT_SOURCE } from "@/utils/helper";
 import MyDetail from "@/components/detail";
 import basecase from "@/api/operate/basecase";
+import MyHeader from "@/components/seachHeader/index"
 
 export default {
   components: {
     MyDetail,
+    MyHeader
   },
   data() {
     return {
@@ -301,20 +304,41 @@
       });
     },
     // 鑾峰彇鐢ㄦ埛鍒楄〃
-    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)
+
+      basecase
+          .baseCasePoolList(params)
           .then(({ records, total }) => {
             this.tableData = records;
             this.totalNum = total;
           })
-          .catch(err => this.$message.error(err))
+          .catch((err) => this.$message.error(err));
     },
     // 璁剧疆琛ㄦ牸鏂戦┈绾�
     tableRowClassName({ row, rowIndex }) {
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) {
diff --git a/src/views/operate/disposal/casepool/notDeal/index.vue b/src/views/operate/disposal/casepool/notDeal/index.vue
index 6da9127..28f4a64 100644
--- a/src/views/operate/disposal/casepool/notDeal/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/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="mystatus"
-              placeholder="杩濊"
-              @change="setMystatus"
-            >
-              <el-option
-                v-for="item in resourceOptions"
-                :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="mystatus"-->
+<!--              placeholder="杩濊"-->
+<!--              @change="setMystatus"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in resourceOptions"-->
+<!--                :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">
@@ -212,13 +213,14 @@
 import MyIllDetail from "@/components/illdetail";
 import basecase from "@/api/operate/basecase";
 import { RESOURCE_OPTIONS } from "@/utils/helper";
-
+import MyHeader from "@/components/seachHeader";
 export default {
   components: {
     uploadVio,
     uploadIll,
     MyDetail,
     MyIllDetail,
+    MyHeader
   },
   data() {
     return {
@@ -354,21 +356,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) {
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index a069592..391bf7c 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/index.vue
@@ -1,66 +1,35 @@
 <template>
   <div class="userList">
     <header>
-      <div class="headerContent">
-        <div class="search">
-          <span>鏉ユ簮鏌ヨ:</span>
-          <div class="option">
-            <el-select clearable v-model="resource" placeholder="璇烽�夋嫨鏉ユ簮">
-              <el-option
-                v-for="item in eventSourceOptions"
-                :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 class="addUser">
-          <el-button
-            class="addBtn button-addition"
-            type="primary"
-            @click="dialogCreate = true"
-            >娣诲姞</el-button
-          >
-          <!-- 閫夋嫨鐧昏绫诲瀷 -->
-          <el-dialog
-            :before-close="handleClose"
-            :visible.sync="dialogCreate"
-            title="璇烽�夋嫨涓婃姤浜嬩欢绫诲瀷"
-            width="45%"
-            v-if="dialogCreate"
-          >
-            <createUser @getPageProp="setDialog" />
-          </el-dialog>
-          <!-- 浜嬩欢鐧昏 -->
-          <el-dialog
-            :before-close="handleClose"
-            :visible.sync="dialogNewAdd"
-            :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏'"
-            width="80%"
-            v-if="dialogNewAdd"
-          >
-            <!-- 杩濆缓鐧昏 -->
-            <MyIll
-              v-if="newAddType === 1"
-              :refresh="getUserList"
-              :mytype="newAddType"
-              @changeDialog="changeDialog"
-            />
-            <!-- 杩濊鐧昏 -->
-            <myVio
-              v-else
-              :refresh="getUserList"
-              :mytype="newAddType"
-              @changeDialog="changeDialog"
-            />
-          </el-dialog>
-        </div>
-      </div>
+      <MyHeader @dialogCreatepro="dialogCreatepro" @getUserList ="getUserList"></MyHeader>
+<!--      <div class="headerContent">-->
+<!--        <div class="search">-->
+<!--          <span>鏉ユ簮鏌ヨ:</span>-->
+<!--          <div class="option">-->
+<!--            <el-select clearable v-model="resource" placeholder="璇烽�夋嫨鏉ユ簮">-->
+<!--              <el-option-->
+<!--                v-for="item in eventSourceOptions"-->
+<!--                :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 class="addUser">-->
+<!--          <el-button-->
+<!--            class="addBtn button-addition"-->
+<!--            type="primary"-->
+<!--            @click="dialogCreate = true"-->
+<!--            >娣诲姞</el-button-->
+<!--          >-->
+
+<!--        </div>-->
+<!--      </div>-->
     </header>
     <main>
       <div class="mainContent">
@@ -246,6 +215,39 @@
         </div>
       </div>
     </main>
+    <!-- 閫夋嫨鐧昏绫诲瀷 -->
+    <el-dialog
+        :before-close="handleClose"
+        :visible.sync="dialogCreate"
+        title="璇烽�夋嫨涓婃姤浜嬩欢绫诲瀷"
+        width="45%"
+        v-if="dialogCreate"
+    >
+      <createUser @getPageProp="setDialog" />
+    </el-dialog>
+    <!-- 浜嬩欢鐧昏 -->
+    <el-dialog
+        :before-close="handleClose"
+        :visible.sync="dialogNewAdd"
+        :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏'"
+        width="80%"
+        v-if="dialogNewAdd"
+    >
+      <!-- 杩濆缓鐧昏 -->
+      <MyIll
+          v-if="newAddType === 1"
+          :refresh="getUserList"
+          :mytype="newAddType"
+          @changeDialog="changeDialog"
+      />
+      <!-- 杩濊鐧昏 -->
+      <myVio
+          v-else
+          :refresh="getUserList"
+          :mytype="newAddType"
+          @changeDialog="changeDialog"
+      />
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -258,7 +260,7 @@
 import helper from "@/utils/mydate";
 import { RESOURCE_OPTIONS } from "@/utils/helper";
 import basecase from "@/api/operate/basecase";
-
+import MyHeader from "@/components/seachHeader/index"
 export default {
   components: {
     createUser,
@@ -267,6 +269,7 @@
     MyDetail,
     MyDispatch,
     MyIllDetail,
+    MyHeader
   },
   data() {
     return {
@@ -361,9 +364,15 @@
         this.statusArr[1] = item.value;
       }
     });
-    this.getUserList();
+    this.getUserList(undefined);
+  },
+  mounted() {
   },
   methods: {
+    dialogCreatepro(){
+      console.log('-------------------')
+      this.dialogCreate = true
+    },
     // 璋冨害
     handleDispatch(data) {
       this.baseId = data.id;
@@ -438,14 +447,34 @@
       });
     },
     // 鑾峰彇鐢ㄦ埛鍒楄〃
-    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 }) => {
diff --git a/src/views/operate/images/updateUser/index.vue b/src/views/operate/images/updateUser/index.vue
index a72651b..ce8a559 100644
--- a/src/views/operate/images/updateUser/index.vue
+++ b/src/views/operate/images/updateUser/index.vue
@@ -24,7 +24,7 @@
               v-model="getCategory(imagedata.category).label"
             ></el-input>
           </el-form-item>
-          
+
           <el-form-item prop="regionName" label="绀惧尯鍚嶇О">
             <el-input v-model="imagedata.regionName"></el-input>
           </el-form-item>
@@ -41,7 +41,7 @@
               />
             </el-select>
           </el-form-item> -->
-          <el-form-item prop="url" label="鍥剧墖:" min-width="8"> 
+          <el-form-item prop="url" label="鍥剧墖:" min-width="8">
             <my-upload
               :picture-list="imageList"
               :is-show-upload="dialogType !== 'view'"
@@ -54,8 +54,7 @@
               type="primary"
               class="btn submit"
               @click.native.prevent="onSubmit"
-              >鎻愪氦</el-button
-            >
+              >鎻愪氦</el-button>
           </div>
         </el-form>
       </div>
@@ -346,4 +345,4 @@
 .el-select {
   width: 280px !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/systemSetting/platform/cockpitManage/index.vue b/src/views/systemSetting/platform/cockpitManage/index.vue
index d5965dc..5054128 100644
--- a/src/views/systemSetting/platform/cockpitManage/index.vue
+++ b/src/views/systemSetting/platform/cockpitManage/index.vue
@@ -375,6 +375,8 @@
     importTable(file) {
       const formData = new FormData();
       formData.append("file", file.file);
+      console.log(formData)
+      console.log(file)
       importTeamInfo(formData)
         .then(() => {
           this.$message({ type: "success", message: "鎿嶄綔鎴愬姛" });

--
Gitblit v1.8.0