点位排序修改

ruoyi-ui/src/components/CommonComponents/PublicCoponents/editTree/TreeLog.vue

@@ -19,7 +19,7 @@
           <el-input v-model="dataForm.label" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item v-if="types.type !== 3" :label-width="formLabelWidth" label="排序编码" prop="id">
-          <el-input v-model="dataForm.id" type="number"></el-input>
+          <el-input v-model="dataForm.sort" type="number"></el-input>
         </el-form-item>
         <el-form-item v-if="types.type == 3" :label-width="formLabelWidth" label="排序编码" prop="id">
           <el-input v-model="dataForm.sort" type="number"></el-input>

ruoyi-ui/src/views/demo/date.vue

@@ -67,6 +67,9 @@ export default {
     },
     nextCanClick: {
       type: Boolean
+    },
+    totalData:{
+      type:Array
     }
   },
   data() {

ruoyi-ui/src/views/system/management/electronic-patrol/patrol-point/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="app-container">
     <div class="m-tree-data-box">
-      <tree-box :has-icon="true" :group-data="groupData" :title="'巡更点位分组'" class="m-tree-box" @addTree="addTree"
+      <tree-box :group-data="groupData" :has-icon="true" :title="'巡更点位分组'" class="m-tree-box"
+                @addTree="addTree"
                 @changeTree="changeTree" @deleteTree="deleteTree" @selectTree="selectTree"></tree-box>
       <div class="m-data-box">
         <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px"
@@ -120,9 +121,10 @@
               <div class="m-longitude-box">
                 <el-input v-model="form.longitude" placeholder="请输入经度"/>
                 <el-input v-model="form.dimension" placeholder="请输入纬度"/>
-<!--                <r-location :lan-lat="[114.48,38.06]" :isButton="true" :isLine="false" :lat.sync="form.dimension" :lng.sync="form.longitude"-->
-<!--                            placeholder="请选择点或路段"/>-->
-                <new-location :line-type="false" :map-center="[114.48,38.06]" :lat.sync="form.dimension" :lng.sync="form.longitude"></new-location>
+                <!--                <r-location :lan-lat="[114.48,38.06]" :isButton="true" :isLine="false" :lat.sync="form.dimension" :lng.sync="form.longitude"-->
+                <!--                            placeholder="请选择点或路段"/>-->
+                <new-location :lat.sync="form.dimension" :line-type="false" :lng.sync="form.longitude"
+                              :map-center="[114.48,38.06]"></new-location>
               </div>
             </el-form-item>
             <el-form-item label="打卡方式" prop="checkInWay">
@@ -179,10 +181,13 @@ import NewLocation from "@/components/CommonComponents/PublicCoponents/map/NewLo
 
 export default {
   name: "PatrolPoint",
-  components: {treeBox, RLocation,NewLocation},
+  components: {treeBox, RLocation, NewLocation},
   mixins: [tickt],
   data() {
-    return {change:false,
+    return {
+      //左侧分组类型
+      types: {},
+      change: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -263,14 +268,14 @@ export default {
       }
     };
   },
-  watch:{
-    'open':{
-      deep:true,
-      immediate:true,
-      handler(val){
-        if (val == false){
+  watch: {
+    'open': {
+      deep: true,
+      immediate: true,
+      handler(val) {
+        if (val == false) {
           this.change = false
-        }else {
+        } else {
           this.change = true
         }
       }
@@ -280,6 +285,12 @@ export default {
     this.getList();
     this.listPatrolPoint(this.params)
   },
+  mounted() {
+    const obj = {
+      type: 3
+    }
+    this.types = obj
+  },
   methods: {
     /** 查询巡更点位列表 */
     listPatrolPoint(val) {
@@ -349,7 +360,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       if (this.groupId == '') {
-        this.$message.error('前线选择左侧分组名称再进行添加点位的操作')
+        this.$message.error('请选择左侧分组名称再进行添加点位的操作')
         return
       } else {
         this.reset();

ruoyi-ui/src/views/system/management/institutional-organization/scheduling-person/index.vue

@@ -103,7 +103,7 @@
 
     <div>
       <date ref="dateMonth" :next-can-click="nextCanClick" :pro-can-click="proCanClick" :start-month="startMonth" :start-year="startYear"
-            :startMonth.sync='newMonth' :startYear.sync='newYear' @openDialog="handleAdd"></date>
+            :startMonth.sync='newMonth' :total-data="totalData" :startYear.sync='newYear' @openDialog="handleAdd"></date>
     </div>
 
 <!--    <pagination-->