From 326f2538ad4bdc671d5d383988a557a7b316bd03 Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Mon, 31 Jul 2023 18:55:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E7=BA=BF=E5=85=A5=E4=BE=B5=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/alarm/alarm.js                        |  42 +
 .../wirelessintrusion/wirelessintrusion.js    |  32 +
 src/assets/image/position_icon.png            | Bin 0 -> 27185 bytes
 src/router/page/index.js                      |  10 +
 src/views/map/index.vue                       |  83 +-
 .../wirelessintrusion/deployment/list.vue     | 879 ++++++++++--------
 src/views/wirelessintrusion/device/list.vue   |  64 +-
 src/views/wirelessintrusion/warn/record.vue   | 603 +++++-------
 8 files changed, 913 insertions(+), 800 deletions(-)
 create mode 100644 src/api/alarm/alarm.js
 create mode 100644 src/assets/image/position_icon.png

diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
new file mode 100644
index 0000000..7ee019e
--- /dev/null
+++ b/src/api/alarm/alarm.js
@@ -0,0 +1,42 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/alarmInformation/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (code) => {
+  return request({
+    url: '/api/blade-system/region/detail',
+    method: 'get',
+    params: {
+      code
+    }
+  })
+}
+
+export const remove = (id) => {
+  return request({
+    url: '/api/blade-system/region/remove',
+    method: 'post',
+    params: {
+      id,
+    }
+  })
+}
+
+export const submit = (row) => {
+  return request({
+    url: '/api/blade-system/region/submit',
+    method: 'post',
+    data: row
+  })
+}
+
diff --git a/src/api/wirelessintrusion/wirelessintrusion.js b/src/api/wirelessintrusion/wirelessintrusion.js
index c18e164..eec1468 100644
--- a/src/api/wirelessintrusion/wirelessintrusion.js
+++ b/src/api/wirelessintrusion/wirelessintrusion.js
@@ -57,3 +57,35 @@ export const bizDeviceDetail = (token, id) => {
   })
 }
 
+//定时任务列表
+export const cornJobList = (params) => {
+  return request({
+    url: '/api/cornJob/list',
+    method: 'get',
+    params: params
+  })
+}
+//定时任务新增
+export const cornJobSave = (data) => {
+  return request({
+    url: '/api/cornJob/save',
+    method: 'post',
+    data: data
+  })
+}
+//定时任务编辑
+export const cornJobUpdate = (data) => {
+  return request({
+    url: '/api/cornJob/update',
+    method: 'post',
+    data: data
+  })
+}
+//定时任务编辑
+export const cornJobRemove = (data) => {
+  return request({
+    url: '/api/cornJob/remove',
+    method: 'post',
+    params: data
+  })
+}
\ No newline at end of file
diff --git a/src/assets/image/position_icon.png b/src/assets/image/position_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e2cf3a3d8b10526f870e68ce3f40c51bd826d3a
GIT binary patch
literal 27185
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
Ef=Kv=lK=n!

literal 0
HcmV?d00001

diff --git a/src/router/page/index.js b/src/router/page/index.js
index 04e5fde..e6056f2 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -20,6 +20,16 @@ export default [{
     isTab: false,
     isAuth: false
   }
+},{
+  path: '/map',
+  name: '齐鲁医院地图',
+  component: () =>
+    import( /* webpackChunkName: "page" */ '@/views/map/index'),
+  meta: {
+    keepAlive: true,
+    isTab: false,
+    isAuth: false
+  }
 },
   {
     path: '/lock',
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index b893b7b..1365e01 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -1,33 +1,70 @@
 <template>
-  <div>
-    <div id='mapContainer' style="widht:1000px;height:1000px;background:red;"></div>
-  </div>
+	<div>
+		<div id='mapContainer' style="widht:1000px;height:1000px;"></div>
+	</div>
 </template>
 
 <script>
+import Img from "@/assets/image/position_icon.png";
+export default {
+	name: "map",
+	data() {
+		return {
+		};
+	},
+	destroyed() {
+		window.map.destroy();
+		window.map = null;
+	},
+	mounted() {
+		window.map = new jsmapbase.JSMap({
+			container: 'mapContainer',
+			mapServerURL: 'data/map'
+		});
+		window.map.openMapById('0001');
+		window.map.on("loadComplete", e => {
+			var floorControl = new jsmapbase.JSFloorControl({
+				position: jsmapbase.JSControlPosition.LEFT_TOP,//控件在容器中的位置
+				showBtnCount: 3,//默认显示楼层的个数 TODO
+				allLayers: false, //初始是否是多层显示，默认单层显示
+				needAllLayerBtn: true, // 是否显示多层/单层切换按钮
+				offset: {
+					x: 20,
+					y: 10
+				}//位置x,y的偏移量
+			});
+			window.map.addControl(floorControl);
+			console.log('点位标注')
+			//点位标注
+			var imagerMarker = new jsmapbase.JSImageMarker({
+				id: 'iamgeMareker1',//id
+				image: Img,//图片路径
+				position: new jsmapbase.JSPoint(120.61988850529002, 31.37531834395683, 0),//坐标位置
+				width: 55,//尺寸-宽
+				height: 55,//尺寸-高
+				floorId: 1,//楼层id
+				offset: jsmapbase.JSControlPosition.RIGHT_BOTTOM,//偏移位置
+				depthTest: false,//是否开启深度检测
+				show: true,  //是否显示
+				properties: {
+					name: 'test'
+				},//属性设置
+				callback: (node) => {
+					console.log(node);
+				}//回调
+			});
+			window.map.addMarker(imagerMarker);
+		});
+	},
+	methods: {
 
-  export default {
-    name: "map",
-    data() {
-      return {
-      };
-    },
-    mounted() {
-        window.map = new jsmapbase.JSMap({
-            container:'mapContainer',
-            mapServerURL:'data/map'
-        });
-        window.map.openMapById('0001');
-    },
-    methods: {
-      
-    },
-  };
+	},
+};
 </script>
 
 <style>
-  .el-font-size {
-    font-size: 14px;
-  }
+.el-font-size {
+	font-size: 14px;
+}
 </style>
 
diff --git a/src/views/wirelessintrusion/deployment/list.vue b/src/views/wirelessintrusion/deployment/list.vue
index 24a7955..0a13414 100644
--- a/src/views/wirelessintrusion/deployment/list.vue
+++ b/src/views/wirelessintrusion/deployment/list.vue
@@ -1,470 +1,555 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               ref="crud"
-               v-model="form"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
+      :permission="permissionList" :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
+      @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+      @refresh-change="refreshChange" @on-load="onLoad" :selecttable="selectable1">
       <template slot="menuLeft">
-        <el-button 
-          size="small"
-          @click="handleAddPre">
-          <i class="add_item"></i>
-          一键布防
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd">
+          新 增
         </el-button>
-        <el-button 
-          type="primary"
-          size="small"
-          @click="handleCancel">
-          <i class="cancel_item"></i>
-          一键撤防
-        </el-button>
-        <el-button 
-          type="primary"
-          size="small"
-          @click="handleAdd">
-          新增
+        <el-button type="danger" icon="el-icon-delete" size="small" plain @click="handleDelete">
+          删 除
         </el-button>
       </template>
-      <template slot-scope="{row}"
-                slot="status">
+      <template slot-scope="{row}" slot="status">
         <el-tag type="danger" v-show="row.status == 0">关闭</el-tag>
         <el-tag type="success" v-show="row.status == 1">开启</el-tag>
       </template>
-      <template #menu="{size:row,index}">
-        <el-button size="small" @click="handleDetail(row,index)">详情</el-button>
-        <el-button size="small" @click="handleEdit(row,index)">编辑</el-button>
-        <el-button size="small" @click="handleDelete(row,index)">删除</el-button>
+      <template #menu="{ size, row, index }">
+        <el-button type="text" icon="el-icon-view" size="small" @click="handleDetail(row, index)">详情</el-button>
+        <el-button type="text" icon="el-icon-edit" size="small" @click="handleEdit(row, index)">编辑</el-button>
+        <el-button type="text" icon="el-icon-delete" size="small" @click="handleDeleteRow(row, index)">删除</el-button>
       </template>
     </avue-crud>
-    <el-dialog  
-      title="布防设置"
-      :visible.sync="dialogVisible"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      custom-class="dia_box"
-    >
-      <el-form v-model="addForm">
-        <el-form-item label="布防时间：" prop="preTime">
-          <el-time-picker
-            v-model="addForm.preTime"
-            placeholder="请选择布防时间"
-            :readonly="isDetail ? true : false"
-            value-format="HH:mm:ss">
-          </el-time-picker>
-        </el-form-item>
+    <el-dialog title="布/撤防设置" :visible.sync="dialogVisible" v-if="dialogVisible" :append-to-body="true" :close-on-click-modal="false"
+      :close-on-press-escape="false" custom-class="dia_box" width="950px">
+      <el-form :model="addForm" ref="addform" :rules="addRules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="任务标题：" prop="taskTitle">
+              <el-input v-model="addForm.taskTitle" placeholder="请输入任务标题" :disabled="isDetail ? true : false"
+                maxlength="30" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="任务时间：" prop="executeTime">
+              <el-time-picker v-model="addForm.executeTime" placeholder="请选择任务时间" :disabled="isDetail ? true : false"
+                value-format="HH:mm:ss" style="width:100%;">
+              </el-time-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="任务类型：" prop="type">
+              <el-radio-group v-model="addForm.type" :disabled="isDetail ? true : false">
+                <el-radio :label="1">布防</el-radio>
+                <el-radio :label="2">撤防</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="是否启用：" prop="status">
+              <el-switch v-model="addForm.status" active-value="1" inactive-value="0" :disabled="isDetail ? true : false">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="选择设备：">
-          <el-table
-            class="table_box"
-            ref="multipleTable"
-            :data="tableData"
-            tooltip-effect="dark"
-            style="width: 100%"
-            @selection-change="handleSelectionChange">
-            <el-table-column
-              type="selection"
-              width="55"
-              align="center"
-              :reserve-selection="true"
-              :selectable="selectable"
-            >
+          <el-table class="table_box" ref="multipleTable" row-key="id" :data="tableData" tooltip-effect="dark"
+            style="width: 100%" @selection-change="handleSelectionChange" size="small">
+            <el-table-column type="selection" width="55" align="center" reserve-selection :selectable="selectable">
+            </el-table-column>
+            <el-table-column prop="name" label="设备名称">
+              <template slot-scope="scope">
+                {{ scope.row.name }}/{{ scope.row.remark }}
+              </template>
             </el-table-column>
-            <el-table-column
-              prop="deviceName"
-              label="设备名称">
+            <el-table-column prop="productName" label="设备所属产品">
             </el-table-column>
-            <el-table-column
-              prop="deviceNo"
-              label="设备编号">
+            <el-table-column prop="nodeLabel" label="节点类型">
             </el-table-column>
-            <el-table-column
-              prop="deviceType"
-              label="设备大类">
+            <el-table-column prop="gateway" label="网关信息">
             </el-table-column>
-            <el-table-column
-              prop="deviceArea"
-              label="所在区域">
+            <el-table-column prop="statusLabel" label="设备状态">
             </el-table-column>
-            <el-table-column
-              prop="position"
-              label="安装位置">
+            <el-table-column prop="createTime" label="创建时间" width="160px">
             </el-table-column>
           </el-table>
           <div class="page_box">
-            <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="diaPage.currentPage"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="diaPage.pageSize"
-              background
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="diaPage.total">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+              :current-page="diaPage.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="diaPage.pageSize" background
+              layout="total, sizes, prev, pager, next, jumper" :total="diaPage.total">
             </el-pagination>
           </div>
         </el-form-item>
-        <el-form-item label="是否启用：" prop="isOpen">
-          <el-switch
-            v-model="addForm.isOpen"
-            active-text="禁用"
-            inactive-text="启用"
-            :readonly="isDetail ? true : false">
-          </el-switch>
+        <el-form-item label="任务描述：" prop="taskDescribe">
+          <el-input type="textarea" v-model="addForm.taskDescribe" placeholder="请输入任务描述"
+            :disabled="isDetail ? true : false" maxlength="200" show-word-limit>
+          </el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确认布防</el-button>
+        <el-button type="primary" @click="submitForm" v-if="!isDetail">确 认</el-button>
       </div>
     </el-dialog>
   </basic-container>
 </template>
 
 <script>
-  import {mapGetters} from "vuex";
+import { mapGetters } from "vuex";
+import { bizLogin, bizDeviceList, bizDeviceStatus, bizNodeType, cornJobList, cornJobSave, cornJobUpdate, cornJobRemove } from "@/api/wirelessintrusion/wirelessintrusion";
 
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        dialogVisible:false,
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        diaPage:{
-          pageSize:10,
-          currentPage:1,
-          total:10,
-        },
-        addForm:{},
-        selectionList: [],
-        option: {
-          height: 'auto',
-          menuWidth:300,
-          calcHeight: 30,
-          dialogWidth: 950,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          addBtn:false,
-          viewBtn: false,
-          editBtn:false,
-          delBtn:false,
-          selection: true,
-          excelBtn: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "布防时间",
-              prop: "time",
-              span: 12,
-              // search: true,
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-            },
-            {
-              label: "关联设备",
-              prop: "device",
-              type: 'textarea',
-              span: 12,
-              overHidden: true,
-            },
-            {
-              label: "布防状态",
-              type: "select",
-              prop: "brandCode",
-              span: 12,
-              hide: true,
-              search: true,
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-            },
-            {
-             label: "是否启用",
-              prop: "status",
-              span: 24,
-              width: 80,
-              align: "center",
-              slot: true,
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-            },
-          ]
-        },
-        tableData:[],
-        data: [
-          {time:'09:00:00',device:'空调1、空调2、消防1、消防2、消防3、消防4、消防5...',status:'0'},
-          {time:'09:00:00',device:'空调1、空调2、消防1、消防2、消防3、消防4、消防5...',status:'1'},
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      dialogVisible: false,
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      diaPage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 10,
+      },
+      addForm: {},
+      addRules: {
+        taskTitle: [
+          { required: true, message: "请输入任务标题", trigger: "blur,change" },
         ],
-        multipleSelection:[],
-        selectedArr:[],
-        isDetail:false
+        executeTime: [
+          { required: true, message: "请选择任务时间", trigger: "change" },
+        ],
+      },
+      selectionList: [],
+      option: {
+        height: 'auto',
+        menuWidth: 200,
+        calcHeight: 30,
+        dialogWidth: 950,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        searchLabelWidth: 100,
+        border: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        selection: true,
+        excelBtn: false,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "任务标题",
+            prop: "taskTitle",
+            minWidth: 200,
+            overHidden: true,
+          },
+          {
+            label: "布/撤防时间",
+            prop: "executeTime",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+          },
+          // {
+          //   label: "关联设备",
+          //   prop: "deviceId",
+          //   overHidden: true,
+          // },
+          {
+            label: "任务类型",
+            type: "select",
+            prop: "type",
+            dicData: [
+              { value: 1, label: '布防' }, { value: 2, label: '撤防' }
+            ],
+            search: true,
+          },
+          {
+            label: "是否启用",
+            prop: "status",
+            align: "center",
+            slot: true,
+          },
+        ]
+      },
+      tableData: [],
+      data: [],
+      multipleSelection: [],
+      selectedArr: [],
+      isDetail: false
+    };
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.notice_add, false),
+        viewBtn: this.vaildData(this.permission.notice_view, false),
+        delBtn: this.vaildData(this.permission.notice_delete, false),
+        editBtn: this.vaildData(this.permission.notice_edit, false)
       };
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.notice_add, false),
-          viewBtn: this.vaildData(this.permission.notice_view, false),
-          delBtn: this.vaildData(this.permission.notice_delete, false),
-          editBtn: this.vaildData(this.permission.notice_edit, false)
-        };
-      },
-      
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
+
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  mounted() {
+    this.loadDict();
+  },
+  methods: {
+    //字典加载
+    loadDict() {
+      let token = window.sessionStorage.getItem('bizToken');
+      if (token == 'undefined' || !token) {
+        bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => {
+          window.sessionStorage.setItem('bizToken', res.data.data.token);
+          bizDeviceStatus(res.data.data.token).then(res => {
+            this.bizDeviceStatus = res.data.data;
+          })
+          bizNodeType(res.data.data.token).then(res => {
+            this.bizNodeType = res.data.data;
+          })
+        })
+      } else {
+        bizDeviceStatus(token).then(res => {
+          if (res.data.code == 401) {
+            window.sessionStorage.removeItem('bizToken');
+            this.loadDict();
+          }
+          else if (res.data.code == 200) {
+            this.bizDeviceStatus = res.data.data;
+          }
+        })
+        bizNodeType(token).then(res => {
+          this.bizNodeType = res.data.data;
+        })
       }
     },
-    methods: {
-      //多选框禁选
-      selectable(row, index) {
-        //row 就是每行的数据
-        let data = this.selectedArr //这是多选按钮保存的数据
-        //return : false  就是禁用
-        //return : true  不禁用
-        return data.findIndex(item => item == row.id) === -1
-      },
-      //点击新增按钮
-      handleAdd(){
-        this.dialogVisible = true;
-        this.isDetail = false;
-        this.tableData = [
-          {id:'001',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'002',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'003',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'004',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'005',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'006',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'007',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'008',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'009',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'010',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-        ]
-        this.selectedArr = ['001','003','005']
-      },
-      // 弹窗表格多选
-      handleSelectionChange(val){
-        this.multipleSelection = val
-      },
-      // 弹窗确认按钮
-      submitForm(){
-        console.log(this.addForm)
-      },
-      // 一键布防
-      handleAddPre(){
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-      },
-      // 一键撤防
-      handleCancel(){
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        console.log(list)
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      //查看详情
-      handleDetail(row){
-        this.dialogVisible = true;
-        this.isDetail = true;
-        this.tableData = [
-          {id:'001',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'002',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-        ];
-        this.addForm = {
-          preTime:'09:00:00',
-          isOpen:Boolean(1)
+    //节点类型转换
+    renderLabel(node, col) {
+      const dicData = this[col];
+      let idx = dicData.findIndex(item => item.dictValue == node);
+      return idx > -1 ? dicData[idx].dictLabel : '';
+    },
+    //设备列表多选框禁选
+    selectable() {
+      return this.isDetail ? false : true;
+    },
+    //任务列表多选框禁选
+    selectable1(row, index) {
+      return row.status == 1 ? false : true;
+    },
+    //点击新增按钮
+    handleAdd() {
+      this.addForm = {
+        taskTitle: '',
+        taskDescribe: '',
+        type: 1,
+        executeTime: null,
+        deviceId: '',
+        status: '1'
+      }
+      this.multipleSelection = [];
+      this.dialogVisible = true;
+      this.isDetail = false;
+      this.diaPage.currentPage = 1;
+      this.$nextTick(() => {
+        this.queryDeviceList(this.diaPage);
+      })
+    },
+    // 弹窗表格多选
+    handleSelectionChange(val) {
+      this.multipleSelection = val.map(item => item.id);
+      console.log(this.multipleSelection)
+    },
+    // 弹窗确认按钮
+    submitForm() {
+      this.$refs.addform.validate((valid) => {
+        if (valid) {
+          if (this.multipleSelection.length === 0) {
+            this.$message({
+              type: "warning",
+              message: "请选择关联设备"
+            })
+            return;
+          }
+          let ids = this.multipleSelection.join(",");
+          console.log(ids)
+          this.submitLoading = true;
+          if (this.addForm.id > 0) {
+            cornJobUpdate({ ...this.addForm, deviceId: ids }).then((res) => {
+              this.submitLoading = false;
+              this.dialogVisible = false;
+              this.onLoad(this.page);
+              this.$message({
+                type: "success",
+                message: "操作成功!"
+              });
+            }, () => {
+              this.submitLoading = false;
+            })
+          } else {
+            cornJobSave({ ...this.addForm, deviceId: ids }).then(res => {
+              this.submitLoading = false;
+              this.dialogVisible = false;
+              this.onLoad(this.page);
+              this.$message({
+                type: "success",
+                message: "操作成功!"
+              });
+            }, () => {
+              this.submitLoading = false;
+            })
+          }
         }
-      },
-      //点击编辑按钮
-      handleEdit(){
-        this.dialogVisible = true;
-        this.isDetail = false;
-        this.tableData = [
-          {id:'001',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'002',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'003',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'004',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'005',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'006',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'007',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'008',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'009',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-          {id:'010',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
-        ]
-        this.selectedArr = ['001','003','005']
-        let selectArr = ['002','004']
-        let map = new Map();
-        for (let item of this.tableData) {
-            if (!map.has(item.id)) {
-                map.set(item.id, item);
-            };
-        };
-        this.multipleSelection = [...map.values()].filter(item => selectArr.includes(item.id));
-        this.$nextTick(() =>{
-          this.multipleSelection.forEach((row) => {
-            this.$refs.multipleTable.toggleRowSelection(row, true) //选中已经选择的
-          })
+      })
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      console.log(list)
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    //查看详情
+    handleDetail(row) {
+      row.status = row.status + '';
+      this.addForm = row;
+      this.dialogVisible = true;
+      this.isDetail = true;
+      this.$nextTick(() => {
+        this.queryDeviceList(this.diaPage);
+      })
+    },
+    //点击编辑按钮
+    handleEdit(row, index) {
+      row.status = row.status + '';
+      this.addForm = row;
+      this.dialogVisible = true;
+      this.isDetail = false;
+      this.$nextTick(() => {
+        this.queryDeviceList(this.diaPage);
+      })
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return cornJobRemove({ ids: this.ids.join(",") });
         })
-        
-      },
-      handleDelete() {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+        .then(() => {
+          this.onLoad(this.page);
+          this.selectionClear();
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    handleDeleteRow(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return cornJobRemove({ ids: row.id });
         })
-          .then(() => {
-
-          })
-          .then(() => {
-            // this.onLoad(this.page);
-            // this.$message({
-            //   type: "success",
-            //   message: "操作成功!"
-            // });
-            // this.$refs.crud.toggleSelection();
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
           });
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        // const {releaseTimeRange} = this.query;
-        // let values = {
-        //   ...params,
-        //   ...this.query
-        // };
-        // if (releaseTimeRange) {
-        //   values = {
-        //     ...values,
-        //     releaseTime_datege: releaseTimeRange[0],
-        //     releaseTime_datelt: releaseTimeRange[1],
-        //   };
-        //   values.releaseTimeRange = null;
-        // }
-        // this.loading = true;
-        // getList(page.currentPage, page.pageSize, values).then(res => {
-        //   const data = res.data.data;
-        //   this.page.total = data.total;
-        //   this.data = data.records;
-        //   this.loading = false;
-        //   this.selectionClear();
-        // });
-        this.data = [
-          {time:'09:00:00',device:'空调1、空调2、消防1、消防2、消防3、消防4、消防5...',status:0},
-          {time:'09:00:00',device:'空调1、空调2、消防1、消防2、消防3、消防4、消防5...',status:1},
-        ];
+        });
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      let values = {
+        ...params,
+        ...this.query
+      };
+      this.loading = true;
+      cornJobList({ current: page.currentPage, size: page.pageSize, ...values }).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      }, err => {
         this.loading = false;
-        this.page.total = this.data.length;
+        this.selectionClear();
+      });
+    },
+    //设备列表
+    queryDeviceList(page, params = {}) {
+      let values = {
+        ...params,
+        pid: 100
+      };
+      let token = window.sessionStorage.getItem('bizToken');
+      if (token == 'undefined' || !token) {
+        bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => {
+          window.sessionStorage.setItem('bizToken', res.data.data.token);
+          bizDeviceList(res.data.data.token, { ...values, pageSize: page.pageSize, pageNum: page.currentPage }).then(res2 => {
+            const data = res2.data;
+            this.diaPage.total = data.total;
+            data.rows.map(item => {
+              item.node = item.bizProduct.node;
+              item.nodeLabel = this.renderLabel(item.node, 'bizNodeType');
+              item.statusLabel = this.renderLabel(item.status, 'bizDeviceStatus')
+              item.productName = item.bizProduct.name;
+            })
+            this.tableData = data.records;
+            this.$refs.multipleTable.clearSelection();
+            this.multipleSelection = this.addForm.deviceId ? this.addForm.deviceId.split(",") : [];
+            if (this.multipleSelection.length > 0) { // 判断是否存在勾选过的数据
+              this.$nextTick(() => {
+                this.tableData.forEach(row => {  // 获取数据列表接口请求到的数据
+                  this.multipleSelection.forEach(item => {  // 勾选到的数据
+                    if (row.id === parseInt(item)) {
+                      this.$refs.multipleTable.toggleRowSelection(row, true); // 若有重合，则回显该条数据
+                    }
+                  });
+                })
+              })
+
+            }
+          });
+        })
+      } else {
+        bizDeviceList(token, { ...values, pageSize: page.pageSize, pageNum: page.currentPage, pid: 100 }).then(res2 => {
+          if (res2.data.code == 401) {
+            window.sessionStorage.removeItem('bizToken');
+            this.queryDeviceList();
+          }
+          else if (res2.data.code == 200) {
+            const data = res2.data;
+            this.diaPage.total = data.total;
+            data.rows.map(item => {
+              item.node = item.bizProduct.node;
+              item.nodeLabel = this.renderLabel(item.node, 'bizNodeType');
+              item.statusLabel = this.renderLabel(item.status, 'bizDeviceStatus')
+              item.productName = item.bizProduct.name;
+            })
+            this.tableData = data.rows;
+            this.$refs.multipleTable.clearSelection();
+            this.multipleSelection = this.addForm.deviceId ? this.addForm.deviceId.split(",") : [];
+            if (this.multipleSelection.length > 0) { // 判断是否存在勾选过的数据
+              this.$nextTick(() => {
+                this.tableData.forEach(row => {  // 获取数据列表接口请求到的数据
+                  this.multipleSelection.forEach(item => {  // 勾选到的数据
+                    if (row.id === parseInt(item)) {
+                      this.$refs.multipleTable.toggleRowSelection(row, true); // 若有重合，则回显该条数据
+                    }
+                  });
+                })
+              })
+            }
+          }
+        }, err => {
+        });
       }
     }
-  };
+  }
+};
 </script>
 
 <style lang="scss" scoped>
 ::v-deep .cancel_item {
-  background: url('~@/assets/image/cancel_iten.png') center no-repeat;			// 注意此处的url，在这里引入自己的图片
+  background: url('~@/assets/image/cancel_iten.png') center no-repeat; // 注意此处的url，在这里引入自己的图片
   font-size: 12px;
   background-size: cover;
 }
+
 ::v-deep .cancel_item:before {
   content: "替";
   font-size: 12px;
   visibility: hidden;
 }
+
 ::v-deep .add_item {
-  background: url('~@/assets/image/add.png') center no-repeat;			// 注意此处的url，在这里引入自己的图片
+  background: url('~@/assets/image/add.png') center no-repeat; // 注意此处的url，在这里引入自己的图片
   font-size: 12px;
   background-size: cover;
 }
+
 ::v-deep .add_item:before {
   content: "替";
   font-size: 12px;
   visibility: hidden;
 }
-.table_box{
-  th.el-table__cell{
+
+.table_box {
+  th.el-table__cell {
     background: #F7F8FA;
-  } 
+  }
 }
-</style>
-<style lang="scss">
-  .dia_box{
-    height: 700px;
-    overflow: auto;
 
-    .el-table{
-      width: 90% !important;
-      border: 1px solid #D6D8DF;
-    }
-    .el-table th.el-table__cell{
-      background: #F7F8FA;
-    }
-    .dialog-footer{
-      width: 100%;
-      height: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
+.dia_box {
+  height: 700px;
+  overflow: auto;
 
-    .page_box{
-      width: 90%;
-      margin-left: 9%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-top: 15px;
-    }
+  .el-table {
+    width: 100% !important;
+    border: 1px solid #D6D8DF;
+  }
+
+  .el-table th.el-table__cell {
+    background: #F7F8FA;
   }
+
+  .dialog-footer {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .page_box {
+    width: 90%;
+    margin-left: 9%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 15px;
+  }
+}
 </style>
diff --git a/src/views/wirelessintrusion/device/list.vue b/src/views/wirelessintrusion/device/list.vue
index eb089b8..ab7f028 100644
--- a/src/views/wirelessintrusion/device/list.vue
+++ b/src/views/wirelessintrusion/device/list.vue
@@ -1,16 +1,15 @@
 <template>
   <basic-container>
-    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
-      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
-      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud"
+      v-model="form" :before-open="beforeOpen"
+      @search-change="searchChange" @search-reset="searchReset"
       @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
-import { bizLogin, bizDeviceList, bizDeviceDetail, bizDeviceStatus, bizNodeType } from "@/api/wirelessintrusion/wirelessintrusion";
-import { mapGetters } from "vuex";
+import { bizLogin, bizDeviceList, bizDeviceStatus, bizNodeType } from "@/api/wirelessintrusion/wirelessintrusion";
 
 export default {
   data() {
@@ -37,6 +36,8 @@ export default {
         editBtn: false,
         delBtn: false,
         addBtn: false,
+        menu: true,
+        menuWidth: 100,
         dialogClickModal: false,
         column: [
           {
@@ -47,19 +48,27 @@ export default {
             formatter: (val, value, label) => {
               return val.name + '/' + val.remark
             },
-            labelWidth: 120
+            labelWidth: 120,
+            viewDisplay: false,
+          },
+          {
+            label: "设备名称",
+            prop: "name",
+            span: 12,
+            search: true,
+            labelWidth: 120,
+            hide: true
           },
           {
             label: "备注名称",
             prop: "remark",
             span: 12,
             hide: true,
-            viewDisplay: true,
             labelWidth: 120
           },
           {
             label: "设备所属产品",
-            prop: "name",
+            prop: "productName",
             span: 12,
             labelWidth: 120
           },
@@ -81,11 +90,11 @@ export default {
             prop: "nodeLabel",
             labelWidth: 120,
             hide: true,
-            viewDisplay: true
           },
           {
             label: "网关信息",
             prop: "gateway",
+            span: 12,
             formatter: (val, value, label) => {
               return val.gateway || '-'
             },
@@ -107,18 +116,19 @@ export default {
           {
             label: "节点类型",
             prop: "statusLabel",
+            span: 12,
             labelWidth: 120,
             hide: true,
-            viewDisplay: true
           },
           {
-            label: "创建时间时间",
+            label: "创建时间",
             prop: "createTime",
+            span: 12,
             labelWidth: 120,
             hide: true,
-            viewDisplay: true,
           }, {
             label: "最后上线时间",
+            span: 12,
             prop: "lastOnline",
             labelWidth: 120
           },
@@ -128,24 +138,6 @@ export default {
       nodeType: [],//节点类型
     };
   },
-  computed: {
-    ...mapGetters(["permission"]),
-    permissionList() {
-      return {
-        addBtn: this.vaildData(this.permission.notice_add, false),
-        viewBtn: this.vaildData(this.permission.notice_view, false),
-        delBtn: this.vaildData(this.permission.notice_delete, false),
-        editBtn: this.vaildData(this.permission.notice_edit, false)
-      };
-    },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
-    }
-  },
   mounted() {
     this.loadDict();
   },
@@ -295,7 +287,7 @@ export default {
       let values = {
         ...params,
         ...this.query,
-        pid: 98
+        pid: 100
       };
       let token = window.sessionStorage.getItem('bizToken');
       if (token == 'undefined' || !token) {
@@ -305,14 +297,19 @@ export default {
           bizDeviceList(res.data.data.token, { ...values, pageSize: page.pageSize, pageNum: page.currentPage }).then(res2 => {
             const data = res2.data;
             this.page.total = data.total;
+            data.rows.map(item => {
+              item.node = item.bizProduct.node;
+              item.nodeLabel = this.renderLabel(item.node,'node');
+              item.statusLabel = this.renderLabel(item.status,'status')
+              item.productName = item.bizProduct.name;
+            })
             this.data = data.records;
             this.loading = false;
-            this.selectionClear();
           });
         })
       } else {
         this.loading = true;
-        bizDeviceList(token, { ...values, pageSize: page.pageSize, pageNum: page.currentPage }).then(res2 => {
+        bizDeviceList(token, { ...values, pageSize: page.pageSize, pageNum: page.currentPage, pid: 100 }).then(res2 => {
           this.loading = false;
           this.selectionClear();
           if(res2.data.code == 401){
@@ -327,6 +324,7 @@ export default {
               item.node = item.bizProduct.node;
               item.nodeLabel = this.renderLabel(item.node,'node');
               item.statusLabel = this.renderLabel(item.status,'status')
+              item.productName = item.bizProduct.name;
             })
             this.data = data.rows;
           }
diff --git a/src/views/wirelessintrusion/warn/record.vue b/src/views/wirelessintrusion/warn/record.vue
index dffe924..a7f74b4 100644
--- a/src/views/wirelessintrusion/warn/record.vue
+++ b/src/views/wirelessintrusion/warn/record.vue
@@ -1,94 +1,33 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               ref="crud"
-               @row-del="rowDel"
-               v-model="form"
-               :permission="permissionList"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               :before-open="beforeOpen"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
+      v-model="form" :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
+      @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+      @refresh-change="refreshChange" @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-turn-off"
-                   plain>消警
+        <el-button type="danger" size="small" icon="el-icon-turn-off" plain>消警
         </el-button>
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-turn-off"
-                   plain>撤防
+        <el-button type="danger" size="small" icon="el-icon-turn-off" plain>撤防
         </el-button>
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-turn-off"
-                   plain>旁路恢复
+        <el-button type="danger" size="small" icon="el-icon-turn-off" plain>旁路恢复
         </el-button>
-        <el-button type="warning"
-                   size="small"
-                   icon="el-icon-download"
-                   plain>导出
+        <el-button @click="handleExport" type="warning" size="small" icon="el-icon-download" plain>导出
         </el-button>
-        <!-- <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.notice_delete"
-                   @click="handleDelete">删 除
-        </el-button> -->
       </template>
-      <template slot-scope="{row}"
-                slot="alarmInfo">
-        <!-- <el-tag type="danger"> -->
-          {{row.alarmInfo}}
-          <!-- </el-tag> -->
-      </template>
-      <template #menu="{row,index}">
-        <el-button @click="tip(row,index)"
-                 type="primart" plain
-                 size="small" >详情</el-button>
-        <el-button 
-          @click="tip(row,index)"
-          type="primart" plain
-          size="small"
+      <template slot-scope="{ row, index }" slot="menu">
+        <el-button @click="tip(row, index)" type="text" icon="el-icon-brush" size="small"
           :disabled="row.cancelTime == ''">
           消警
         </el-button>
-        <!-- <el-button @click="tip(row,index)"
-        type="primart" plain
-                 size="small">撤防</el-button> -->
-        <!-- <el-button @click="tip(row,index)"
-        type="primart" plain
-                 size="small">旁路恢复</el-button> -->
-        <el-button 
-          @click="linkVideo(row,index)"
-          type="primart" 
-          plain
-          size="small" 
+        <el-button @click="linkVideo(row, index)" type="text" icon="el-icon-video-camera-solid" size="small"
           :disabled="row.cancelTime == ''">
           视频联动
         </el-button>
       </template>
     </avue-crud>
     <!-- 视频联动弹窗 -->
-    <el-dialog  
-      title="视频联动"
-      :visible.sync="dialogVisible"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      custom-class="video_dia"
-      width="65%">
+    <el-dialog title="视频联动" :visible.sync="dialogVisible" :append-to-body="true" :close-on-click-modal="false"
+      :close-on-press-escape="false" custom-class="video_dia" width="950px">
 
       <div class="video_box">
         <!-- <div class="video_item" v-for="item in videoData" :key="item.id">
@@ -107,296 +46,266 @@
 </template>
 
 <script>
-  import {getList, remove, update, add, getNotice} from "@/api/desk/notice";
-  import {mapGetters} from "vuex";
+import { getList } from "@/api/alarm/alarm";
+import {exportBlob} from "@/api/common";
+import { downloadXls } from "@/util/util";
+import {dateNow} from "@/util/date";
+import {getToken} from "@/util/auth";
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import func from "@/util/func";
 
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        dialogVisible:false,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height: 'auto',
-          calcHeight: 30,
-          dialogWidth: 950,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          // index: true,
-          menuWidth: 320,
-          viewBtn: false,
-          addBtn: false,
-          editBtn: false,
-          delBtn: false,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "设备名称",
-              prop: "title",
-              span: 24,
-              row: true,
-              search: true,
-            },
-            {
-              label: "设备编号",
-              prop: "deviceNo",
-              span: 24,
-              row: true,
-            },
-            {
-              label: "设备大类",
-              prop: "deviceType",
-              span: 24,
-              row: true,
-            },
-            {
-              label: "品牌编号",
-              prop: "brandNo",
-              span: 24,
-              row: true,
-            },
-            // {
-            //   label: "报警类型",
-            //   type: "select",
-            //   dicUrl: "/api/blade-system/dict/dictionary?code=notice",
-            //   props: {
-            //     label: "dictValue",
-            //     value: "dictKey"
-            //   },
-            //   dataType: "number",
-            //   slot: true,
-            //   prop: "category",
-            //   search: true,
-            // },
-            {
-              label: "所属区域",
-              prop: "floor",
-              // slot: true,
-            },
-            {
-              label: "安装位置",
-              prop: "address",
-              // slot: true,
-            },
-            {
-              label: "报警信息",
-              prop: "alarmInfo",
-              slot: true,
-              overHidden:true
-            },
-            {
-              label: "报警时间",
-              prop: "alarmTime",
-              type: "date",
-            },
-            {
-              label: "消报时间",
-              prop: "cancelTime",
-              type: "date",
-            },
-          ]
-        },
-        data: [],
-        videoData:[]
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.notice_add, false),
-          viewBtn: this.vaildData(this.permission.notice_view, false),
-          delBtn: this.vaildData(this.permission.notice_delete, false),
-          editBtn: this.vaildData(this.permission.notice_edit, false)
-        };
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      loading: true,
+      dialogVisible: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
       },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
-        });
+      selectionList: [],
+      option: {
+        height: 'auto',
+        calcHeight: 30,
+        tip: false,
+        border: true,
+        searchShow: true,
+        searchMenuSpan: 6,
+        menuWidth: 240,
+        viewBtn: true,
+        addBtn: false,
+        editBtn: false,
+        delBtn: false,
+        selection: true,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "设备名称",
+            prop: "title",
+          },
+          {
+            label: "设备编号",
+            prop: "deviceId",
+            row: true,
+          },
+          {
+            label: "设备类型",
+            type: 'select',
+            prop: "deviceType",
+            dataType: "number",
+            dictData: [],
+            search: true
+          },
+          // {
+          //   label: "报警类型",
+          //   type: "select",
+          //   dicUrl: "/api/blade-system/dict/dictionary?code=notice",
+          //   props: {
+          //     label: "dictValue",
+          //     value: "dictKey"
+          //   },
+          //   dataType: "number",
+          //   slot: true,
+          //   prop: "category",
+          //   search: true,
+          // },
+          {
+            label: "楼号",
+            prop: "buildId",
+          },
+          {
+            label: "楼层",
+            prop: "floorNo",
+          },
+          {
+            label: "经纬度",
+            prop: "longidute",
+            formatter: (data) => {
+              return (data.longidute ? data.longidute + ',' : '') + data.latidute;
+            }
+          },
+          {
+            label: "报警信息",
+            prop: "content",
+            overHidden: true,
+            width: '200'
+          },
+          {
+            label: "上报时间",
+            prop: "reportTime",
+            width: '150'
+          },
+          {
+            label: '上报日期',
+            prop: 'releaseTimeRange',
+            type: 'datetime',
+            valueFormat: 'yyyy-MM-dd HH:mm:ss',
+            searchRange: true,
+            search: true,
+            hide: true,
+            viewDisplay: false,
+          },
+        ]
       },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
+      data: [],
+      videoData: []
+    };
+  },
+  computed: {
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
+          this.$refs.crud.toggleSelection();
         });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getNotice(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        // const {releaseTimeRange} = this.query;
-        // let values = {
-        //   ...params,
-        //   ...this.query
-        // };
-        // if (releaseTimeRange) {
-        //   values = {
-        //     ...values,
-        //     releaseTime_datege: releaseTimeRange[0],
-        //     releaseTime_datelt: releaseTimeRange[1],
-        //   };
-        //   values.releaseTimeRange = null;
-        // }
-        // this.loading = true;
-        // getList(page.currentPage, page.pageSize, values).then(res => {
-        //   const data = res.data.data;
-        //   this.page.total = data.total;
-        //   this.data = data.records;
-        //   this.loading = false;
-        //   this.selectionClear();
-        // });
-        this.data = [
-          {title:'空调',deviceNo:'A101',deviceType:'空调设备',brandNo:'格力AT51',floor:'一号楼一层北',address:'1011室',alarmInfo:'无法制冷',alarmTime:'2023-07-14 09:55:23',cancelTime:'2023-07-15 15:23:10'},
-          {title:'空调',deviceNo:'A101',deviceType:'空调设备',brandNo:'格力AT51',floor:'一号楼一层北',address:'1011室',alarmInfo:'无法制冷,无法制冷无法制冷',alarmTime:'2023-07-14 09:55:23',cancelTime:''},
-        ];
+    },
+    beforeOpen(done, type) {
+      done();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      const { releaseTimeRange } = this.query;
+      let values = {
+        ...params,
+        ...this.query
+      };
+      if (releaseTimeRange) {
+        values = {
+          ...values,
+          startTime: releaseTimeRange[0],
+          endTime: releaseTimeRange[1],
+        };
+        values.releaseTimeRange = null;
+      }
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, values).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
         this.loading = false;
-        this.page.total = this.data.length
-      },
-      // 视频联动按钮
-      linkVideo(){
-        this.dialogVisible = true;
-        this.videoData = [
-          {id:'001',url:'cdcdcdcd',name:'视频一'},
-          {id:'002',url:'cdcdcdcd',name:'视频一'},
-          {id:'003',url:'cdcdcdcd',name:'视频一'},
-          {id:'004',url:'cdcdcdcd',name:'视频一'},
-          {id:'005',url:'cdcdcdcd',name:'视频一'},
-          {id:'006',url:'cdcdcdcd',name:'视频一'},
-          {id:'007',url:'cdcdcdcd',name:'视频一'},
-          {id:'008',url:'cdcdcdcd',name:'视频一'},
-        ]
-      },
-    }
-  };
+        this.selectionClear();
+      });
+    },
+    // 视频联动按钮
+    linkVideo() {
+      this.dialogVisible = true;
+      this.videoData = [
+        { id: '001', url: 'cdcdcdcd', name: '视频一' },
+        { id: '002', url: 'cdcdcdcd', name: '视频一' },
+        { id: '003', url: 'cdcdcdcd', name: '视频一' },
+        { id: '004', url: 'cdcdcdcd', name: '视频一' },
+        { id: '005', url: 'cdcdcdcd', name: '视频一' },
+        { id: '006', url: 'cdcdcdcd', name: '视频一' },
+        { id: '007', url: 'cdcdcdcd', name: '视频一' },
+        { id: '008', url: 'cdcdcdcd', name: '视频一' },
+      ]
+    },
+    // 导出
+    handleExport() {
+      let values = {
+        deviceType: func.toStr(this.query.deviceType)
+      };
+      if (this.query.releaseTimeRange) {
+        values = {
+          ...values,
+          startTime: this.queryreleaseTimeRange[0],
+          endTime: this.queryreleaseTimeRange[1],
+        };
+      }
+      let params = '';
+      Object.keys(values).map(key => {
+        params = '&' + key + '=' + values[key];
+      })
+      this.$confirm("是否导出报警数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        NProgress.start();
+        exportBlob(`/api/alarmInformation/export?${this.website.tokenHeader}=${getToken()}${params}`).then(res => {
+          downloadXls(res.data, `报警数据表${dateNow()}.xlsx`);
+          NProgress.done();
+        })
+      });
+    },
+  }
+};
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
 <style lang="scss">
-  .video_dia{
-    .video_box{
-      width: 100%;
-      // display: flex;
-      // justify-content: space-between;
-      // flex-wrap: wrap;
+.video_dia {
+  .video_box {
+    width: 100%;
+    // display: flex;
+    // justify-content: space-between;
+    // flex-wrap: wrap;
 
-      .grid-content {
-        width: 100%;
-        height: 200px;
-        margin-bottom: 18px;
-        background: #959595;
+    .grid-content {
+      width: 100%;
+      height: 200px;
+      margin-bottom: 18px;
+      background: #959595;
 
 
-        video{
-          width: 100%;
-          height: 100%;
-        }
+      video {
+        width: 100%;
+        height: 100%;
       }
     }
   }
+}
 </style>