zc

src/api/iotDevice/index.js

@@ -708,3 +708,44 @@ export function iotAlarmLogList(data) {
     data: data
   })
 }
+/************************* 监控配置 *************************/
+//消息日志-列表
+export function iotMonitorConfigList(data) {
+  return request({
+    url: '/iot/monitor/config/list',
+    method: 'post',
+    data: data
+  })
+}
+//消息日志-新增
+export function iotMonitorConfigAdd(data) {
+  return request({
+    url: '/iot/monitor/config/add',
+    method: 'post',
+    data: data
+  })
+}
+//消息日志-编辑
+export function iotMonitorConfigUpdate(data) {
+  return request({
+    url: '/iot/monitor/config/update',
+    method: 'post',
+    data: data
+  })
+}
+//消息日志-删除
+export function iotMonitorConfigDelete(data) {
+  return request({
+    url: '/iot/monitor/config/delete',
+    method: 'post',
+    data: data
+  })
+}
+//消息日志-详情
+export function iotMonitorConfigDetail(query) {
+  return request({
+    url: '/iot/monitor/config/detail',
+    method: 'get',
+    params: query
+  })
+}

src/views/iotDevice/intelligenceIot/iotClassification/functionPage.vue

@@ -153,6 +153,20 @@
   export default {
     name: 'functionPage',
     data(){
+      const doubleCheck = (rule, value, callback) => {
+        let self = this;
+        let num = 0;
+        for(let i=0;i<self.dialogForm.reqParams.length;i++){
+          if(value == self.dialogForm.reqParams[i].keyName){
+            num++
+          }
+        }
+        if(num > 1){
+          return callback(new Error('参数重复'));
+        }else{
+          callback();
+        }
+      };
       return{
         //上传相关
         uploadFile: this.uploadUrl(), // 上传的图片服务器地址
@@ -201,7 +215,8 @@
           ],
           keyName: [
             { required: true, message: "请输入键", trigger: "blur" },
-            { required: true, message: "请输入键", validator: this.spaceJudgment, trigger: "blur" }
+            { required: true, message: "请输入键", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, message: "参数重复", validator: doubleCheck, trigger: "blur" }
           ],
           keyType: [
             { required: true, message: "请选择类型", trigger: "blur" },

src/views/iotDevice/intelligenceIot/iotHardware/hardwareIotInfo.vue

@@ -41,7 +41,16 @@
       initialize(){
         if(this.$parent.propsData.networkId){
           iotNetworkInfo({isList:false,id:this.$parent.propsData.networkId}).then(response => {
-            response.data.params = response.data.params ? JSON.parse(response.data.params) : [];
+            let obj = response.data.params ? JSON.parse(response.data.params) : {};
+            let list = [];
+            Object.keys(obj).forEach((key) => {
+              const value = obj[key];
+              list.push({
+                key:key,
+                value:value
+              })
+            });
+            response.data.params = list;
             this.$set(this,'newData',response.data);
           });
         }

src/views/iotDevice/operationManagement/iotLogs/index.vue

@@ -1,190 +0,0 @@
-<!--物联日志-->
-<template>
-  <div class="app-container iotLogs">
-    <div class="page-container iotLogsPage">
-      <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="queryData1">
-            <el-input
-              maxLength="30"
-              v-model="queryParams.queryData1"
-              placeholder="请输入关键词"
-              clearable
-              style="width: 200px"
-            />
-          </el-form-item>
-          <el-form-item label="" prop="dateRange">
-            <el-date-picker
-              :clearable="false"
-              v-model="dateRange"
-              size="small"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="请求时间"
-              end-placeholder="请求时间"
-            ></el-date-picker>
-          </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-submit-common-style-button"
-             style="float: right;"
-             @click="dialogOpen"
-             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="设备名称" width="80" align="left" prop="data1" />
-          <el-table-column label="ip" align="left" prop="data2" show-overflow-tooltip/>
-          <el-table-column label="请求路径" align="left" prop="data3" show-overflow-tooltip/>
-          <el-table-column label="请求方法" align="left" prop="data4" show-overflow-tooltip/>
-          <el-table-column label="请求时间" align="left" prop="data5" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.data5) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="请求人" align="left" prop="data6" show-overflow-tooltip/>
-          <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <div class="table-button-box">
-                <p class="table-button-null"></p>
-                <p class="table-button-p"
-                   @click="tableButton(2,scope.row)"
-                >详情</p>
-                <p class="table-button-p"
-                   @click="tableButton(3,scope.row)"
-                >编辑</p>
-                <p class="table-button-p"
-                   @click="tableButton(4,scope.row)"
-                >删除</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="iotLogs-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">
-      <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>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: 'index',
-    data(){
-      return{
-        loading:false,
-        options:[{label:'启用',value:true},{label:'停用',value:false}],
-        dateRange:[],
-        queryParams:{
-          page:1,
-          pageSize:20,
-          queryData1:"",
-          jobGroup:null,
-          queryData2:null,
-        },
-        dataList:[],
-        total:0,
-        dialogTitle:null,
-        dialogType:false,
-        dialogForm:{},
-      }
-    },
-    created(){
-
-    },
-    mounted(){
-
-    },
-    methods:{
-      //弹层关闭
-      dialogOff(){
-        this.$set(this,'dialogType',false);
-      },
-      //弹层开启
-      dialogOpen(){
-        this.dialogFormReset();
-        this.$set(this,'dialogTitle','新增');
-        this.$set(this,'dialogType',true);
-      },
-      //弹层确定
-      dialogSubmit(){
-        this.$set(this,'dialogType',false);
-      },
-      handleQuery(){
-        this.$set(this.queryParams,'page',1);
-        this.getList();
-      },
-      resetQuery(){
-        this.$set(this,'dateRange',[])
-        this.$set(this,'queryParams',{
-          page:1,
-          pageSize:20,
-          queryData1:"",
-          queryData2:null,
-        });
-        this.getList();
-      },
-      dialogFormReset(){
-        this.$set(this,'dialogForm',{
-
-        });
-      },
-      //获取数据列表
-      getList(){
-        // this.$set(this,'loading',true);
-        // let obj = JSON.parse(JSON.stringify(this.queryParams))
-        // if(this.dateRange[0]){
-        //   obj.startTime = this.dateRange[0]+'T00:00:00'
-        //   obj.endTime = this.dateRange[1]+'T23:59:59'
-        // }else{
-        //   obj.startTime = "";
-        //   obj.endTime = "";
-        // }
-        // listJobLog(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){
-        if(type == 2){
-
-        }else if(type == 3){
-          this.dialogFormReset();
-        }else if(type == 4){
-
-        }
-      },
-    },
-  }
-</script>
-
-<style scoped lang="scss">
-  .iotLogs{
-    .iotLogsPage{
-
-    }
-  }
-</style>

src/views/iotDevice/operationManagement/monitorConfig/addPage.vue

@@ -0,0 +1,73 @@
+<template>
+  <div class="page-container monitorConfig-addPage">
+    <div class="page-top-title-box">
+      <p class="page-top-title-name-p">{{propsData.configId?'编辑':'新增'}}</p>
+      <p class="page-top-title-out-p" @click="backPage">返回</p>
+      <p class="page-top-title-add-p" @click="submitForm">提交</p>
+    </div>
+    <div class="content-box scrollbar-box">
+      <el-form class="add-form-box" :model="newData" ref="form" :rules="rules" label-width="120px">
+        <el-form-item label="" prop="name">
+          <el-input v-model="newData.name" placeholder="请输入名称" maxLength="20" style="width:500px;"></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { iotMonitorConfigDetail,iotMonitorConfigAdd,iotMonitorConfigUpdate,iotTypeGetAllTypes } from "@/api/iotDevice/index";
+  export default {
+    name: 'addPage',
+    props:{
+      propsData:{},
+    },
+    data(){
+      return{
+        newData:{},
+      }
+    },
+    created(){
+      this.initialize();
+    },
+    mounted(){
+
+    },
+    methods:{
+      // 初始化
+      initialize(){
+        this.iotTypeGetAllTypes();
+        if(this.propsData.configId){
+
+        }else{
+          this.$set(this,'newData',{
+
+          })
+        }
+      },
+
+      // 返回按钮
+      backPage(){
+        this.$parent.tableButton(6);
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+
+          }
+        })
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .monitorConfig-addPage{
+    .content-box{
+      flex:1;
+      display: flex;
+      padding:20px;
+    }
+  }
+</style>

src/views/iotDevice/operationManagement/monitorConfig/index.vue

@@ -0,0 +1,237 @@
+<!-- 监控配置 -->
+<template>
+  <div class="app-container monitorConfig">
+    <div class="page-container monitorConfigPage" 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="searchValue">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.searchValue"
+              placeholder="请输入名称"
+              style="width: 200px"
+            />
+          </el-form-item>
+          <el-form-item label="" prop="deviceTypeKey">
+            <el-select v-model="queryParams.deviceTypeKey" placeholder="请选择设备分类" style="width: 200px">
+              <el-option
+                v-for="dict in typeOptionList"
+                :key="dict.typeKey"
+                :label="dict.typeName"
+                :value="dict.typeKey"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="state">
+            <el-select v-model="queryParams.state" placeholder="请选择状态" style="width: 200px">
+              <el-option
+                v-for="dict in optionList"
+                :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="monitorName"  show-overflow-tooltip/>
+          <el-table-column label="设备分类" prop="deviceType" width="200" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-for="(item,index) in typeOptionList" v-show="item.typeKey === scope.row.deviceType">{{item.typeName}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="监控类型" prop="monitorType" width="200" show-overflow-tooltip/>
+          <el-table-column label="告警类型" prop="alarmType" width="200" show-overflow-tooltip/>
+          <el-table-column label="次数" prop="count" width="200" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{scope.row.count?scope.row.count:'N/A'}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" prop="state" width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{scope.row.state?'启用':'禁用'}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" prop="createTime" width="200" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</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(2,scope.row)"-->
+                   <!--v-hasPermiRouter="['demo:demo:detail']"-->
+                <!--&gt;详情</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>
+    <add-page :propsData="propsData" v-if="pageType === 2"></add-page>
+  </div>
+</template>
+<script>
+  import { iotMonitorConfigList,iotMonitorConfigDelete,iotTypeGetAllTypes } 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,
+        //下拉列表数据
+        typeOptionList:[],
+        optionList:[{value:true,label:'启用'},{value:false,label:'停用'}],
+        //查询条件
+        queryParams:{
+          page:1,
+          pageSize:20,
+          searchValue:"",
+          deviceTypeKey :null,
+          state :null,
+        },
+        //列表数据
+        dataList:[],
+        //数据数量
+        total:0,
+        //组件传参
+        propsData:{},
+      }
+    },
+    created () {
+
+    },
+    mounted () {
+      this.iotTypeGetAllTypes();
+      this.getList();
+    },
+    methods: {
+      //查询按钮
+      handleQuery(){
+        this.$set(this.queryParams,'page',1);
+        this.getList();
+      },
+      //重置按钮
+      resetQuery(){
+        this.$set(this,'queryParams',{
+          page:1,
+          pageSize:20,
+          searchValue:"",
+          deviceTypeKey :null,
+          state :null,
+        });
+        this.getList();
+      },
+      //获取数据列表
+      getList(){
+        this.$set(this,'loading',true);
+        iotMonitorConfigList(this.queryParams).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,'pageType',2);
+          this.$set(this,'propsData',{});
+        }else if(type == 2){
+          //详情
+          this.$set(this,'pageType',2);
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = true;
+          this.$set(this,'propsData',obj);
+        }else if(type == 3){
+          //编辑
+          this.$set(this,'pageType',2);
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = false;
+          this.$set(this,'propsData',obj);
+        }else if(type == 4){
+          //删除
+          this.$confirm('是否确认删除?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+          }).then(() => {
+            iotMonitorConfigDelete({configId:row.configId}).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(() => {
+            stateFunction({id:row.id,state:!row.state,}).then(response => {
+              self.msgSuccess(response.message)
+              self.getList();
+            });
+          }).catch(() => {});
+        }else if(type == 6){
+          //返回并刷新
+          this.$set(this,'pageType',1);
+          this.getList();
+        }
+      },
+      //获取设备分类列表
+      iotTypeGetAllTypes(){
+        iotTypeGetAllTypes({}).then(response => {
+          this.$set(this,'typeOptionList',response.data);
+        });
+      },
+    },
+  }
+</script>
+<style scoped lang="scss">
+  .monitorConfig{
+    .monitorConfigPage{
+
+    }
+  }
+</style>

src/views/iotDevice/operationManagement/monitorLog/index.vue

@@ -0,0 +1,243 @@
+<!-- 监控日志 -->
+<template>
+  <div class="app-container monitorLog">
+    <div class="page-container monitorLogPage" 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="queryParamsData1">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.queryParamsData1"
+              placeholder="请输入"
+              style="width: 200px"
+            />
+          </el-form-item>
+          <el-form-item label="状态" prop="queryParamsData2">
+            <el-select v-model="queryParams.queryParamsData2" placeholder="请选择" style="width: 200px">
+              <el-option
+                v-for="dict in optionList"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="时间" prop="state">
+            <el-date-picker
+              :clearable="false"
+              v-model="dateRange"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </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="name"  show-overflow-tooltip/>
+          <el-table-column label="内容" prop="content" width="200" show-overflow-tooltip/>
+          <el-table-column label="状态" prop="state" width="100" 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="200" 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(2,scope.row)"
+                   v-hasPermiRouter="['demo:demo:detail']"
+                >详情</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>
+    <!--<add-page :propsData="propsData" v-if="pageType === 2"></add-page>-->
+  </div>
+</template>
+<script>
+  //import { getDicts } from "@/api/commonality/noPermission";
+  //import { systemUserSelect } from "@/api/commonality/permission";
+  //import { getInfo } from "@/api/basicsModules/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,
+          queryParamsData1:"",
+          queryParamsData2 :null,
+        },
+        //时间数据
+        dateRange:[],
+        //列表数据
+        dataList:[],
+        //数据数量
+        total:0,
+        //组件传参
+        propsData:{},
+      }
+    },
+    created () {
+
+    },
+    mounted () {
+      //this.getList();
+    },
+    methods: {
+      //查询按钮
+      handleQuery(){
+        this.$set(this.queryParams,'page',1);
+        this.getList();
+      },
+      //重置按钮
+      resetQuery(){
+        this.$set(this,'dateRange',[])
+        this.$set(this,'queryParams',{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          queryParamsData2 :null,
+        });
+        this.getList();
+      },
+      //获取数据列表
+      getList(){
+        this.$set(this,'loading',true);
+        let obj = JSON.parse(JSON.stringify(this.queryParams))
+        if(this.dateRange[0]){
+          obj.startTime = this.dateRange[0]+'T00:00:00'
+          obj.endTime = this.dateRange[1]+'T23:59:59'
+        }else{
+          obj.startTime = "";
+          obj.endTime = "";
+        }
+        getListFunction(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,'pageType',2);
+          this.$set(this,'propsData',{});
+        }else if(type == 2){
+          //详情
+          this.$set(this,'pageType',2);
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = true;
+          this.$set(this,'propsData',obj);
+        }else if(type == 3){
+          //编辑
+          this.$set(this,'pageType',2);
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = false;
+          this.$set(this,'propsData',obj);
+        }else if(type == 4){
+          //删除
+          this.$confirm('是否确认删除?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+          }).then(() => {
+            deleteFunction({id:row.id}).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(() => {
+            stateFunction({id:row.id,state:!row.state,}).then(response => {
+              self.msgSuccess(response.message)
+              self.getList();
+            });
+          }).catch(() => {});
+        }else if(type == 6){
+          //返回并刷新
+          this.$set(this,'pageType',1);
+          this.getList();
+        }
+      },
+    },
+  }
+</script>
+<style scoped lang="scss">
+  .monitorLog{
+    .monitorLogPage{
+
+    }
+  }
+</style>

src/views/iotDevice/operationManagement/networkComponent/index.vue

@@ -326,6 +326,20 @@
   export default {
     name: 'index',
     data(){
+      const doubleCheck = (rule, value, callback) => {
+        let self = this;
+        let num = 0;
+        for(let i=0;i<self.dialogForm.params.length;i++){
+          if(value == self.dialogForm.params[i].key){
+            num++
+          }
+        }
+        if(num > 1){
+          return callback(new Error('参数重复'));
+        }else{
+          callback();
+        }
+      };
       return{
         loading:false,
         options:[{label:'HTTP服务',value:1},{label:'TCP服务',value:2},{label:'MQTT服务',value:3},{label:'MQTT客户端',value:4}],
@@ -403,7 +417,8 @@
           ],
           key: [
             { required: true, message: "请输入键", trigger: "blur" },
-            { required: true, message: "请输入键", validator: this.spaceJudgment, trigger: "blur" }
+            { required: true, message: "请输入键", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, message: "参数重复", validator: doubleCheck, trigger: "blur" }
           ],
           value: [
             { required: true, message: "请输入值", trigger: "blur" },
@@ -541,9 +556,26 @@
           messageLength:data.moduleType == 3 || data.moduleType == 4 ?data.messageLength:'',
         }
         if(type == 'get'){
-          newData.params = data.params?JSON.parse(data.params):[];
+          if(data.params){
+            let obj = data.params?JSON.parse(data.params):{};
+            let list = [];
+            Object.keys(obj).forEach((key) => {
+              const value = obj[key];
+              list.push({
+                key:key,
+                value:value
+              })
+            });
+            newData.params = list[0]?list:[];
+          }else{
+            newData.params = [];
+          }
         }else if(type == 'set'){
-          newData.params = data.params[0]?JSON.stringify(data.params):'';
+          let obj = {};
+          for(let i=0;i<data.params.length;i++){
+            obj[data.params[i].key] = data.params[i].value
+          }
+          newData.params = data.params[0]?JSON.stringify(obj):'';
         }
         if(data.id){
           newData.id = data.id;