Merge remote-tracking branch 'origin/master'

src/api/estate/feedback.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/cyzh-estate/feedback/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/cyzh-estate/feedback/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/cyzh-estate/feedback/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/cyzh-estate/feedback/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/cyzh-estate/feedback/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/api/estate/workordergroup.js

@@ -0,0 +1,58 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/cyzh-estate/workordergroup/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/cyzh-estate/workordergroup/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/cyzh-estate/workordergroup/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/cyzh-estate/workordergroup/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/cyzh-estate/workordergroup/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const tree = (groupType) => {
+  return request({
+    url: '/api/cyzh-estate/workordergroup/tree',
+    method: 'post',
+    params: groupType
+  })
+}
+

src/api/estate/workordergroupuser.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/cyzh-estate/workordergroupuser/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/cyzh-estate/workordergroupuser/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/cyzh-estate/workordergroupuser/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/cyzh-estate/workordergroupuser/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/cyzh-estate/workordergroupuser/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/components/3DScene/3DScene.vue

@@ -5,18 +5,18 @@
 </template>
 
 <script>
-import * as Three from 'three'
 import { CSS2DRenderer } from 'three/examples/jsm/renderers/CSS2DRenderer.js';
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
 import { OBJLoader } from 'three/examples/jsm/loaders/OBJLoader';
 import { MTLLoader } from 'three/examples/jsm/loaders/MTLLoader';
 import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader';
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
 import Box1 from "../3DMap/map-components/infobox/box1";
 import InfoLayer from "../3DMap/map-components/InfoLayer";
 import MapForScene from "./map";
 import TWEEN from '@tweenjs/tween.js'
 import Box2 from "../3DMap/map-components/infobox/box2";
+import * as Three from 'three';
 
 export default {
   name: "Scene3D",
@@ -173,7 +173,6 @@ export default {
       //初始化场景
       this.scene = new Three.Scene();
 
-
       //渲染器
       this.renderer = new Three.WebGLRenderer({antialias: true,alpha: true,logarithmicDepthBuffer: true});
       this.renderer.setSize(container.clientWidth, container.clientHeight);
@@ -186,7 +185,6 @@ export default {
       this.labelRenderer.domElement.style.position = 'absolute';
       this.labelRenderer.domElement.style.top = '0px';
       container.appendChild( this.labelRenderer.domElement );
-
       //坐标轴
       // let axes = new Three.AxisHelper(30000);
       //  this.scene.add(axes);
@@ -196,7 +194,7 @@ export default {
       this.scene.add(new Three.HemisphereLight(0xffffff,0xffffff,0.45));
 
       //控制器
-        this.controls = new OrbitControls(this.camera, this.labelRenderer.domElement);
+      this.controls = new OrbitControls(this.camera, this.labelRenderer.domElement);
       this.controls.minDistance = this.controlsOption.minDistance;
       this.controls.maxDistance = this.controlsOption.maxDistance;
       this.controls.autoRotate = this.controlsOption.autoRotate;
@@ -272,6 +270,151 @@ export default {
         this.camera.lookAt(to)
       })
       this.tween.start();
+    },
+
+    //---------------------------VR相关方法------------------------------
+    //VR初始化
+    initXR() {
+      if (QueryArgs.getBool('usePolyfill', true)) {
+        this.polyfill = new WebXRPolyfill();
+      }
+
+      let container = document.getElementById('3DScene');
+      this.xrButton = new WebXRButton({
+        onRequestSession: this.onRequestSession,
+        onEndSession: this.onEndSession
+      });
+      container.appendChild(this.xrButton.domElement);
+
+      if (navigator.xr) {
+        navigator.xr.isSessionSupported('immersive-vr').then(() => {
+          this.xrButton.enabled = true;
+        });
+
+        // Pick an arbitrary device for the magic window content and start
+        // up a non-immersive session if possible.
+        navigator.xr.requestSession('inline')
+          .then((session) => {
+            // Add the canvas to the document once we know that it will be
+            // rendered to.
+            this.onSessionStarted(session);
+          });
+      }
+    },
+    onButtonClicked() {
+      if (!this.xrSession) {
+        navigator.xr.requestSession('immersive-vr').then(this.onSessionStarted);
+      } else {
+        this.xrSession.end();
+      }
+    },
+    onResize (){
+      this.gl.canvas.width = (this.gl.canvas.offsetWidth * window.devicePixelRatio);
+      this.gl.canvas.height = (this.gl.canvas.offsetHeight * window.devicePixelRatio);
+    },
+    onXRFrame(t, frame) {
+      let session = frame.session;
+      // Ensure that we're using the right frame of reference for the session.
+      let frameOfRef = session.immersive ?
+        this.xrExclusiveFrameOfRef :
+        this.xrNonExclusiveFrameOfRef;
+      let pose = frame.getViewerPose(frameOfRef);
+
+      this.scene.startFrame();
+
+      session.requestAnimationFrame(this.onXRFrame);
+
+      this.gl.bindFramebuffer(this.gl.FRAMEBUFFER, session.baseLayer.framebuffer);
+      this.gl.clear(this.gl.COLOR_BUFFER_BIT | this.gl.DEPTH_BUFFER_BIT);
+
+      if (pose) {
+        for (let view of frame.views) {
+          let viewport = session.baseLayer.getViewport(view);
+          this.gl.viewport(viewport.x, viewport.y,
+            viewport.width, viewport.height);
+
+          this.scene.draw(view.projectionMatrix, pose.getViewMatrix(view));
+        }
+      }
+      this.scene.endFrame();
+    },
+    onRequestSession() {
+      navigator.xr.requestSession('immersive-vr').then((session) => {
+        this.xrButton.setSession(session);
+        this.onSessionStarted(session);
+      });
+    },
+    onEndSession(session) {
+      session.end();
+    },
+    onSessionStarted(session) {
+      session.addEventListener('end', this.onSessionEnded);
+
+      if (!this.gl) {
+        this.gl = createWebGLContext({
+          xrCompatible: true
+        });
+        let container = document.getElementById('3DScene');
+        container.appendChild(this.gl.canvas);
+        this.onResize();
+        window.addEventListener('resize', this.onResize);
+        this.vrRenderer = new Renderer(this.gl);
+
+        this.vrScene.setRenderer(this.vrRenderer);
+      }
+
+      // WebGL layers for inline sessions won't allocate their own framebuffer,
+      // which causes gl commands to naturally execute against the default
+      // framebuffer while still using the canvas dimensions to compute
+      // viewports and projection matrices.
+      let glLayer = new XRWebGLLayer(session, this.gl);
+
+      session.updateRenderState({
+        baseLayer: glLayer
+      });
+
+      let refSpaceType = session.isImmersive ? 'local' : 'viewer';
+      session.requestReferenceSpace(refSpaceType).then((refSpace) => {
+        // Since we're dealing with multiple sessions now we need to track
+        // which XRReferenceSpace is associated with which XRSession.
+        if (session.isImmersive) {
+          this.xrImmersiveRefSpace = refSpace;
+        } else {
+          this.xrInlineRefSpace = refSpace;
+        }
+        session.requestAnimationFrame(this.onXRFrame);
+      });
+    },
+    onSessionEnded(event) {
+      // Only reset the button when the immersive session ends.
+      if (event.session.immersive)
+        this.xrButton.setSession(null);
+    },
+    onXRFrame(t, frame) {
+      let session = frame.session;
+      /*// Ensure that we're using the right frame of reference for the session.
+      let frameOfRef = session.immersive ?
+        this.xrExclusiveFrameOfRef :
+        this.xrNonExclusiveFrameOfRef;
+      let pose = frame.getViewerPose(frameOfRef);*/
+
+      this.vrScene.startFrame();
+
+      session.requestAnimationFrame(this.onXRFrame);
+
+      // this.gl.bindFramebuffer(this.gl.FRAMEBUFFER, session.baseLayer.framebuffer);
+      // this.gl.clear(gl.COLOR_BUFFER_BIT | this.gl.DEPTH_BUFFER_BIT);
+      //
+      // if (pose) {
+      //   for (let view of frame.views) {
+      //     let viewport = session.baseLayer.getViewport(view);
+      //     this.gl.viewport(viewport.x, viewport.y,
+      //       viewport.width, viewport.height);
+      //
+      //     this.vrScene.draw(view.projectionMatrix, pose.getViewMatrix(view));
+      //   }
+      // }
+      this.vrScene.endFrame();
     }
   },
 
@@ -280,7 +423,7 @@ export default {
     await this.init();
     this.animate();
     window.addEventListener('resize', this.resize);
-  }
+  },
 }
 </script>
 

src/views/businessmng/estatemng/feedback.vue

@@ -0,0 +1,233 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.feedback_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+      <template slot="name" slot-scope="{row}">
+          <img v-if="row.avatar" :src="row.avatar" style="width:40px; height: 40px; border-radius:40px;vertical-align: middle;"/>
+          <span style="display: inline-block;vertical-align: middle; margin-left: 10px">{{row.name}}</span>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/estate/feedback";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "用户",
+              prop: "name",
+              slot: true,
+            },
+            {
+              label: "手机号码",
+              prop: "phone",
+            },
+            {
+              label: "所属园区",
+              prop: "agencyName",
+            },
+            {
+              label: "反馈内容",
+              prop: "content",
+              type: "textarea"
+            },
+            {
+              label: "图片",
+              prop: "images",
+              type: "upload",
+              dataType: 'string',
+              listType: 'picture-card',
+              propsHttp: {
+                res: "data",
+                url: "link"
+              },
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.feedback_add, false),
+          viewBtn: this.vaildData(this.permission.feedback_view, false),
+          delBtn: this.vaildData(this.permission.feedback_delete, false),
+          editBtn: this.vaildData(this.permission.feedback_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/businessmng/estatemng/parkrepair.vue

@@ -32,22 +32,43 @@
           <el-dropdown>
             <span class="el-dropdown-link">操作<i class="el-icon-arrow-down el-icon--right"></i></span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item icon="el-icon-view" type="text" @click.native="openWorkOrderForm(row)" v-if="row.hasWorkOrder === 0">生成工单</el-dropdown-item>
-              <el-dropdown-item icon="el-icon-view" type="text" @click.native="viewWorkOrderDetial(row)" v-if="row.hasWorkOrder === 1">工单详情</el-dropdown-item>
+              <el-dropdown-item icon="el-icon-view" type="text" @click.native="newWorkOrderForm(row)" v-if="row.hasWorkOrder === 0">生成工单</el-dropdown-item>
+              <el-dropdown-item icon="el-icon-view" type="text" @click.native="viewWorkOrderDetail(row)" v-if="row.hasWorkOrder === 1">工单详情</el-dropdown-item>
               <el-dropdown-item icon="el-icon-view" type="text" v-if="permission.device_heartbeat" @click.native="viewComment(row)">用户评价</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </el-button>
       </template>
+      <template slot="handleStatus" slot-scope="{row}">
+          <i v-if="row.handleStatus === 0" style="width:8px;height:8px;border-radius:50%;background-color:gray;display: inline-block;margin-right: 5px"></i>
+          <i v-if="row.handleStatus === 1" style="width:8px;height:8px;border-radius:50%;background-color:red;display: inline-block;margin-right: 5px"></i>
+          <i v-if="row.handleStatus === 2" style="width:8px;height:8px;border-radius:50%;background-color:green;display: inline-block;;margin-right: 5px"></i>
+          <i v-if="row.handleStatus === 3" style="width:8px;height:8px;border-radius:50%;background-color:orange;display: inline-block;margin-right: 5px"></i>
+          <span>{{row.$handleStatus}}</span>
+      </template>
     </avue-crud>
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :modal-append-to-body="false" :visible.sync="workOrderFormVisible" @close="workOrderFormClose" width="50%">
-      <avue-form :option="workOrderOption" v-model="workOrderForm" @submit="createWorkOrder"></avue-form>
-    </el-dialog>
+    <avue-crud ref="crud2" v-show="false" :option="workOrderOption" v-model="workOrderForm" @row-save="createWorkOrder"></avue-crud>
   </basic-container>
 </template>
 
 <script>
+  const dic=[{
+    value: 'zhinan',
+    label: '指南',
+    children: [{
+      value: 'shejiyuanze',
+      label: '设计原则',
+      children: [{
+        value: 'yizhi',
+        label: '一致'
+      }, {
+        value: 'fankui',
+        label: '反馈'
+      }]
+    }]
+  }]
   import {getList, getDetail, add, update, remove, generateWorkOrder} from "@/api/estate/repair";
+  import {getDetail as getWorkOrderDetail} from "@/api/estate/workorder";
   import {mapGetters} from "vuex";
 
   export default {
@@ -62,56 +83,6 @@
           total: 0
         },
         currentRepairId: null,
-        workOrderFormVisible: false,
-        groupArray: [
-          {
-            icon: 'el-icon-info',
-            label: '工单详情',
-            prop: 'group1',
-            viewDisplay: true,
-            addDisplay: false,
-            editDisplay: false,
-            column:[
-              {
-                label: "处理人",
-                prop: "handler",
-                rules: [{
-                  required: true,
-                  message: "请输入处理人",
-                  trigger: "blur"
-                }]
-              },
-              {
-                label: "处理人电话",
-                prop: "handlerPhone",
-                labelWidth: 100,
-                rules: [{
-                  required: true,
-                  message: "请输入处理人电话",
-                  trigger: "blur"
-                }]
-              },
-              {
-                label: "处理状态",
-                prop: "handleStatus",
-                rules: [{
-                  required: true,
-                  message: "请输入处理状态",
-                  trigger: "blur"
-                }]
-              },
-              {
-                label: "处理时间",
-                prop: "handleTime",
-                rules: [{
-                  required: true,
-                  message: "请输入处理时间",
-                  trigger: "blur"
-                }]
-              },
-            ]
-          }
-        ],
         selectionList: [],
         option: {
           height:'auto',
@@ -119,7 +90,7 @@
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 4,
           border: true,
           index: true,
           viewBtn: true,
@@ -209,7 +180,6 @@
               type: "select",
               disabled: true,
               addDisplay: false,
-              editDisplay: false,
               width: 100,
               dicData:[
                 {
@@ -225,11 +195,34 @@
                   value: 2
                 }
               ],
-              rules: [{
-                required: false,
-                message: "请输入受理状态：0：等待受理，1：已受理，2：拒绝受理",
-                trigger: "blur"
-              }]
+            },
+            {
+              label: "处理状态",
+              prop: "handleStatus",
+              type: "select",
+              search: true,
+              addDisplay: false,
+              searchSpan: 4,
+              width: 100,
+              slot: true,
+              dicData:[
+                {
+                  label: "未处理",
+                  value: 0
+                },
+                {
+                  label: "处理中",
+                  value: 1
+                },
+                {
+                  label: "已处理",
+                  value: 2
+                },
+                {
+                  label: "不作处理",
+                  value: 3
+                }
+              ],
             },
             {
               label: "所属园区",
@@ -292,6 +285,18 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "处理结果",
+              prop: "handleResult",
+              type: "textarea",
+              hide: true,
+              addDisplay: false,
+              rules: [{
+                required: false,
+                message: "请输入处理结果",
+                trigger: "blur"
+              }]
+            },
             {
               label: "事件图片",
               prop: "pic",
@@ -314,62 +319,26 @@
                 trigger: "blur"
               }]
             },
-          ],
-          group:[
             {
-              icon: 'el-icon-info',
-              label: '工单详情',
-              prop: 'group1',
-              viewDisplay: true,
+              label: "结果评分",
+              prop: "rate",
+              type: 'rate',
+              width: 150
+            },
+            {
+              label: "结果评价",
+              prop: "comment",
+              type: "textarea",
               addDisplay: false,
-              editDisplay: false,
-              column:[
-                {
-                  label: "处理人",
-                  prop: "handler",
-                  rules: [{
-                    required: true,
-                    message: "请输入处理人",
-                    trigger: "blur"
-                  }]
-                },
-                {
-                  label: "处理人电话",
-                  prop: "handlerPhone",
-                  labelWidth: 100,
-                  rules: [{
-                    required: true,
-                    message: "请输入处理人电话",
-                    trigger: "blur"
-                  }]
-                },
-                {
-                  label: "处理状态",
-                  prop: "handleStatus",
-                  rules: [{
-                    required: true,
-                    message: "请输入处理状态",
-                    trigger: "blur"
-                  }]
-                },
-                {
-                  label: "处理时间",
-                  prop: "handleTime",
-                  rules: [{
-                    required: true,
-                    message: "请输入处理时间",
-                    trigger: "blur"
-                  }]
-                },
-              ]
-            }
-          ]
+              hide: true
+            },
+          ],
         },
         data: [],
         workOrderOption:{
           group: [
             {
-              label: '生成工单',
+              label: '工单信息',
               icon: 'van-icon-location-o',
               arrow: false,
               column: [
@@ -397,27 +366,56 @@
                   ]
                 },
                 {
-                  label: '处理人',
-                  prop: 'handler',
+                  label: "工单团队",
+                  prop: "groupId",
+                  type: "select",
+                  cascaderItem: ['groupUserId'],
+                  viewDisplay: false,
+                  dicUrl: "/api/cyzh-estate/workordergroup/select",
+                  props: {
+                    label: "name",
+                    value: "id"
+                  },
                   rules: [
                     {
-                      required: true,
-                      message: '请选择姓名',
-                      trigger: 'blur'
-                    }
-                  ]
+                    required: true,
+                    message: "请选择工单团队",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "工单团队",
+                  prop: "groupName",
+                  viewDisplay: true,
+                  addDisplay: false,
                 },
                 {
-                  label: '处理人联系电话',
+                  label: "处理人",
+                  prop: "groupUserId",
+                  type: "select",
+                  viewDisplay: false,
+                  dicUrl: "/api/cyzh-estate/workordergroupuser/select?groupId={{key}}",
+                  props: {
+                    label: "person",
+                    value: "id"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请选择处理人",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "处理人",
+                  prop: "handler",
+                  viewDisplay: true,
+                  addDisplay: false,
+                },
+                {
+                  label: '处理人电话',
                   prop: 'handlerPhone',
-                  labelWidth: 120,
-                  rules: [
-                    {
-                      required: false,
-                      message: '请选择姓名',
-                      trigger: 'blur'
-                    }
-                  ]
+                  addDisplay:false,
+                  editDisplay: false,
                 },
                 {
                   label: '处理时间',
@@ -427,7 +425,7 @@
                   rules: [
                     {
                       required: false,
-                      message: '请选择姓名',
+                      message: '请选择处理时间',
                       trigger: 'blur'
                     }
                   ]
@@ -458,26 +456,37 @@
       }
     },
     methods: {
-      workOrderFormClose(){
-        this.currentRepairId = null;
-        this.workOrderFormVisible = false;
+      viewWorkOrderDetail(row){
+        this.$refs.crud2.rowView(row, row.$index);
+        getWorkOrderDetail(row.workOrderId).then(res => {
+          let data = res.data.data;
+          this.workOrderForm = {};
+          this.workOrderForm.workOrderName = data.orderName;
+          this.workOrderForm.bizTag = data.bizTag;
+          this.workOrderForm.handler = data.handler;
+          this.workOrderForm.handlerPhone = data.handlerPhone;
+          this.workOrderForm.handleTime = data.handleTime;
+          this.workOrderForm.groupName = data.groupName;
+          this.currentRepairId = row.id;
+        });
       },
-      openWorkOrderForm(row){
+      newWorkOrderForm(row){
+        this.workOrderForm = {};
         this.currentRepairId = row.id;
-        this.workOrderFormVisible = true;
+        this.$refs.crud2.rowAdd();
       },
-      createWorkOrder(done, type){
+      createWorkOrder(row,done,loading){
         this.workOrderForm.id = this.currentRepairId;
         generateWorkOrder(this.workOrderForm).then(res =>{
+          this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "工单生成成功!"
           });
+          this.currentRepairId = null;
+          this.workOrderForm = {};
+          done();
         });
-        this.currentRepairId = null;
-        this.workOrderFormVisible = false;
-        this.workOrderForm = {};
-        done();
       },
       rowSave(row, done, loading) {
         add(row).then(() => {
@@ -545,15 +554,15 @@
           });
       },
       beforeOpen(done, type) {
-        if (["add"].includes(type)) {
-          this.option.group = null;
-        }
+        // if (["add"].includes(type)) {
+        //   this.option.group = null;
+        // }
         if (["edit", "view"].includes(type)) {
-          if(type === "view"){
-            this.option.group = this.groupArray;;
-          }else{
-            this.option.group = null;
-          }
+          // if(type === "view"){
+          //   this.option.group = this.groupArray;
+          // }else{
+          //   this.option.group = null;
+          // }
           getDetail(this.form.id).then(res => {
             this.form = res.data.data;
           });

src/views/businessmng/estatemng/workordergroup.vue

@@ -0,0 +1,561 @@
+<template>
+  <el-row>
+    <el-col :span="14">
+      <basic-container>
+        <avue-crud :option="optionParent" :table-loading="loading" :data="dataParent" :page="pageParent" :permission="permissionList"
+                       :before-open="beforeOpen" v-model="formParent" ref="crud" @row-click="handleRowClick" @row-update="rowUpdate"
+                       @row-save="rowSave" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
+                       @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+                       @on-load="onLoadParent">
+              <template slot="menuLeft">
+                <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.alarmgroup_delete"
+                           @click="handleDelete">删 除
+                </el-button>
+              </template>
+              <template slot="residentialId" slot-scope="scope">
+                <div>{{scope.row.residentialName}}</div>
+              </template>
+              <template slot="residentialId" slot-scope="scope">{{scope.row.residentialName}}</template>
+              <template slot="residentialIdForm" slot-scope="scope">
+                <select-dialog-residential :id="formParent.residentialId" :name="formParent.residentialName" :callback="selectCallback"></select-dialog-residential>
+              </template>
+            </avue-crud>
+      </basic-container>
+    </el-col>
+    <el-col :span="10">
+      <basic-container>
+        <avue-crud :option="optionChild" :table-loading="loadingChild" :data="dataChild" :page="pageChild" :permission="permissionListChild"
+                   :before-open="beforeOpenChild" v-model="formChild" ref="crudChild" @row-update="rowUpdateChild" @row-save="rowSaveChild"
+                   @row-del="rowDelChild" @search-change="searchChangeChild" @search-reset="searchResetChild" @selection-change="selectionChangeChild"
+                   @current-change="currentChangeChild" @size-change="sizeChangeChild" @refresh-change="refreshChangeChild"
+                   @on-load="onLoadChild">
+          <template slot="menuLeft">
+            <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.alarmgroupuser_delete"
+                       @click="handleDeleteChild">删 除
+            </el-button>
+          </template>
+          <template slot="isHandler" slot-scope="scope">
+            <el-switch v-model="scope.row.isHandler" disabled>
+            </el-switch>
+          </template>
+        </avue-crud>
+      </basic-container>
+    </el-col>
+  </el-row>
+
+</template>
+
+<script>
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove
+} from "@/api/estate/workordergroup";
+import {
+  getList as getUserList,
+  getDetail as getUserDetail,
+  add as addUser,
+  update as updateUser,
+  remove as removeUser
+} from "@/api/estate/workordergroupuser";
+import {
+  mapGetters
+} from "vuex";
+import {validatePhone} from "../../../util/validator";
+import SelectDialogResidential from "../../../components/select-dialog/select-dialog-residential";
+
+var DIC = {
+  yes_no: [{
+    label: '否',
+    value: 0
+  }, {
+    label: '是',
+    value: 1
+  }]
+}
+
+export default {
+  components: {SelectDialogResidential},
+  data() {
+    return {
+      activeName: "device",
+      form:{},
+      formParent: {},
+      query: {},
+      loading: true,
+      pageParent: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      selectionList: [],
+      optionParent: {
+        height: 'auto',
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 8,
+        border: true,
+        index: true,
+        viewBtn: false,
+        dialogWidth: 600,
+        selection: true,
+        dialogClickModal: false,
+        menuPosition: "center",
+        column: [
+          {
+            label: "组名",
+            prop: "name",
+            row: true,
+            span: 20,
+            rules: [
+              {
+              required: true,
+              message: "请输入组名",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "工单类型",
+            prop: "groupType",
+            type: "select",
+            search: true,
+            value: 1,
+            span: 20,
+            dicData:[
+              {
+                label: "设备维护",
+                value: 1
+              },
+              {
+                label: "报事报修",
+                value: 2
+              }
+            ],
+            change: ({value,column}) =>{
+              let tagsObj = this.findObject(this.optionParent.column, "tags");
+              if(value === 1){
+                tagsObj.display = true;
+              }else{
+                tagsObj.display = false;
+              }
+            },
+            rules: [
+              {
+                required: true,
+                message: "请选择工单类型",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
+            label: "设备类型",
+            prop: "tags",
+            type: "select",
+            multiple: true,
+            display: true,
+            hide: false,
+            row: true,
+            span: 20,
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=iot_device_type",
+            props: {
+              label: "dictValue",
+              value: "dictKey",
+            },
+            dataType: "string",
+            rules: [{
+              required: true,
+              message: "请输入标识",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "负责区域",
+            prop: "residentialName",
+            addDisplay: false,
+            editDisplay: false,
+          },
+          {
+            label: "负责区域",
+            prop: "residentialId",
+            hide: true,
+            row: true,
+            span: 20,
+            type: "select",
+            viewDisplay:false,
+            dicUrl: "/api/cyzh-community/residential/list?size=100",
+            dicFormatter:(res)=>{
+              return res.data.records;//返回字典的层级结构
+            },
+            props: {
+              label: "name",
+              value: "id"
+            },
+            rules: [
+              {
+              required: true,
+              message: "请选择负责区域",
+              trigger: "blur"
+            }]
+          },
+        ]
+      },
+      dataParent: [],
+      repairDataParent: [],
+      //-----------------------------------------------------------------------------------------
+      formChild: {},
+      loadingChild: true,
+      pageChild: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      optionChild: {
+        height: 'auto',
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        menuPosition: "center",
+        dialogWidth: 600,
+        border: true,
+        index: true,
+        viewBtn: false,
+        selection: true,
+        dialogClickModal: false,
+        column: [
+        {
+          label: "成员",
+          prop: "person",
+          row: true,
+          span: 20,
+          labelWidth: 120,
+          rules: [
+          {
+            required: true,
+            message: "请输入成员名称",
+            trigger: "blur"
+          }]
+        },
+          {
+            label: "成员电话",
+            prop: "phone",
+            row: true,
+            labelWidth: 120,
+            span: 20,
+            rules: [{
+              required: true,
+              message: "请输入成员电话",
+            },{
+              validator: validatePhone,
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "默认处理人",
+            prop: "isHandler",
+            type: "switch",
+            slot: true,
+            span: 20,
+            labelWidth: 120,
+            dicData: [{
+              label: '否',
+              value: 0
+            }, {
+              label: '是',
+              value: 1
+            }],
+            rules: [{
+              required: false,
+              message: "请选择是否默认处理人",
+              trigger: "blur"
+            }]
+          },
+
+        ]
+      },
+      dataChild: []
+    };
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.iotalarmgroup_add, false),
+        viewBtn: this.vaildData(this.permission.iotalarmgroup_view, false),
+        delBtn: this.vaildData(this.permission.iotalarmgroup_delete, false),
+        editBtn: this.vaildData(this.permission.iotalarmgroup_edit, false)
+      };
+    },
+    permissionListChild() {
+      return {
+        addBtn: this.vaildData(this.permission.iotalarmgroupuser_add, false),
+        viewBtn: this.vaildData(this.permission.iotalarmgroupuser_view, false),
+        delBtn: this.vaildData(this.permission.iotalarmgroupuser_delete, false),
+        editBtn: this.vaildData(this.permission.iotalarmgroupuser_edit, false)
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    selectCallback(row){
+      this.formParent.residentialId = row.id;
+      this.formParent.residentialName = row.name;
+    },
+    rowSave(row, done, loading) {
+      add(row).then(() => {
+        this.onLoadParent(this.pageParent);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        window.console.log(error);
+      });
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(() => {
+        this.onLoadParent(this.pageParent);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        console.log(error);
+      });
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoadParent(this.pageParent);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoadParent(this.pageParent);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        /*getDetail(this.formParent.id).then(res => {
+          this.formParent = res.data.data;
+        });*/
+      }
+      done();
+    },
+    handleRowClick(row) {
+      this.query = {};
+      this.parentId = row.id;
+      this.dictValue = row.dictValue;
+      this.$refs.crudChild.value.code = row.code;
+      this.$refs.crudChild.value.parentId = row.id;
+      this.onLoadChild(this.pageChild);
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoadParent(this.pageParent);
+    },
+    searchChange(params, done) {
+      let tagsObj = this.findObject(this.optionParent.column, "tags");
+      if(params.groupType === 2){
+        tagsObj.hide = true;
+      }else{
+        tagsObj.hide = false;
+      }
+      this.query = params;
+      this.pageParent.currentPage = 1;
+      this.onLoadParent(this.pageParent, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.pageParent.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.pageParent.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoadParent(this.pageParent, this.query);
+    },
+    onLoadParent(page, params = {}) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.pageParent.total = data.total;
+        this.dataParent = data.records;
+        if (this.dataParent.length > 0) {
+          this.parentId = this.dataParent[0].id;
+          this.onLoadChild(this.pageChild);
+        }
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    rowSaveChild(row, done, loading) {
+      row.groupId = this.parentId;
+      addUser(row).then(() => {
+        this.onLoadChild(this.pageChild);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        window.console.log(error);
+      });
+    },
+    rowUpdateChild(row, index, done, loading) {
+      updateUser(row).then(() => {
+        this.onLoadChild(this.pageChild);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        console.log(error);
+      });
+    },
+    rowDelChild(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return removeUser(row.id);
+        })
+        .then(() => {
+          this.onLoadChild(this.pageChild);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    handleDeleteChild() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoadChild(this.pageChild);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    beforeOpenChild(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getUserDetail(this.formChild.id).then(res => {
+          this.formChild = res.data.data;
+        });
+      }
+      done();
+    },
+    searchResetChild() {
+      this.query = {};
+      this.onLoadChild(this.pageChild);
+    },
+    searchChangeChild(params, done) {
+      this.query = params;
+      this.pageChild.currentPage = 1;
+      this.onLoadChild(this.pageChild, params);
+      done();
+    },
+    selectionChangeChild(list) {
+      this.selectionList = list;
+    },
+    selectionClearChild() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChangeChild(currentPage) {
+      this.pageChild.currentPage = currentPage;
+    },
+    sizeChangeChild(pageSize) {
+      this.pageChild.pageSize = pageSize;
+    },
+    refreshChangeChild() {
+      this.onLoadChild(this.pageChild, this.query);
+    },
+    onLoadChild(page, params = {}) {
+      this.loadingChild = true;
+      params.groupId = this.parentId;
+      getUserList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.pageChild.total = data.total;
+        this.dataChild = data.records;
+        // debugger
+        this.dataChild.forEach(item => {
+          item.isHandler = item.isHandler == 1;
+        })
+        this.loadingChild = false;
+        this.selectionClearChild();
+      });
+    }
+  }
+};
+</script>
+
+<style>
+</style>

src/views/businessmng/estatemng/workordergroupuser.vue

@@ -0,0 +1,243 @@
+<template>
+  <basic-container>
+    <avue-crud :option="optionChild"
+               :table-loading="loadingChild"
+               :data="dataChild"
+               :page="pageChild"
+               :permission="permissionListChild"
+               :before-open="beforeOpenChild"
+               v-model="formChild"
+               ref="crud"
+               @row-update="rowUpdateChild"
+               @row-save="rowSaveChild"
+               @row-del="rowDelChild"
+               @search-change="searchChangeChild"
+               @search-reset="searchResetChild"
+               @selection-change="selectionChangeChild"
+               @current-change="currentChangeChild"
+               @size-change="sizeChangeChild"
+               @refresh-change="refreshChangeChild"
+               @on-load="onLoadChild">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.alarmgroupuser_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/estate/workordergroupuser";
+  import {mapGetters} from "vuex";
+  import {validatePhone} from "../../../util/validator";
+
+  export default {
+    data() {
+      return {
+        formChild: {},
+        query: {},
+        loadingChild: true,
+        pageChild: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        optionChild: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "组id",
+              prop: "groupId",
+              rules: [{
+                required: true,
+                message: "请输入组id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "责任人",
+              prop: "person",
+              rules: [{
+                required: true,
+                message: "请输入责任人",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "责任人电话",
+              prop: "phone",
+              rules: [{
+                required: true,
+                message: "请输入责任人电话",
+              },{
+                validator: validatePhone,
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "是否为处理人",
+              prop: "phone",
+              type: "switch",
+              mock:{
+                type:'dic'
+              },
+              rules: [{
+                required: true,
+                message: "请输入是否为处理人",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        dataChild: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionListChild() {
+        return {
+          addBtn: this.vaildData(this.permission.alarmgroupuser_add, false),
+          viewBtn: this.vaildData(this.permission.alarmgroupuser_view, false),
+          delBtn: this.vaildData(this.permission.alarmgroupuser_delete, false),
+          editBtn: this.vaildData(this.permission.alarmgroupuser_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSaveChild(row, done, loading) {
+        add(row).then(() => {
+          this.onLoadChild(this.pageChild);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdateChild(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoadChild(this.pageChild);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDelChild(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoadChild(this.pageChild);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDeleteChild() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoadChild(this.pageChild);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpenChild(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.formChild.id).then(res => {
+            this.formChild = res.data.data;
+          });
+        }
+        done();
+      },
+      searchResetChild() {
+        this.query = {};
+        this.onLoadChild(this.pageChild);
+      },
+      searchChangeChild(params, done) {
+        this.query = params;
+        this.pageChild.currentPage = 1;
+        this.onLoadChild(this.pageChild, params);
+        done();
+      },
+      selectionChangeChild(list) {
+        this.selectionList = list;
+      },
+      selectionClearChild() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChangeChild(currentPage){
+        this.pageChild.currentPage = currentPage;
+      },
+      sizeChangeChild(pageSize){
+        this.pageChild.pageSize = pageSize;
+      },
+      refreshChangeChild() {
+        this.onLoadChild(this.pageChild, this.query);
+      },
+      onLoadChild(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.pageChild.total = data.total;
+          this.dataChild = data.records;
+          this.loadingChild = false;
+          this.selectionClearChild();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/dashboard/parkingmng/comps/parking-data.vue

@@ -19,7 +19,7 @@
         <img v-if="index % 2== 0" src="/img/icon/outer.png" style="width: 16px;height: 16px;"/>
       </div>
       <div class="area4">A1</div>
-      <div class="area5">0{{index}}:2{{index}}</div>
+      <div class="area5">{{index}}:{{index}}</div>
     </div>
 
   </div>