From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/business/deviceEvent.vue |  224 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 121 insertions(+), 103 deletions(-)

diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index 1e7d2ac..d86b88f 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -1,101 +1,102 @@
 <template>
-    <TableLayout :permissions="['business:deviceevent:query']">
-        <!-- 鎼滅储琛ㄥ崟 -->
-        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-            <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
-                <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
-            </el-form-item>
-            <el-form-item label="鍏徃/缁勭粐鍚嶇О" prop="companyName">
-                <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ュ叕鍙�/缁勭粐鍚嶇О" @keypress.enter.native="search"></el-input>
-            </el-form-item>
-            <el-form-item label="浜哄憳绫诲瀷" prop="personType">
-                <el-select v-model="searchForm.personType" placeholder="璇烽�夋嫨">
-                    <el-option label="澶栨潵璁垮" value="1"></el-option>
-                    <el-option label="鍐呴儴浜哄憳" value="2"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
-                <el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
-                    <el-option label="浜鸿劯璁よ瘉澶辫触" value="197163"></el-option>
-                    <el-option label="浜鸿劯璁よ瘉閫氳繃" value="196893"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="璧峰鏃堕棿" prop="eventType">
-                <el-date-picker
-                    @change="seleTime"
-                    v-model="time"
-                    type="datetimerange"
-                    format="yyyy-MM-dd HH:mm:ss"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    range-separator="鑷�"
-                    start-placeholder="寮�濮嬫棩鏈�"
-                    end-placeholder="缁撴潫鏃ユ湡">
-                </el-date-picker>
-            </el-form-item>
-            <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
-                <el-radio-button label="0">褰撳ぉ</el-radio-button>
-                <el-radio-button label="1">杩�7澶�</el-radio-button>
-                <el-radio-button label="2">杩�30澶�</el-radio-button>
-            </el-radio-group>
-            <section>
-                <el-button type="primary" @click="search">鎼滅储</el-button>
-                <el-button @click="reset">閲嶇疆</el-button>
-            </section>
-        </el-form>
-        <!-- 琛ㄦ牸鍜屽垎椤� -->
-        <template v-slot:table-wrap>
-            <ul class="toolbar" v-permissions="['business:deviceevent:exportExcel']">
-<!--
+  <TableLayout :permissions="['business:deviceevent:query']">
+    <!-- 鎼滅储琛ㄥ崟 -->
+    <div ref="QueryFormRef" slot="search-form">
+      <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+        <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
+          <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+        </el-form-item>
+        <el-form-item label="缁勭粐" prop="companyName">
+          <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
+        </el-form-item>
+        <!-- <el-form-item label="浜哄憳绫诲瀷" prop="personType">
+        <el-select v-model="searchForm.personType" placeholder="璇烽�夋嫨">
+          <el-option label="澶栨潵璁垮" value="1"></el-option>
+          <el-option label="鍐呴儴浜哄憳" value="2"></el-option>
+        </el-select>
+      </el-form-item> -->
+        <el-form-item label="浜哄憳绫诲瀷" prop="queryUserType">
+          <el-select v-model="searchForm.queryUserType" placeholder="璇烽�夋嫨">
+            <el-option label="璁垮" value="0"></el-option>
+            <el-option label="鐩稿叧鏂圭粍缁�" value="1"></el-option>
+            <el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
+          <el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
+            <el-option label="浜鸿劯璁よ瘉澶辫触" value="197163"></el-option>
+            <el-option label="浜鸿劯璁よ瘉閫氳繃" value="196893"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="闂ㄧ鐐�" prop="srcName">
+          <el-input v-model="searchForm.srcName" placeholder="璇疯緭鍏ラ棬绂佺偣" @keypress.enter.native="search"></el-input>
+        </el-form-item>
+        <el-form-item label="璧锋鏃堕棿" prop="eventType">
+          <!-- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
+          </el-date-picker> -->
+          <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+          <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
+        </el-form-item>
+        <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+          <el-radio-button label="0">褰撳ぉ</el-radio-button>
+          <el-radio-button label="1">杩�7澶�</el-radio-button>
+          <el-radio-button label="2">杩�30澶�</el-radio-button>
+        </el-radio-group>
+        <section>
+          <el-button type="primary" @click="search">鎼滅储</el-button>
+          <el-button @click="reset">閲嶇疆</el-button>
+        </section>
+      </el-form>
+    </div>
+
+    <!-- 琛ㄦ牸鍜屽垎椤� -->
+    <template v-slot:table-wrap>
+      <ul class="toolbar" v-permissions="['business:deviceevent:exportExcel']">
                 <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:deviceevent:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
--->
-            </ul>
-            <el-table
-                v-loading="isWorking.search"
-                :data="tableData.list"
-                stripe
-            >
-                <el-table-column prop="userType" label="浜哄憳绫诲瀷" min-width="100px">
+      </ul>
+      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
+        <!-- <el-table-column prop="userType" label="浜哄憳绫诲瀷" min-width="100px">
                     <template slot-scope="{row}">
                         <span v-if="row.personType == 0">鍔冲姟璁垮</span>
                         <span v-if="row.personType == 1">鏅�氳瀹�</span>
                         <span v-if="row.personType == 2">鍐呴儴浜哄憳</span>
                         <span v-if="row.personType == null">澶栨潵璁垮</span>
                     </template>
-                </el-table-column>
-              <el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
-                <el-table-column prop="devName" label="闂ㄧ鍚嶇О" min-width="100px"></el-table-column>
-                <el-table-column prop="srcName" label="闂ㄧ鐐�" min-width="100px"></el-table-column>
-                <el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
-                <el-table-column label="鍑哄叆绫诲瀷" min-width="100px">
-                    <template slot-scope="{row}">
-                        <span v-if="row.extEventInOut === 1">杩�</span>
-                        <span v-if="row.extEventInOut != 1">鍑�</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="鎶撴媿鐓х墖" min-width="100px">
-                    <template slot-scope="{row}">
-                        <el-image
-                            style="width: 80px; height: 80px"
-                            :src="row.extEventPictureURL"
-                            :preview-src-list="[row.extEventPictureURL]">
-                        </el-image>
-                    </template>
-                </el-table-column>
-
-              <el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
-              <el-table-column prop="personPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
-              <el-table-column prop="personIdcardDecode" label="璇佷欢鍙�" min-width="100px"></el-table-column>
-              <el-table-column prop="personCompanyName" label="鍏徃/缁勭粐" min-width="100px"></el-table-column>
-
-            </el-table>
-            <pagination
-                @size-change="handleSizeChange"
-                @current-change="handlePageChange"
-                :pagination="tableData.pagination"
-            >
-            </pagination>
-        </template>
-    </TableLayout>
+</el-table-column> -->
+        <el-table-column prop="personName" label="濮撳悕" min-width="80px"></el-table-column>
+        <el-table-column prop="personPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+        <el-table-column prop="personIdcardDecode" label="韬唤璇佸彿" min-width="140px"></el-table-column>
+        <el-table-column prop="personCompanyName" label="缁勭粐" min-width="100px"></el-table-column>
+        <el-table-column label="浜哄憳绫诲瀷" min-width="100px">
+          <template slot-scope="{ row }">
+            <span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
+            <span v-else-if="row.companyType == 1">鍐呴儴鍛樺伐</span>
+            <span v-else>璁垮</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="140px"></el-table-column>
+        <el-table-column prop="devName" label="闂ㄧ鍚嶇О" min-width="100px"></el-table-column>
+        <el-table-column prop="srcName" label="闂ㄧ鐐�" min-width="110px"></el-table-column>
+        <el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
+        <el-table-column label="鍑哄叆绫诲瀷" min-width="100px">
+          <template slot-scope="{row}">
+            <span v-if="row.extEventInOut === 1">杩�</span>
+            <span v-if="row.extEventInOut != 1">鍑�</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="鎶撴媿鐓х墖" min-width="100px">
+          <template slot-scope="{row}">
+            <el-image v-if="row.extEventPictureURL" style="width: 80px; height: 80px" :src="row.extEventPictureURL" :preview-src-list="[row.extEventPictureURL]">  </el-image>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+      </pagination>
+    </template>
+  </TableLayout>
 </template>
 
 <script>
@@ -107,7 +108,7 @@
   name: 'DeviceEvent',
   extends: BaseTable,
   components: { TableLayout, Pagination },
-  data () {
+  data() {
     return {
       // 鎼滅储
       searchForm: {
@@ -117,12 +118,13 @@
         eventType: '',
         startTime: '',
         endTime: '',
-        radio: 0
+        radio: 0,
+        srcName: ''
       },
       time: []
     }
   },
-  created () {
+  created() {
     this.config({
       module: '闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃',
       api: '/business/deviceEvent',
@@ -130,36 +132,52 @@
       'field.main': 'id'
     })
     this.changeRadio('0')
-    this.search()
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 260
+    })
   },
   methods: {
-    changeRadio (e) {
+    changeRadio(e) {
       if (e === '0') {
         this.searchForm.startTime = timeForMat(0)[0]
         this.searchForm.endTime = timeForMat(0)[1]
-        this.time = timeForMat(0)
       } else if (e === '1') {
         this.searchForm.startTime = timeForMat(6)[0]
         this.searchForm.endTime = timeForMat(6)[1]
-        this.time = timeForMat(6)
       } else if (e === '2') {
         this.searchForm.startTime = timeForMat(29)[0]
         this.searchForm.endTime = timeForMat(29)[1]
-        this.time = timeForMat(29)
+      } else {
+        this.searchForm.radio = ''
+      }
+      if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+        this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+        this.searchForm.startTime = ''
+        return
       }
       this.search()
     },
-    seleTime (e) {
+    seleTime(e) {
       this.searchForm.startTime = e[0]
       this.searchForm.endTime = e[1]
       this.searchForm.radio = null
       this.search()
     },
-    reset () {
+    reset() {
       this.$refs.searchForm.resetFields()
-      this.time = []
-      this.searchForm.radio = '0'
-      this.changeRadio('0')
+      this.searchForm = {
+        keyWords: '',
+        companyName: '',
+        personType: '',
+        eventType: '',
+        startTime: '',
+        endTime: '',
+        radio: 0
+      }
+      this.searchForm.radio = ''
+      // this.changeRadio('0')
       this.search()
     }
   }

--
Gitblit v1.9.3