m

youxiw2000
1 parent fdd3fe73
Showing 36 changed files with 380 additions and 176 deletions
trash-admin/bin/src/main/java/com/trash/Application.class
trash-admin/bin/src/main/java/com/trash/ServletInitializer.class
trash-admin/bin/src/main/java/com/trash/web/controller/common/CaptchaController.class
trash-admin/bin/src/main/java/com/trash/web/controller/common/CommonController.class
trash-admin/bin/src/main/java/com/trash/web/controller/monitor/ServerController.class
trash-admin/bin/src/main/java/com/trash/web/controller/monitor/SysLogininforController.class
trash-admin/bin/src/main/java/com/trash/web/controller/monitor/SysOperlogController.class
trash-admin/bin/src/main/java/com/trash/web/controller/monitor/SysUserOnlineController.class
trash-admin/bin/src/main/java/com/trash/web/controller/system/SysConfigController.class
trash-admin/bin/src/main/java/com/trash/web/controller/system/SysDeptController.class
trash-admin/bin/src/main/java/com/trash/web/controller/system/SysDictDataController.class
trash-admin/bin/src/main/java/com/trash/web/controller/system/SysDictTypeController.class
trash-admin/bin/src/main/java/com/trash/web/controller/system/SysMenuController.class
trash-admin/bin/src/main/java/com/trash/web/controller/system/SysNoticeController.class
trash-admin/bin/src/main/java/com/trash/web/controller/system/SysPostController.class
trash-admin/bin/src/main/java/com/trash/web/controller/system/SysProfileController.class
trash-admin/bin/src/main/java/com/trash/web/controller/system/SysRoleController.class
trash-admin/bin/src/main/java/com/trash/web/controller/system/SysUserController.class
trash-admin/bin/src/main/java/com/trash/web/controller/tool/SwaggerController.class
trash-admin/bin/src/main/java/com/trash/web/controller/tool/TestController.class
+restart.include.json=/com.alibaba.fastjson.*.jar
 \ No newline at end of file
+#错误消息
+not.null=* 必须填写
+user.jcaptcha.error=验证码错误
+user.jcaptcha.expire=验证码已失效
+user.not.exists=用户不存在/密码错误
+user.password.not.match=用户不存在/密码错误
+user.password.retry.limit.count=密码输入错误{0}次
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
+user.password.delete=对不起，您的账号已被删除
+user.blocked=用户已封禁，请联系管理员
+role.blocked=角色已封禁，请联系管理员
+user.logout.success=退出成功
+
+length.not.valid=长度必须在{min}到{max}个字符之间
+
+user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.password.not.valid=* 5-50个字符
+ 
+user.email.not.valid=邮箱格式错误
+user.mobile.phone.number.not.valid=手机号格式错误
+user.login.success=登录成功
+user.notfound=请重新登录
+user.forcelogout=管理员强制退出，请重新登录
+user.unknown.error=未知错误，请重新登录
+
+##文件上传消息
+upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
+upload.filename.exceed.length=上传的文件名最长{0}个字符
+
+##权限
+no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
+no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
+no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
+no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
+no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
+no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+	
+	<settings>
+		<setting name="cacheEnabled"             value="true" />  <!-- 全局映射器启用缓存 -->
+		<setting name="useGeneratedKeys"         value="true" />  <!-- 允许 JDBC 支持自动生成主键 -->
+		<setting name="defaultExecutorType"      value="REUSE" /> <!-- 配置默认的执行器 -->
+		<setting name="logImpl"                  value="SLF4J" /> <!-- 指定 MyBatis 所用日志的具体实现 -->
+		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/>  驼峰式命名 -->
+	</settings>
+	
+</configuration>
@@ -2,6 +2,7 @@ package com.trash.web.controller.system;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
@@ -9,9 +10,13 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.alibaba.fastjson.JSONObject;
 import com.trash.common.constant.Constants;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.core.domain.entity.SysMenu;
@@ -62,6 +67,43 @@ public class SysLoginController
         return ajax;
     }
+
+    @RequestMapping("loginByToken")
+    public AjaxResult loginByToken(@RequestBody String token){
+    	
+    	JSONObject jsonObject = JSONObject.parseObject(token);
+    	
+        LoginUser loginUser = loginService.loginByRemote(jsonObject.getString("token"));
+        
+        if(loginUser == null){
+        	return AjaxResult.error();
+        }
+        
+        SysUser user = loginUser.getUser();
+        
+//        Set<String> roles = new HashSet<String>();
+//        roles.add("admin");
+        
+        Set<String> permissions = loginUser.getPermissions();
+        
+        Set<String> roles = new HashSet<String>();
+        
+        if(user.getRoles() != null){
+        	 for(SysRole role : user.getRoles()){
+             	roles.add(role.getRoleKey());
+             }
+        }
+       
+//        // 权限集合
+//        Set<String> permissions = permissionService.getMenuPermission(user);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("user", user);
+        ajax.put("roles", roles);
+        ajax.put("permissions", permissions);
+        ajax.put("token", loginUser.getToken());
+        return ajax;
+    }
+    
     /**
      * 获取用户信息
      * 
@@ -98,7 +98,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/captchaImage").anonymous()
+                .antMatchers("/login", "/captchaImage","/loginByToken").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/*.html",
@@ -45,7 +45,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
     		String token = request.getHeader("Authorization");
             if(token == null){
-            	token = tokenService.getTokenFromCookies(request);
+             	token = tokenService.getTokenFromCookies(request);
             }
             if(token!= null && !token.equals("undefined")){
@@ -94,7 +94,7 @@ public class TokenService
 	public String getTokenFromCookies(HttpServletRequest request) {
 		try {
-			for(Cookie cookie : request.getCookies()){
+ 			for(Cookie cookie : request.getCookies()){
 				if(("token").equals(cookie.getName())){
 					return cookie.getValue();
 				}
@@ -102,6 +102,9 @@ public class TokenService
 		} catch (Exception e) {
 //			e.printStackTrace();
 		}
+		
+		String token = request.getParameter("token");
+		
 		return null;
 	}
@@ -7,6 +7,7 @@ import com.trash.common.utils.StringUtils;
 import com.trash.system.domain.SysUserOnline;
 import com.trash.system.service.ISysUserOnlineService;
+
 /**
  * 在线用户 服务层处理
  * 
 import requestRemote from '@/utils/requestRemote'
 export function constructionsitesList(data) {
-  const req = requestRemote({
+  return requestRemote({
     url: '/api/siteservice/cs/constructionsites/search',
     method: 'post',
     data: data
   });
+}
-  return req;
+export function earthsitesList(data) {
+  return requestRemote({
+    url: '/api/siteservice/cs/earthsites/list',
+    method: 'post',
+    data: data
+  });
 }
+export function getArea(data) {
+  return requestRemote({
+    url: '/api/gpsservice/cs/area',
+    method: 'get',
+    param: data
+  });
+}
+
+
 export function getDict(param) {
-  const req = requestRemote({
+  return requestRemote({
     url: '/api/gpsservice/cs/dataDict',
     method: 'get',
-    param: param
+    params: param
   });
-
-  return req;
 }
-
@@ -19,8 +19,18 @@ export function login(username, password, code, uuid) {
 export function getInfo() {
   return request({
     url: '/getInfo',
-    method: 'get'
-  })
+    method: 'get',
+    param:{'token':"123"}
+  });
+}
+
+// 获取用户详细信息
+export function loginByToken(token) {
+  return request({
+    url: '/loginByToken',
+    method: 'post',
+    data:{'token':token}
+  });
 }
 // 退出方法
@@ -37,4 +47,4 @@ export function getCodeImg() {
     url: '/captchaImage',
     method: 'get'
   })
-}
 \ No newline at end of file
+}
@@ -5,6 +5,7 @@ import NProgress from &#39;nprogress&#39;
 import 'nprogress/nprogress.css'
 import { getToken,setToken } from '@/utils/auth'
 import Cookies from "js-cookie";
+import { loginByToken } from '@/api/login'
 NProgress.configure({ showSpinner: false })
@@ -13,18 +14,50 @@ const whiteList = [&#39;/login&#39;, &#39;/auth-redirect&#39;, &#39;/bind&#39;, &#39;/register&#39;]
 // const whiteList = ['/*']
 router.beforeEach((to, from, next) => {
+  debugger;
   NProgress.start()
   var token = getToken();
   if(!token){
     if( to.query.token ){
-      token = to.query.token;
-      Cookies.set("token", token, { expires: 30 });
+      loginByToken(to.query.token).then(res=>{
+          setToken(res.token);
+        if (store.getters.roles.length === 0) {
+
+          const user = res.user;
+          const roles = res.roles;
+          const avatar = require("@/assets/image/profile.jpg");
+          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+            store.commit('SET_ROLES', res.roles);
+            store.commit('SET_PERMISSIONS', res.permissions);
+          } else {
+            store.commit('SET_ROLES', ['ROLE_DEFAULT']);
+          }
+          store.commit('SET_NAME', user.userName);
+          store.commit('SET_NICK_NAME', user.nickName);
+          store.commit('SET_AVATAR', avatar);
+
+            store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
+            // 测试 默认静态页面
+            // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => {
+              // 根据roles权限生成可访问的路由表
+              router.addRoutes(accessRoutes) // 动态添加可访问路由表
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+            })
+        } else {
+          next()
+        }
+      });
     }else{
       Cookies.remove("token");
+      if (whiteList.indexOf(to.path) !== -1) {
+        // 在免登录白名单，直接进入
+        next()
+      } else {
+        next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+        NProgress.done()
+      }
     }
-  }
-
-  if (token) {
+  }else{
     /* has token*/
     if (to.path === '/login') {
       next({ path: '/' })
@@ -34,9 +67,9 @@ router.beforeEach((to, from, next) =&gt; {
         store.dispatch('GetInfo').then(res => {
           // 拉取user_info
           const roles = res.roles
-
+    
           setToken(res.token)
-
+    
           store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
           // 测试 默认静态页面
           // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => {
@@ -61,16 +94,7 @@ router.beforeEach((to, from, next) =&gt; {
         // }
         // 可删 ↑
       }
-    }
-  } else {
-    // 没有token
-    if (whiteList.indexOf(to.path) !== -1) {
-      // 在免登录白名单，直接进入
-      next()
-    } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-      NProgress.done()
-    }
+  }
   }
 })
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
+import Cookies from "js-cookie";
 const user = {
   state: {
@@ -53,22 +54,22 @@ const user = {
     // 获取用户信息
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
-        getInfo(state.token).then(res => {
-          const user = res.user
-          const avatar = require("@/assets/image/profile.jpg");
-          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-            commit('SET_ROLES', res.roles)
-            commit('SET_PERMISSIONS', res.permissions)
-          } else {
-            commit('SET_ROLES', ['ROLE_DEFAULT'])
-          }
-          commit('SET_NAME', user.userName)
-          commit('SET_NICK_NAME', user.nickName)
-          commit('SET_AVATAR', avatar)
-          resolve(res)
-        }).catch(error => {
-          reject(error)
-        })
+          getInfo(state.token).then(res => {
+            const user = res.user
+            const avatar = require("@/assets/image/profile.jpg");
+            if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+              commit('SET_ROLES', res.roles)
+              commit('SET_PERMISSIONS', res.permissions)
+            } else {
+              commit('SET_ROLES', ['ROLE_DEFAULT'])
+            }
+            commit('SET_NAME', user.userName)
+            commit('SET_NICK_NAME', user.nickName)
+            commit('SET_AVATAR', avatar)
+            resolve(res)
+          }).catch(error => {
+            reject(error)
+          })
       })
     },
@@ -3,13 +3,19 @@ import Cookies from &#39;js-cookie&#39;
 const TokenKey = 'Admin-Token'
 export function getToken() {
-  return Cookies.get(TokenKey)
+  let token = Cookies.get('Admin-Token');
+  if(!token){
+    token = sessionStorage.getItem('Admin-Token');
+  }
+  return token
 }
 export function setToken(token) {
+
+  sessionStorage.setItem(TokenKey, token)
   return Cookies.set(TokenKey, token)
 }
 export function removeToken() {
   return Cookies.remove(TokenKey)
-}
 \ No newline at end of file
+}
@@ -77,9 +77,11 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="所属区域" prop="place">
-              <el-select v-model="form.place" placeholder="请选择所属区域">
-                <el-option label="A区" value="A区" />
-                <el-option label="B区" value="B区" />
+              <el-select v-model="form.place" placeholder="请选择所属区域" filterable clearable reserve-keyword
+                @clear="areaClear">
+                <el-option @click.native="selectArea(item.code)" v-for="item in areas" :label="item.name"
+                  :value="item.code" :key="item.code">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -88,16 +90,18 @@
           <el-col :span="12">
             <el-form-item :label="labelName" prop="name">
               <el-select v-model="form.name" filterable clearable reserve-keyword>
-                <el-option label="A区" value="A区" />
-                <el-option label="B区" value="B区" />
+                <el-option @click.native="getObjId(item)" v-for="item in remoteData" :label="item.name"
+                  :value="item.name" :key="item.id" v-if="areaCode == null || item.areaCode == areaCode">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="labelName2" prop="place">
-              <el-select v-model="form.objectId">
-                <el-option label="A区" value="A区" />
-                <el-option label="B区" value="A区" />
+              <el-select v-model="bindname">
+                <el-option @click.native="getEarthsiteId(item)" v-for="item in bindData" :label="item.name"
+                  :value="item.name" :key="item.id">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -222,6 +226,9 @@
             </p>
           </el-col>
         </el-row>
+
+          <el-input v-model="form.earthsitesId" type="hidden" />
+        <el-input v-model="form.objectId" type="hidden" />
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -243,7 +250,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所属区域" >
+            <el-form-item label="所属区域">
               <el-select v-model="infoData.place" disabled>
                 <el-option label="A区" value="A区" />
                 <el-option label="B区" value="B区" />
@@ -314,7 +321,7 @@
           </el-col>
         </el-row>
-        <el-row v-if="infoData.img0" >
+        <el-row v-if="infoData.img0">
           <el-col :span="4">
             过水槽照片
           </el-col>
@@ -324,7 +331,7 @@
             </el-row>
           </el-col>
         </el-row>
-        <el-row v-if="infoData.img1" >
+        <el-row v-if="infoData.img1">
           <el-col :span="4">
             洗车平台照片
           </el-col>
@@ -334,7 +341,7 @@
             </el-row>
           </el-col>
         </el-row>
-        <el-row v-if="infoData.img2" >
+        <el-row v-if="infoData.img2">
           <el-col :span="4">
             出入口照片
           </el-col>
@@ -344,106 +351,106 @@
             </el-row>
           </el-col>
         </el-row>
-          <el-row v-if="infoData.img3" >
-            <el-col :span="4">
-              沉淀池照片
-            </el-col>
-            <el-col :span="20">
-              <el-row v-for="img in infoData.img3.split(',')" style="margin-bottom:10px;">
-                <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
-              </el-row>
-            </el-col>
-          </el-row>
-            <el-row v-if="infoData.img4" >
-              <el-col :span="4">
-                硬质路面照片
-              </el-col>
-              <el-col :span="20">
-                <el-row v-for="img in infoData.img4.split(',')" style="margin-bottom:10px;">
-                  <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
-                </el-row>
-              </el-col>
+        <el-row v-if="infoData.img3">
+          <el-col :span="4">
+            沉淀池照片
+          </el-col>
+          <el-col :span="20">
+            <el-row v-for="img in infoData.img3.split(',')" style="margin-bottom:10px;">
+              <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row v-if="infoData.img4">
+          <el-col :span="4">
+            硬质路面照片
+          </el-col>
+          <el-col :span="20">
+            <el-row v-for="img in infoData.img4.split(',')" style="margin-bottom:10px;">
+              <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row v-if="infoData.img5">
+          <el-col :span="4">
+            摄像头视频截图1
+          </el-col>
+          <el-col :span="20">
+            <el-row v-for="img in infoData.img5.split(',')" style="margin-bottom:10px;">
+              <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row v-if="infoData.img6">
+          <el-col :span="4">
+            摄像头视频截图2
+          </el-col>
+          <el-col :span="20">
+            <el-row v-for="img in infoData.img6.split(',')" style="margin-bottom:10px;">
+              <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row v-if="infoData.img7">
+          <el-col :span="4">
+            摄像头视频截图3
+          </el-col>
+          <el-col :span="20">
+            <el-row v-for="img in infoData.img7.split(',')" style="margin-bottom:10px;">
+              <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row v-if="infoData.img8">
+          <el-col :span="4">
+            其他1
+          </el-col>
+          <el-col :span="20">
+            <el-row v-for="img in infoData.img8.split(',')" style="margin-bottom:10px;">
+              <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row v-if="infoData.img9">
+          <el-col :span="4">
+            其他2
+          </el-col>
+          <el-col :span="20">
+            <el-row v-for="img in infoData.img9.split(',')" style="margin-bottom:10px;">
+              <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row v-if="infoData.img10">
+          <el-col :span="4">
+            其他3
+          </el-col>
+          <el-col :span="20">
+            <el-row v-for="img in infoData.img10.split(',')" style="margin-bottom:10px;">
+              <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row v-if="infoData.img11">
+          <el-col :span="4">
+            其他4
+          </el-col>
+          <el-col :span="20">
+            <el-row v-for="img in infoData.img11.split(',')" style="margin-bottom:10px;">
+              <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row v-if="infoData.img12">
+          <el-col :span="4">
+            其他5
+          </el-col>
+          <el-col :span="20">
+            <el-row v-for="img in infoData.img12.split(',')" style="margin-bottom:10px;">
+              <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
             </el-row>
-         <el-row v-if="infoData.img5" >
-           <el-col :span="4">
-             摄像头视频截图1
-           </el-col>
-           <el-col :span="20">
-             <el-row v-for="img in infoData.img5.split(',')" style="margin-bottom:10px;">
-               <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
-             </el-row>
-           </el-col>
-         </el-row>
-          <el-row v-if="infoData.img6" >
-            <el-col :span="4">
-              摄像头视频截图2
-            </el-col>
-            <el-col :span="20">
-              <el-row v-for="img in infoData.img6.split(',')" style="margin-bottom:10px;">
-                <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
-              </el-row>
-            </el-col>
-          </el-row>
-          <el-row v-if="infoData.img7" >
-            <el-col :span="4">
-              摄像头视频截图3
-            </el-col>
-            <el-col :span="20">
-              <el-row v-for="img in infoData.img7.split(',')" style="margin-bottom:10px;">
-                <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
-              </el-row>
-            </el-col>
-          </el-row>
-          <el-row v-if="infoData.img8" >
-             <el-col :span="4">
-               其他1
-             </el-col>
-             <el-col :span="20">
-               <el-row v-for="img in infoData.img8.split(',')" style="margin-bottom:10px;">
-                 <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
-               </el-row>
-             </el-col>
-           </el-row>
-             <el-row v-if="infoData.img9" >
-               <el-col :span="4">
-               其他2
-               </el-col>
-               <el-col :span="20">
-                 <el-row v-for="img in infoData.img9.split(',')" style="margin-bottom:10px;">
-                   <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
-                 </el-row>
-               </el-col>
-             </el-row>
-          <el-row v-if="infoData.img10" >
-            <el-col :span="4">
-               其他3
-            </el-col>
-            <el-col :span="20">
-              <el-row v-for="img in infoData.img10.split(',')" style="margin-bottom:10px;">
-                <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
-              </el-row>
-            </el-col>
-          </el-row>
-           <el-row v-if="infoData.img11" >
-             <el-col :span="4">
-               其他4
-             </el-col>
-             <el-col :span="20">
-               <el-row v-for="img in infoData.img11.split(',')" style="margin-bottom:10px;">
-                 <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
-               </el-row>
-             </el-col>
-           </el-row>
-           <el-row v-if="infoData.img12" >
-             <el-col :span="4">
-               其他5
-             </el-col>
-             <el-col :span="20">
-               <el-row v-for="img in infoData.img12.split(',')" style="margin-bottom:10px;">
-                 <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
-               </el-row>
-             </el-col>
-           </el-row>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -486,8 +493,10 @@
   } from "@/utils/auth";
   import {
+    earthsitesList,
     constructionsitesList,
-    getDict
+    getDict,
+    getArea
   } from "@/api/dict";
   export default {
@@ -518,8 +527,8 @@
         fileList: [],
         // 弹出层标题
         title: "",
-        labelName: "",
-        labelName2: "",
+        labelName: "工地名称",
+        labelName2: "绑定消纳场",
         upload: {
           // 是否显示弹出层（用户导入）
           open: false,
@@ -553,7 +562,8 @@
           companyTrucks: null
         },
         // 表单参数
-        form: {},
+        form: {
+        },
         picIndex: null,
         // 表单校验
         rules: {
@@ -592,7 +602,6 @@
             message: '请填写完整',
             trigger: 'blur'
           }, ],
-
           phone: [{
               required: true,
               message: '请填写完整',
@@ -603,25 +612,49 @@
               message: '手机号格式错误',
               trigger: 'blur'
             },
-          ],
-
-        }
+          ]
+        },
+        SiteWorkAreaCodeType: [],
+        remoteData: [],
+        remoteQueryData: {
+          "page": 1,
+          "size": 9999
+        },
+        areas: [],
+        areaCode: null,
+        bindData: [],
+        bindname:null,
       };
     },
     created() {
-
-      let data = {
-        page:1,
-        size:9999
-      }
-
-      constructionsitesList(data).then(response=>{
-        console.log(response);
+      getArea().then(res => {
+        this.areas = res.result;
       });
-
       this.getList();
     },
     methods: {
+      areaClear() {
+        this.areaCode = null;
+      },
+      selectArea(a) {
+        this.areaCode = a;
+      },
+      getObjId(item) {
+        if (this.form.type == 0) {
+          this.form.objectId = item.id;
+          this.form.place = Number(item.areaCode);
+        } else {
+          this.form.earthsitesId = item.id;
+          this.form.place = Number(item.areaCode);
+        }
+      },
+      getEarthsiteId(item) {
+        if (this.form.type == 0) {
+          this.form.objectId = item.id;
+        } else {
+            this.form.earthsitesId = item.id;
+        }
+      },
       downloadFile(path) {
         window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
       },
@@ -669,10 +702,30 @@
         if (value == "0") {
           this.labelName = "工地名称";
           this.labelName2 = "绑定消纳场";
+
         } else {
           this.labelName = "消纳场名称";
           this.labelName2 = "绑定工地";
         }
+
+        this.form.name = null;
+        this.bindname = null;
+        constructionsitesList(this.remoteQueryData).then(res => {
+          if (value == 0) {
+            this.remoteData = res.result.list;
+          } else {
+            this.bindData = res.result.list;
+          }
+        });
+
+        earthsitesList(this.remoteQueryData).then(res => {
+          if (value == 0) {
+            this.bindData = res.result.list;
+          } else {
+            this.remoteData = res.result.list;
+          }
+        });
+
       },
       /** 查询【请填写功能名称】列表 */
       getList() {