Merge remote-tracking branch 'origin/master'

src/api/contracted/cbdkxx.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request';
+
+// 承包地块信息列表
+export function listCbdkxx(params) {
+    return request({
+      url: '/service/cbdkxx/mobile/list',
+      method: 'get',
+      params: params
+    });
+}
+
+// 承包地块详情
+export function getCbdkxx(id) {
+  return request({
+    url: '/service/cbdkxx/get/' + id,
+    method: 'get'
+  });
+}
+
+// 新增承包地块信息
+export function addCbdkxx(data) {
+  return request({
+    url: '/service/cbdkxx/insert',
+    method: 'post',
+    data: data
+  });
+}
+
+// 修改承包地块信息
+export function updateCbdkxx(data) {
+  return request({
+    url: '/service/cbdkxx/modify',
+    method: 'post',
+    data: data
+  });
+}
+
+// 删除承包地块信息
+export function deleteCbdkxx(id) {
+  return request({
+    url: '/service/cbdkxx/delete/' + id,
+    method: 'get'
+  });
+}
+
+// 转出承包地块
+export function transferCbdkxx(params) {
+  return request({
+    url: '/service/cbdkxx/transfer',
+    method: 'get',
+    params: params
+  });
+}
+

src/api/contracted/cbf.js

@@ -0,0 +1,79 @@
+import request from '@/utils/request';
+
+// 获取承包方列表
+export function listCbf(params) {
+  return request({
+    url: '/service/cbf/list',
+    method: 'get',
+    params: params
+  });
+}
+
+// 获取承包方详情
+export function getCbf(cbfbm) {
+  return request({
+    url: '/service/cbf/obtain/' + cbfbm,
+    method: 'get',
+  });
+}
+
+// 获取承包方详情
+export function getCbfById(id) {
+  return request({
+    url: '/service/cbf/get/' + id,
+    method: 'get'
+  });
+}
+
+// 新增承包方信息
+export function addCbf(data) {
+  return request({
+    url: '/service/cbf/add',
+    method: 'post',
+    data: data
+  });
+}
+
+// 更新承包方信息
+export function updateCbf(data) {
+  return request({
+    url: '/service/cbf/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除承包方信息
+export function deleteCbf(id) {
+  return request({
+    url: '/service/cbf/delete/' + id,
+    method: 'get'
+  });
+}
+
+// 生成承包方编码
+export function generateContractorCode(params) {
+  return request({
+    url: '/service/cbf/generateCode',
+    method: 'get',
+    params: params
+  });
+}
+
+// 承包方调查签字
+export function contractorSignature(data) {
+  return request({
+    url: '/service/cbf/surveySign',
+    method: 'post',
+    data: data
+  });
+}
+
+// 调查挂起
+export function hangUp(data) {
+  return request({
+    url: '/service/cbf/hangUp',
+    method: 'post',
+    data: data
+  });
+}

src/api/contracted/cbfjtcy.js

@@ -0,0 +1,70 @@
+import request from '@/utils/request';
+
+// 查询承包方家庭成员列表
+export function listJtcy(params) {
+  return request({
+    url: '/service/jtcy/list',
+    method: 'get',
+    params: params
+  });
+}
+
+// 查询承包方家庭成员详细
+export function getJtcy(id) {
+  return request({
+    url: '/service/jtcy/get/' + id,
+    method: 'get'
+  });
+}
+
+// 新增承包方家庭成员信息
+export function addJtcy(data) {
+  return request({
+    url: '/service/jtcy/add',
+    method: 'post',
+    data: data
+  });
+}
+
+// 修改承包方家庭成员信息
+export function updateJtcy(data) {
+  return request({
+    url: '/service/jtcy/edit',
+    method: 'post',
+    data: data
+  });
+}
+
+// 删除承包方家庭成员信息
+export function deleteJtcy(id) {
+  return request({
+    url: '/service/jtcy/remove/' + id,
+    method: 'get'
+  });
+}
+
+// 家庭成员分户
+export function divisionJtcy(id) {
+  return request({
+    url: '/service/jtcy/division/' + id,
+    method: 'get'
+  });
+}
+
+// 家庭成员移户
+export function transferJtcy(params) {
+  return request({
+    url: '/service/jtcy/transfer',
+    method: 'get',
+    params: params
+  });
+}
+
+// 家庭成员设为户主
+export function setHouseholder(id) {
+  return request({
+    url: '/service/jtcy/householder/' + id,
+    method: 'get'
+  });
+}
+

src/api/contracted/cbht.js

@@ -0,0 +1,35 @@
+import request from '@/utils/request';
+
+// 获取承包合同详情
+export function getCbht(cbfbm) {
+  return request({
+    url: '/service/cbht/obtain/' + cbfbm,
+    method: 'get'
+  });
+}
+
+// 新增承包合同信息
+export function addCbht(data) {
+  return request({
+    url: '/service/cbht/insert',
+    method: 'post',
+    data: data
+  });
+}
+
+// 修改承包合同信息
+export function updateCbht(data) {
+  return request({
+    url: '/service/cbht/edit',
+    method: 'post',
+    data: data
+  });
+}
+
+// 承包合同延期
+export function extendCbht(id) {
+  return request({
+    url: '/service/cbht/extension/' + id,
+    method: 'get'
+  });
+}

src/api/contracted/dk.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request';
+
+// 地块信息列表
+export function listDk(params) {
+  return request({
+    url: '/service/dk/list',
+    method: 'get',
+    params: params
+  });
+}
+
+// 地块信息详情
+export function getDk(id) {
+  return request({
+    url: '/service/dk/get/' + id,
+    method: 'get'
+  });
+}
+
+// 新增地块属性信息
+export function addDk(data) {
+  return request({
+    url: '/service/dk/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改地块属性信息
+export function updateDk(data) {
+  return request({
+    url: '/service/dk/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除地块信息
+export function deleteDk(id) {
+  return request({
+    url: '/service/dk/remove/' + id,
+    method: 'get'
+  });
+}
+
+
+// 生成地块编码
+export function generateLandCode(params) {
+  return request({
+    url: '/service/dk/generateCode',
+    method: 'get',
+    params: params
+  });
+}

src/api/contracted/fbf.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request';
+
+// 获取承包方列表
+export function listFbf(params) {
+  return request({
+    url: '/service/fbf/list',
+    method: 'get',
+    params: params
+  });
+}
+
+// 新增发包方信息
+export function addFbf(data) {
+  return request({
+    url: '/service/fbf/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改发包方信息
+export function updateFbf(data) {
+  return request({
+    url: '/service/fbf/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 发包方调查签字
+export function manualSignature(data) {
+  return request({
+    url: '/service/fbf/surveySign',
+    method: 'post',
+    data: data
+  });
+}
+
+// 生成发包方编码
+export function generateEmployerCode(params) {
+  return request({
+    url: '/service/fbf/generateCode',
+    method: 'get',
+    params: params
+  });
+}
+
+// 发包方签字授权
+  export function authorizeSignature(id) {
+  return request({
+    url: '/service/fbf/authorize/' + id,
+    method: 'get'
+  });
+}

src/api/contracted/index.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request';
+
+// 根据deptId获取部门信息
+export function getDept(deptId) {
+  return request({
+    url: '/system/dept/get/' + deptId,
+    method: 'get'
+  });
+}
+
+// 获取确权调查任务列表
+export function listSurveyTask(params) {
+  return request({
+    url: '/service/landsurvey/mobile/list',
+    method: 'get',
+    params: params
+  });
+}

src/api/system/config.js

@@ -58,3 +58,11 @@ export function refreshCache() {
     method: 'delete'
   })
 }
+
+// 根据参数键名查询参数值
+// export function getConfigKey(configKey) {
+//   return request({
+//     url: '/open/typz/configKey/' + configKey,
+//     method: 'get'
+//   })
+// }

src/permission.js

@@ -9,7 +9,7 @@ import { isRelogin } from '@/utils/request'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/register', '/app/login', '/app/list', '/app/edit']
+const whiteList = ['/login', '/register', '/app/login', '/app/list', '/app/edit', '/app/map']
 
 const isWhiteList = (path) => {
   return whiteList.some(pattern => isPathMatch(pattern, path))

src/router/index.js

@@ -87,7 +87,61 @@ export const constantRoutes = [
         meta: { title: '个人中心', icon: 'user' }
       }
     ]
-  }
+  },
+  { //登录页
+    path: '/app/login',
+    name: 'appLogin',
+    hidden: true,
+    meta: {
+      title: '登录',
+    },
+    component: (resolve) => require(['@/views/app/login'], resolve)
+  },
+  { //首页
+    path: '/app/index',
+    name: 'appIndex',
+    hidden: true,
+    meta: {
+      title: '首页',
+    },
+    component: (resolve) => require(['@/views/app/index'], resolve)
+  },
+  { //用户页
+    path: '/app/user',
+    name: 'appUser',
+    hidden: true,
+    meta: {
+      title: '首页',
+    },
+    component: (resolve) => require(['@/views/app/user'], resolve)
+  },
+  { //用户页
+    path: '/app/list',
+    name: 'appList',
+    hidden: true,
+    meta: {
+      title: '列表',
+    },
+    component: (resolve) => require(['@/views/app/list'], resolve)
+  },
+  { //用户页
+    path: '/app/edit',
+    name: 'appEdit',
+    hidden: true,
+    meta: {
+      title: '修改',
+    },
+    component: (resolve) => require(['@/views/app/edit'], resolve)
+  },
+  { //用户页
+    path: '/app/map',
+    name: 'appMap',
+    hidden: true,
+    meta: {
+      title: '地图',
+    },
+    component: (resolve) => require(['@/views/app/map'], resolve)
+  },
 ]
 
 // 动态路由，基于用户权限动态去加载
@@ -175,61 +229,7 @@ export const dynamicRoutes = [
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }
     ]
-  },
-  { //登录页
-    path: '/app/login',
-    name: 'appLogin',
-    meta: {
-      title: '登录',
-      hidden: true,
-    },
-    component: (resolve) => require(['@/views/app/login'], resolve)
-  },
-  { //首页
-    path: '/app/index',
-    name: 'appIndex',
-    meta: {
-      title: '首页',
-      hidden: true,
-    },
-    component: (resolve) => require(['@/views/app/index'], resolve)
-  },
-  { //用户页
-    path: '/app/user',
-    name: 'appUser',
-    meta: {
-      title: '首页',
-      hidden: true,
-    },
-    component: (resolve) => require(['@/views/app/user'], resolve)
-  },
-  { //用户页
-    path: '/app/list',
-    name: 'appList',
-    meta: {
-      title: '列表',
-      hidden: true,
-    },
-    component: (resolve) => require(['@/views/app/list'], resolve)
-  },
-  { //用户页
-    path: '/app/edit',
-    name: 'appEdit',
-    meta: {
-      title: '修改',
-      hidden: true,
-    },
-    component: (resolve) => require(['@/views/app/edit'], resolve)
-  },
-  { //用户页
-    path: '/app/map',
-    name: 'appMap',
-    meta: {
-      title: '地图',
-      hidden: true,
-    },
-    component: (resolve) => require(['@/views/app/map'], resolve)
-  },
+  }
 ]
 
 // 防止连续点击多次路由报错

src/views/app/index.vue

@@ -18,28 +18,12 @@
           <p slot="left-icon" class="notice_tt">通知</p>
       </van-notice-bar>
 
-      <div class="content">
-        <p class="title">服务功能</p>
+      <div class="content" v-for="(item,index) in menuList" :key="index">
+        <p class="title">{{item.modelType}}</p>
         <div class="flex-main">
-          <div>
-            <img src="../../assets/images/app/user_header.png" alt="">
-            <p>地图管理</p>
-          </div>
-          <div>
-            <img src="../../assets/images/app/user_header.png" alt="">
-            <p>地图管理</p>
-          </div>
-          <div>
-            <img src="../../assets/images/app/user_header.png" alt="">
-            <p>地图管理</p>
-          </div>
-          <div>
-            <img src="../../assets/images/app/user_header.png" alt="">
-            <p>地图管理</p>
-          </div>
-          <div>
-            <img src="../../assets/images/app/user_header.png" alt="">
-            <p>地图管理</p>
+          <div v-for="(itemChild,indexChild) in item.menus" :key="indexChild" @click="$router.push({path:itemChild.menuUrl})">
+            <img :src="require('@/assets/images/app/' + itemChild.menuIcon)" alt="">
+            <p>{{itemChild.menuName}}</p>
           </div>
         </div>
       </div>
@@ -54,7 +38,7 @@
     name: "appIndex",
     data() {
       return {
-
+        menuList:[]
       };
     },
     created() {
@@ -63,7 +47,7 @@
     methods: {
       getMenuApp(){
         getMenuApp().then((res) => {
-
+          this.menuList = res.data;
         });
       }
     },

src/views/app/list.vue

@@ -25,7 +25,7 @@
         >
           <!--1-->
           <van-swipe-cell right-width="200" class="item" v-for="(item,index) in 10" :key="index">
-            <div class="item_box" @click="$router.push({name:'',query:{id:item.id}})">
+            <div class="item_box" @click="$router.push({name:'appEdit',query:{id:item.id}})">
               <div class="head_block">
                 <div class="title">334656556565</div>
                 <div class="describe">已清查</div>
@@ -217,6 +217,7 @@
       flex-shrink: 0;
       background: linear-gradient( 271deg, #53E4A5 0%, #24DBDB 100%);
       border: none;
+      width: 20%;
     }
   }
 

vue.config.js

@@ -9,8 +9,8 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE
 
-const baseUrl = 'http://localhost:8080' // 后端接口
-//const baseUrl = 'http://192.168.0.108:8080' // 后端接口 zzl
+//const baseUrl = 'http://localhost:8080' // 后端接口
+const baseUrl = 'http://192.168.0.109:8080' // 后端接口 zzl
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口