Parcourir la source

列表页面超出部分处理

yf_zhb il y a 2 ans
Parent
commit
fc87ccee54

+ 82 - 12
minggao/src/page/recordForm/fieldSurveys.vue

@@ -86,16 +86,32 @@
             width="120"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column prop="lng" label="经度" width="80">
+          <el-table-column
+            prop="lng"
+            label="经度"
+            show-overflow-tooltip
+            width="80"
+          >
           </el-table-column>
-          <el-table-column prop="lat" label="纬度" width="80">
+          <el-table-column
+            prop="lat"
+            label="纬度"
+            show-overflow-tooltip
+            width="80"
+          >
           </el-table-column>
-          <el-table-column prop="height" label="海拔" width="80">
+          <el-table-column
+            prop="height"
+            label="海拔"
+            show-overflow-tooltip
+            width="80"
+          >
           </el-table-column>
           <el-table-column
             prop="inspect_area"
             label="踏查点面积"
             min-width="100"
+            show-overflow-tooltip
           >
           </el-table-column>
           <el-table-column
@@ -103,23 +119,56 @@
             label="发生生境"
             min-width="140"
             align="center"
+            show-overflow-tooltip
           >
             <template slot-scope="scope">
               {{ getOccursName(scope.row.occurs) }}
             </template>
           </el-table-column>
-          <el-table-column prop="pest_name" label="物种名称"> </el-table-column>
-          <el-table-column prop="harm_obj" label="危害对象"> </el-table-column>
-          <el-table-column prop="occurs_area" label="发生面积">
+          <el-table-column
+            prop="pest_name"
+            label="物种名称"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="harm_obj"
+            label="危害对象"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="occurs_area"
+            label="发生面积"
+            show-overflow-tooltip
+          >
           </el-table-column>
           <el-table-column prop="is_std" label="是否设置标准样地" width="140">
           </el-table-column>
-          <el-table-column prop="check_num" label="调查株数"> </el-table-column>
+          <el-table-column
+            prop="check_num"
+            label="调查株数"
+            show-overflow-tooltip
+          >
+          </el-table-column>
           <el-table-column prop="harm_num" label="危害株数"> </el-table-column>
-          <el-table-column prop="harm_place" label="危害部位">
+          <el-table-column
+            prop="harm_place"
+            label="危害部位"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="harm_rate"
+            label="危害率"
+            show-overflow-tooltip
+          >
           </el-table-column>
-          <el-table-column prop="harm_rate" label="危害率"> </el-table-column>
-          <el-table-column prop="sample_num" label="样本编号">
+          <el-table-column
+            prop="sample_num"
+            label="样本编号"
+            show-overflow-tooltip
+          >
           </el-table-column>
           <el-table-column prop="user_name" label="踏查人"> </el-table-column>
           <el-table-column prop="submit_time" label="提交时间" width="200">
@@ -145,7 +194,7 @@
     </el-card>
     <!-- 弹框 -->
     <el-dialog
-      title="表2:踏查记录表"
+      title="踏查记录表"
       :visible.sync="dialogVisible"
       width="1000px"
       :close-on-click-modal="false"
@@ -179,6 +228,7 @@
                 :precision="2"
                 :step="0.1"
                 :min="0.1"
+                :max="999999999"
               ></el-input-number>
             </el-form-item>
           </el-col>
@@ -190,6 +240,7 @@
                 :precision="2"
                 :step="0.1"
                 :min="0.1"
+                :max="999999999"
               ></el-input-number>
             </el-form-item>
           </el-col>
@@ -201,6 +252,7 @@
                 :precision="2"
                 :step="0.1"
                 :min="0.1"
+                :max="999999999"
               ></el-input-number>
             </el-form-item>
           </el-col>
@@ -233,6 +285,7 @@
             :precision="2"
             :step="0.1"
             :min="0.1"
+            :max="999999999"
           ></el-input-number>
         </el-form-item>
         <el-form-item label="发生生境:" prop="occurs_list">
@@ -278,6 +331,7 @@
             :precision="2"
             :step="0.1"
             :min="0.1"
+            :max="999999999"
           ></el-input-number>
         </el-form-item>
         <el-form-item label="是否设置标准样地:" prop="is_std">
@@ -296,6 +350,7 @@
               <el-input-number
                 v-model="baseForm.check_num"
                 :min="1"
+                :max="999999999"
               ></el-input-number>
             </el-form-item>
           </el-col>
@@ -308,6 +363,7 @@
               <el-input-number
                 v-model="baseForm.harm_num"
                 :min="1"
+                :max="999999999"
               ></el-input-number>
             </el-form-item>
           </el-col>
@@ -506,8 +562,22 @@ export default {
           ]
         },
         {
-          label: '水库道路周边地块、荒地(待建地、城乡失管地等)',
+          label: '水库道路周边地块',
           value: '4'
+        },
+        {
+          label: '荒地',
+          value: '5',
+          children: [
+            {
+              label: '待建地',
+              value: '5-1'
+            },
+            {
+              label: '城乡失管地',
+              value: '5-2'
+            }
+          ]
         }
       ],
       exportLoading: false

+ 36 - 10
minggao/src/page/recordForm/sampleAppraisal.vue

@@ -46,18 +46,43 @@
               <span>{{ (queryInfo.page - 1) * 20 + (scope.$index + 1) }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="sample_num" label="样本编号"></el-table-column>
-          <el-table-column prop="sample_name" label="样本名称">
+          <el-table-column
+            prop="sample_num"
+            label="样本编号"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="sample_name"
+            label="样本名称"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column prop="tag" label="标识" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column prop="num" label="数量" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="check_1"
+            label="检测项目与方法"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="check_2"
+            label="形态学鉴定"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="check_3"
+            label="分子生物学鉴定"
+            show-overflow-tooltip
+          >
           </el-table-column>
-          <el-table-column prop="tag" label="标识"> </el-table-column>
-          <el-table-column prop="num" label="数量"> </el-table-column>
-          <el-table-column prop="check_1" label="检测项目与方法">
+          <el-table-column prop="result" label="鉴定结果" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column prop="check_2" label="形态学鉴定"> </el-table-column>
-          <el-table-column prop="check_3" label="分子生物学鉴定">
+          <el-table-column prop="remarks" label="备注" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column prop="result" label="鉴定结果"> </el-table-column>
-          <el-table-column prop="remarks" label="备注"> </el-table-column>
           <el-table-column prop="check_time" label="鉴定时间" width="200">
           </el-table-column>
           <el-table-column label="操作" width="200">
@@ -88,7 +113,7 @@
     </el-card>
     <!-- 弹框 -->
     <el-dialog
-      title="表7:样本鉴定记录表"
+      title="样本鉴定记录表"
       :visible.sync="dialogVisible"
       width="800px"
       :close-on-click-modal="false"
@@ -126,6 +151,7 @@
           <el-input-number
             v-model="baseForm.num"
             :min="1"
+            :max="999999999"
             label="数量"
           ></el-input-number>
         </el-form-item>

+ 122 - 29
minggao/src/page/recordForm/samplePlot.vue

@@ -71,22 +71,51 @@
             prop="sample_num"
             label="标准样地编号"
             width="120"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             prop="sample_area"
             label="样地面积"
+            show-overflow-tooltip
           ></el-table-column>
-          <el-table-column prop="lng" label="经度"> </el-table-column>
-          <el-table-column prop="lat" label="纬度"> </el-table-column>
-          <el-table-column prop="height" label="海拔"> </el-table-column>
-          <el-table-column prop="occurs" label="发生境"> </el-table-column>
-          <el-table-column prop="pest_name" label="物种名称"> </el-table-column>
-          <el-table-column prop="pest_name_2" label="当地俗名">
+          <el-table-column prop="lng" label="经度" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column prop="lat" label="纬度" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column prop="is_check" label="是否需要辅助调查" width="140">
+          <el-table-column prop="height" label="海拔" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column prop="harm_obj" label="危害对象"> </el-table-column>
-          <el-table-column prop="harm_place" label="危害部位">
+          <el-table-column prop="occurs" label="发生境" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="pest_name"
+            label="物种名称"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="pest_name_2"
+            label="当地俗名"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="is_check"
+            label="是否需要辅助调查"
+            width="140"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="harm_obj"
+            label="危害对象"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="harm_place"
+            label="危害部位"
+            show-overflow-tooltip
+          >
           </el-table-column>
           <el-table-column prop="is_gather" label="是否采集样本" width="120">
           </el-table-column>
@@ -127,7 +156,7 @@
     </el-card>
     <!-- 弹框 -->
     <el-dialog
-      title="表5:外来入侵病虫害标准样地调查表"
+      title="外来入侵病虫害标准样地调查表"
       :visible.sync="dialogVisible"
       width="1000px"
       :close-on-click-modal="false"
@@ -170,6 +199,7 @@
                 :precision="2"
                 :step="0.1"
                 :min="0.1"
+                :max="999999999"
               ></el-input-number>
             </el-form-item>
           </el-col>
@@ -183,6 +213,7 @@
                 :precision="2"
                 :step="0.1"
                 :min="0.1"
+                :max="999999999"
               ></el-input-number>
             </el-form-item>
           </el-col>
@@ -194,6 +225,7 @@
                 :precision="2"
                 :step="0.1"
                 :min="0.1"
+                :max="999999999"
               ></el-input-number>
             </el-form-item>
           </el-col>
@@ -205,6 +237,7 @@
                 :precision="2"
                 :step="0.1"
                 :min="0.1"
+                :max="999999999"
               ></el-input-number>
             </el-form-item>
           </el-col>
@@ -213,7 +246,9 @@
           <el-checkbox-group v-model="baseForm.occurs_list" :max="1">
             <el-row v-for="item in habitatList" :key="item.value">
               <el-col>
-                <el-checkbox :label="item.value">{{ item.label }}</el-checkbox>
+                <el-checkbox :label="item.value" :disabled="!!item.children">{{
+                  item.label
+                }}</el-checkbox>
                 <span
                   class="character"
                   v-if="item.children && item.children.length"
@@ -295,12 +330,12 @@
           </el-col>
         </el-row>
         <el-table :data="baseForm.tableList" border style="margin-bottom:20px;">
-          <el-table-column label="样方/样线编号" align="center">
+          <el-table-column label="样方/样线编号" align="center" width="120">
             <template slot-scope="scope">
               {{ scope.row.row_name }}
             </template>
           </el-table-column>
-          <el-table-column label="1" align="center" width="120">
+          <el-table-column label="1" align="center" width="150">
             <template slot-scope="scope">
               <el-form-item
                 :prop="'tableList.' + scope.$index + '.num_1'"
@@ -310,15 +345,24 @@
                   trigger: 'blur'
                 }"
               >
-                <el-input
+                <el-input-number
+                  :precision="2"
+                  :step="1"
+                  :min="0.1"
+                  :max="999999999"
+                  @change="value => handleInputChange(value, scope.row)"
+                  v-model="scope.row.num_1"
+                  size="small"
+                ></el-input-number>
+                <!-- <el-input
                   @change="value => handleInputChange(value, scope.row)"
                   v-model="scope.row.num_1"
                   onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"
-                ></el-input>
+                ></el-input> -->
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="2" align="center" width="120">
+          <el-table-column label="2" align="center" width="150">
             <template slot-scope="scope">
               <el-form-item
                 :prop="'tableList.' + scope.$index + '.num_2'"
@@ -328,15 +372,24 @@
                   trigger: 'blur'
                 }"
               >
-                <el-input
+                <el-input-number
+                  :precision="2"
+                  :step="1"
+                  :min="0.1"
+                  :max="999999999"
+                  @change="value => handleInputChange(value, scope.row)"
+                  v-model="scope.row.num_2"
+                  size="small"
+                ></el-input-number>
+                <!-- <el-input
                   @change="value => handleInputChange(value, scope.row)"
                   v-model="scope.row.num_2"
                   onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"
-                ></el-input>
+                ></el-input> -->
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="3" align="center" width="120">
+          <el-table-column label="3" align="center" width="150">
             <template slot-scope="scope">
               <el-form-item
                 :prop="'tableList.' + scope.$index + '.num_3'"
@@ -346,15 +399,24 @@
                   trigger: 'blur'
                 }"
               >
-                <el-input
+                <el-input-number
+                  :precision="2"
+                  :step="1"
+                  :min="0.1"
+                  :max="999999999"
+                  @change="value => handleInputChange(value, scope.row)"
+                  v-model="scope.row.num_3"
+                  size="small"
+                ></el-input-number>
+                <!-- <el-input
                   @change="value => handleInputChange(value, scope.row)"
                   v-model="scope.row.num_3"
                   onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"
-                ></el-input>
+                ></el-input> -->
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="4" align="center" width="120">
+          <el-table-column label="4" align="center" width="150">
             <template slot-scope="scope">
               <el-form-item
                 :prop="'tableList.' + scope.$index + '.num_4'"
@@ -364,15 +426,24 @@
                   trigger: 'blur'
                 }"
               >
-                <el-input
+                <el-input-number
+                  :precision="2"
+                  :step="1"
+                  :min="0.1"
+                  :max="999999999"
+                  @change="value => handleInputChange(value, scope.row)"
+                  v-model="scope.row.num_4"
+                  size="small"
+                ></el-input-number>
+                <!-- <el-input
                   @change="value => handleInputChange(value, scope.row)"
                   v-model="scope.row.num_4"
                   onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"
-                ></el-input>
+                ></el-input> -->
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="5" align="center" width="120">
+          <el-table-column label="5" align="center" width="150">
             <template slot-scope="scope">
               <el-form-item
                 :prop="'tableList.' + scope.$index + '.num_5'"
@@ -382,15 +453,29 @@
                   trigger: 'blur'
                 }"
               >
-                <el-input
+                <el-input-number
+                  :precision="2"
+                  :step="1"
+                  :min="0.1"
+                  :max="999999999"
+                  @change="value => handleInputChange(value, scope.row)"
+                  v-model="scope.row.num_5"
+                  size="small"
+                ></el-input-number>
+                <!-- <el-input
                   @change="value => handleInputChange(value, scope.row)"
                   v-model="scope.row.num_5"
                   onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"
-                ></el-input>
+                ></el-input> -->
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="平均值" align="center" width="120">
+          <el-table-column
+            label="平均值"
+            align="center"
+            width="120"
+            fixed="right"
+          >
             <template slot-scope="scope">
               <el-input v-model="scope.row.num_6" disabled></el-input>
             </template>
@@ -931,11 +1016,19 @@ export default {
       });
     },
     validateSingleInputNumber(rule, value, callback) {
-      console.log(value, 'validateSingleInputNumber');
+      const index = rule.field.split('.')[1];
+
       if (!value) {
         callback(new Error('请输入大于0的数'));
       } else {
         if (Number(value) > 0) {
+          if (index - 0 === 2) {
+            if (value > 100) {
+              callback(new Error('危害率不能大于100'));
+            } else {
+              callback();
+            }
+          }
           callback();
         } else {
           callback(new Error('请输入大于0的数'));

+ 49 - 10
minggao/src/page/recordForm/trapRecord.vue

@@ -70,24 +70,47 @@
           <el-table-column
             prop="sample_num"
             label="标准样地编号"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             prop="sample_area"
             width="140"
             label="标准样地面积(亩)"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="lng"
+            label="经度"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="lat"
+            label="纬度"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="height"
+            label="海拔"
+            show-overflow-tooltip
           ></el-table-column>
-          <el-table-column prop="lng" label="经度"></el-table-column>
-          <el-table-column prop="lat" label="纬度"></el-table-column>
-          <el-table-column prop="height" label="海拔"></el-table-column>
           <el-table-column
             prop="trap_number"
             label="诱虫灯设备名称"
             width="150"
+            show-overflow-tooltip
           >
           </el-table-column>
-          <el-table-column prop="inducer_name" label="诱剂名称成分">
+          <el-table-column
+            prop="inducer_name"
+            label="诱剂名称成分"
+            show-overflow-tooltip
+          >
           </el-table-column>
-          <el-table-column prop="pest_type_num" label="入侵害虫种类">
+          <el-table-column
+            prop="pest_type_num"
+            label="入侵害虫种类"
+            show-overflow-tooltip
+          >
           </el-table-column>
           <el-table-column prop="user_name" label="调查人"> </el-table-column>
           <el-table-column prop="check_time" label="提交时间" width="200">
@@ -125,7 +148,7 @@
     </el-card>
     <!-- 弹框 -->
     <el-dialog
-      title="表6:农业外来入侵病虫诱捕器调查记录表"
+      title="农业外来入侵病虫诱捕器调查记录表"
       :visible.sync="dialogVisible"
       width="1000px"
       :close-on-click-modal="false"
@@ -168,6 +191,7 @@
                   :precision="2"
                   :step="0.1"
                   :min="0.1"
+                  :max="999999999"
                 ></el-input-number>
               </el-form-item>
             </el-col>
@@ -181,6 +205,7 @@
                   :precision="2"
                   :step="0.1"
                   :min="0.1"
+                  :max="999999999"
                 ></el-input-number>
               </el-form-item>
             </el-col>
@@ -191,6 +216,7 @@
                   :precision="2"
                   :step="0.1"
                   :min="0.1"
+                  :max="999999999"
                 ></el-input-number>
               </el-form-item>
             </el-col>
@@ -201,6 +227,7 @@
                   :precision="2"
                   :step="0.1"
                   :min="0.1"
+                  :max="999999999"
                 ></el-input-number>
               </el-form-item>
             </el-col>
@@ -294,11 +321,17 @@
                     trigger: 'change'
                   }"
                 >
-                  <el-input
+                  <el-input-number
+                    @change="value => handleInputChange(value, scope.row)"
+                    v-model="scope.row.female_num"
+                    :min="1"
+                    :max="999999999"
+                  ></el-input-number>
+                  <!-- <el-input
                     @change="value => handleInputChange(value, scope.row)"
                     v-model="scope.row.female_num"
                     onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"
-                  ></el-input>
+                  ></el-input> -->
                 </el-form-item>
               </template>
             </el-table-column>
@@ -312,11 +345,17 @@
                     trigger: 'change'
                   }"
                 >
-                  <el-input
+                  <el-input-number
+                    v-model="scope.row.male_num"
+                    :min="1"
+                    :max="999999999"
+                    @change="value => handleInputChange(value, scope.row)"
+                  ></el-input-number>
+                  <!-- <el-input
                     v-model="scope.row.male_num"
                     @change="value => handleInputChange(value, scope.row)"
                     onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"
-                  ></el-input>
+                  ></el-input> -->
                 </el-form-item>
               </template>
             </el-table-column>