From 98250a7cff913563152ae8b313c7f45cc27545ba Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 27 二月 2025 09:13:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 admin/src/views/operation/danger/record.vue |  111 +++++++++++++++++++++++++++++++------------------------
 1 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/admin/src/views/operation/danger/record.vue b/admin/src/views/operation/danger/record.vue
index 3d58230..a685a96 100644
--- a/admin/src/views/operation/danger/record.vue
+++ b/admin/src/views/operation/danger/record.vue
@@ -6,36 +6,50 @@
         <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�" @keypress.enter.native="search"></el-input>
       </el-form-item>
       <el-form-item label="鎻愭姤浜虹粍缁�" prop="companyName">
-        <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏�" clearable
-          @keypress.enter.native="search"></el-input>
+        <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏�" clearable @keypress.enter.native="search"></el-input>
       </el-form-item>
       <el-form-item label="璐d换閮ㄩ棬" prop="dutyCompanyName">
-        <el-input v-model="searchForm.dutyCompanyName" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�" clearable
-          @keypress.enter.native="search"></el-input>
+        <el-input v-model="searchForm.dutyCompanyName" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�" clearable @keypress.enter.native="search"></el-input>
       </el-form-item>
       <el-form-item label="闅愭偅鍖哄煙" prop="areaId">
-        <el-select v-model="searchForm.areaId" placeholder="璇烽�夋嫨闅愭偅鍖哄煙" clearable @change="search">
-          <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id">
+        <el-select v-model="searchForm.areaId" placeholder="璇烽�夋嫨闅愭偅鍖哄煙" clearable  @change="search">
+          <el-option
+              v-for="item in areaList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="闅愭偅绫诲瀷" prop="cateId">
         <el-select v-model="searchForm.cateId" placeholder="璇烽�夋嫨闅愭偅绫诲瀷" clearable @change="search">
-          <el-option v-for="item in cateList" :key="item.id" :label="item.name" :value="item.id">
+          <el-option
+              v-for="item in cateList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="鐘舵��" prop="status">
-        <el-select v-model="searchForm.status" @change="search" clearable placeholder="鐘舵��">
+        <el-select v-model="searchForm.status"  @change="search" clearable 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="startTime">
-        <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
-          format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
-          range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
+        <el-date-picker
+            @change="seleTime"
+            v-model="time"
+            @keypress.enter.native="search"
+            type="datetimerange"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']"
+            range-separator="鑷�"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡">
         </el-date-picker>
       </el-form-item>
       <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
@@ -51,12 +65,15 @@
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>
       <ul class="toolbar" v-permissions="['business:hiddendanger:create', 'business:hiddendanger:exportExcel']">
-        <li><el-button type="primary" icon="el-icon-plus" v-permissions="['business:hiddendanger:create']"
-            @click="handleEdit">鏂板缓</el-button></li>
-        <li><el-button type="primary" v-permissions="['business:hiddendanger:exportExcel']"
-            @click="handleEx">瀵煎嚭</el-button></li>
+        <li><el-button type="primary" icon="el-icon-plus" v-permissions="['business:hiddendanger:create']" @click="handleEdit">鏂板缓</el-button></li>
+        <li><el-button type="primary" v-permissions="['business:hiddendanger:exportExcel']" @click="handleEx">瀵煎嚭</el-button></li>
       </ul>
-      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+      <el-table
+          v-loading="isWorking.search"
+          :data="tableData.list"
+          stripe
+          @selection-change="handleSelectionChange"
+      >
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="dutyCompanyName" label="璐d换閮ㄩ棬" min-width="150px"></el-table-column>
         <el-table-column prop="areaName" label="闅愭偅鍖哄煙" min-width="150px"></el-table-column>
@@ -66,25 +83,33 @@
         <el-table-column prop="createDate" label="鎻愭姤鏃堕棿" min-width="150px"></el-table-column>
         <el-table-column label="澶勭悊缁撴灉" min-width="100px">
           <template slot-scope="{row}">
-            <span class="status-blue" v-if="row.status === 0">寰呭鐞�</span>
-            <span class="status-green" v-if="row.status === 1">宸插鐞�</span>
-            <span class="status-red" v-if="row.status === 2">宸查��鍥�</span>
+            <span class="status-blue"  v-if="row.status === 0">寰呭鐞�</span>
+            <span class="status-green"   v-if="row.status === 1">宸插鐞�</span>
+            <span class="status-red"   v-if="row.status === 2">宸查��鍥�</span>
           </template>
         </el-table-column>
         <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
-        <el-table-column label="鎿嶄綔" min-width="100" fixed="right">
+        <el-table-column
+            label="鎿嶄綔"
+            min-width="180"
+            fixed="right"
+        >
           <template slot-scope="{row}">
-            <el-button type="text" icon="el-icon-edit"
-              @click="$refs.OperaHiddenDangerWindow.open('闅愭偅闅忔墜鎷嶈鎯�', row)">鏌ョ湅璇︽儏</el-button>
+            <el-button type="text" icon="el-icon-edit" @click="$refs.OperaHiddenDangerWindow.open('闅愭偅闅忔墜鎷嶈鎯�',row)" >鏌ョ湅璇︽儏</el-button>
+            <el-button  type="text"  icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:hiddendanger:delete']">鍒犻櫎</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+      <pagination
+          @size-change="handleSizeChange"
+          @current-change="handlePageChange"
+          :pagination="tableData.pagination"
+      >
       </pagination>
     </template>
-    <OperaHiddenDangerWindow ref="OperaHiddenDangerWindow" @success="handlePageChange" />
+    <OperaHiddenDangerWindow ref="OperaHiddenDangerWindow" @success="handlePageChange"/>
     <!-- 鏂板缓 -->
-    <HiddenDangerParam @close="isShowEdit = false" @success="search" v-if="isShowEdit" ref="HiddenDangerParamRef" />
+    <HiddenDangerParam @close="isShowEdit = false" @success="search"  v-if="isShowEdit" ref="HiddenDangerParamRef" />
   </TableLayout>
 </template>
 
@@ -99,8 +124,8 @@
 export default {
   name: 'Empower',
   extends: BaseTable,
-  components: { TableLayout, Pagination, OperaHiddenDangerWindow, HiddenDangerParam },
-  data() {
+  components: { TableLayout, Pagination ,OperaHiddenDangerWindow, HiddenDangerParam},
+  data () {
     return {
       isShowEdit: false,
       // 鎼滅储
@@ -108,7 +133,6 @@
         memberName: '',
         companyName: '',
         queryStartTime: '',
-        companyName: '',
         queryEndTime: '',
         areaId: null,
         cateId: null,
@@ -120,7 +144,7 @@
       time: []
     }
   },
-  created() {
+  created () {
     this.config({
       module: '闅愭偅闅忔墜鎷嶇鐞�',
       api: '/business/hiddenDanger',
@@ -132,7 +156,7 @@
     this.loadParams()
   },
   methods: {
-    handleEx() {
+    handleEx () {
       this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
         .then(() => {
           this.exLoading = true
@@ -149,13 +173,13 @@
             })
         })
     },
-    handleEdit() {
+    handleEdit () {
       this.isShowEdit = true
       this.$nextTick(() => {
         this.$refs.HiddenDangerParamRef.isShowModal = true
       })
     },
-    changeRadio(e) {
+    changeRadio (e) {
       this.searchForm.radio = e
       if (e === '0') {
         this.searchForm.queryStartTime = timeForMat(0)[0]
@@ -172,7 +196,7 @@
       }
       this.search()
     },
-    loadParams() {
+    loadParams () {
       allList({
       })
         .then(res => {
@@ -193,28 +217,17 @@
         .finally(() => {
         })
     },
-    seleTime(e) {
+    seleTime (e) {
       this.searchForm.queryStartTime = e[0]
       this.searchForm.queryEndTime = e[1]
       this.searchForm.radio = null
       this.search()
     },
-    reset() {
+    reset () {
       this.$refs.searchForm.resetFields()
-      this.time = []
-      this.searchForm = {
-        memberName: '',
-        companyName: '',
-        queryStartTime: '',
-        companyName: '',
-        queryEndTime: '',
-        areaId: null,
-        cateId: null,
-        status: null,
-        radio: ''
-      }
-      // this.changeRadio('0')
-      this.search()
+      this.searchForm.radio = '0'
+      this.changeRadio('0')
+      // this.search()
     }
   }
 }

--
Gitblit v1.9.3