修复 bug

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/AnnouncementTelController.java

@@ -150,6 +150,9 @@ public class AnnouncementTelController extends BaseController {
 		announcementTelQueryWrapper.eq("community_id", userElement.getCommunityId());
 		AnnouncementTel telServiceOne = announcementTelService.getOne(announcementTelQueryWrapper);
 		if (null != telServiceOne && announcementTel.getTel().equals(telServiceOne.getTel()) && announcementTel.getId().equals(telServiceOne.getId())) {
+			announcementTel.setUpdateUser(userElement.getId());
+			announcementTel.setUpdateDate(LocalDateTime.now());
+			announcementTelService.updateById(announcementTel);
 			responseBean.addSuccess("修改物业端号码成功");
 			return responseBean;
 		}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpEquipmentController.java

@@ -33,7 +33,7 @@ public class TpEquipmentController extends BaseController {
     @Autowired
     private ITpEquipmentService iTpEquipmentService;
 
-    @RequestMapping(value = "/equipment", method = RequestMethod.GET)
+    @RequestMapping(value = "/equipment/list", method = RequestMethod.GET)
     @ApiOperation(value = "根据类型查询设备表", notes = "根据类型查询设备表")
     @ApiImplicitParams({
         @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "type", value = "1 监控 2 访客机 3 可是对讲"),
@@ -61,7 +61,7 @@ public class TpEquipmentController extends BaseController {
     }
 
     @RequestMapping(value = "/equipment/{id}", method = RequestMethod.DELETE)
-    @ApiOperation(value = "删除设备", notes = "删除设备s")
+    @ApiOperation(value = "删除设备", notes = "删除设备")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "设备id"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
@@ -72,4 +72,31 @@ public class TpEquipmentController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/equipment/delete", method = RequestMethod.DELETE)
+    @ApiOperation(value = "批量删除设备", notes = "批量删除设备")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = Integer.class, name = "ids", value = "设备id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    public ResponseBean deleteBachEquipmentById(@RequestBody List<Integer> ids, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTpEquipmentService.deleteBachEquipmentById(ids);
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/equipment/{id}", method = RequestMethod.GET)
+    @ApiOperation(value = "根据类型查询设备表", notes = "根据类型查询设备表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "type", value = "1 监控 2 访客机 3 可是对讲"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "设备id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    public ResponseBean getMonitoringById(@RequestParam("type") Integer type, @PathVariable("id") Integer id,HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTpEquipmentService.getMonitoringById(userElement, type, id);
+        return responseBean;
+    }
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpEquipmentMapper.java

@@ -39,4 +39,25 @@ public interface TpEquipmentMapper extends BaseMapper<TpEquipment> {
             "where tm.community_id = #{communityId} and tm.equipment_type = #{equipmentType}")
     List<TpEquipment> selectAllByCommunityAndEquipmentType(@Param("communityId") Integer communityId, @Param("equipmentType") Integer equipmentType);
 
+
+    /**
+     * 根据小区id 和 类型查询 和 设备id
+     * @param communityId
+     * @param equipmentType
+     * @return
+     */
+    @ResultType(TpEquipment.class)
+    @Select("select " +
+            "tm.*, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.url_id) as url, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_guard_tel_id) as securityGuardTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_room_tel_id) as securityRoomTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.address_id) as address, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.uuid_id)as uuid " +
+            "FROM " +
+            "tp_equipment tm " +
+            "where tm.community_id = #{communityId} and tm.equipment_type = #{equipmentType} and tm.id = #{monitoringId}")
+    TpEquipment getMonitoringById(@Param("communityId") Integer communityId, @Param("equipmentType") Integer equipmentType, @Param("monitoringId") Integer monitoringId);
+
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpEquipmentService.java

@@ -5,6 +5,8 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.model.TpEquipment;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备表 服务类
@@ -37,4 +39,20 @@ public interface ITpEquipmentService extends IService<TpEquipment> {
      * @return
      */
     ResponseBean deleteEquipmentById(Integer equipmentId);
+
+    /**
+     * 根据设备id 查询
+     * @param userElement
+     * @param type
+     * @param id
+     * @return
+     */
+    ResponseBean getMonitoringById(UserElement userElement, Integer type, Integer id);
+
+    /**
+     * 批量删除
+     * @param ids
+     * @return
+     */
+    ResponseBean deleteBachEquipmentById(List<Integer> ids);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpEquipmentServiceImpl.java

@@ -57,10 +57,8 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
         equipmentTreeQueryWrapper.eq("community_id", userElement.getCommunityId());
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectOne(equipmentTreeQueryWrapper);
 
-        List<TpEquipment> tpEquipments = JSONObject.parseArray(parameter, TpEquipment.class);
-        for (int i = 0; i < tpEquipments.size(); i++){
-            TpEquipment equipment = tpEquipments.get(i);
-            Integer id = equipment.getId();
+        TpEquipment equipment = JSONObject.parseObject(parameter, TpEquipment.class);
+        Integer id = equipment.getId();
             if (null == id) {
                 // 监控地址
                 String address = equipment.getAddress();
@@ -73,13 +71,13 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
 
                 // 开始插入设备数据
                 // 地址
-                TpConfiguration tpConfigurationAddress = insertConfigguration(userElement.getCommunityId(), "监控地址" + i, address, userElement.getId());
+                TpConfiguration tpConfigurationAddress = insertConfigguration(userElement.getCommunityId(), "监控地址" , address, userElement.getId());
                 // 监控url
-                TpConfiguration tpConfigurationUrl = insertConfigguration(userElement.getCommunityId(), "监控" + i, url, userElement.getId());
+                TpConfiguration tpConfigurationUrl = insertConfigguration(userElement.getCommunityId(), "监控", url, userElement.getId());
                 // 保安人员号码
-                TpConfiguration tpConfigurationSecurityGuardTel = insertConfigguration(userElement.getCommunityId(), "保安电话" + i, securityGuardTel, userElement.getId());
+                TpConfiguration tpConfigurationSecurityGuardTel = insertConfigguration(userElement.getCommunityId(), "保安电话" , securityGuardTel, userElement.getId());
                 // 保安室号码
-                TpConfiguration tpConfigurationSecurityRoomTel = insertConfigguration(userElement.getCommunityId(), "安保室电话" + i, securityRoomTel, userElement.getId());
+                TpConfiguration tpConfigurationSecurityRoomTel = insertConfigguration(userElement.getCommunityId(), "安保室电话" , securityRoomTel, userElement.getId());
 
                 equipment.setAddressId(tpConfigurationAddress.getId());
                 equipment.setUrlId(tpConfigurationUrl.getId());
@@ -96,10 +94,10 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
                 updateConfiguration(equipment.getAddress(), equipment.getAddressId());
                 updateConfiguration(equipment.getUrl(), equipment.getUrlId());
                 updateConfiguration(equipment.getSecurityGuardTel(), equipment.getSecurityGuardTelId());
-                updateConfiguration(equipment.getSecurityRoomTel(), equipment.getSecurityGuardTelId());
+                updateConfiguration(equipment.getSecurityRoomTel(), equipment.getSecurityRoomTelId());
                 tpEquipmentMapper.updateById(equipment);
             }
-        }
+
 
         responseBean.addSuccess("操作成功！");
         return responseBean;
@@ -147,4 +145,20 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
         responseBean.addSuccess("操作成功!");
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getMonitoringById(UserElement userElement, Integer type, Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        TpEquipment monitoring = tpEquipmentMapper.getMonitoringById(userElement.getCommunityId(), type, id);
+        responseBean.addSuccess(monitoring);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean deleteBachEquipmentById(List<Integer> ids) {
+        ResponseBean responseBean = new ResponseBean();
+        this.removeByIds(ids);
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
 }

VUECODE/smart-property-manage/src/api/equipment.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询设备列表
 export function getAll(data) {
   return request({
-    url: '/equipment',
+    url: '/equipment/list',
     method: 'get',
     params: {
       type: data.type
@@ -28,3 +28,22 @@ export function deleteEquipment(id) {
   })
 }
 
+// 根据设备id查询
+export function getMonitoringById(data) {
+  return request({
+    url: '/equipment/' + data.id,
+    method: 'get',
+    params: {
+      type: data.type
+    }
+  })
+}
+
+// 批量删除设备
+export function deleteMonitoringBachByIds(data) {
+  return request({
+    url: '/equipment/delete',
+    method: 'delete',
+    data
+  })
+}

VUECODE/smart-property-manage/src/router/index.js

@@ -513,25 +513,63 @@ export const constantRouterMap = [
     alwaysShow: true,
     meta: { title: '系统资源', icon: 'zip' },
     children: [
+      // {
+      //   path: '/systemResources/app/index',
+      //   component: () => import('@/views/systemResources/app/index'),
+      //   name: 'app-index',
+      //   meta: { title: 'APP配置', icon: 'table' }
+      // },
+      {
+        path: '/systemResources/banner/index',
+        component: () => import('@/views/systemResources/banner/index'),
+        name: 'banner-index',
+        meta: { title: 'banner轮播', icon: 'table' }
+      },
+      {
+        path: '/systemResources/homeIndex/index',
+        component: () => import('@/views/systemResources/homeIndex/index'),
+        name: 'homeIndex-index',
+        meta: { title: '首页功能按钮', icon: 'table' }
+      },
+      {
+        path: '/systemResources/property/index',
+        component: () => import('@/views/systemResources/property/index'),
+        name: 'property-index',
+        meta: { title: '物业号码', icon: 'table' }
+      },
       {
-        path: '/systemResources/app/index',
-        component: () => import('@/views/systemResources/app/index'),
-        name: 'app-index',
-        meta: { title: 'APP配置', icon: 'table' }
+        path: '/systemResources/monitoring/index',
+        component: () => import('@/views/systemResources/monitoring/index'),
+        name: 'monitoring-index',
+        meta: { title: '公区监控', icon: 'table' }
       },
       {
-        path: '/systemResources/app/property/add/index',
-        component: () => import('@/views/systemResources/app/property/add/index'),
+        path: '/systemResources/property/add/index',
+        component: () => import('@/views/systemResources/property/add/index'),
         name: 'property-add-index',
         hidden: true,
         meta: { title: '添加物业号码', icon: 'table' }
       },
       {
-        path: '/systemResources/app/property/edi/index',
-        component: () => import('@/views/systemResources/app/property/edi/index'),
+        path: '/systemResources/property/edi/index',
+        component: () => import('@/views/systemResources/property/edi/index'),
         name: 'property-edi-index',
         hidden: true,
         meta: { title: '修改物业号码', icon: 'table' }
+      },
+      {
+        path: '/systemResources/monitoring/add/index',
+        component: () => import('@/views/systemResources/monitoring/add/index'),
+        name: 'monitoring-add-index',
+        hidden: true,
+        meta: { title: '添加监控设备', icon: 'table' }
+      },
+      {
+        path: '/systemResources/monitoring/edi/index',
+        component: () => import('@/views/systemResources/monitoring/edi/index'),
+        name: 'monitoring-edi-index',
+        hidden: true,
+        meta: { title: '修改监控设备', icon: 'table' }
       }
     ]
   }

VUECODE/smart-property-manage/src/store/modules/equipment.js

@@ -1,4 +1,4 @@
-import { getAll, equipmentMonitoring, deleteEquipment } from '@/api/equipment'
+import { getAll, equipmentMonitoring, deleteEquipment, getMonitoringById, deleteMonitoringBachByIds } from '@/api/equipment'
 
 const equipment = {
   state: {
@@ -34,6 +34,24 @@ const equipment = {
           reject(error)
         })
       })
+    },
+    GetMonitoringById({ commit }, data) { // 根据设备id 和 类型
+      return new Promise((resolve, reject) => {
+        getMonitoringById(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    DeleteMonitoringBachByIds({ commit }, data) { // 批量删除设备,id 集合
+      return new Promise((resolve, reject) => {
+        deleteMonitoringBachByIds(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/systemResources/banner/index.vue

@@ -0,0 +1,89 @@
+<template>
+  <div id="root">
+    <div style="width: 1000px; margin-left: auto; margin-right: auto; margin-top: 20px;">
+      <span>APP端公告列表中,前多少个,显示在公告banner位？</span>
+      <el-input v-model="announcementBannerNum" min="1" max="10" type="number" placeholder="请输入数字" style="width: 150px;" @change="handleBannerChange"/>
+      <el-tooltip class="item" effect="dark" content="如果需要修改,请选择1~10之间的数字后保存!" placement="top-start">
+        <i class="el-icon-info"/>
+      </el-tooltip>
+      <el-button v-if="announcementBannerBool" type="primary" @click="carouselAnnouncementBanner">保存</el-button>
+    </div>
+    <div style="width: 1000px; margin-left: auto; margin-right: auto; margin-top: 20px;">
+      <span>APP端活动列表中,前多少个,显示在活动banner位？</span>
+      <el-input v-model="activityBannerNum" min="1" max="10" type="number" placeholder="请输入数字" style="width: 150px;" @change="handleActivityChange"/>
+      <el-tooltip class="item" effect="dark" content="如果需要修改,请选择1~10之间的数字后保存!" placement="top-start">
+        <i class="el-icon-info"/>
+      </el-tooltip>
+      <el-button v-if="activityBannerNumBool" type="primary" @click="carouselActivityBanner">保存</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Banner',
+  data() {
+    return {
+      announcementBannerNum: 0, // banner数量
+      activityBannerNum: 0, // 活动banner数量
+      announcementBannerBool: false, // 是否显示公告的保存按钮
+      activityBannerNumBool: false // 是否显示活动的保存按钮
+    }
+  },
+  mounted() {
+    this.carouselGetBanner()
+  },
+  methods: {
+    handleBannerChange(value) {
+      console.log(value)
+      this.announcementBannerNum = value
+      this.announcementBannerBool = true
+    },
+    handleActivityChange(value) {
+      console.log(value)
+      this.activityBannerNum = value
+      this.activityBannerNumBool = true
+    },
+    carouselAnnouncementBanner() { // 修改公告的Banner数量
+      this.$store.dispatch('CarouselAnnouncementBanner', this.announcementBannerNum).then(res => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
+        }
+        this.$message.success(res.message)
+        this.announcementBannerBool = false
+      }).catch(() => {
+        console.log('error CarouselAnnouncementBanner')
+      })
+    },
+    carouselActivityBanner() { // 修改公告的Banner数量
+      this.$store.dispatch('CarouselActivityBanner', this.activityBannerNum).then(res => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
+        }
+        this.$message.success(res.message)
+        this.activityBannerNumBool = false
+      }).catch(() => {
+        console.log('error CarouselActivityBanner')
+      })
+    },
+    carouselGetBanner() { // 获取设置Banner的数量
+      this.$store.dispatch('CarouselGetBanner').then(res => {
+        const resData = res.data
+        this.activityBannerNum = resData.activity.carouselNum
+        this.announcementBannerNum = resData.announcement.carouselNum
+      }).catch(() => {
+        console.log('error CarouselGetBanner')
+      })
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>

VUECODE/smart-property-manage/src/views/systemResources/homeIndex/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>$Title$</title>
+</head>
+<body>
+$END$
+</body>
+</html>

VUECODE/smart-property-manage/src/views/systemResources/homeIndex/index.vue

@@ -0,0 +1,111 @@
+<template>
+  <div id="root">
+    <el-table
+      :data="indexData"
+      border
+      style="width: 100%">
+      <el-table-column
+        prop="id"
+        align="center"
+        label="序号"
+        width="180"/>
+      <el-table-column
+        prop="menuName"
+        align="center"
+        label="按钮名"
+        width="180"/>
+      <el-table-column
+        prop="menuUrl"
+        align="center"
+        label="图标">
+        <template slot-scope="scope">
+          <img :src="scope.row.imgUrl" width="50" height="50">
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="explain"
+        align="center"
+        label="说明"/>
+      <el-table-column
+        prop="address"
+        align="center"
+        width="150"
+        label="启用">
+        <template slot-scope="scope">
+          <el-button v-if="scope.row.status === '1'" type="primary" @click="menuEnable(scope.row.id)">启用</el-button>
+          <el-button v-if="scope.row.status === '0'" type="danger" @click="menuDisable(scope.row.id)">停用</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        align="center"
+        width="150"
+        label="配置">
+        <template slot-scope="scope">
+          <el-button type="primary">配置</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'HomeIndex',
+  data() {
+    return {
+      indexData: [] // APP端菜单列表数据
+    }
+  },
+  mounted() {
+    this.getMenuList()
+  },
+  methods: {
+    getMenuList() { // 获取菜单列表
+      this.$store.dispatch('GetMenuList').then(res => {
+        this.indexData = res.data
+      }).catch(() => {
+        console.log('error GetMenuList')
+      })
+    },
+    handleSelectionChange(val) {
+      console.log(val)
+      this.ids = []
+      val.map((item, index) => {
+        this.ids.push(item.id)
+      })
+      console.log(this.ids)
+    },
+    menuEnable(id) { // 启用菜单
+      this.$store.dispatch('MenuEnable', id).then(res => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
+        }
+        this.$message.success(res.message)
+        this.getMenuList()
+      }).catch(() => {
+        console.log('error MenuEnable')
+      })
+    },
+    menuDisable(id) { // 停用菜单
+      this.$store.dispatch('MenuDisable', id).then(res => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
+        }
+        this.$message.success(res.message)
+        this.getMenuList()
+      }).catch(() => {
+        console.log('error MenuDisable')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

VUECODE/smart-property-manage/src/views/systemResources/monitoring/add/index.vue

@@ -0,0 +1,59 @@
+<template>
+  <div id="root">
+    <el-form ref="monitoringForm" :model="formInfo" label-width="120px" style="margin-top: 20px; width: 500px; margin-left: auto; margin-right: auto;">
+      <div style="margin: 20px 15px 10px 15px;">
+        <el-form-item label="视频流地址">
+          <el-input v-model="formInfo.url" :disabled="false" name="name"/>
+        </el-form-item>
+        <el-form-item label="地址">
+          <el-input v-model="formInfo.address" :disabled="false" name="address"/>
+        </el-form-item>
+        <el-form-item label="安保人员电话">
+          <el-input v-model="formInfo.securityGuardTel" :disabled="false" name="phone"/>
+        </el-form-item>
+        <el-form-item label="保安室电话">
+          <el-input v-model="formInfo.securityRoomTel" :disabled="false" name="phone-2"/>
+        </el-form-item>
+      </div>
+      <el-form-item>
+        <el-button type="primary" @click="monitoringSubmit" >提交</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MonitoringAdd',
+  data() {
+    return {
+      formInfo: {
+        url: '',
+        address: '',
+        securityGuardTel: '',
+        securityRoomTel: ''
+      },
+      equipment: [] // 监控设备
+    }
+  },
+  methods: {
+    monitoringSubmit() { // 监控提交
+      console.log('monitoringForm : ', this.formInfo)
+      this.$store.dispatch('EquipmentMonitoring', this.formInfo).then((res) => {
+        if (res.code === '0') {
+          this.$message.success(res.message)
+          // 监控
+          // this.equipmentGetAll()
+          this.$router.go(-1)
+        }
+      }).catch(() => {
+        console.log('EquipmentMonitoring error')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

VUECODE/smart-property-manage/src/views/systemResources/monitoring/edi/index.vue

@@ -0,0 +1,85 @@
+<template>
+  <div id="root">
+    <el-form ref="monitoringForm" :model="formInfo" label-width="120px" style="margin-top: 20px; width: 500px; margin-left: auto; margin-right: auto;">
+      <div style="margin: 20px 15px 10px 15px;">
+        <el-form-item label="视频流地址">
+          <el-input v-model="formInfo.url" :disabled="false" name="name"/>
+        </el-form-item>
+        <el-form-item label="地址">
+          <el-input v-model="formInfo.address" :disabled="false" name="address"/>
+        </el-form-item>
+        <el-form-item label="安保人员电话">
+          <el-input v-model="formInfo.securityGuardTel" :disabled="false" name="phone"/>
+        </el-form-item>
+        <el-form-item label="保安室电话">
+          <el-input v-model="formInfo.securityRoomTel" :disabled="false" name="phone-2"/>
+        </el-form-item>
+      </div>
+      <el-form-item>
+        <el-button type="primary" @click="monitoringSubmit" >提交</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MonitoringAdd',
+  data() {
+    return {
+      formInfo: {
+        address: '',
+        addressId: '',
+        communityId: '',
+        createTime: '',
+        createUser: '',
+        equipmentTreeId: '',
+        equipmentType: '',
+        id: '',
+        securityGuardTel: '',
+        securityGuardTelId: '',
+        securityRoomTel: '',
+        securityRoomTelId: '',
+        updateTime: '',
+        updateUser: '',
+        url: '',
+        urlId: '',
+        uuid: '',
+        uuidId: ''
+      }
+    }
+  },
+  mounted() {
+    this.formInfo.id = this.$route.query.id
+    this.getMonitoringById()
+  },
+  methods: {
+    monitoringSubmit() { // 监控提交
+      console.log('monitoringForm : ', this.formInfo)
+      this.$store.dispatch('EquipmentMonitoring', this.formInfo).then((res) => {
+        if (res.code === '0') {
+          this.$message.success(res.message)
+          // 监控
+          // this.equipmentGetAll()
+          this.$router.go(-1)
+        }
+      }).catch(() => {
+        console.log('EquipmentMonitoring error')
+      })
+    },
+    getMonitoringById() { // 查询设备
+      const dataQuery = { id: this.formInfo.id, type: 1 }
+      this.$store.dispatch('GetMonitoringById', dataQuery).then((res) => {
+        if (res.code === '0') {
+          // 监控
+          this.formInfo = res.data
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

VUECODE/smart-property-manage/src/views/systemResources/monitoring/index.vue

@@ -0,0 +1,192 @@
+<template>
+  <div id="root">
+    <div style="margin: 20px 15px 10px 15px;">
+      <el-button type="primary" @click="addMonitoring">添加</el-button>
+      <el-button type="warning" @click="ediMonitoring">修改</el-button>
+      <el-button type="danger" @click="deleteMonitoring">删除</el-button>
+    </div>
+    <!--<div style="display: flex; justify-content: center; flex-wrap: wrap; ">-->
+    <!--<el-form v-for="(item, index) in equipmentList" ref="monitoringForm" label-width="120px" style="margin-top: 20px;">-->
+    <!--<div style="padding: 10px 20px 0;border-radius: 8px;margin: 20px 15px 10px 15px;border: 1px solid #eee;box-shadow: 4px 4px 10px #dadada;">-->
+    <!--<el-form-item label="编号">-->
+    <!--&lt;!&ndash; item.id &ndash;&gt;-->
+    <!--<span>{{ index }}</span>-->
+    <!--</el-form-item>-->
+    <!--<el-form-item label="视频流地址">-->
+    <!--<el-input v-model="item.url" :disabled="false" name="name"/>-->
+    <!--</el-form-item>-->
+    <!--<el-form-item label="地址">-->
+    <!--<el-input v-model="item.address" :disabled="false" name="address"/>-->
+    <!--</el-form-item>-->
+    <!--<el-form-item label="安保人员电话">-->
+    <!--<el-input v-model="item.securityGuardTel" :disabled="false" name="phone"/>-->
+    <!--</el-form-item>-->
+    <!--<el-form-item label="保安室电话">-->
+    <!--<el-input v-model="item.securityRoomTel" :disabled="false" name="phone-2"/>-->
+    <!--</el-form-item>-->
+    <!--</div>-->
+    <!--<el-form-item>-->
+    <!--<el-button type="info" @click="monitoringRemover(item.id, index)" >删除</el-button>-->
+    <!--</el-form-item>-->
+    <!--</el-form>-->
+    <!--</div>-->
+    <el-table
+      :data="equipmentList"
+      border
+      style="width: 100%"
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        width="55"/>
+      <el-table-column
+        prop="id"
+        label="编号"
+        align="center"
+        width="50"/>
+      <el-table-column
+        prop="url"
+        label="视频流地址"
+        align="center"
+        width="600"/>
+      <el-table-column
+        prop="address"
+        align="center"
+        label="地址"/>
+      <el-table-column
+        prop="securityGuardTel"
+        align="center"
+        label="安保人员电话"/>
+      <el-table-column
+        prop="securityRoomTel"
+        align="center"
+        label="保安室电话"/>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Monitoring',
+  data() {
+    return {
+      monitoring: { // 监控数据
+
+      },
+      ids: [],
+      equipmentList: [] // 处理过后的监控数据
+    }
+  },
+  mounted() {
+    this.equipmentGetAll()
+  },
+  methods: {
+    handleSelectionChange(val) {
+      this.ids = []
+      val.map((item, index) => {
+        this.ids.push(item.id)
+      })
+    },
+    equipmentGetAll() { // 监控配置
+      const eqData = { type: 1 }
+      this.$store.dispatch('EquipmentGetAll', eqData).then((res) => {
+        this.equipmentList = res.data
+      }).catch(() => {
+        console.log('EquipmentGetAll error')
+      })
+    },
+    addMonitoring() { // 添加一个公区监控配置
+      // this.equipmentList.push({
+      //   'address': '',
+      //   'addressId': '',
+      //   'communityId': '',
+      //   'createTime': '',
+      //   'createUser': '',
+      //   'equipmentTreeId': '',
+      //   'equipmentType': '',
+      //   'id': '',
+      //   'securityGuardTel': '',
+      //   'securityGuardTelId': '',
+      //   'securityRoomTel': '',
+      //   'securityRoomTelId': '',
+      //   'updateTime': '',
+      //   'updateUser': '',
+      //   'url': '',
+      //   'urlId': '',
+      //   'uuid': '',
+      //   'uuidId': ''
+      // })
+      this.$router.push({ name: 'monitoring-add-index' })
+    },
+    monitoringSubmit() { // 监控提交
+      console.log('monitoringForm : ', this.equipmentList)
+      this.$store.dispatch('EquipmentMonitoring', this.equipmentList).then((res) => {
+        if (res.code === '0') {
+          this.$message.success(res.message)
+          // 监控
+          this.equipmentGetAll()
+        }
+      }).catch(() => {
+        console.log('EquipmentMonitoring error')
+      })
+    },
+    monitoringRemover(id, equipmentIndex) { // 监控删除
+      // console.log('monitoringForm : ', this.equipmentList, '  下坐标：', equipmentIndex)
+      const tempEquipmentList = []
+      this.equipmentList.map((item, index) => {
+        // 排除需要删除的下坐标的数据
+        if (index !== equipmentIndex) {
+          tempEquipmentList.push(item)
+        }
+      })
+      this.equipmentList = tempEquipmentList
+
+      if (id !== '') {
+        this.$store.dispatch('DeleteEquipment', id).then(res => {
+          const resCode = res.code
+          if (resCode === '1') {
+            this.$message.error(res.message)
+            return
+          }
+          this.getMenuList()
+        }).catch(() => {
+          console.log('DeleteEquipment error!')
+        })
+      }
+    },
+    ediMonitoring() {
+      if (this.ids.length === 0) {
+        this.$message.error('请至少选择一行！')
+        return
+      }
+      if (this.ids.length > 1) {
+        this.$message.error('只能操作一行！')
+        return
+      }
+      this.$router.push({ name: 'monitoring-edi-index', query: { id: this.ids[0] }})
+    },
+    deleteMonitoring() {
+      if (this.ids.length === 0) {
+        this.$message.error('请至少选择一行！')
+        return
+      }
+      this.$store.dispatch('DeleteMonitoringBachByIds', this.ids).then((res) => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
+        }
+        this.$message.success(res.message)
+        this.equipmentGetAll()
+      }).catch(() => {
+        console.log('DeleteMonitoringBachByIds error!')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+#root {
+  margin-top: 20px;
+}
+</style>

VUECODE/smart-property-manage/src/views/systemResources/property/add/index.vue

@@ -0,0 +1,65 @@
+<template>
+  <div id="root">
+    <el-form :model="formInline" label-width="80px" class="form-class">
+      <el-form-item label="名称">
+        <el-input v-model="formInline.name"/>
+      </el-form-item>
+      <el-form-item label="号码">
+        <el-input v-model="formInline.tel"/>
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input v-model="formInline.remark"/>
+      </el-form-item>
+      <div class="button-class">
+        <el-button type="info" @click="exit">取消</el-button>
+        <el-button type="primary" @click="add">保存</el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index',
+  data() {
+    return {
+      formInline: {
+        name: '',
+        tel: '',
+        remark: ''
+      }
+    }
+  },
+  methods: {
+    add() {
+      this.$store.dispatch('TelAdd', this.formInline).then(res => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
+        }
+        this.$message.success(res.message)
+        this.$router.go(-1)
+      }).catch(() => {
+        console.log('error TelAdd')
+      })
+    },
+    exit() {
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.form-class {
+  width: 400px;
+  margin-right: auto;
+  margin-left: auto;
+  margin-top: 20px;
+}
+.button-class {
+  display: flex;
+  justify-content: center;
+}
+</style>

VUECODE/smart-property-manage/src/views/systemResources/property/edi/index.vue

@@ -0,0 +1,85 @@
+<template>
+  <div id="root">
+    <el-form :model="formInline" label-width="80px" class="form-class">
+      <el-form-item label="名称">
+        <el-input v-model="formInline.name"/>
+      </el-form-item>
+      <el-form-item label="号码">
+        <el-input v-model="formInline.tel"/>
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input v-model="formInline.remark"/>
+      </el-form-item>
+      <div class="button-class">
+        <el-button type="info" @click="exit">取消</el-button>
+        <el-button type="primary" @click="updateTels">保存</el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index',
+  data() {
+    return {
+      formInline: {
+        id: '',
+        name: '',
+        tel: '',
+        remark: ''
+      }
+    }
+  },
+  mounted() {
+    this.formInline.id = this.$route.query.id
+    this.getTelsById()
+  },
+  methods: {
+    updateTels() {
+      this.$store.dispatch('TelUpdate', this.formInline).then(res => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
+        }
+        this.$message.success(res.message)
+        this.$router.go(-1)
+      }).catch(() => {
+        console.log('error TelUpdate')
+      })
+    },
+    exit() {
+      this.$router.go(-1)
+    },
+    getTelsById() { // 根据详情查询物业号码
+      this.$store.dispatch('GetTelById', this.formInline.id).then(res => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
+        }
+        const resData = res.data
+        this.formInline.name = resData.name
+        this.formInline.tel = resData.tel
+        this.formInline.remark = resData.remark
+      }).catch(() => {
+        console.log('error ')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.form-class {
+  width: 400px;
+  margin-right: auto;
+  margin-left: auto;
+  margin-top: 20px;
+}
+.button-class {
+  display: flex;
+  justify-content: center;
+}
+</style>

VUECODE/smart-property-manage/src/views/systemResources/property/index.vue

@@ -0,0 +1,146 @@
+<template>
+  <div id="root">
+    <el-form :model="formInline" inline="true" class="form-inline">
+      <el-form-item label="名称">
+        <el-input v-model="formInline.name" placeholder="名称"/>
+      </el-form-item>
+      <el-form-item label="号码">
+        <el-input v-model="formInline.tel" placeholder="号码"/>
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input v-model="formInline.remark" placeholder="备注"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <div style="margin-left: 20px;">
+      <el-button type="primary" @click="add">添加</el-button>
+      <el-button type="warning" @click="edi">修改</el-button>
+      <el-button type="danger" @click="deleteIds">删除</el-button>
+    </div>
+    <el-table
+      ref="multipleTable"
+      :data="propertyList"
+      border
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        width="55"/>
+      <el-table-column
+        prop="name"
+        label="名称"/>
+      <el-table-column
+        prop="tel"
+        label="号码"/>
+      <el-table-column
+        prop="remark"
+        label="备注"/>
+      <el-table-column
+        prop="updateName"
+        label="编辑人"/>
+      <el-table-column
+        prop="updateDate"
+        label="编辑时间">
+        <template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Property',
+  data() {
+    return {
+      formInline: {
+        name: '',
+        tel: '',
+        remark: '',
+        pageNum: 1,
+        pageSize: 100
+      },
+      ids: [], // id集合
+      propertyList: [] // 物业数据列表
+    }
+  },
+  mounted() {
+    this.getPropertyData()
+  },
+  methods: {
+    getPropertyData() { // 查询物业号码数据
+      this.$store.dispatch('GetTelsList', this.formInline).then(res => {
+        const resData = res.data
+        this.propertyList = resData.list
+      }).catch(() => {
+        console.log('error GetTelsList')
+      })
+    },
+    onSubmit() {
+      this.getPropertyData()
+    },
+    add() { // 跳转添加物业号码
+      this.$router.push({ name: 'property-add-index' })
+    },
+    edi() { // 修改页面
+      if (this.ids.length === 0) {
+        this.$message.error('请至少选择一项')
+        return
+      }
+      if (this.ids.length > 1) {
+        this.$message.error('只能选择一项进行操作')
+        return
+      }
+      this.$router.push({ name: 'property-edi-index', query: { id: this.ids[0] }})
+    },
+    deleteIds() { // 批量删除id
+      if (this.ids.length === 0) {
+        this.$message.error('请至少选择一个项')
+        return
+      }
+      this.$store.dispatch('TelDeleteProperty', this.ids).then(res => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
+        }
+        this.$message.success(res.message)
+        this.getPropertyData()
+      }).catch(() => {
+        console.log('error TelDelete')
+      })
+    },
+    handleSelectionChange(val) {
+      console.log(val)
+      this.ids = []
+      val.map((item, index) => {
+        this.ids.push(item.id)
+      })
+      console.log(this.ids)
+    },
+    formatDate(val) {
+      if (val === null) {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .form-inline {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+</style>