数据中心 名称统一修改

data-ui/src/views/data/digitalagriculture/breedingFarm/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="true" label-width="90px" @submit.native.prevent>
-      <el-form-item label="户主名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入户主名称"
+          placeholder="请输入名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -67,7 +67,7 @@
 
     <el-table v-loading="loading" :data="breedingFarmList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="户主名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="年份" align="center" prop="year"/>
       <el-table-column label="数量" align="center" prop="number"/>
       <el-table-column label="种类" align="center" prop="varieties">
@@ -139,8 +139,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="户主名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入户主名称名称" maxlength="32"/>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称名称" maxlength="32"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -349,7 +349,7 @@
         // 表单校验
         rules: {
           name: [
-            {required: true, message: "户主名称名称不能为空", trigger: "blur"}
+            {required: true, message: "名称名称不能为空", trigger: "blur"}
           ],
           deptId: [
             {required: true, message: "所属部门不能为空", trigger: "change"}

data-ui/src/views/data/digitalagriculture/filingsLivestock/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px" @submit.native.prevent>
-      <el-form-item label="养殖场名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入养殖场名称"
+          placeholder="请输入名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -83,7 +83,7 @@
 
     <el-table v-loading="loading" :data="filingsLivestockList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="养殖场名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="详细通讯地址" align="center" prop="address"/>
       <el-table-column label="所属部门" align="center" prop="deptName"/>
       <el-table-column label="经度" align="center" prop="longitude"/>
@@ -148,8 +148,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="养殖场名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入养殖场名称" maxlength="50"/>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" maxlength="50"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -344,7 +344,7 @@
         // 表单校验
         rules: {
           name: [
-            {required: true, message: "养殖场名称不能为空", trigger: "blur"}
+            {required: true, message: "名称不能为空", trigger: "blur"}
           ],
           deptId: [
             {required: true, message: "所属部门不能为空", trigger: "change"}

data-ui/src/views/data/digitalagriculture/greenhousefilm/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="98px" @submit.native.prevent>
-      <el-form-item label="棚膜园区名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入棚膜园区名称"
+          placeholder="请输入名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -83,7 +83,7 @@
 
     <el-table v-loading="loading" :data="greenhousefilmList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="棚膜园区名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="园区地址" align="center" prop="address"/>
       <el-table-column label="经营主体名称" align="center" prop="operateName"/>
       <el-table-column label="园区总栋数" align="center" prop="parkBuilds"/>
@@ -128,8 +128,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="棚膜园区名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入棚膜园区名称" maxlength="20"/>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" maxlength="20"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">

data-ui/src/views/data/digitalagriculture/livestock/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px" @submit.native.prevent>
-      <el-form-item label="养殖场名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入养殖场名称"
+          placeholder="请输入名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -70,7 +70,7 @@
       <el-table-column label="所属部门" align="center" prop="deptName"/>
       <el-table-column label="经度" align="center" prop="longitude"/>
       <el-table-column label="纬度" align="center" prop="latitude"/>
-      <el-table-column label="养殖场名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="详细通讯地址" align="center" prop="address"/>
       <el-table-column label="联系人" align="center" prop="contacts"/>
       <el-table-column label="联系电话" align="center" prop="phone"/>
@@ -135,8 +135,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="养殖场名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入养殖场名称" maxlength="32"/>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" maxlength="32"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -320,7 +320,7 @@
             {required: true, message: "所属部门不能为空", trigger: "change"}
           ],
           name: [
-            {required: true, message: "养殖场名称不能为空", trigger: "blur"}
+            {required: true, message: "名称不能为空", trigger: "blur"}
           ],
           breedVarieties: [
             {required: true, message: "养殖品种不能为空", trigger: "change"}

data-ui/src/views/data/digitalemergency/enterprises/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="true" label-width="90px" @submit.native.prevent>
-      <el-form-item label="企业名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入企业名称"
+          placeholder="请输入名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -67,7 +67,7 @@
 
     <el-table v-loading="loading" :data="enterprisesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="企业名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="负责人" align="center" prop="contacts"/>
       <el-table-column label="联系电话" align="center" prop="phone"/>
       <el-table-column label="企业类别" align="center" prop="category">
@@ -130,8 +130,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="企业名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入企业名称" maxlength="32"/>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" maxlength="32"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -280,7 +280,7 @@
         // 表单校验
         rules: {
           name: [
-            {required: true, message: "企业名称名称不能为空", trigger: "blur"}
+            {required: true, message: "名称名称不能为空", trigger: "blur"}
           ],
           deptId: [
             {required: true, message: "所属部门不能为空", trigger: "change"}

data-ui/src/views/data/digitalemergency/team/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
-      <el-form-item label="队伍名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入队伍名称"
+          placeholder="请输入名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -70,7 +70,7 @@
       <!--<el-table-column label="主键ID" align="center" prop="id"/>
       <el-table-column label="数据所属部门(政或党的id)" align="center" prop="dataDeptId"/>
       <el-table-column label="数据状态(1-可用 2-不可用 )" align="center" prop="dataStatus"/>-->
-      <el-table-column label="队伍名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <!--<el-table-column label="类别(字典项目)" align="center" prop="teamType"/>-->
       <el-table-column label="队伍性质" align="center" prop="teamNature">
         <template slot-scope="scope">
@@ -127,8 +127,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="队伍名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入队伍名称" maxlength="30"/>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" maxlength="30"/>
             </el-form-item>
             <el-form-item label="队伍人数(正式)" prop="personnumberZ">
               <el-input v-model="form.personnumberZ" placeholder="请输入队伍人数(正式)" maxlength="5"/>
@@ -285,7 +285,7 @@ export default {
       // 表单校验
       rules: {
         name: [
-          {required: true, message: '队伍名称不能为空', trigger: 'change'}
+          {required: true, message: '名称不能为空', trigger: 'change'}
         ],
         teamNature: [
           {required: true, message: '队伍性质不能为空', trigger: 'change'}

data-ui/src/views/data/digitalemergency/warehouse/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
-      <el-form-item label="仓库名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入仓库名称"
+          placeholder="请输入名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -68,7 +68,7 @@
     <el-table v-loading="loading" :data="warehouseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <!--<el-table-column label="主键ID" align="center" prop="id"/>-->
-      <el-table-column label="仓库名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="经度" align="center" prop="longitude"/>
       <el-table-column label="纬度" align="center" prop="latitude"/>
       <!--<el-table-column label="所属部门id" align="center" prop="deptId"/>-->
@@ -110,8 +110,8 @@
     <!-- 添加或修改仓库信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" class="form-style">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="仓库名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入仓库名称" maxlength="50"/>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" maxlength="50"/>
         </el-form-item>
         <el-form-item label="所属部门" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true" :noResultsText="'空'" :noOptionsText="'空'"
@@ -239,7 +239,7 @@ export default {
       // 表单校验
       rules: {
         name: [
-          {required: true, message: '仓库名称不能为空', trigger: 'change'}
+          {required: true, message: '名称不能为空', trigger: 'change'}
         ],
         deptId: [
           {required: true, message: '所属部门不能为空', trigger: 'change'}

data-ui/src/views/data/digitalenvironment/keyenterprise/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
-      <el-form-item label="企业名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入企业名称"
+          placeholder="请输入名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -96,7 +96,7 @@
     <el-table v-loading="loading" :data="keyenterpriseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <!--<el-table-column label="主键id" align="center" prop="id"/>-->
-      <el-table-column label="企业名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="企业代码" align="center" prop="code"/>
       <el-table-column label="企业联系人" align="center" prop="legalPerson"/>
       <el-table-column label="联系电话" align="center" prop="contactsPhone"/>
@@ -144,8 +144,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="企业名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入企业名称" maxlength="50"/>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -278,7 +278,7 @@
         // 表单校验
         rules: {
           name: [
-            {required: true, message: '企业名称不能为空', trigger: 'blur'}
+            {required: true, message: '名称不能为空', trigger: 'blur'}
           ],
           code: [
             {required: true, message: '企业代码不能为空', trigger: 'blur'}

data-ui/src/views/data/digitalenvironment/monitor/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
-      <el-form-item label="断面名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入断面名称"
+          placeholder="请输入名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -69,7 +69,7 @@
     <el-table v-loading="loading" :data="monitorList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="所属部门名称" align="center" prop="deptName"/>
-      <el-table-column label="断面名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="经度" align="center" prop="longitude"/>
       <el-table-column label="纬度" align="center" prop="latitude"/>
       <el-table-column label="县（市）区" align="center" prop="district"/>
@@ -125,8 +125,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="160px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="断面名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入断面名称" maxlength="32"/>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" maxlength="32"/>
             </el-form-item>
 
           </el-col>
@@ -312,7 +312,7 @@
             {validator: checkLat, trigger: 'blur'}
           ],
           name: [
-            {required: true, message: "断面名称不能为空", trigger: "blur"}
+            {required: true, message: "名称不能为空", trigger: "blur"}
           ],
           districtHead: [
             {required: true, message: "县（区）负责人不能为空", trigger: "blur"}

data-ui/src/views/data/digitalfirecontrol/foamliquid/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
-      <el-form-item label="单位名称" prop="company">
+      <el-form-item label="名称" prop="company">
         <el-input
           v-model="queryParams.company"
-          placeholder="请输入单位名称"
+          placeholder="请输入名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -78,7 +78,7 @@
     <el-table v-loading="loading" :data="foamliquidList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <!--<el-table-column label="主键id" align="center" prop="id"/>-->
-      <el-table-column label="单位名称" align="center" prop="company"/>
+      <el-table-column label="名称" align="center" prop="company"/>
       <el-table-column label="泡沫液储量" align="center" prop="reserves"/>
       <el-table-column label="联系人" align="center" prop="contacts"/>
       <el-table-column label="联系电话" align="center" prop="contactsPhone"/>
@@ -133,8 +133,8 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="单位名称" prop="company">
-              <el-input v-model="form.company" placeholder="请输入单位名称" maxlength="20"/>
+            <el-form-item label="名称" prop="company">
+              <el-input v-model="form.company" placeholder="请输入名称" maxlength="20"/>
             </el-form-item>
             <el-form-item label="联系人" prop="contacts">
               <el-input v-model="form.contacts" placeholder="请输入联系人" maxlength="20"/>
@@ -263,7 +263,7 @@ export default {
       // 表单校验
       rules: {
         company: [
-          {required: true, message: '单位名称不能为空', trigger: 'blur'}
+          {required: true, message: '名称不能为空', trigger: 'blur'}
         ],
         contacts: [
           {required: true, message: '联系人不能为空', trigger: 'blur'}

data-ui/src/views/data/digitalfirecontrol/sensor/index.vue

@@ -68,7 +68,7 @@
 
     <el-table v-loading="loading" :data="sensorList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="传感器名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="安装位置" align="center" prop="address"/>
       <el-table-column label="编号" align="center" prop="number"/>
       <el-table-column label="设置参数" align="center" prop="parameters"/>
@@ -113,7 +113,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="名称" prop="name" label-width="120px">
-              <el-input v-model="form.name" placeholder="请输入传感器名称" maxlength="20"/>
+              <el-input v-model="form.name" placeholder="请输入名称" maxlength="20"/>
             </el-form-item>
             <el-form-item label="负责人" prop="contacts" label-width="120px">
               <el-input v-model="form.contacts" placeholder="请输入负责人名称" maxlength="20"/>

data-ui/src/views/data/digitalforest/channel/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
-      <el-form-item label="渠道名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入渠道名称"
+          placeholder="请输入名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -140,7 +140,7 @@
     <el-table v-loading="loading" :data="channelList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <!--      <el-table-column label="主键id" align="center" prop="id" />-->
-      <el-table-column label="渠道名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="水源面积" align="center" prop="sourceArea"/>
       <el-table-column label="水量" align="center" prop="volume"/>
       <el-table-column label="联系人" align="center" prop="channelPerson"/>
@@ -203,8 +203,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="渠道名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入渠道名称" :disabled="disabled" maxlength="20"/>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" :disabled="disabled" maxlength="20"/>
             </el-form-item>
             <el-form-item label="水源面积" prop="sourceArea">
               <el-input v-model="form.sourceArea" placeholder="请输入水源面积" :disabled="disabled" maxlength="50"/>
@@ -374,7 +374,7 @@
         // 表单校验
         rules: {
           name: [
-            {required: true, message: '渠道名称不能为空', trigger: 'blur'}
+            {required: true, message: '名称不能为空', trigger: 'blur'}
           ],
           sourceArea: [
             {validator: checkPositiveDecimal, trigger: 'blur'}

data-ui/src/views/data/digitalforest/keyFireproofPlots/index.vue

@@ -2,10 +2,10 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90"
              @submit.native.prevent>
-      <el-form-item label="单位名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入单位名称"
+          placeholder="请输入名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -78,7 +78,7 @@
 
     <el-table v-loading="loading" :data="keyFireproofPlotsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="单位名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="面积（公顷）" align="center" prop="plotsArea"/>
       <el-table-column label="经度" align="center" prop="longitude"/>
       <el-table-column label="纬度" align="center" prop="latitude"/>
@@ -129,8 +129,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="单位名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入单位名称" :disabled="disabled" maxlength="50"/>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" :disabled="disabled" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -278,7 +278,7 @@ export default {
       // 表单校验
       rules: {
         name: [
-          {required: true, message: '单位名称不能为空', trigger: 'blur'}
+          {required: true, message: '名称不能为空', trigger: 'blur'}
         ],
         longitude: [
           {required: true, message: '经度不能为空', trigger: ['change', 'blur']},

data-ui/src/views/data/digitalforest/landing/index.vue

@@ -34,10 +34,10 @@
       <!--          placeholder="请选择维护时间">-->
       <!--        </el-date-picker>-->
       <!--      </el-form-item>-->
-      <el-form-item label="起降点名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入起降点名称"
+          placeholder="请输入名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -149,7 +149,7 @@
     <el-table v-loading="loading" :data="landingList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <!--<el-table-column label="主键id" align="center" prop="id"/>-->
-      <el-table-column label="起降点名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="负责人" align="center" prop="landingPerson"/>
       <el-table-column label="电话" align="center" prop="landingTel"/>
       <el-table-column label="维护周期" align="center" prop="landingCycle"/>
@@ -210,8 +210,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="起降点名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入起降点名称" :disabled="disabled" maxlength="20"/>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" :disabled="disabled" maxlength="20"/>
             </el-form-item>
             <el-form-item label="负责人" prop="landingPerson">
               <el-input v-model="form.landingPerson" placeholder="请输入负责人" :disabled="disabled" maxlength="20"/>
@@ -361,7 +361,7 @@ export default {
       // 表单校验
       rules: {
         name: [
-          {required: true, message: '起降点名称不能为空', trigger: 'blur'}
+          {required: true, message: '名称不能为空', trigger: 'blur'}
         ],
         landingPerson: [
           {required: true, message: '负责人不能为空', trigger: 'blur'}

src/main/java/com/sooka/sponest/data/digitalagriculture/domain/CenterdataTFarmAgriculturalCooperatives.java

@@ -29,11 +29,11 @@ public class CenterdataTFarmAgriculturalCooperatives extends BaseBusinessEntity
     private String id;
 
     /**
-     * 申请单位名称
+     * 名称
      */
-    @ApiModelProperty(value = "单位名称", required = true)
-    @Excel(name = "单位名称")
-    @NotBlank(message = "单位名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

src/main/java/com/sooka/sponest/data/digitalagriculture/domain/CenterdataTFarmBreedingFarm.java

@@ -30,11 +30,11 @@ public class CenterdataTFarmBreedingFarm extends BaseBusinessEntity {
     private String id;
 
     /**
-     * 户主名称
+     * 名称
      */
-    @ApiModelProperty(value = "户主名称", required = true)
-    @Excel(name = "户主名称")
-    @NotBlank(message = "户主名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

src/main/java/com/sooka/sponest/data/digitalagriculture/domain/CenterdataTFarmFilingsLivestock.java

@@ -31,11 +31,11 @@ public class CenterdataTFarmFilingsLivestock extends BaseBusinessEntity {
     private String id;
 
     /**
-     * 养殖场名称
+     * 名称
      */
-    @ApiModelProperty(value = "养殖场名称", required = true)
-    @Excel(name = "养殖场名称")
-    @NotBlank(message = "养殖场名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

src/main/java/com/sooka/sponest/data/digitalagriculture/domain/CenterdataTFarmLivestock.java

@@ -61,11 +61,11 @@ public class CenterdataTFarmLivestock extends BaseBusinessEntity {
     private String latitude;
 
     /**
-     * 养殖场名称
+     * 名称
      */
-    @ApiModelProperty(value = "养殖场名称", required = true)
-    @Excel(name = "养殖场名称")
-    @NotBlank(message = "养殖场名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

src/main/java/com/sooka/sponest/data/digitalagriculture/domain/vo/CenterdataTFarmGreenhouseFilmVo.java

@@ -30,11 +30,11 @@ public class CenterdataTFarmGreenhouseFilmVo extends BaseBusinessEntity {
     private String id;
 
     /**
-     * 棚膜园区名称
+     * 名称
      */
-    @ApiModelProperty(value = "棚膜园区名称", required = true)
-    @Excel(name = "棚膜园区名称")
-    @NotBlank(message = "棚膜园区名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

src/main/java/com/sooka/sponest/data/digitalemergency/domain/CenterdataTEmergencyEnterprises.java

@@ -47,11 +47,11 @@ public class CenterdataTEmergencyEnterprises extends BaseBusinessEntity {
     private String deptName;
 
     /**
-     * 企业名称
+     * 名称
      */
-    @ApiModelProperty(value = "企业名称", required = false)
-    @Excel(name = "企业名称")
-    @NotBlank(message = "企业名称不能为空")
+    @ApiModelProperty(value = "名称", required = false)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

src/main/java/com/sooka/sponest/data/digitalemergency/domain/CenterdataTEmergencyTeam.java

@@ -44,11 +44,11 @@ public class CenterdataTEmergencyTeam extends BaseBusinessEntity {
     private String dataStatus;
 
     /**
-     * 队伍名称
+     * 名称
      */
-    @ApiModelProperty(value = "队伍名称", required = true)
-    @Excel(name = "队伍名称")
-    @NotBlank(message = "队伍名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

src/main/java/com/sooka/sponest/data/digitalemergency/domain/CenterdataTEmergencyWarehouse.java

@@ -44,11 +44,11 @@ public class CenterdataTEmergencyWarehouse extends BaseBusinessEntity {
     private String dataStatus;
 
     /**
-     * 仓库名称
+     * 名称
      */
-    @ApiModelProperty(value = "仓库名称", required = true)
-    @Excel(name = "仓库名称")
-    @NotBlank(message = "仓库名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

src/main/java/com/sooka/sponest/data/digitalenvironment/domain/CenterdataTEnvironmentKeyEnterprise.java

@@ -31,7 +31,7 @@ public class CenterdataTEnvironmentKeyEnterprise extends BaseBusinessEntity {
      * 名称
      */
     @ApiModelProperty(value = "名称", required = false)
-    @Excel(name = "企业名称")
+    @Excel(name = "名称")
     @NotBlank(message = "名称不能为空")
     private String name;
 

src/main/java/com/sooka/sponest/data/digitalenvironment/domain/CenterdataTEnvironmentSewageOutlet.java

@@ -53,11 +53,11 @@ public class CenterdataTEnvironmentSewageOutlet extends BaseBusinessEntity {
     private String address;
 
     /**
-     * 排污口名称
+     * 名称
      */
-    @Excel(name = "排污口名称")
-    @NotBlank(message = "排污口名称不能为空")
-    @ApiModelProperty(value = "排污口名称", required = false)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
+    @ApiModelProperty(value = "名称", required = false)
     private String name;
 
     /**

src/main/java/com/sooka/sponest/data/digitalenvironment/domain/CenterdataTHydraulicWaterMonitor.java

@@ -71,10 +71,10 @@ public class CenterdataTHydraulicWaterMonitor extends BaseBusinessEntity {
     private String waterBody;
 
     /**
-     * 断面名称
+     * 名称
      */
-    @Excel(name = "断面名称")
-    @NotBlank(message = "断面名称不能为空")
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

src/main/java/com/sooka/sponest/data/digitalfirecontrol/domain/CenterdataTFirecontrolBasicLinkageForce.java

@@ -45,7 +45,7 @@ public class CenterdataTFirecontrolBasicLinkageForce extends BaseBusinessEntity
     private String institutionName;
 
     /**
-     * 单位名称
+     * 名称
      */
     @ApiModelProperty(value = "名称", required = true)
     @Excel(name = "名称")

src/main/java/com/sooka/sponest/data/digitalfirecontrol/domain/CenterdataTFirecontrolFireForce.java

@@ -119,7 +119,12 @@ public class CenterdataTFirecontrolFireForce extends BaseBusinessEntity {
     @NotBlank(message = "所属部门不能为空")
     private String deptName;
 
+    /**
+     * 名称
+     */
     @ApiModelProperty(value = "名称", required = false)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     @ApiModelProperty(value = "getdeviceList", required = false)

src/main/java/com/sooka/sponest/data/digitalfirecontrol/domain/CenterdataTFirecontrolFirePressureSensor.java

@@ -31,11 +31,11 @@ public class CenterdataTFirecontrolFirePressureSensor extends BaseBusinessEntity
     private String id;
 
     /**
-     * 传感器名称
+     * 名称
      */
-    @ApiModelProperty(value = "传感器名称", required = true)
-    @Excel(name = "传感器名称")
-    @NotBlank(message = "传感器名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

src/main/java/com/sooka/sponest/data/digitalfirecontrol/domain/CenterdataTFirecontrolFoamLiquid.java

@@ -31,11 +31,11 @@ public class CenterdataTFirecontrolFoamLiquid extends BaseBusinessEntity {
     private String id;
 
     /**
-     * 单位名称
+     * 名称
      */
-    @ApiModelProperty(value = "单位名称", required = true)
-    @Excel(name = "单位名称")
-    @NotBlank(message = "单位名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String company;
 
     /**

src/main/java/com/sooka/sponest/data/digitalfirecontrol/domain/CenterdataTFirecontrolFulltimeStation.java

@@ -84,7 +84,11 @@ public class CenterdataTFirecontrolFulltimeStation extends BaseBusinessEntity {
     @NotBlank(message = "所属部门不能为空")
     private String deptName;
 
+    /**
+     * 所属部门
+     */
     @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
     @NotBlank(message = "名称不能为空")
     private String name;
     public List<String> getdeviceList() {

src/main/java/com/sooka/sponest/data/digitalfirecontrol/domain/CenterdataTFirecontrolOtherLinkageForce.java

@@ -31,7 +31,7 @@ public class CenterdataTFirecontrolOtherLinkageForce extends BaseBusinessEntity
     private String id;
 
     /**
-     * 单位
+     * 名称
      */
     @ApiModelProperty(value = "名称", required = true)
     @Excel(name = "名称")

src/main/java/com/sooka/sponest/data/digitalforest/domain/CenterdataTForestChannel.java

@@ -29,11 +29,11 @@ public class CenterdataTForestChannel extends BaseBusinessEntity {
     private String id;
 
     /**
-     * 渠道名称
+     * 名称
      */
-    @ApiModelProperty(value = "渠道名称",required = true)
-    @Excel(name = "渠道名称")
-    @NotBlank(message = "渠道名称不能为空")
+    @ApiModelProperty(value = "名称",required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

src/main/java/com/sooka/sponest/data/digitalforest/domain/CenterdataTForestKeyFireproofPlots.java

@@ -28,11 +28,11 @@ public class CenterdataTForestKeyFireproofPlots extends BaseBusinessEntity {
     private String id;
 
     /**
-     * 单位名称
+     * 名称
      */
-    @ApiModelProperty(value = "单位名称")
-    @Excel(name = "单位名称")
-    @NotBlank(message = "单位名称不能为空")
+    @ApiModelProperty(value = "名称")
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

src/main/java/com/sooka/sponest/data/digitalforest/domain/CenterdataTForestLanding.java

@@ -69,11 +69,11 @@ public class CenterdataTForestLanding extends BaseBusinessEntity {
     private Date landingTime;
 
     /**
-     * 起降点名称
+     * 名称
      */
-    @ApiModelProperty(value = "起降点名称", required = true)
-    @Excel(name = "起降点名称")
-    @NotBlank(message = "起降点名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**