zc

src/views/iotDevice/intelligenceIot/classConfig/addPage.vue

@@ -3,7 +3,7 @@
     <div class="title-box">
       <el-form :model="queryParams" class="form-box" ref="queryForm"
                :inline="true" style="width:100%;">
-        <el-form-item label="关键词" prop="searchValue" label-width="90px">
+        <el-form-item label="" prop="searchValue">
           <el-input
             maxLength="30"
             v-model="queryParams.searchValue"
@@ -12,8 +12,8 @@
             style="width: 200px"
           />
         </el-form-item>
-        <el-form-item label="状态" prop="state ">
-          <el-select v-model="queryParams.state " clearable placeholder="请选择" style="width: 200px">
+        <el-form-item label="" prop="state ">
+          <el-select v-model="queryParams.state " clearable placeholder="请选择状态" style="width: 200px">
             <el-option
               v-for="dict in options"
               :key="dict.value"

src/views/iotDevice/intelligenceIot/classConfig/index.vue

@@ -5,17 +5,17 @@
       <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 " label-width="90px">
+          <el-form-item label="" prop="searchValue " >
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
-              placeholder="请输入关键词"
+              placeholder="请输入关键词关键词"
               clearable
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="状态" prop="state ">
-            <el-select v-model="queryParams.state " clearable placeholder="请选择" style="width: 200px">
+          <el-form-item label="" prop="state ">
+            <el-select v-model="queryParams.state " clearable placeholder="请选择状态" style="width: 200px">
               <el-option
                 v-for="dict in options"
                 :key="dict.value"

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

@@ -5,7 +5,7 @@
       <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 " label-width="90px">
+          <el-form-item label="" prop="searchValue ">
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue "
@@ -14,8 +14,8 @@
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="状态" prop="state ">
-            <el-select v-model="queryParams.state " clearable placeholder="请选择" style="width: 200px">
+          <el-form-item label="" prop="state ">
+            <el-select v-model="queryParams.state " clearable placeholder="请选择状态" style="width: 200px">
               <el-option
                 v-for="dict in options"
                 :key="dict.value"

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

@@ -18,17 +18,17 @@
       <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" label-width="50px">
+          <el-form-item label="" prop="queryParamsData1" label-width="50px">
             <el-input
               maxLength="30"
               v-model="queryParams.queryParamsData1"
-              placeholder="请输入"
+              placeholder="请输入名称"
               clearable
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="状态" prop="queryParamsData2">
-            <el-select v-model="queryParams.queryParamsData2" clearable placeholder="请选择" style="width: 200px">
+          <el-form-item label="" prop="queryParamsData2">
+            <el-select v-model="queryParams.queryParamsData2" clearable placeholder="请选择状态" style="width: 200px">
               <el-option
                 v-for="dict in optionList"
                 :key="dict.value"
@@ -37,7 +37,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="时间" prop="state">
+          <el-form-item label="" prop="state">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -46,8 +46,8 @@
               value-format="yyyy-MM-dd"
               type="daterange"
               range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="创建时间"
+              end-placeholder="创建时间"
             ></el-date-picker>
           </el-form-item>
           <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>

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

@@ -239,33 +239,37 @@
             { required: true, message: "请输入AgentID", trigger: "blur" },
             { required: true, message: "请输入AgentID", validator: this.spaceJudgment, trigger: "blur" }
           ],
-          receiveDept: [
-            { required: true, message: "请选择接收部门", trigger: "blur" },
-            { required: true, message: "请选择接收部门", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          receiver: [
-            { required: true, message: "请选择人员", trigger: "blur" },
-            { required: true, message: "请选择人员", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          bodyType: [
-            { required: true, message: "请选择消息类型", trigger: "blur" },
-            { required: true, message: "请选择消息类型", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          title: [
-            { required: true, message: "请输入", trigger: "blur" },
-            { required: true, message: "请输入", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          retry: [
-            { required: true, message: "请输入播放次数", trigger: "blur" },
-            { required: true, message: "请输入播放次数", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          signature: [
-            { required: true, message: "短信签名不能为空", trigger: "blur" },
-            { required: true, message: "短信签名不能为空", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          content: [
-            { required: true, message: "请输入模板内容", trigger: "blur" },
-            { required: true, message: "请输入模板内容", validator: this.spaceJudgment, trigger: "blur" }
+          // receiveDept: [
+          //   { required: true, message: "请选择接收部门", trigger: "blur" },
+          //   { required: true, message: "请选择接收部门", validator: this.spaceJudgment, trigger: "blur" }
+          // ],
+          // receiver: [
+          //   { required: true, message: "请选择人员", trigger: "blur" },
+          //   { required: true, message: "请选择人员", validator: this.spaceJudgment, trigger: "blur" }
+          // ],
+          // bodyType: [
+          //   { required: true, message: "请选择消息类型", trigger: "blur" },
+          //   { required: true, message: "请选择消息类型", validator: this.spaceJudgment, trigger: "blur" }
+          // ],
+          // title: [
+          //   { required: true, message: "请输入", trigger: "blur" },
+          //   { required: true, message: "请输入", validator: this.spaceJudgment, trigger: "blur" }
+          // ],
+          // retry: [
+          //   { required: true, message: "请输入播放次数", trigger: "blur" },
+          //   { required: true, message: "请输入播放次数", validator: this.spaceJudgment, trigger: "blur" }
+          // ],
+          // signature: [
+          //   { required: true, message: "短信签名不能为空", trigger: "blur" },
+          //   { required: true, message: "短信签名不能为空", validator: this.spaceJudgment, trigger: "blur" }
+          // ],
+          // content: [
+          //   { required: true, message: "请输入模板内容", trigger: "blur" },
+          //   { required: true, message: "请输入模板内容", validator: this.spaceJudgment, trigger: "blur" }
+          // ],
+          remark: [
+            { required: true, message: "请输入说明", trigger: "blur" },
+            { required: true, message: "请输入说明", validator: this.spaceJudgment, trigger: "blur" }
           ],
         },
         noRules:{},

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

@@ -5,17 +5,17 @@
       <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="templateName" label-width="90px">
+          <el-form-item label="" prop="templateName">
             <el-input
               maxLength="30"
               v-model="queryParams.templateName"
-              placeholder="请输入"
+              placeholder="请输入名称"
               clearable
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="方式" prop="alarmType">
-            <el-select v-model="queryParams.alarmType" clearable placeholder="请选择" style="width: 200px">
+          <el-form-item label="" prop="alarmType">
+            <el-select v-model="queryParams.alarmType" clearable placeholder="请选择方式" style="width: 200px">
               <el-option
                 v-for="dict in typeList"
                 :key="dict.id"
@@ -35,7 +35,7 @@
       </div>
       <div class="page-content-box">
         <el-table class="table-box" v-loading="loading" border :data="dataList">
-          <el-table-column label="模板名称" align="left" width="200"prop="templateName" />
+          <el-table-column label="模板名称" align="left" width="200" prop="templateName" />
           <el-table-column label="方式" align="left" prop="alarmType" width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <p v-for="(item,index) in typeList" :key="index" v-show="item.id == scope.row.alarmType">{{item.name}}</p>

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

@@ -5,7 +5,7 @@
       <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" label-width="90px">
+          <el-form-item label="" prop="queryData1">
             <el-input
               maxLength="30"
               v-model="queryParams.queryData1"
@@ -14,8 +14,8 @@
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="类型" prop="queryData2">
-            <el-select v-model="queryParams.queryData2" clearable placeholder="请选择" style="width: 200px">
+          <el-form-item label="" prop="queryData2">
+            <el-select v-model="queryParams.queryData2" clearable placeholder="请选择类型" style="width: 200px">
               <el-option
                 v-for="dict in options"
                 :key="dict.value"

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

@@ -5,7 +5,7 @@
       <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" label-width="90px">
+          <el-form-item label="" prop="queryData1">
             <el-input
               maxLength="30"
               v-model="queryParams.queryData1"
@@ -14,7 +14,7 @@
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="告警时间" prop="dateRange">
+          <el-form-item label="" prop="dateRange">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -23,8 +23,8 @@
               value-format="yyyy-MM-dd"
               type="daterange"
               range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="告警时间"
+              end-placeholder="告警时间"
             ></el-date-picker>
           </el-form-item>
           <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>

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

@@ -5,7 +5,7 @@
       <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm"
                  :inline="true" style="width:100%;">
-          <el-form-item label="名称" label-width="70px">
+          <el-form-item label="">
             <el-input
               maxLength="30"
               v-model="queryParams.name"
@@ -14,10 +14,10 @@
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="方式">
+          <el-form-item label="">
             <el-select v-model="queryParams.alarmType"
                        style="width: 200px"
-                       clearable placeholder="请选择">
+                       clearable placeholder="请选择方式">
               <el-option
                 v-for="dict in typeList"
                 :key="dict.id"
@@ -256,7 +256,7 @@
           height:240px;
           -webkit-box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.2);
           border-radius:6px;
-          margin:20px;
+          margin:20px 0 0 20px;
           overflow: hidden;
           .for-card-title-p{
             font-size:16px;

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

@@ -5,7 +5,7 @@
       <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" label-width="90px">
+          <el-form-item label="" prop="queryData1">
             <el-input
               maxLength="30"
               v-model="queryParams.queryData1"
@@ -14,7 +14,7 @@
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="请求时间" prop="dateRange">
+          <el-form-item label="" prop="dateRange">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -23,8 +23,8 @@
               value-format="yyyy-MM-dd"
               type="daterange"
               range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="请求时间"
+              end-placeholder="请求时间"
             ></el-date-picker>
           </el-form-item>
           <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>

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

@@ -5,7 +5,7 @@
       <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" label-width="90px">
+          <el-form-item label="" prop="searchValue" >
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
@@ -14,8 +14,8 @@
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="设备类型" prop="moduleType">
-            <el-select v-model="queryParams.moduleType" clearable placeholder="请选择" style="width: 200px">
+          <el-form-item label="" prop="moduleType">
+            <el-select v-model="queryParams.moduleType" clearable placeholder="请选择设备类型" style="width: 200px">
               <el-option
                 v-for="dict in options"
                 :key="dict.value"

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

@@ -5,7 +5,7 @@
       <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" label-width="90px">
+          <el-form-item label="" prop="queryData1">
             <el-input
               maxLength="30"
               v-model="queryParams.queryData1"
@@ -14,8 +14,8 @@
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="设备类型" prop="queryData2">
-            <el-select v-model="queryParams.queryData2" clearable placeholder="请选择" style="width: 200px">
+          <el-form-item label="" prop="queryData2">
+            <el-select v-model="queryParams.queryData2" clearable placeholder="请选择设备类型" style="width: 200px">
               <el-option
                 v-for="dict in options"
                 :key="dict.value"