无线入侵定时任务接口联调完成，设备增加分类过滤

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
+  })
+}
+

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
+  })
+}

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',

src/views/map/index.vue

@@ -1,23 +1,60 @@
 <template>
 	<div>
-    <div id='mapContainer' style="widht:1000px;height:1000px;background:red;"></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: {
 

src/views/wirelessintrusion/deployment/list.vue

@@ -1,131 +1,93 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
-               :table-loading="loading"
+      :permission="permissionList" :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
-               :data="data"
+      @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-               :page.sync="page"
+      @refresh-change="refreshChange" @on-load="onLoad" :selecttable="selectable1">
-               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">
       <template slot="menuLeft">
-        <el-button 
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd">
-          size="small"
-          @click="handleAddPre">
-          <i class="add_item"></i>
-          一键布防
-        </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>
+        <el-button type="danger" icon="el-icon-delete" size="small" plain @click="handleDelete">
+          删 除
+        </el-button>
       </template>
-      <template slot-scope="{row}"
+      <template slot-scope="{row}" slot="status">
-                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}">
+      <template #menu="{ size, row, index }">
-        <el-button size="small" @click="handleDetail(row,index)">详情</el-button>
+        <el-button type="text" icon="el-icon-view" size="small" @click="handleDetail(row, index)">详情</el-button>
-        <el-button size="small" @click="handleEdit(row,index)">编辑</el-button>
+        <el-button type="text" icon="el-icon-edit" size="small" @click="handleEdit(row, index)">编辑</el-button>
-        <el-button size="small" @click="handleDelete(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  
+    <el-dialog title="布/撤防设置" :visible.sync="dialogVisible" v-if="dialogVisible" :append-to-body="true" :close-on-click-modal="false"
-      title="布防设置"
+      :close-on-press-escape="false" custom-class="dia_box" width="950px">
-      :visible.sync="dialogVisible"
+      <el-form :model="addForm" ref="addform" :rules="addRules" label-width="100px">
-      :append-to-body="true"
+        <el-row :gutter="20">
-      :close-on-click-modal="false"
+          <el-col :span="12">
-      :close-on-press-escape="false"
+            <el-form-item label="任务标题：" prop="taskTitle">
-      custom-class="dia_box"
+              <el-input v-model="addForm.taskTitle" placeholder="请输入任务标题" :disabled="isDetail ? true : false"
-    >
+                maxlength="30" clearable>
-      <el-form v-model="addForm">
+              </el-input>
-        <el-form-item label="布防时间：" prop="preTime">
+            </el-form-item>
-          <el-time-picker
+            <el-form-item label="任务时间：" prop="executeTime">
-            v-model="addForm.preTime"
+              <el-time-picker v-model="addForm.executeTime" placeholder="请选择任务时间" :disabled="isDetail ? true : false"
-            placeholder="请选择布防时间"
+                value-format="HH:mm:ss" style="width:100%;">
-            :readonly="isDetail ? true : false"
-            value-format="HH:mm:ss">
               </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
+          <el-table class="table_box" ref="multipleTable" row-key="id" :data="tableData" tooltip-effect="dark"
-            class="table_box"
+            style="width: 100%" @selection-change="handleSelectionChange" size="small">
-            ref="multipleTable"
+            <el-table-column type="selection" width="55" align="center" reserve-selection :selectable="selectable">
-            :data="tableData"
+            </el-table-column>
-            tooltip-effect="dark"
+            <el-table-column prop="name" label="设备名称">
-            style="width: 100%"
+              <template slot-scope="scope">
-            @selection-change="handleSelectionChange">
+                {{ scope.row.name }}/{{ scope.row.remark }}
-            <el-table-column
+              </template>
-              type="selection"
-              width="55"
-              align="center"
-              :reserve-selection="true"
-              :selectable="selectable"
-            >
             </el-table-column>
-            <el-table-column
+            <el-table-column prop="productName" label="设备所属产品">
-              prop="deviceName"
-              label="设备名称">
             </el-table-column>
-            <el-table-column
+            <el-table-column prop="nodeLabel" label="节点类型">
-              prop="deviceNo"
-              label="设备编号">
             </el-table-column>
-            <el-table-column
+            <el-table-column prop="gateway" label="网关信息">
-              prop="deviceType"
-              label="设备大类">
             </el-table-column>
-            <el-table-column
+            <el-table-column prop="statusLabel" label="设备状态">
-              prop="deviceArea"
-              label="所在区域">
             </el-table-column>
-            <el-table-column
+            <el-table-column prop="createTime" label="创建时间" width="160px">
-              prop="position"
-              label="安装位置">
             </el-table-column>
           </el-table>
           <div class="page_box">
-            <el-pagination
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-              @size-change="handleSizeChange"
+              :current-page="diaPage.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="diaPage.pageSize" background
-              @current-change="handleCurrentChange"
+              layout="total, sizes, prev, pager, next, jumper" :total="diaPage.total">
-              :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-form-item label="任务描述：" prop="taskDescribe">
-          <el-switch
+          <el-input type="textarea" v-model="addForm.taskDescribe" placeholder="请输入任务描述"
-            v-model="addForm.isOpen"
+            :disabled="isDetail ? true : false" maxlength="200" show-word-limit>
-            active-text="禁用"
+          </el-input>
-            inactive-text="启用"
-            :readonly="isDetail ? true : false">
-          </el-switch>
         </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>
@@ -133,6 +95,7 @@
 
 <script>
 import { mapGetters } from "vuex";
+import { bizLogin, bizDeviceList, bizDeviceStatus, bizNodeType, cornJobList, cornJobSave, cornJobUpdate, cornJobRemove } from "@/api/wirelessintrusion/wirelessintrusion";
 
 export default {
   data() {
@@ -152,69 +115,70 @@
         total: 10,
       },
       addForm: {},
+      addRules: {
+        taskTitle: [
+          { required: true, message: "请输入任务标题", trigger: "blur,change" },
+        ],
+        executeTime: [
+          { required: true, message: "请选择任务时间", trigger: "change" },
+        ],
+      },
       selectionList: [],
       option: {
         height: 'auto',
-          menuWidth:300,
+        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: true,
+        excelBtn: false,
         dialogClickModal: false,
         column: [
           {
-              label: "布防时间",
+            label: "任务标题",
-              prop: "time",
+            prop: "taskTitle",
-              span: 12,
+            minWidth: 200,
-              // search: true,
+            overHidden: true,
+          },
+          {
+            label: "布/撤防时间",
+            prop: "executeTime",
             addDisplay: false,
             editDisplay: false,
             viewDisplay: false,
           },
+          // {
+          //   label: "关联设备",
+          //   prop: "deviceId",
+          //   overHidden: true,
+          // },
           {
-              label: "关联设备",
+            label: "任务类型",
-              prop: "device",
-              type: 'textarea',
-              span: 12,
-              overHidden: true,
-            },
-            {
-              label: "布防状态",
             type: "select",
-              prop: "brandCode",
+            prop: "type",
-              span: 12,
+            dicData: [
-              hide: true,
+              { value: 1, label: '布防' }, { value: 2, label: '撤防' }
+            ],
             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: [
+      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'},
-        ],
       multipleSelection: [],
       selectedArr: [],
       isDetail: false
@@ -239,54 +203,116 @@
       return ids.join(",");
     }
   },
+  mounted() {
+    this.loadDict();
+  },
   methods: {
-      //多选框禁选
+    //字典加载
-      selectable(row, index) {
+    loadDict() {
-        //row 就是每行的数据
+      let token = window.sessionStorage.getItem('bizToken');
-        let data = this.selectedArr //这是多选按钮保存的数据
+      if (token == 'undefined' || !token) {
-        //return : false  就是禁用
+        bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => {
-        //return : true  不禁用
+          window.sessionStorage.setItem('bizToken', res.data.data.token);
-        return data.findIndex(item => item == row.id) === -1
+          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;
+        })
+      }
+    },
+    //节点类型转换
+    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.tableData = [
+      this.diaPage.currentPage = 1;
-          {id:'001',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
+      this.$nextTick(() => {
-          {id:'002',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
+        this.queryDeviceList(this.diaPage);
-          {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
+      this.multipleSelection = val.map(item => item.id);
+      console.log(this.multipleSelection)
     },
     // 弹窗确认按钮
     submitForm() {
-        console.log(this.addForm)
+      this.$refs.addform.validate((valid) => {
-      },
+        if (valid) {
-      // 一键布防
+          if (this.multipleSelection.length === 0) {
-      handleAddPre(){
+            this.$message({
-        if (this.selectionList.length === 0) {
+              type: "warning",
-          this.$message.warning("请选择至少一条数据");
+              message: "请选择关联设备"
+            })
             return;
           }
-      },
+          let ids = this.multipleSelection.join(",");
-      // 一键撤防
+          console.log(ids)
-      handleCancel(){
+          this.submitLoading = true;
-        if (this.selectionList.length === 0) {
+          if (this.addForm.id > 0) {
-          this.$message.warning("请选择至少一条数据");
+            cornJobUpdate({ ...this.addForm, deviceId: ids }).then((res) => {
-          return;
+              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;
+            })
           }
+        }
+      })
     },
     searchReset() {
       this.query = {};
@@ -308,65 +334,61 @@
     },
     //查看详情
     handleDetail(row) {
+      row.status = row.status + '';
+      this.addForm = row;
       this.dialogVisible = true;
       this.isDetail = true;
-        this.tableData = [
+      this.$nextTick(() => {
-          {id:'001',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
+        this.queryDeviceList(this.diaPage);
-          {id:'002',deviceName:'空调',deviceNo:"A101",deviceType:'空调设备',deviceArea:'1号楼一层北',position:'120.51,36.12'},
+      })
-        ];
-        this.addForm = {
-          preTime:'09:00:00',
-          isOpen:Boolean(1)
-        }
     },
     //点击编辑按钮
-      handleEdit(){
+    handleEdit(row, index) {
+      row.status = row.status + '';
+      this.addForm = row;
       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.queryDeviceList(this.diaPage);
-            this.$refs.multipleTable.toggleRowSelection(row, true) //选中已经选择的
       })
-        })
-        
     },
     handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       })
         .then(() => {
-
+          return cornJobRemove({ ids: this.ids.join(",") });
         })
         .then(() => {
-            // this.onLoad(this.page);
+          this.onLoad(this.page);
-            // this.$message({
+          this.selectionClear();
-            //   type: "success",
+          this.$message({
-            //   message: "操作成功!"
+            type: "success",
-            // });
+            message: "操作成功!"
-            // this.$refs.crud.toggleSelection();
+          });
+        });
+    },
+    handleDeleteRow(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return cornJobRemove({ ids: row.id });
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
         });
     },
     currentChange(currentPage) {
@@ -379,33 +401,91 @@
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-        // const {releaseTimeRange} = this.query;
+      let values = {
-        // let values = {
+        ...params,
-        //   ...params,
+        ...this.query
-        //   ...this.query
+      };
-        // };
+      this.loading = true;
-        // if (releaseTimeRange) {
+      cornJobList({ current: page.currentPage, size: page.pageSize, ...values }).then(res => {
-        //   values = {
+        const data = res.data.data;
-        //     ...values,
+        this.page.total = data.total;
-        //     releaseTime_datege: releaseTimeRange[0],
+        this.data = data.records;
-        //     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},
-        ];
         this.loading = false;
-        this.page.total = this.data.length;
+        this.selectionClear();
+      }, err => {
+        this.loading = false;
+        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 => {
+        });
+      }
     }
   }
 };
@@ -417,39 +497,44 @@
   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，在这里引入自己的图片
   font-size: 12px;
   background-size: cover;
 }
+
 ::v-deep .add_item:before {
   content: "替";
   font-size: 12px;
   visibility: hidden;
 }
+
 .table_box {
   th.el-table__cell {
     background: #F7F8FA;
   }
 }
-</style>
+
-<style lang="scss">
 .dia_box {
   height: 700px;
   overflow: auto;
 
   .el-table {
-      width: 90% !important;
+    width: 100% !important;
     border: 1px solid #D6D8DF;
   }
+
   .el-table th.el-table__cell {
     background: #F7F8FA;
   }
+
   .dialog-footer {
     width: 100%;
     height: 100%;

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"
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud"
-      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
+      v-model="form" :before-open="beforeOpen"
-      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @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 { bizLogin, bizDeviceList, bizDeviceStatus, bizNodeType } from "@/api/wirelessintrusion/wirelessintrusion";
-import { mapGetters } from "vuex";
 
 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;
           }

src/views/wirelessintrusion/warn/record.vue

@@ -1,94 +1,33 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
-               :table-loading="loading"
+      v-model="form" :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
-               :data="data"
+      @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-               :page.sync="page"
+      @refresh-change="refreshChange" @on-load="onLoad">
-               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">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <el-button type="danger" size="small" icon="el-icon-turn-off" plain>消警
-                   size="small"
-                   icon="el-icon-turn-off"
-                   plain>消警
         </el-button>
-        <el-button type="danger"
+        <el-button type="danger" size="small" icon="el-icon-turn-off" plain>撤防
-                   size="small"
-                   icon="el-icon-turn-off"
-                   plain>撤防
         </el-button>
-        <el-button type="danger"
+        <el-button type="danger" size="small" icon="el-icon-turn-off" plain>旁路恢复
-                   size="small"
-                   icon="el-icon-turn-off"
-                   plain>旁路恢复
         </el-button>
-        <el-button type="warning"
+        <el-button @click="handleExport" type="warning" size="small" icon="el-icon-download" plain>导出
-                   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}"
+      <template slot-scope="{ row, index }" slot="menu">
-                slot="alarmInfo">
+        <el-button @click="tip(row, index)" type="text" icon="el-icon-brush" size="small"
-        <!-- <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"
           :disabled="row.cancelTime == ''">
           消警
         </el-button>
-        <!-- <el-button @click="tip(row,index)"
+        <el-button @click="linkVideo(row, index)" type="text" icon="el-icon-video-camera-solid" size="small"
-        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" 
           :disabled="row.cancelTime == ''">
           视频联动
         </el-button>
       </template>
     </avue-crud>
     <!-- 视频联动弹窗 -->
-    <el-dialog  
+    <el-dialog title="视频联动" :visible.sync="dialogVisible" :append-to-body="true" :close-on-click-modal="false"
-      title="视频联动"
+      :close-on-press-escape="false" custom-class="video_dia" width="950px">
-      :visible.sync="dialogVisible"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      custom-class="video_dia"
-      width="65%">
 
       <div class="video_box">
         <!-- <div class="video_item" v-for="item in videoData" :key="item.id">
@@ -107,8 +46,14 @@
 </template>
 
 <script>
-  import {getList, remove, update, add, getNotice} from "@/api/desk/notice";
+import { getList } from "@/api/alarm/alarm";
-  import {mapGetters} from "vuex";
+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() {
@@ -126,14 +71,12 @@
       option: {
         height: 'auto',
         calcHeight: 30,
-          dialogWidth: 950,
         tip: false,
+        border: true,
         searchShow: true,
         searchMenuSpan: 6,
-          border: true,
+        menuWidth: 240,
-          // index: true,
+        viewBtn: true,
-          menuWidth: 320,
-          viewBtn: false,
         addBtn: false,
         editBtn: false,
         delBtn: false,
@@ -143,27 +86,19 @@
           {
             label: "设备名称",
             prop: "title",
-              span: 24,
-              row: true,
-              search: true,
           },
           {
             label: "设备编号",
-              prop: "deviceNo",
+            prop: "deviceId",
-              span: 24,
             row: true,
           },
           {
-              label: "设备大类",
+            label: "设备类型",
+            type: 'select',
             prop: "deviceType",
-              span: 24,
+            dataType: "number",
-              row: true,
+            dictData: [],
-            },
+            search: true
-            {
-              label: "品牌编号",
-              prop: "brandNo",
-              span: 24,
-              row: true,
           },
           // {
           //   label: "报警类型",
@@ -179,30 +114,40 @@
           //   search: true,
           // },
           {
-              label: "所属区域",
+            label: "楼号",
-              prop: "floor",
+            prop: "buildId",
-              // slot: true,
           },
           {
-              label: "安装位置",
+            label: "楼层",
-              prop: "address",
+            prop: "floorNo",
-              // slot: true,
+          },
+          {
+            label: "经纬度",
+            prop: "longidute",
+            formatter: (data) => {
+              return (data.longidute ? data.longidute + ',' : '') + data.latidute;
+            }
           },
           {
             label: "报警信息",
-              prop: "alarmInfo",
+            prop: "content",
-              slot: true,
+            overHidden: true,
-              overHidden:true
+            width: '200'
           },
           {
-              label: "报警时间",
+            label: "上报时间",
-              prop: "alarmTime",
+            prop: "reportTime",
-              type: "date",
+            width: '150'
           },
           {
-              label: "消报时间",
+            label: '上报日期',
-              prop: "cancelTime",
+            prop: 'releaseTimeRange',
-              type: "date",
+            type: 'datetime',
+            valueFormat: 'yyyy-MM-dd HH:mm:ss',
+            searchRange: true,
+            search: true,
+            hide: true,
+            viewDisplay: false,
           },
         ]
       },
@@ -211,15 +156,6 @@
     };
   },
   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 => {
@@ -229,49 +165,6 @@
     }
   },
   methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
-        });
-      },
-      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);
@@ -312,11 +205,6 @@
         });
     },
     beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getNotice(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
       done();
     },
     currentChange(currentPage) {
@@ -329,33 +217,27 @@
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-        // const {releaseTimeRange} = this.query;
+      const { releaseTimeRange } = this.query;
-        // let values = {
+      let values = {
-        //   ...params,
+        ...params,
-        //   ...this.query
+        ...this.query
-        // };
+      };
-        // if (releaseTimeRange) {
+      if (releaseTimeRange) {
-        //   values = {
+        values = {
-        //     ...values,
+          ...values,
-        //     releaseTime_datege: releaseTimeRange[0],
+          startTime: releaseTimeRange[0],
-        //     releaseTime_datelt: releaseTimeRange[1],
+          endTime: releaseTimeRange[1],
-        //   };
+        };
-        //   values.releaseTimeRange = null;
+        values.releaseTimeRange = null;
-        // }
+      }
-        // this.loading = true;
+      this.loading = true;
-        // getList(page.currentPage, page.pageSize, values).then(res => {
+      getList(page.currentPage, page.pageSize, values).then(res => {
-        //   const data = res.data.data;
+        const data = res.data.data;
-        //   this.page.total = data.total;
+        this.page.total = data.total;
-        //   this.data = data.records;
+        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:''},
-        ];
         this.loading = false;
-        this.page.total = this.data.length
+        this.selectionClear();
+      });
     },
     // 视频联动按钮
     linkVideo() {
@@ -371,12 +253,39 @@
         { 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 lang="scss" scoped></style>
-</style>
 <style lang="scss">
 .video_dia {
   .video_box {