样式，报表

src/api/core/reportForms/safetyInspectReport.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询列表监控调阅计划
+export function listReport(query) {
+  return request({
+    url: '/core/safetyInspectReport/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 下发
+export function selectAllOrg() {
+    return request({
+      url: '/core/safetyInspectReport/selectAllOrg',
+      method: 'get'
+    })
+  }

src/views/core/accessPlan/index.vue

@@ -11,8 +11,8 @@
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
                  label-width="68px">
-                 <el-form-item label="计划名称" prop="planName">
-            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" maxlength="50" clearable
+                 <el-form-item label="任务名称" prop="planName">
+            <el-input v-model="queryParams.planName" placeholder="请输入关键字" maxlength="50" clearable
                       @keyup.enter.native="handleQuery"/>
           </el-form-item>
           <el-form-item label="机构类型" prop="orgType">
@@ -23,20 +23,20 @@
           </el-form-item>
 
 
-          <el-form-item label="调阅角色" prop="roleId">
-            <el-select v-model="queryParams.roleId" placeholder="请选择调阅角色">
+          <el-form-item label="调阅人员" prop="roleId">
+            <el-select v-model="queryParams.roleId" placeholder="请选择用户角色">
               <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="调阅周期" prop="planCycle">
-            <el-select style="width: 100%;" v-model="queryParams.planCycle" placeholder="请选择调阅周期">
+          <el-form-item label="任务周期" prop="planCycle">
+            <el-select style="width: 100%;" v-model="queryParams.planCycle" placeholder="请选择任务周期">
               <el-option v-for="dict in dict.type.sys_access_cycle" :key="dict.value" :label="dict.label"
                          :value="`${dict.value}`"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="计划状态" prop="planStatus">
-            <el-select style="width: 100%;" v-model="queryParams.planStatus" placeholder="请选择计划状态">
+          <el-form-item label="任务状态" prop="planStatus">
+            <el-select style="width: 100%;" v-model="queryParams.planStatus" placeholder="请选择任务状态">
               <el-option v-for="dict in dict.type.edu_plan_status" :key="dict.value" :label="dict.label"
                          :value="`${dict.value}`"></el-option>
             </el-select>
@@ -55,7 +55,7 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
-                 v-hasPermi="['core:accessPlan:add']"  v-if="check==true" >新增
+                 v-hasPermi="['core:accessPlan:add']"  v-if="check==true" >新增任务
             </el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -70,42 +70,44 @@
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-          <el-table-column width="140" label="计划名称" align="center" prop="planName"/>
+          <el-table-column width="140" label="任务名称" align="center" prop="planName"/>
           <el-table-column width="140" label="创建机构" align="center" prop="orgName"/>
+          <el-table-column width="140" label="行社名称" align="center" prop="organization"/>
           <el-table-column label="机构类型" align="center" key="orgType" prop="orgType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.orgType"/>
             </template>
           </el-table-column>
-          <el-table-column label="调阅角色" align="center" prop="roleName"/>
+          <el-table-column label="调阅人员" align="center" prop="roleName"/>
 
-          <el-table-column label="调阅周期" align="center" key="planCycle" prop="planCycle" width="80">
+          <el-table-column label="任务周期" align="center" key="planCycle" prop="planCycle" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_access_cycle" :value="scope.row.planCycle"/>
             </template>
           </el-table-column>
-          <el-table-column label="调阅频次" align="center" prop="planFrequency"/>
+          <el-table-column label="任务次数" align="center" prop="planFrequency"/>
 
-          <el-table-column label="计划状态" align="center" key="planStatus" prop="planStatus" width="80">
+          <el-table-column label="任务状态" align="center" key="planStatus" prop="planStatus" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.edu_plan_status" :value="scope.row.planStatus"/>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="修改人" align="center" prop="updateBy"/>
-          <el-table-column label="修改时间" align="center" prop="updateTime"/> -->
-          <el-table-column label="备注" align="center" prop="description"/>
+          <!-- <el-table-column label="备注" align="center" prop="description"/> -->
           <el-table-column label="操作" fixed="right" width="150px" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-if="scope.row.orgId==isEdit&&check==true"
-                         v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">编辑
+              <el-button size="mini" type="text" v-if="scope.row.parentId==null&& scope.row.orgId==isEdit&&scope.row.isDistribute == 0 && (scope.row.planStatus==0||scope.row.planStatus==2)" icon="el-icon-d-arrow-right" style="transform: rotate(90deg);"
+                         @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">
               </el-button>
-              <el-button size="mini" type="text" v-if="scope.row.parentId==null&& scope.row.orgId==isEdit&&scope.row.isDistribute == 0 && (scope.row.planStatus==0||scope.row.planStatus==2)" icon="el-icon-arrow-down"
+              <el-button size="mini" type="text" v-if="scope.row.parentId==null&& scope.row.orgId==isEdit&&scope.row.isDistribute == 0 && (scope.row.planStatus==0||scope.row.planStatus==2)"
                          @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">下发
               </el-button>
-              <el-button size="mini" type="text" v-if="scope.row.orgId==isEdit&&scope.row.isDistribute == 1 && scope.row.planStatus==1&&scope.row.parentId==null" icon="el-icon-arrow-down"
+              <el-button size="mini" type="text" v-if="scope.row.orgId==isEdit&&scope.row.isDistribute == 1 && scope.row.planStatus==1&&scope.row.parentId==null" icon="el-icon-refresh-left"
                          @click="handWithdraw(scope.row)" >撤回
               </el-button>
-
+              <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-if="scope.row.orgId==isEdit&&check==true"
+                         v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">编辑
+              </el-button>
+         
               <el-button size="mini" type="text" v-if="scope.row.parentOrgId==isEdit&&scope.row.parentId==null && check==true" icon="el-icon-delete" @click="handleDelete(scope.row)" 
                          v-hasPermi="['core:accessPlan:remove']">删除
               </el-button>
@@ -123,8 +125,8 @@
     <!-- 添加或修改监控调阅计划对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="计划名称" prop="planName">
-          <el-input v-model="form.planName" placeholder="请输入计划名称" maxlength="50" :disabled="form.isEdit"/>
+        <el-form-item label="任务名称" prop="planName">
+          <el-input v-model="form.planName" placeholder="请输入任务名称" maxlength="50" :disabled="form.isEdit"/>
         </el-form-item>
 
         <el-form-item label="机构类型" prop="orgType">
@@ -139,6 +141,19 @@
                        :value="`${dict.value}`" :disabled="form.isEdit||form.isComplete"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="调阅人员" prop="roleId">
+          <el-select style="width: 100%;" v-model="form.roleId" placeholder="请选择用户角色" @change="changeSelectOrgType">
+            <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id" :disabled="form.isEdit||form.isComplete"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="调阅次数" prop="planFrequency" v-if="form.isEdit==true">
+          <el-input type="number" @change="numChange"
+                    v-model.number="form.planFrequency" placeholder="请输入调阅次数" :disabled="form.isComplete"/>
+        </el-form-item>
+        <el-form-item label="调阅次数" prop="planFrequency" v-if="form.isEdit==false||form.isEdit==null">
+          <el-input type="number"  :min="1" oninput="if(value<0)value=1"
+                    v-model.number="form.planFrequency" placeholder="请输入调阅次数" :disabled="form.isComplete"/>
+        </el-form-item>
         <el-form-item label="立即生效" prop="immediately" v-if="form.planCycle!=0">
               <el-checkbox v-model="form.immediately" :disabled="form.isEdit||form.isComplete">
                 默认从下个周期生成任务，
@@ -160,29 +175,9 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="调阅角色" prop="roleId">
-          <el-select style="width: 100%;" v-model="form.roleId" placeholder="请选择调阅角色" @change="changeSelectOrgType">
-            <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id" :disabled="form.isEdit||form.isComplete"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="调阅频次" prop="planFrequency" v-if="form.isEdit==true">
-          <el-input type="number" @change="numChange"
-                    v-model.number="form.planFrequency" placeholder="请输入调阅频次" :disabled="form.isComplete"/>
-        </el-form-item>
-        <el-form-item label="调阅频次" prop="planFrequency" v-if="form.isEdit==false||form.isEdit==null">
-          <el-input type="number"  :min="1" oninput="if(value<0)value=1"
-                    v-model.number="form.planFrequency" placeholder="请输入调阅频次" :disabled="form.isComplete"/>
-        </el-form-item>
-        <!-- <el-form-item label="计划状态" prop="planStatus">
-          <el-radio-group v-model="form.planStatus">
-            <el-radio v-for="dict in dict.type.edu_plan_status" :key="dict.value" :label="dict.value" :disabled="form.isEdit">{{ dict.label
-              }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item> -->
-      
+     
+  
 
-       
         <el-form-item label="备注" prop="description">
           <el-input v-model="form.description" type="textarea" placeholder="请输入备注" :disabled="form.isEdit||form.isComplete"/>
         </el-form-item>
@@ -425,7 +420,7 @@
       handleAdd() {
         this.reset();
         this.open = true;
-        this.title = "新增监控调阅计划";
+        this.title = "新增监控调阅任务";
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
@@ -435,7 +430,7 @@
           this.form = response.data;
           this.initNum = response.data.parentFrequency; 
           this.open = true;
-          this.title = "修改监控调阅计划";
+          this.title = "编辑监控调阅任务";
           findRoleByType(this.form.orgType).then(response => {
           this.roleList = response;
         })

src/views/core/reportForms/safetyInspectReport.vue

@@ -0,0 +1,288 @@
+<template>
+    <div class="app-container">
+
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+
+            <el-form-item label="统计机构" prop="orgId">
+
+<el-select style="width: 100%;"  v-model="queryParams.orgId" placeholder="请选择统计机构">
+  <el-option v-for="item in orgOptions" :key="item.id" :label="item.name"
+    :value="item.id"></el-option>
+</el-select>
+</el-form-item>
+
+
+<el-form-item label="年份" prop="year">
+    <el-date-picker
+      value-format='yyyy'
+      v-model="queryParams.year"
+      type="year"
+      placeholder="选择年份">
+    </el-date-picker>
+        </el-form-item> 
+
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+  
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+                         v-hasPermi="['core:safetyInspectReport:export']">导出
+              </el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          </el-row>
+          <el-table
+            border
+            height="600"
+            size="small"
+            v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
+       
+            <el-table-column label="序号" align="center" min-width="50">
+              <template v-slot:default="scope">
+                <span v-text="getPageIndex(scope.$index)"> </span>
+              </template>
+            </el-table-column>
+          
+            <el-table-column label="单位名称" align="center" prop="orgName" />
+            <el-table-column label="网点数量" align="left" prop="networkNumber"/>
+            <el-table-column label="应检查次数" align="center" prop="planInspectNumber"/>
+            <el-table-column label="已检查次数" align="center" prop="realityInspectNumber"/>
+            <el-table-column label="检查率" align="center" prop="inspectRate"/>
+            <el-table-column label="隐患问题数" align="center" prop="pitfallNumber"/>
+  
+          </el-table>
+          <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                      :limit.sync="queryParams.pageSize"
+                      @pagination="getList"/>
+  
+    </div>
+  </template>
+  
+  <script>
+    import tableList from '@/mixins/tableList'
+    import {listReport,selectAllOrg} from "@/api/core/reportForms/safetyInspectReport";
+    import treeselect from '@riophae/vue-treeselect'
+    import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+    import {deptTreeSelect,businessTreeSelect} from "@/api/system/public";
+    import orgTree from "@/components/orgTree";
+    export default {
+      name: "Check",
+      /** 引入基础minxins*/
+      mixins: [tableList],
+      components: {treeselect,orgTree},
+      dicts: ['sys_normal_disable','sys_org_type'],
+      data() {
+        return {
+          // 遮罩层
+          loading: true,
+          // 选中数组
+          ids: [],
+          names: [],
+          // 非单个禁用
+          single: true,
+          //搜索tree
+          deptName: null,
+          // 非多个禁用
+          multiple: true,
+          // 显示搜索条件
+          showSearch: true,
+          //区域
+          roleOptions: [],
+           //全部检查机构
+      orgOptions: [],
+          //搜索tree
+          deptName: null,
+          // 部门树选项
+          deptOptions: [],
+          // 总条数
+          total: 0,
+          //区域集合
+          areaList: [],
+          // 区域采集点表格数据
+          checkList: [],
+          // 弹出层标题
+          title: "",
+          // 是否显示弹出层
+          open: false,
+          // 查询参数
+          queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+            checkName: null,
+            areaId: null,
+            orgId: null,
+            year:null
+          },
+          // 表单参数
+          form: {},
+          // 表单校验
+          checkList: [],
+          roleOptions: [],
+          defaultKeys: [],
+          //是否关联下级
+          checked: false,
+          defaultProps: {
+            children: "children",
+            label: "name"
+          },
+  
+          rules: {
+            areaId: [
+              {required: true, message: '请选择区域', trigger: 'blur'},
+            ],
+            orgType: [
+              {required: true, message: '请选择机构类型', trigger: 'blur'},
+            ],
+            checkName: [
+              {required: true, message: '请输入NFC点位名称', trigger: 'change'}
+            ],
+          },
+          defaultKeys: []
+  
+        };
+      },
+      created() {
+      this.  getAllOrg();
+      this. getList();
+      },
+      watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+          this.$refs.tree.filter(val);
+        }
+      },
+      methods: {
+
+   
+        getPageIndex($index) {
+          //表格序号
+          return (
+            (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+          );
+        },
+        handleExport() {
+      this.download('core/safetyInspectReport/export', {
+        ...this.queryParams
+      }, `${'【'+this.orgName+'】'+'-检查统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+    },
+    
+        /** 查询区域采集点列表 */
+        getList() {
+          this.loading = true;
+          listReport(this.queryParams).then(response => {
+         this.orgName=response.orgName;
+            this.checkList = response.data.rows;
+            this.total = response.data.total;
+            this.loading = false;
+          });
+        },
+        getAllOrg() {
+          selectAllOrg().then(response => {
+        this.orgOptions = response.data;
+      })
+    },
+ 
+    
+        // 取消按钮
+        cancel() {
+          this.open = false;
+          this.reset();
+        },
+        // 表单重置
+        reset() {
+          this.form = {
+            id: null,
+            checkName: null,
+            areaId: null,
+            orgId: null,
+            createTime: null,
+            updateTime: null,
+            updateId: null,
+            createBy: null,
+            delFlag: null,
+            updateBy: null
+          };
+          this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+          this.queryParams.pageNum = 1;
+          this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+          this.resetForm("queryForm");
+          this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+          this.ids = selection.map(item => item.id)
+          this.names = selection.map(item => item.checkName)
+          this.single = selection.length !== 1
+          this.multiple = !selection.length
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+          this.reset();
+          getCheck('').then(response => {
+  
+            this.roleOptions = response.areas;
+  
+            this.open = true;
+            this.title = "新增";
+            this.form.password = this.initPassword;
+          });
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+          this.reset();
+          const id = row.id || this.ids
+  
+          getCheck(id).then(response => {
+            this.form = response.data;
+            this.roleOptions = response.areas;
+            this.open = true;
+            this.title = "编辑";
+          });
+        },
+        /** 提交按钮 */
+        submitForm() {
+          this.$refs["form"].validate(valid => {
+            if (valid) {
+              if (this.form.id != null) {
+                updateCheck(this.form).then(response => {
+                  this.$modal.msgSuccess("处理成功");
+                  this.open = false;
+                  this.getList();
+                });
+              } else {
+                addCheck(this.form).then(response => {
+                  this.$modal.msgSuccess("处理成功");
+                  this.open = false;
+                  this.getList();
+                });
+              }
+            }
+          });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+          const ids = row.id || this.ids;
+          const names = row.checkName || this.names
+          this.$modal.confirm('是否确认删除区域NFC点位名称为"' + names + '"的数据项？').then(function () {
+            return delCheck(ids);
+          }).then(() => {
+            this.getList();
+            this.$modal.msgSuccess("删除成功");
+          }).catch(() => {
+          });
+        },
+  
+      }
+    };
+  </script>
+  

src/views/system/bind/index.vue

@@ -324,7 +324,7 @@ export default {
       }
       return {
         id: node.id,
-        label: node.name,
+        label: node.shortName,
         children: node.children
       }
     },

src/views/system/device/index.vue

@@ -15,12 +15,12 @@
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
             label-width="68px">
             <el-form-item label="设备名称" prop="deviceName">
-              <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" maxlength="50"
+              <el-input v-model="queryParams.deviceName" placeholder="请输入关键字" maxlength="50"
                 @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="资产类别" prop="assetType">
+            <el-form-item label="设备类别" prop="assetType">
 
-              <el-select style="width: 100%;"  v-model="queryParams.assetType" placeholder="请选择"
+              <el-select style="width: 100%;"  v-model="queryParams.assetType" placeholder="请选择设备类别"
                 @change="searchChangeSelectDevice">
                 <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
                   :value="`${dict.value}`"></el-option>
@@ -29,7 +29,7 @@
 
           <el-form-item label="设备分类" prop="deviceType">
 
-              <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择">
+              <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择设备种类">
                 <el-option v-for="item in searchDevices" :key="item.dictValue" :label="item.dictLabel"
                   :value="item.dictValue"></el-option>
               </el-select>
@@ -50,36 +50,32 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-              <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
-                v-hasPermi="['system:device:import']">导入</el-button>
-            </el-col>  -->
           <el-col :span="1.5">
             <el-button
               type="primary"
               icon="el-icon-plus"
               size="mini"
-              @click="handleImport"
-              v-hasPermi="['system:device:importData']"
-              >导入</el-button
+              @click="handleAdd"
+              v-hasPermi="['system:device:add']"
+              >新增设备</el-button
             >
           </el-col>
 
           <el-col :span="1.5">
             <el-button
               type="primary"
-              icon="el-icon-plus"
+              icon="el-icon-upload"
               size="mini"
-              @click="handleAdd"
-              v-hasPermi="['system:device:add']"
-              >新增</el-button
+              @click="handleImport"
+              v-hasPermi="['system:device:importData']"
+              >导入设备</el-button
             >
           </el-col>
 
           <el-col :span="1.5">
             <el-button
               type="primary"
-              icon="el-icon-plus"
+              icon="el-icon-download"
               size="mini"
               @click="handleOut"
               v-hasPermi="['system:user:export']"
@@ -99,6 +95,7 @@
           v-loading="loading"
           :data="deviceList"
           @selection-change="handleSelectionChange"
+          :header-cell-style="{backgroundColor:'#CCE8F7'}"
         >
           <!--<el-table-column type="selection" width="55" align="center" />-->
           <el-table-column label="序号" align="center" min-width="50">
@@ -109,7 +106,7 @@
           <el-table-column label="所属机构" align="left" prop="orgName" />
 
           <el-table-column
-            label="资产类别"
+            label="设备类别"
             align="center"
             key="assetType"
             prop="assetType"
@@ -137,15 +134,15 @@
               />
             </template>
           </el-table-column>
-          <el-table-column label="设备名称" align="center" prop="deviceName" />
-          <el-table-column label="设备品牌" align="center" prop="deviceBrand" />
+          <el-table-column label="设备名称" align="center" prop="deviceName"  />
+          <!-- <el-table-column label="设备品牌" align="center" prop="deviceBrand" />
           <el-table-column
             label="有效期至"
             align="center"
             prop="checkTime"
             width="160"
           >
-          </el-table-column>
+          </el-table-column> -->
           <!--    <el-table-column label="保修期限" align="center" prop="maintenanceTerm" /> -->
           <el-table-column
             label="操作"
@@ -213,11 +210,11 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="资产类别" prop="assetType">
+            <el-form-item label="设备类别" prop="assetType">
               <el-select
                 style="width: 100%"
                 v-model="form.assetType"
-                placeholder="请选择"
+                placeholder="请选择设备类别"
                 @change="changeSelectDevice"
               >
                 <el-option
@@ -234,7 +231,7 @@
               <el-select
                 style="width: 100%"
                 v-model="form.deviceType"
-                placeholder="请选择"
+                placeholder="请选择设备分类"
               >
                 <el-option
                   v-for="item in devices"
@@ -251,14 +248,14 @@
             <el-form-item label="设备名称" prop="deviceName">
               <el-input
                 v-model="form.deviceName"
-                placeholder="请输入"
+                placeholder="请进行设备命名"
                 maxlength="50"
               />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="设备品牌" prop="deviceBrand">
-              <el-input v-model="form.deviceBrand" placeholder="请输入" maxlength="50" />
+              <el-input v-model="form.deviceBrand" placeholder="请输入设备品牌" maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -266,13 +263,13 @@
           <el-col :span="12">
             <el-form-item
               v-if="form.deviceType == 2"
-              label="主机"
+              label="硬盘录像机"
               prop="hostId"
             >
               <el-select
                 style="width: 100%"
                 v-model="form.hostId"
-                placeholder="请选择"
+                placeholder="请选择关联主机"
               >
                 <el-option
                   v-for="item in hostList"
@@ -296,7 +293,7 @@
                 min="0"
                 oninput="if(value<=0)value=null;if(value>=64)value=64;value=parseInt(value)"
                 v-model="form.channel"
-                placeholder="请输入"
+                placeholder="请输入关联通道号"
               />
             </el-form-item>
           </el-col>
@@ -315,7 +312,7 @@
                 v-model="form.checkTime"
                 type="date"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择时间"
+                placeholder="请选择到期时间"
               >
               </el-date-picker>
             </el-form-item>
@@ -677,7 +674,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd(val) {
       this.open = true;
-      this.title = "新增";
+      this.title = "新增设备信息";
       this.form.orgId = this.selectOrgId;
       this.dept.id = this.selectOrgId;
       this.changeSelect(this.dept);
@@ -710,7 +707,7 @@ export default {
         this.devices = response.devices;
         this.hostList = response.hostList;
         this.open = true;
-        this.title = "编辑";
+        this.title = "编辑设备信息";
       });
     },
     /** 提交按钮 */