Merge remote-tracking branch 'origin/feature_select_by_dept' into feature_select_by_dept

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

@@ -259,7 +259,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="区域" prop="points" @dblclick.native="showMap">
-              <el-input v-model="form.points" placeholder="鼠标双击选择区域" :disabled="disabled" disabled/>
+              <el-input v-model="form.points" placeholder="鼠标双击选择区域" :disabled="disabled" readonly/>
             </el-form-item>
           </el-col>
         </el-row>

data-ui/src/views/data/digitalwater/length/index.vue

@@ -219,7 +219,7 @@
                           placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'"/>
             </el-form-item>
             <el-form-item label="排序" prop="sort">
-              <el-input v-model="form.sort" placeholder="请输入排序" maxlength="50"/>
+              <el-input-number controls-position="right" v-model="form.sort" placeholder="请输入排序" maxlength="50" :min="1" :max="99999"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">

data-ui/src/views/data/digitalwater/track/index.vue

@@ -173,7 +173,7 @@
           <el-input v-model="form.type" placeholder="请选择类型"/>
         </el-form-item>-->
         <el-form-item label="任务轨迹" prop="patrolTrajectory" @dblclick.native="showMapTwo">
-          <el-input v-model="form.patrolTrajectory" placeholder="鼠标双击选择任务轨迹"  disabled maxlength="32"/>
+          <el-input v-model="form.patrolTrajectory" placeholder="鼠标双击选择任务轨迹"  readonly maxlength="32"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

data-ui/src/views/data/generalbusiness/camera/index.vue

@@ -119,7 +119,7 @@
 
 
           <el-form-item label="区域标记" prop="latLngs" @dblclick.native="showMap">
-            <el-input v-model="form.latLngs" placeholder="鼠标双击选择区域标记" disabled maxlength="32"/>
+            <el-input v-model="form.latLngs" placeholder="鼠标双击选择区域标记" readonly maxlength="32"/>
           </el-form-item>
           </el-col>
         </el-row>

src/main/java/com/sooka/sponest/data/digitalwater/service/impl/CenterdataTHydraulicRiverLengthServiceImpl.java

@@ -76,7 +76,7 @@ public class CenterdataTHydraulicRiverLengthServiceImpl extends BaseServiceImpl
         centerdataTHydraulicRiverLength.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTHydraulicRiverLength.setCreateBy(SecurityUtils.getUserId().toString());
         if (StringUtils.isNull(centerdataTHydraulicRiverLength.getSort())){
-            centerdataTHydraulicRiverLength.setSort(999l);
+            centerdataTHydraulicRiverLength.setSort(99l);
         }
         return centerdataTHydraulicRiverLengthMapper.insertCenterdataTHydraulicRiverLength(centerdataTHydraulicRiverLength);
     }
@@ -93,7 +93,7 @@ public class CenterdataTHydraulicRiverLengthServiceImpl extends BaseServiceImpl
         centerdataTHydraulicRiverLength.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTHydraulicRiverLength.setUpdateTime(DateUtils.getNowDate());
         if (StringUtils.isNull(centerdataTHydraulicRiverLength.getSort())){
-            centerdataTHydraulicRiverLength.setSort(999l);
+            centerdataTHydraulicRiverLength.setSort(99l);
         }
         return centerdataTHydraulicRiverLengthMapper.updateCenterdataTHydraulicRiverLength(centerdataTHydraulicRiverLength);
     }