zc

src/api/iotDevice/index.js

@@ -408,6 +408,15 @@ export function iotAlarmTemplateDelete(data) {
     data: data
   })
 }
+//消息模板-发送调试信息
+export function iotAlarmSendCheck(data) {
+  return request({
+    url: '/iot/alarm/send/check',
+    method: 'post',
+    data: data
+  })
+}
+
 
 //消息模板启用&禁用
 export function iotAlarmTemplateChangeState(data) {
@@ -560,4 +569,46 @@ export function iotDeviceFindByType(data) {
   })
 }
 
+/***********接收人*************/
+
+//获取接收人-列表
+export function iotAlarmReceiveList(data) {
+  return request({
+    url: '/iot/alarm/receive/list',
+    method: 'post',
+    data: data
+  })
+}
+//获取接收人-新增
+export function iotAlarmReceiveAdd(data) {
+  return request({
+    url: '/iot/alarm/receive/add',
+    method: 'post',
+    data: data
+  })
+}
+//获取接收人-删除
+export function iotAlarmReceiveDelete(data) {
+  return request({
+    url: '/iot/alarm/receive/delete',
+    method: 'post',
+    data: data
+  })
+}
+//获取接收人-编辑
+export function iotAlarmReceiveUpdate(data) {
+  return request({
+    url: '/iot/alarm/receive/update',
+    method: 'post',
+    data: data
+  })
+}
+//获取接收人-下拉列表
+export function iotAlarmReceiveDropList(data) {
+  return request({
+    url: '/iot/alarm/receive/dropList',
+    method: 'post',
+    data: data
+  })
+}
 

src/views/iotDevice/monitoringWarning/messageTemplate/addPage.vue

@@ -63,21 +63,43 @@
           </el-form-item>
           <div style="display: flex">
             <el-form-item label="接收部门：" prop="receiveDept">
-              <el-select :disabled="showType" v-model="newData.receiveDept" placeholder="请选择接收部门" style="width:200px;">
-                <el-option label="测试部门-1" :value="1"></el-option>
-                <el-option label="测试部门-2" :value="2"></el-option>
+              <el-select :disabled="showType" v-model="newData.receiveDept"
+                         multiple collapse-tags
+                         placeholder="请选择接收部门" style="width:500px;">
+                <el-option
+                  v-for="(item,index) in sectionOptionList"
+                  :key="item.receiveCode"
+                  :label="item.receiveName"
+                  :value="item.receiveCode">
+                </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="接收人：" prop="receiver" label-width="100px">
-              <el-select :disabled="showType" v-model="newData.receiver" placeholder="请选择接收人" style="width:200px;">
-                <el-option label="测试人员-1" :value="1"></el-option>
-                <el-option label="测试人员-2" :value="2"></el-option>
+          </div>
+          <div style="display: flex">
+            <el-form-item label="接收人：" prop="receiver">
+              <el-select :disabled="showType" v-model="newData.receiver"
+                         multiple collapse-tags @change="receiverChange"
+                         placeholder="请选择接收人" style="width:500px;">
+                <el-option
+                  v-for="(item,index) in personnelOptionList"
+                  :key="item.receiveCode"
+                  :label="item.receiveName"
+                  :value="item.receiveCode">
+                </el-option>
               </el-select>
             </el-form-item>
           </div>
-          <el-form-item label="标签：" prop="title">
-            <el-input :disabled="showType" v-model="newData.title"
-                      placeholder="请输入标签" maxLength="200" style="width:500px;"></el-input>
+          <el-form-item label="标签：" prop="receiveTag ">
+            <el-select :disabled="showType" v-model="newData.receiveTag"
+                       multiple collapse-tags
+                       placeholder="请选择标签" style="width:500px;">
+              <el-option
+                v-for="(item,index) in tagOptionList"
+                :key="item.receiveCode"
+                :label="item.receiveName"
+                :value="item.receiveCode">
+              </el-option>
+            </el-select>
           </el-form-item>
         </div>
         <div v-if="newData.alarmType == 3">
@@ -201,7 +223,7 @@
             style="width:500px;"
             type="textarea"
             resize="none"
-            maxLength="50"
+            maxLength="1000"
             :rows="6"
             placeholder="变量格式：${name} : 示例：尊敬的${name}，监测到${deviceName} 掉线，请及时确认！"
             show-word-limit
@@ -225,7 +247,7 @@
 </template>
 
 <script>
-  import { iotAlarmTemplateAdd,iotAlarmTemplateUpdate,iotAlarmTemplateBodyType } from "@/api/iotDevice/index";
+  import { iotAlarmTemplateAdd,iotAlarmTemplateUpdate,iotAlarmTemplateBodyType,iotAlarmReceiveDropList } from "@/api/iotDevice/index";
   import { iotAlarmTypeSelect,systemUserSelect } from "@/api/commonality/permission";
   export default {
     name: 'addPage',
@@ -289,6 +311,10 @@
         userOptions:[],
         //消息模板类型列表
         bodyTypeList:[],
+        //部门/人员/标签下拉列表
+        personnelOptionList:[],
+        sectionOptionList:[],
+        tagOptionList:[],
       }
     },
     created(){
@@ -299,6 +325,21 @@
       this.iotAlarmTypeSelect();
     },
     methods:{
+      //接收人选中
+      receiverChange(val){
+        console.log(val);
+        if(val[1]){
+          for(let i=0;i<val.length;i++){
+            if(val[i] == '@all'){
+              if(i == val.length - 1 && i > 0){
+                this.$set(this.newData,'receiver',['@all']);
+              }else{
+                this.newData.receiver.splice(i,1);
+              }
+            }
+          }
+        }
+      },
       //人员查询
       userSelect(query){
         if (query !== '') {
@@ -337,6 +378,18 @@
       //初始化
       initialize(){
         this.$set(this,'showType',this.propsData.showType);
+        //获取部门/人员/标签下拉列表数据
+        iotAlarmReceiveDropList({receiveType:1}).then(response => {
+          let obj = JSON.parse(JSON.stringify(response.data))
+          obj.push({receiveCode:'@all',receiveName:'全部人员'});
+          this.$set(this,'personnelOptionList',obj);
+        });
+        iotAlarmReceiveDropList({receiveType:2}).then(response => {
+          this.$set(this,'sectionOptionList',response.data);
+        });
+        iotAlarmReceiveDropList({receiveType:3}).then(response => {
+          this.$set(this,'tagOptionList',response.data);
+        });
         if(this.propsData.templateId){
           let obj = JSON.parse(JSON.stringify(this.propsData))
           let newObj = {
@@ -347,18 +400,20 @@
             category:obj.category,
             remark:obj.remark,
             agentId:obj.agentId?obj.agentId:null,
-            receiveDept:obj.receiveDept?obj.receiveDept.split(','):[],
-            receiver:obj.receiver?obj.receiver.split(','):[],
+            receiveDept:obj.receiveDept?obj.receiveDept.split('|'):[],
+            receiver:obj.receiver?obj.receiver.split('|'):[],
+            receiveTag:obj.receiveTag?obj.receiveTag.split('|'):[],
             bodyType:obj.bodyType?obj.bodyType:null,
             title:obj.title?obj.title:null,
             retry:obj.retry?obj.retry:null,
             signature:obj.signature?obj.signature:null,
             content:obj.content?obj.content:null,
           };
-          console.log(newObj);
-          systemUserSelect({userType:1,userName:'',userIds:newObj.receiver}).then(response => {
-            this.userOptions = response.data;
-          });
+          if(newObj.alarmType == 3 || newObj.alarmType == 5){
+            systemUserSelect({userType:1,userName:'',userIds:newObj.receiver}).then(response => {
+              this.userOptions = response.data;
+            });
+          }
           this.$set(this,'newData',newObj);
         }else{
           this.$set(this,'newData',{
@@ -369,6 +424,7 @@
             agentId:null,
             receiveDept:[],
             receiver:[],
+            receiveTag:[],
             bodyType:null,
             title:null,
             retry:1,
@@ -416,7 +472,7 @@
               newObj.agentId = obj.agentId;
               newObj.receiveDept = obj.receiveDept+'';
               newObj.receiver = obj.receiver+'';
-              newObj.title = obj.title;
+              newObj.receiveTag = obj.receiveTag+'';
               newObj.bodyType = obj.bodyType;
             }else if (obj.alarmType == 3){
               newObj.title = obj.title;
@@ -454,7 +510,7 @@
     .content-box{
       flex:1;
       display: flex;
-      padding:20px;
+      margin:20px;
       ::v-deep .el-input.is-disabled .el-input__inner{
         background-color: #fff;
         color: #666;

src/views/iotDevice/monitoringWarning/messageTemplate/index.vue

@@ -111,7 +111,7 @@
 </template>
 
 <script>
-  import { iotAlarmTemplateList,iotAlarmTemplateAdd,iotAlarmTemplateUpdate,iotAlarmTemplateDelete,iotAlarmTemplateChangeState } from "@/api/iotDevice/index";
+  import { iotAlarmTemplateList,iotAlarmTemplateAdd,iotAlarmTemplateUpdate,iotAlarmSendCheck,iotAlarmTemplateDelete,iotAlarmTemplateChangeState } from "@/api/iotDevice/index";
   import addPage from "./addPage.vue";
   export default {
     name: 'index',
@@ -192,6 +192,16 @@
           this.$set(this,'propsData',obj);
         }else if(type == 4){
           //调试
+          this.$confirm('是否确认发送调试信息?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+          }).then(() => {
+            iotAlarmSendCheck({templateId:row.templateId}).then(response => {
+              self.msgSuccess(response.message)
+            });
+          }).catch(() => {});
         }else if(type == 5){
           this.$confirm('是否确认删除?', "警告", {
             confirmButtonText: "确定",

src/views/iotDevice/monitoringWarning/receiver/index.vue

@@ -0,0 +1,322 @@
+<!-- 接收人 -->
+<template>
+  <div class="app-container receiver">
+    <div class="page-container receiverPage" v-if="pageType === 1">
+      <div class="page-form-title-box">
+        <el-form :model="queryParams" class="form-box" ref="queryForm"
+                 :inline="true" style="width:100%;">
+          <el-form-item label="接收人姓名" prop="receiveName">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.receiveName "
+              placeholder="请输入接收人姓名"
+              style="width: 200px"
+            />
+          </el-form-item>
+          <el-form-item label="模板类型" prop="receiveType">
+            <el-select v-model="queryParams.receiveType" placeholder="请选择" style="width: 200px">
+              <el-option
+                v-for="dict in optionTypeList"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <p class="page-add-common-style-button"
+             style="float: right;"
+             @click="tableButton(1)"
+             v-hasPermiRouter="['demo:demo:add']"
+          >新增</p>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table class="table-box" v-loading="loading" border :data="dataList">
+          <el-table-column label="类型" prop="receiveType"  show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.receiveType == 1 ? '用户' : (
+                scope.row.receiveType == 2 ? '部门' : (
+                scope.row.receiveType == 3 ? '标签' : '其他'))}}
+            </template>
+          </el-table-column>
+          <el-table-column label="标识" prop="receiveCode" width="200" show-overflow-tooltip/>
+          <el-table-column label="姓名" prop="receiveName" width="200" show-overflow-tooltip/>
+          <el-table-column label="状态" prop="state" width="200" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-switch
+                @click.native="tableButton(5,scope.row)"
+                class="switch captcha-img"
+                :active-value="true"
+                :inactive-value="false"
+                active-color="#0183FA"
+                inactive-color="#999"
+                v-model="scope.row.state"
+                active-text="启用"
+                inactive-text="停用"
+                disabled
+              ></el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" prop="createTime" width="300" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="200" show-overflow-tooltip v-if="tableButtonType">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-null"></p>
+                <p class="table-button-p"
+                   @click="tableButton(3,scope.row)"
+                   v-hasPermiRouter="['demo:demo:edit']"
+                >编辑</p>
+                <p class="table-button-p"
+                   @click="tableButton(4,scope.row)"
+                   v-hasPermiRouter="['demo:demo:del']"
+                >删除</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0"
+                    :total="total"
+                    :page.sync="queryParams.page"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+        />
+      </div>
+    </div>
+    <!--新增弹窗-->
+    <el-dialog class="iot-receiver-dialog" :title='dialogTitle' width="540px" append-to-body
+               :visible.sync="dialogType" v-if="dialogType" @close="dialogOff()"
+               :close-on-click-modal="false" :close-on-press-escape="false">
+      <el-form :model="dialogForm" ref="dialogForm" :inline="true" :rules="dialogRules" class="addCheckPage-min" label-width="120px">
+        <el-form-item label="类型：" prop="receiveType">
+          <el-select v-model="dialogForm.receiveType" placeholder="请选择接接收类型" style="width: 320px">
+            <el-option
+              v-for="item in optionTypeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标识：" prop="receiveCode">
+          <el-input v-model="dialogForm.receiveCode" placeholder="请输入收人标识" maxLength="50" style="width:320px;"/>
+        </el-form-item>
+        <el-form-item label="姓名：" prop="receiveName">
+          <el-input v-model="dialogForm.receiveName" placeholder="请输入接收人姓名" maxLength="50" style="width:320px;"/>
+        </el-form-item>
+        <el-form-item label="状态：" prop="state">
+          <el-radio-group v-model="dialogForm.state">
+            <el-radio :label="true">启用</el-radio>
+            <el-radio :label="false">禁用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer dialog-footer-box">
+        <p class="dialog-footer-button-null"></p>
+        <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-null"></p>
+      </div>
+    </el-dialog>
+    <!--<add-page :propsData="propsData" v-if="pageType === 2"></add-page>-->
+  </div>
+</template>
+<script>
+  import { iotAlarmReceiveList,iotAlarmReceiveAdd,iotAlarmReceiveUpdate,iotAlarmReceiveDelete } from "@/api/iotDevice/index";
+  //import addPage from "./addPage.vue";
+  export default {
+    name: 'index',
+    //components: {
+    //  addPage
+    //},
+    data () {
+      return {
+        tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
+        //页面状态
+        pageType:1,
+        //页面遮罩
+        loading:false,
+        //下拉列表数据
+        optionList:[{value:true,label:'启用'},{value:false,label:'停用'}],
+        //查询条件
+        queryParams:{
+          page:1,
+          pageSize:20,
+          receiveName:"",
+          receiveType :null,
+        },
+        //列表数据
+        dataList:[],
+        //数据数量
+        total:0,
+        //弹窗数据
+        dialogTitle:'',
+        dialogType:false,
+        dialogForm:{
+          receiveType:'',
+          receiveCode:'',
+          receiveName:'',
+          state:true,
+        },
+        dialogRules:{
+          receiveType: [
+            { required: true, message: "请选择类型", trigger: "blur" },
+            { required: true, message: "请选择类型", validator: this.spaceJudgment, trigger: "blur" }
+          ],
+          receiveCode: [
+            { required: true, message: "请输入标识", trigger: "blur" },
+            { required: true, message: "请输入标识", validator: this.spaceJudgment, trigger: "blur" }
+          ],
+          receiveName: [
+            { required: true, message: "请输入姓名", trigger: "blur" },
+            { required: true, message: "请输入姓名", validator: this.spaceJudgment, trigger: "blur" }
+          ],
+          state: [
+            { required: true, message: "请选择状态", trigger: "blur" },
+            { required: true, message: "请选择状态", validator: this.spaceJudgment, trigger: "blur" }
+          ],
+        },
+        optionTypeList:[
+          {
+            value:1,
+            label:'用户'
+          },
+          {
+            value:2,
+            label:'部门'
+          },
+          {
+            value:3,
+            label:'标签'
+          },
+        ]
+      }
+    },
+    created () {
+
+    },
+    mounted () {
+      this.getList();
+    },
+    methods: {
+      //弹窗关闭
+      dialogOff(){
+        this.$set(this,'dialogForm',{
+          receiveType:'',
+          receiveCode:'',
+          receiveName:'',
+          state:true,
+          }
+        );
+        this.$set(this,'dialogType',false);
+      },
+      //弹窗提交
+      dialogSubmit(){
+        this.$refs["dialogForm"].validate(valid => {
+          if (valid) {
+            let obj = JSON.parse(JSON.stringify(this.dialogForm))
+            if(obj.receiveId){
+              //编辑
+              iotAlarmReceiveUpdate(obj).then(response => {
+                this.msgSuccess(response.message)
+                this.dialogOff();
+                this.getList();
+              });
+            }else{
+              //新增
+              iotAlarmReceiveAdd(obj).then(response => {
+                this.msgSuccess(response.message)
+                this.dialogOff();
+                this.getList();
+              });
+            }
+          }
+        })
+      },
+      //查询按钮
+      handleQuery(){
+        this.$set(this.queryParams,'page',1);
+        this.getList();
+      },
+      //重置按钮
+      resetQuery(){
+        this.$set(this,'queryParams',{
+          page:1,
+          pageSize:20,
+          receiveName:"",
+          receiveType :null,
+        });
+        this.getList();
+      },
+      //获取数据列表
+      getList(){
+        this.$set(this,'loading',true);
+        let obj = JSON.parse(JSON.stringify(this.queryParams))
+        iotAlarmReceiveList(obj).then(response => {
+          this.$set(this,'loading',false);
+          this.$set(this,'dataList',response.data.records);
+          this.$set(this,'total',response.data.total);
+        });
+      },
+      //操作按钮
+      tableButton(type,row){
+        let self = this;
+        if(type == 1){
+          //新增
+          this.$set(this,'dialogType',true);
+        }else if(type == 3){
+          //编辑
+          this.$set(this,'dialogForm',row);
+          this.$set(this,'dialogType',true);
+        }else if(type == 4){
+          //删除
+          this.$confirm('是否确认删除?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+          }).then(() => {
+            iotAlarmReceiveDelete({receiveId:row.receiveId}).then(response => {
+              self.msgSuccess(response.message)
+              self.getList();
+            });
+          }).catch(() => {});
+        }else if(type == 5){
+          //启用&停用
+          let text = row.state  ? "停用" : "启用";
+          this.$confirm('是否确认' + text + '?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+          }).then(() => {
+            let obj = JSON.parse(JSON.stringify(row));
+            obj.state = !obj.state;
+            iotAlarmReceiveUpdate(obj).then(response => {
+              this.msgSuccess(response.message)
+              this.getList();
+            });
+          }).catch(() => {});
+        }else if(type == 6){
+          //返回并刷新
+          this.$set(this,'pageType',1);
+          this.getList();
+        }
+      },
+    },
+  }
+</script>
+<style scoped lang="scss">
+  .receiver{
+    .receiverPage{
+
+    }
+  }
+</style>

src/views/iotDevice/monitoringWarning/warningMode/addPage.vue

@@ -3,6 +3,7 @@
     <div class="page-top-title-box">
       <p class="page-top-title-name-p">{{showType?'详情':(newData.typeId?'编辑':'新增')}}</p>
       <p class="page-top-title-out-p" @click="backPage">返回</p>
+      <p class="page-top-title-submit-p" @click="modelSubmit">提交</p>
     </div>
     <div class="content-box scrollbar-box">
       <el-form class="add-form-box" :model="newData" ref="form" :rules="showType?noRules:rules" label-width="120px">
@@ -121,11 +122,6 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="page-bottom-button-box">
-      <p class="page-bottom-button-null-p"></p>
-      <p class="page-bottom-button-submit-p" @click="submitForm">提交</p>
-      <p class="page-bottom-button-null-p"></p>
-    </div>
   </div>
 </template>
 

src/views/systemManagement/roleManagement/addPage.vue

@@ -1,8 +1,10 @@
 <template>
   <div class="page-container teacher-add-page" @click="checkedButton">
     <div class="public-form-box">
-      <div class="top-title-box">
-        <p>PC端权限配置</p>
+      <div class="page-top-title-box">
+        <p class="page-top-title-name-p">PC端权限配置</p>
+        <p class="page-top-title-out-p" @click="outPageButton">返回</p>
+        <p class="page-top-title-submit-p" @click="upDataButton">提交</p>
       </div>
       <!--权限模块-->
       <div class="table-for-max-box">
@@ -84,12 +86,6 @@
         </div>
       </el-dialog>
     </div>
-    <div class="page-bottom-button-box">
-      <p class="page-bottom-button-null-p"></p>
-      <p class="page-bottom-button-cancel-p" @click="outPageButton">返回</p>
-      <p class="page-bottom-button-submit-p" @click="upDataButton">提交</p>
-      <p class="page-bottom-button-null-p"></p>
-    </div>
   </div>
 </template>
 
@@ -400,6 +396,7 @@ export default {
     overflow: hidden;
     display: flex;
     flex-direction: column;
+    padding-bottom:20px;
   }
   .top-title-box{
     border-bottom:1px solid #E0E0E0;
@@ -636,7 +633,7 @@ export default {
     flex-direction: column;
     overflow: hidden;
     border:1px solid #D7D7D7;
-    margin:0 20px;
+    margin:20px 20px 0;
     *{
       margin:0;
       padding:0;