Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2

src/views/ecm/event.vue

@@ -2,74 +2,30 @@
   <el-container>
     <el-header>
       <div class="left-panel">
-        <el-select
+        <el-select v-model="query.cates" placeholder="事件种类" @change="handleQuery" clearable>
-          v-model="query.cates"
+          <el-option v-for="item in cateOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          placeholder="事件种类"
-          @change="handleQuery"
-          clearable
-        >
-          <el-option
-            v-for="item in cateOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
         </el-select>
-        <el-select
+        <el-select v-model="query.area" placeholder="发生区域" @change="handleQuery" style="margin-left:2px" clearable
-          v-model="query.area"
+          filterable>
-          placeholder="发生区域"
+          <el-option v-for="item in areaOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          @change="handleQuery"
-          style="margin-left:2px"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="item in areaOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
         </el-select>
-        <el-date-picker
+        <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至" start-placeholder="发生时间始"
-        v-model="timeRange"
+          end-placeholder="发生时间止" style="margin-left:2px" value-format="YYYY-MM-DD HH:mm:ss" @change="handleQuery"
-        type="datetimerange"
+          clearable />
-        range-separator="至"
+        <el-button type="danger" @click="handleDelete">批量删除</el-button>
-        start-placeholder="发生时间始"
-        end-placeholder="发生时间止"
-        style="margin-left:2px"
-        value-format="YYYY-MM-DD HH:mm:ss"
-        @change="handleQuery"
-        clearable
-      />
       </div>
       <div class="right-panel">
-        <el-button
+        <el-button type="primary" :loading='dLoading' icon="el-icon-download" @click="exportList">下载</el-button>
-            type="primary"
-            :loading = 'dLoading'
-            icon="el-icon-download"
-            @click="exportList"
-          >下载</el-button>
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable
+      <scTable ref="table" :apiObj="apiObj" row-key="id" fit stripe @selection-change="handleSelectionChange"
-        ref="table"
+        @resetQuery="resetQuery">
-        :apiObj="apiObj"
+        <el-table-column type="selection" width="55" />
-        row-key="id"
-        fit
-        stripe
-        @resetQuery="resetQuery"
-      >
         <el-table-column label="#" type="index" width="50"></el-table-column>
         <el-table-column label="事件种类" width="240" :show-overflow-tooltip="true">
           <template #default="scope">
-            <el-tag
+            <el-tag v-for="item in scope.row.cates_" :key="item.id" type="warning" effect="plain">{{ item.name }}</el-tag>
-              v-for="item in scope.row.cates_"
-              :key="item.id"
-              type="warning"
-              effect="plain"
-              >{{ item.name }}</el-tag
-            >
           </template>
         </el-table-column>
         <el-table-column label="发生区域" prop="area_.name"></el-table-column>
@@ -82,20 +38,14 @@
           <template #default="scope">
             <span v-if="scope.row.opl">{{ scope.row.operation_name }}</span>
             <span v-else-if="scope.row.employee">
-              {{eTypeOptions[scope.row.employee_.type]}}-{{scope.row.employee_.name}}-{{ scope.row.employee_.belong_dept_name }}
+              {{ eTypeOptions[scope.row.employee_.type] }}-{{ scope.row.employee_.name }}-{{
+                scope.row.employee_.belong_dept_name }}
             </span>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="发生时间" prop="create_time" width="150"></el-table-column>
-          label="发生时间"
-          prop="create_time"
-          width="150"
-        ></el-table-column>
 
-        <el-table-column
+        <el-table-column label="处理人" prop="handle_user_name"></el-table-column>
-          label="处理人"
-          prop="handle_user_name"
-        ></el-table-column>
         <el-table-column label="事件标记" prop="mark">
           <template #default="scope">
             <el-tag v-if="scope.row.mark == 20" type="warning" effect="plain">误报</el-tag>
@@ -111,21 +61,9 @@
 
         <el-table-column label="操作" fixed="right" align="center">
           <template #default="scope">
-            <el-button
+            <el-button link type="info" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
-              link
+            <el-button link type="primary" size="small" v-if="scope.row.handle_user == null"
-              type="info"
+              @click="table_handle(scope.row, scope.$index)">处理</el-button>
-              size="small"
-              @click="table_show(scope.row, scope.$index)"
-              >查看</el-button
-            >
-            <el-button
-              link
-              type="primary"
-              size="small"
-              v-if="scope.row.handle_user == null"
-              @click="table_handle(scope.row, scope.$index)"
-              >处理</el-button
-            >
             <el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row)">
               <template #reference>
                 <el-button link type="danger" size="small">删除</el-button>
@@ -135,14 +73,8 @@
         </el-table-column>
       </scTable>
     </el-main>
-    <detail-dialog
+    <detail-dialog v-if="dialog.handle" ref="handleDialog" :eventID="eventID" @oplDetail="oplDetail"
-      v-if="dialog.handle"
+      @success="handleSuccess" @closed="dialog.handle = false"></detail-dialog>
-      ref="handleDialog"
-      :eventID="eventID"
-      @oplDetail="oplDetail"
-      @success="handleSuccess"
-      @closed="dialog.handle = false"
-    ></detail-dialog>
     <el-drawer :size="'50%'" v-model="showLimited" title="作业许可证详情" :close-on-click-modal="false">
       <sc-fire :id="oplId"></sc-fire>
     </el-drawer>
@@ -164,6 +96,7 @@ export default {
       showLimited: false,
       defaultTime: ['00:00:00', '23:59:59'],
       timeRange: [],
+      selectionList: [],
       objCateOptions: {
         'people': '人员',
         'opl': '作业',
@@ -205,11 +138,32 @@ export default {
         this.$refs.handleDialog.open("edit").setData(row);
       });
     },
+    handleSelectionChange(val) {
+      this.selectionList = val;
+    },
     table_del(row) {
       this.$API.ecm.event.delete.req(row.id).then(res => {
         this.$refs.table.refresh();
       })
     },
+    handleDelete() {
+      let that = this;
+      if (that.selectionList.length > 0) {
+        that.$confirm(`确定删除选中的${that.selectionList.length}条数据吗？`, "提示", { type: "warning" }).then(() => {
+          let ids = [];
+          that.selectionList.forEach(function (item) {
+            ids.push(item.id);
+          });
+          that.$API.ecm.event.delete.req('bulk', { ids: ids }).then((res) => {
+            that.$message.success("批量删除成功");
+            that.$refs.table.refresh();
+            return res;
+          }).catch((err) => {
+            that.$message.warning(err);
+          });
+        })
+      }
+    },
     //查看
     table_show(row) {
       this.eventID = row.id;

src/views/home/event.vue

@@ -2,41 +2,21 @@
   <el-container>
     <el-header>
       <div class="left-panel">
-        <el-date-picker
+        <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至" start-placeholder="发生时间始"
-          v-model="timeRange"
+          end-placeholder="发生时间止" style="margin-right:10px" value-format="YYYY-MM-DD HH:mm:ss" @change="handleQuery"
-          type="datetimerange"
+          clearable />
-          range-separator="至"
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
-          start-placeholder="发生时间始"
+        <el-button type="danger" @click="handleDelete">批量删除</el-button>
-          end-placeholder="发生时间止"
-          style="margin-right:10px"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          @change="handleQuery"
-          clearable
-        />
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          @click="handleQuery"
-        ></el-button>
       </div>
       <div class="right-panel">
-        <el-button
+        <el-button type="primary" @click="eventSetting">提醒配置
-            type="primary"
-            @click="eventSetting"
-          >提醒配置
         </el-button>
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable
+      <scTable ref="table" :apiObj="apiObj" row-key="id" :params="query" fit stripe
-        ref="table"
+        @selection-change="handleSelectionChange" @resetQuery="resetQuery">
-        :apiObj="apiObj"
+        <el-table-column type="selection" width="55" />
-        row-key="id"
-        :params="query"
-        fit
-        stripe
-        @resetQuery="resetQuery"
-      >
         <el-table-column label="发生类型" prop="buy_date">
         </el-table-column>
         <el-table-column label="事件信息" prop="voice_msg" show-overflow-tooltip>
@@ -68,18 +48,10 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="120px">
           <template #default="scope">
-            <el-link
+            <el-link type="primary" @click="table_handle(scope.row)" v-auth="'equipment.update'">处理
-              type="primary"
-              @click="table_handle(scope.row)"
-              v-auth="'equipment.update'"
-            >处理
             </el-link>
             <el-divider direction="vertical"></el-divider>
-            <el-link
+            <el-link type="danger" @click="table_del(scope.row)" v-auth="'equipment.delete'">删除
-              type="danger"
-              @click="table_del(scope.row)"
-              v-auth="'equipment.delete'"
-            >删除
             </el-link>
           </template>
         </el-table-column>
@@ -121,8 +93,7 @@
       </el-card>
       <el-card v-if="eventItem.handle_user" style="margin-top: 8px">
         <el-descriptions title="事件处理" :border="true">
-          <el-descriptions-item label="事件标记"
+          <el-descriptions-item label="事件标记">{{ mark_options2[eventItem.mark] }}
-            >{{ mark_options2[eventItem.mark] }}
           </el-descriptions-item>
           <el-descriptions-item label="处理人">
             <span v-if="eventItem.handle_user"></span>{{ eventItem.handle_user_name }}
@@ -141,13 +112,8 @@
             <el-col :span='12'>
               <el-form-item label="事件标记">
                 <el-select v-model="form.mark" style="width: 100%">
-                  <el-option
+                  <el-option v-for="item in mark_options" :key="item.id" :label="item.name" :value="item.id"
-                    v-for="item in mark_options"
+                    :disabled="mode === 'show'" />
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                    :disabled="mode==='show'"
-                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -155,11 +121,7 @@
           <el-row>
             <el-col :span='12'>
               <el-form-item label="处理描述">
-                  <el-input
+                <el-input v-model="form.handle_desc" clearable type="textarea"></el-input>
-                    v-model="form.handle_desc"
-                    clearable
-                    type="textarea"
-                  ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -169,25 +131,11 @@
         </div>
       </el-card>
       <el-card header="事件推送情况" style="margin-top: 8px">
-        <scTable
+        <scTable ref="table" :data="remindData" row-key="id" fit stripe hidePagination hideRefresh hideDo>
-          ref="table"
-          :data="remindData"
-          row-key="id"
-          fit
-          stripe
-          hidePagination
-          hideRefresh
-          hideDo
-        >
           <el-table-column label="#" type="index" width="50"></el-table-column>
           <el-table-column label="事件种类" width="200">
             <template #default="scope">
-              <el-tag
+              <el-tag v-for="item in scope.row.event_.cates_" :key="item.id" type="warning">{{ item.name }}</el-tag>
-                v-for="item in scope.row.event_.cates_"
-                :key="item.id"
-                type="warning"
-                >{{ item.name }}</el-tag
-              >
             </template>
           </el-table-column>
           <el-table-column label="事件处理状态" prop="can_handle">
@@ -197,16 +145,9 @@
             </template>
           </el-table-column>
 
-          <el-table-column
+          <el-table-column label="警报信息" prop="event_.voice_msg" width="200"></el-table-column>
-            label="警报信息"
-            prop="event_.voice_msg"
-            width="200"
-          ></el-table-column>
 
-          <el-table-column
+          <el-table-column label="接收人" prop="recipient_.name"></el-table-column>
-            label="接收人"
-            prop="recipient_.name"
-          ></el-table-column>
 
           <el-table-column label="是否可处理" prop="can_handle">
             <template #default="scope">
@@ -221,37 +162,21 @@
             </template>
           </el-table-column>
 
-          <el-table-column
+          <el-table-column label="发送时间" prop="create_time"></el-table-column>
-            label="发送时间"
-            prop="create_time"
-          ></el-table-column>
         </scTable>
       </el-card>
     </el-drawer>
-    <el-dialog
+    <el-dialog title="提醒配置" width="50%" v-model="visible" :append-to-body="true">
-      title="提醒配置"
+      <el-form :model="cateItem" label-width="100px">
-      width="50%"
-      v-model="visible"
-      :append-to-body="true"
-    >
-      <el-form
-        :model="cateItem"
-        label-width="100px"
-      >
         <el-form-item label="告警间隔">
-          <el-input-number
+          <el-input-number v-model="cateItem.unhandled_push_interval" :min="0" style="width: 90%;"
-            v-model="cateItem.unhandled_push_interval"
+            controls-position="right"></el-input-number>
-            :min="0"
-            style="width: 90%;"
-            controls-position="right"
-          ></el-input-number>
           <span>（毫秒）</span>
         </el-form-item>
       </el-form>
       <template #footer>
         <el-button @click="visible = false">取 消</el-button>
-        <el-button type="primary" :loading="isSaveing"  @click="submitSetting"
+        <el-button type="primary" :loading="isSaveing" @click="submitSetting">保 存</el-button>
-          >保 存</el-button>
       </template>
     </el-dialog>
   </el-container>
@@ -337,10 +262,13 @@ export default {
         this.$refs.handleDialog.open("edit").setData(row);
       });
     },
+    handleSelectionChange(val) {
+      this.selectionList = val;
+    },
     //删除事件
     table_del(row) {
       this.$confirm(`确定删除该事件吗？`, "提示", { type: "warning" }).then(() => {
-        this.$API.vm.visit.delete.req(row.id).then((res) => {
+        this.$API.ecm.event.delete.req(row.id).then((res) => {
           this.$message.success("删除成功");
           this.$refs.table.refresh();
           return res;
@@ -349,6 +277,24 @@ export default {
         });
       })
     },
+    handleDelete() {
+      let that = this;
+      if (that.selectionList.length > 0) {
+        that.$confirm(`确定删除选中的${that.selectionList.length}条数据吗？`, "提示", { type: "warning" }).then(() => {
+          let ids = [];
+          that.selectionList.forEach(function (item) {
+            ids.push(item.id);
+          });
+          that.$API.ecm.event.delete.req('bulk', { ids: ids }).then((res) => {
+            that.$message.success("批量删除成功");
+            that.$refs.table.refresh();
+            return res;
+          }).catch((err) => {
+            that.$message.warning(err);
+          });
+        })
+      }
+    },
     //查看
     table_show(row) {
       this.eventID = row.id;