Merge branch 'feature/phaseOne' into feature/appletsModify

src/views/modules/epidemic/testingpoint-add-or-update.vue

@@ -1,10 +1,10 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '180px' : '120px'">
-          <el-form-item label="监测点名称" prop="testingPointName">
-          <el-input v-model="dataForm.testingPointName" placeholder="监测点名称" maxlength="100" show-word-limit></el-input>
+          <el-form-item label="检测" prop="testingPointName">
+          <el-input v-model="dataForm.testingPointName" placeholder="监测" maxlength="100" show-word-limit></el-input>
       </el-form-item>
-          <el-form-item label="监测点介绍">
+          <el-form-item label="介绍">
           <el-input type="textarea" autosize placeholder="请输入内容" v-model="dataForm.introduce" maxlength="200"></el-input>
       </el-form-item>
           <el-form-item label="负责人" prop="contacts">

src/views/modules/epidemic/testingpoint-detail.vue

@@ -1,10 +1,10 @@
 <template>
   <el-dialog :visible.sync="visible" title="详情" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '180px' : '120px'">
-          <el-form-item label="监测点名称">
+          <el-form-item label="监测">
           <div>{{dataForm.testingPointName}}</div>
       </el-form-item>
-          <el-form-item label="监测点介绍">
+          <el-form-item label="介绍">
           <div>{{dataForm.introduce}}</div>
       </el-form-item>
           <el-form-item label="负责人">
@@ -13,7 +13,7 @@
           <el-form-item label="联系电话">
           <div>{{dataForm.tel}}</div>
       </el-form-item>
-          <el-form-item label="监测点位置">
+          <el-form-item label="位置">
           <div>{{dataForm.address}}</div>
       </el-form-item>
           <el-form-item label="经度">

src/views/modules/epidemic/testingpoint.vue

@@ -3,7 +3,7 @@
     <div class="mod-custom__testingpoint}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.testingPointName" placeholder="按监测点名称模糊查询" clearable></el-input>
+          <el-input v-model="dataForm.testingPointName" placeholder="按监测模糊查询" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
@@ -14,7 +14,7 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="testingPointName" label="监测点名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="testingPointName" label="监测" header-align="center" align="center"></el-table-column>
         <el-table-column prop="address" label="位置" header-align="center" align="center"></el-table-column>
         <el-table-column prop="contacts" label="负责人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="tel" label="联系电话" header-align="center" align="center"></el-table-column>