youxiw2000 / trash · Commits

Commit aa2748b39384134acff6d01caf61bb6512a51e19

Authored by youxiw2000
1 parent e0938c1f
build: skipped

m

Inline Side-by-side
Showing 8 changed files with 98 additions and 83 deletions
trash-ui/src/layout/index.vue
  View file @aa2748b
1 1 <template>
2   - <div :class="classObj" class="app-wrapper">
3   - <sidebar class="sidebar-container" />
4   - <div :class="{hasTagsView:needTagsView}" class="main-container">
5   - <tags-view v-if="needTagsView" />
6 2 <app-main />
7   -
8   - </div>
9   - </div>
10 3 </template>
11 4  
12 5 <script>
... ...
trash-ui/src/layout/index4.vue renamed to trash-ui/src/layout/index3.vue
  View file @aa2748b
1 1 <template>
  2 + <div :class="classObj" class="app-wrapper">
  3 + <sidebar class="sidebar-container" />
  4 + <div :class="{hasTagsView:needTagsView}" class="main-container">
  5 + <tags-view v-if="needTagsView" />
2 6 <app-main />
  7 +
  8 + </div>
  9 + </div>
3 10 </template>
4 11  
5 12 <script>
... ...
trash-ui/src/views/activiti/task/constructsiteInfo.vue
  View file @aa2748b
... ... @@ -136,9 +136,6 @@
136 136 </el-row>
137 137 <el-col :span="24" >
138 138 <el-row class="bd_padding">{{infoData.applyOpinion}}</el-row>
139   - <el-row class="bd_padding">
140   - <label style="float: right;">勘察人:{{infoData.surveyor}}</label>
141   - </el-row>
142 139 <el-row >
143 140 <label style="float: right;" v-if="signData && signData.sign1">签字:<img :src="signData.sign1" width="100px" height="40px" />{{signData.sign1Time}}</label>
144 141 </el-row>
... ...
trash-ui/src/views/activiti/task/earthsitesInfo.vue
  View file @aa2748b
... ... @@ -2,7 +2,7 @@
2 2 <div v-loading="loading" style="border:1px solid black;">
3 3 <el-row class="bd_bottom" >
4 4 <el-col :span="6" class="bd_right bd_padding">消纳场名称</el-col>
5   - <el-col :span="6" class="bd_padding">{{infoData.name}}</el-col>
  5 + <el-col :span="6" class="bd_padding">{{infoData.site.name}}</el-col>
6 6 <el-col :span="6" class="bd_left bd_right bd_padding">证书编号</el-col>
7 7 <el-col :span="6" class="bd_padding">{{infoData.certificateNo}}</el-col>
8 8 </el-row>
... ... @@ -14,7 +14,7 @@
14 14 </el-row>
15 15 <el-row class="bd_bottom" >
16 16 <el-col :span="6" class="bd_right bd_padding">所在地址</el-col>
17   - <el-col :span="6" class="bd_padding">{{infoData.address}}</el-col>
  17 + <el-col :span="6" class="bd_padding">{{infoData.site.address}}</el-col>
18 18 <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
19 19 <el-col :span="6" class="bd_padding">{{infoData.workAreaCodeName}}</el-col>
20 20 </el-row>
... ... @@ -27,15 +27,15 @@
27 27 </el-row>
28 28 <el-row class="bd_bottom" >
29 29 <el-col :span="6" class="bd_right bd_padding">建筑单位责任人</el-col>
30   - <el-col :span="6" class="bd_padding">{{infoData.principal}}</el-col>
  30 + <el-col :span="6" class="bd_padding">{{infoData.site.principal}}</el-col>
31 31 <el-col :span="6" class="bd_left bd_right bd_padding">责任人联系电话</el-col>
32   - <el-col :span="6" class="bd_padding">{{infoData.principalPhoneNo}}</el-col>
  32 + <el-col :span="6" class="bd_padding">{{infoData.site.principalPhoneNo}}</el-col>
33 33 </el-row>
34 34 <el-row class="bd_bottom">
35 35 <el-col :span="6" class="bd_right bd_padding">有效期开始时间</el-col>
36   - <el-col :span="6" class="bd_padding">{{infoData.effectiveFrom}}</el-col>
  36 + <el-col :span="6" class="bd_padding">{{infoData.site.effectiveFrom}}</el-col>
37 37 <el-col :span="6" class="bd_left bd_right bd_padding">有效期结束时间</el-col>
38   - <el-col :span="6" class="bd_padding">{{infoData.effectiveEnd}}</el-col>
  38 + <el-col :span="6" class="bd_padding">{{infoData.site.effectiveEnd}}</el-col>
39 39 </el-row>
40 40 <el-row class="bd_bottom">
41 41 <el-col :span="6" class="bd_right bd_padding">建设单位名称</el-col>
... ... @@ -45,9 +45,9 @@
45 45 </el-row>
46 46 <el-row class="bd_bottom">
47 47 <el-col :span="6" class="bd_right bd_padding">洗车平台</el-col>
48   - <el-col :span="6" class="bd_padding">{{infoData.washingPlatform}}</el-col>
  48 + <el-col :span="6" class="bd_padding">{{infoData.washingPlatformName}}</el-col>
49 49 <el-col :span="6" class="bd_left bd_right bd_padding">出口道路状况</el-col>
50   - <el-col :span="6" class="bd_padding">{{infoData.exitRoadConditions}}</el-col>
  50 + <el-col :span="6" class="bd_padding">{{infoData.exitRoadConditionsName}}</el-col>
51 51 </el-row>
52 52 <el-row class="bd_bottom">
53 53 <el-col :span="6" class="bd_right bd_padding">安全警示</el-col>
... ... @@ -57,29 +57,36 @@
57 57 </el-row>
58 58 <el-row class="bd_bottom">
59 59 <el-col :span="6" class="bd_right bd_padding">排水沟</el-col>
60   - <el-col :span="6" class="bd_padding">{{infoData.drainageDitch}}</el-col>
  60 + <el-col :span="6" class="bd_padding">{{infoData.drainageDitchName}}</el-col>
61 61 <el-col :span="6" class="bd_left bd_right bd_padding">沉淀池</el-col>
62   - <el-col :span="6" class="bd_padding">{{infoData.sedimentationTank}}</el-col>
  62 + <el-col :span="6" class="bd_padding">{{infoData.sedimentationTankName}}</el-col>
63 63 </el-row>
64 64 <el-row class="bd_bottom">
65 65 <el-col :span="6" class="bd_right bd_padding">电动栏杆</el-col>
66   - <el-col :span="6" class="bd_padding">{{infoData.electricRailings}}</el-col>
  66 + <el-col :span="6" class="bd_padding">{{infoData.electricRailingsName}}</el-col>
67 67 <el-col :span="6" class="bd_left bd_right bd_padding">水电</el-col>
68   - <el-col :span="6" class="bd_padding">{{infoData.hydroelectricity}}</el-col>
  68 + <el-col :span="6" class="bd_padding">{{infoData.hydroelectricityName}}</el-col>
69 69 </el-row>
70 70 <el-row class="bd_bottom">
71 71 <el-col :span="6" class="bd_right bd_padding">其他情形</el-col>
72   - <el-col :span="6" class="bd_padding">{{infoData.otherSituations}}</el-col>
  72 + <el-col :span="6" class="bd_padding">{{infoData.otherSituationsName}}</el-col>
73 73 <el-col :span="6" class="bd_left bd_right bd_padding">填表人名称</el-col>
74 74 <el-col :span="6" class="bd_padding">{{infoData.filledBy}}</el-col>
75 75 </el-row>
  76 +
  77 + <el-row class="bd_bottom">
  78 + <el-col :span="6" class="bd_right bd_padding">工程类型</el-col>
  79 + <el-col :span="6" class="bd_padding">{{infoData.projectTypeName}}</el-col>
  80 + <el-col :span="6" class="bd_left bd_right bd_padding"></el-col>
  81 + <el-col :span="6" class="bd_padding"></el-col>
  82 + </el-row>
76 83 <el-row class="bd_bottom">
77 84 <el-col :span="6" class="bd_right bd_padding">申请意见</el-col>
78 85 <el-col :span="18" class="bd_padding">{{infoData.applyOpinion}}</el-col>
79 86 </el-row>
80 87 <el-row >
81 88 <el-col :span="6" class="bd_right bd_padding">电子围栏</el-col>
82   - <el-col :span="18" class="bd_padding">{{infoData.polygonId}}</el-col>
  89 + <el-col :span="18" class="bd_padding">{{infoData.site.coord}}</el-col>
83 90 </el-row>
84 91 </div>
85 92 </template>
... ...
trash-ui/src/views/activiti/task/index.vue
  View file @aa2748b
1 1 <template>
2 2 <div class="app-container">
3   - <!-- <el-select v-model="queryParams.dept" filterable reserve-keyword @change="getList">
  3 + <el-select v-model="queryParams.dept" filterable reserve-keyword @change="getList">
4 4 <el-option v-for="item in depts" :label="item.name"
5 5 :value="item.code" :key="item.code">
6 6 </el-option>
... ... @@ -9,7 +9,7 @@
9 9 <el-option v-for="item in roles" :label="item.name"
10 10 :value="item.code" :key="item.code">
11 11 </el-option>
12   - </el-select> -->
  12 + </el-select>
13 13  
14 14  
15 15 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
... ...
trash-ui/src/views/h5/task/constructsiteInfo.vue
  View file @aa2748b
... ... @@ -135,9 +135,9 @@
135 135 </el-row>
136 136 <el-col :span="24" >
137 137 <el-row class="bd_padding">{{infoData.applyOpinion}}</el-row>
138   - <el-row class="bd_padding">
139   - <label style="float: right;">勘察人:{{infoData.surveyor}}</label>
140   - </el-row>
  138 + <el-row >
  139 + <label style="float: right;" v-if="signData && signData.sign1">签字:<img :src="signData.sign1" width="100px" height="40px" />{{signData.sign1Time}}</label>
  140 + </el-row>
141 141 </el-col>
142 142 </el-col>
143 143 </el-col>
... ...
trash-ui/src/views/h5/task/earthsitesInfo.vue
  View file @aa2748b
... ... @@ -2,7 +2,7 @@
2 2 <div v-loading="loading" style="border:1px solid black;">
3 3 <el-row class="bd_bottom" >
4 4 <el-col :span="6" class="bd_right bd_padding">消纳场名称</el-col>
5   - <el-col :span="6" class="bd_padding">{{infoData.name}}</el-col>
  5 + <el-col :span="6" class="bd_padding">{{infoData.site.name}}</el-col>
6 6 <el-col :span="6" class="bd_left bd_right bd_padding">证书编号</el-col>
7 7 <el-col :span="6" class="bd_padding">{{infoData.certificateNo}}</el-col>
8 8 </el-row>
... ... @@ -14,11 +14,11 @@
14 14 </el-row>
15 15 <el-row class="bd_bottom" >
16 16 <el-col :span="6" class="bd_right bd_padding">所在地址</el-col>
17   - <el-col :span="6" class="bd_padding">{{infoData.address}}</el-col>
  17 + <el-col :span="6" class="bd_padding">{{infoData.site.address}}</el-col>
18 18 <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
19 19 <el-col :span="6" class="bd_padding">{{infoData.workAreaCodeName}}</el-col>
20 20 </el-row>
21   -
  21 +
22 22 <el-row class="bd_bottom">
23 23 <el-col :span="6" class="bd_right bd_padding">备案方量(m³)</el-col>
24 24 <el-col :span="6" class="bd_padding">{{infoData.capacity}}</el-col>
... ... @@ -27,15 +27,15 @@
27 27 </el-row>
28 28 <el-row class="bd_bottom" >
29 29 <el-col :span="6" class="bd_right bd_padding">建筑单位责任人</el-col>
30   - <el-col :span="6" class="bd_padding">{{infoData.principal}}</el-col>
  30 + <el-col :span="6" class="bd_padding">{{infoData.site.principal}}</el-col>
31 31 <el-col :span="6" class="bd_left bd_right bd_padding">责任人联系电话</el-col>
32   - <el-col :span="6" class="bd_padding">{{infoData.principalPhoneNo}}</el-col>
  32 + <el-col :span="6" class="bd_padding">{{infoData.site.principalPhoneNo}}</el-col>
33 33 </el-row>
34 34 <el-row class="bd_bottom">
35 35 <el-col :span="6" class="bd_right bd_padding">有效期开始时间</el-col>
36   - <el-col :span="6" class="bd_padding">{{infoData.effectiveFrom}}</el-col>
  36 + <el-col :span="6" class="bd_padding">{{infoData.site.effectiveFrom}}</el-col>
37 37 <el-col :span="6" class="bd_left bd_right bd_padding">有效期结束时间</el-col>
38   - <el-col :span="6" class="bd_padding">{{infoData.effectiveEnd}}</el-col>
  38 + <el-col :span="6" class="bd_padding">{{infoData.site.effectiveEnd}}</el-col>
39 39 </el-row>
40 40 <el-row class="bd_bottom">
41 41 <el-col :span="6" class="bd_right bd_padding">建设单位名称</el-col>
... ... @@ -45,9 +45,9 @@
45 45 </el-row>
46 46 <el-row class="bd_bottom">
47 47 <el-col :span="6" class="bd_right bd_padding">洗车平台</el-col>
48   - <el-col :span="6" class="bd_padding">{{infoData.washingPlatform}}</el-col>
  48 + <el-col :span="6" class="bd_padding">{{infoData.washingPlatformName}}</el-col>
49 49 <el-col :span="6" class="bd_left bd_right bd_padding">出口道路状况</el-col>
50   - <el-col :span="6" class="bd_padding">{{infoData.exitRoadConditions}}</el-col>
  50 + <el-col :span="6" class="bd_padding">{{infoData.exitRoadConditionsName}}</el-col>
51 51 </el-row>
52 52 <el-row class="bd_bottom">
53 53 <el-col :span="6" class="bd_right bd_padding">安全警示</el-col>
... ... @@ -57,19 +57,25 @@
57 57 </el-row>
58 58 <el-row class="bd_bottom">
59 59 <el-col :span="6" class="bd_right bd_padding">排水沟</el-col>
60   - <el-col :span="6" class="bd_padding">{{infoData.drainageDitch}}</el-col>
  60 + <el-col :span="6" class="bd_padding">{{infoData.drainageDitchName}}</el-col>
61 61 <el-col :span="6" class="bd_left bd_right bd_padding">沉淀池</el-col>
62   - <el-col :span="6" class="bd_padding">{{infoData.sedimentationTank}}</el-col>
  62 + <el-col :span="6" class="bd_padding">{{infoData.sedimentationTankName}}</el-col>
63 63 </el-row>
64 64 <el-row class="bd_bottom">
65 65 <el-col :span="6" class="bd_right bd_padding">电动栏杆</el-col>
66   - <el-col :span="6" class="bd_padding">{{infoData.electricRailings}}</el-col>
  66 + <el-col :span="6" class="bd_padding">{{infoData.electricRailingsName}}</el-col>
67 67 <el-col :span="6" class="bd_left bd_right bd_padding">水电</el-col>
68   - <el-col :span="6" class="bd_padding">{{infoData.hydroelectricity}}</el-col>
  68 + <el-col :span="6" class="bd_padding">{{infoData.hydroelectricityName}}</el-col>
  69 + </el-row>
  70 + <el-row class="bd_bottom">
  71 + <el-col :span="6" class="bd_right bd_padding">工程类型</el-col>
  72 + <el-col :span="6" class="bd_padding">{{infoData.projectTypeName}}</el-col>
  73 + <el-col :span="6" class="bd_left bd_right bd_padding"></el-col>
  74 + <el-col :span="6" class="bd_padding"></el-col>
69 75 </el-row>
70 76 <el-row class="bd_bottom">
71 77 <el-col :span="6" class="bd_right bd_padding">其他情形</el-col>
72   - <el-col :span="6" class="bd_padding">{{infoData.otherSituations}}</el-col>
  78 + <el-col :span="6" class="bd_padding">{{infoData.otherSituationsName}}</el-col>
73 79 <el-col :span="6" class="bd_left bd_right bd_padding">填表人名称</el-col>
74 80 <el-col :span="6" class="bd_padding">{{infoData.filledBy}}</el-col>
75 81 </el-row>
... ... @@ -79,7 +85,7 @@
79 85 </el-row>
80 86 <el-row >
81 87 <el-col :span="6" class="bd_right bd_padding">电子围栏</el-col>
82   - <el-col :span="18" class="bd_padding">{{infoData.polygonId}}</el-col>
  88 + <el-col :span="18" class="bd_padding">{{infoData.site.coord}}</el-col>
83 89 </el-row>
84 90 </div>
85 91 </template>
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @aa2748b
... ... @@ -64,50 +64,55 @@ public class SupervisionThreestepController extends BaseController
64 64 public TableDataInfo list(SupervisionThreestep supervisionThreestep)
65 65 {
66 66 startPage();
67   - if(supervisionThreestep.getStatus() == null)
  67 + if(supervisionThreestep.getStatus() == null){
68 68 supervisionThreestep.setCreateBy(SecurityUtils.getUsername());
69 69  
70   - Map<String, String> map = new HashMap<String, String>();
71   - map.put("type", "CSUserDepartmentType");
72   - JSONArray depts = RemoteServerUtils.getDict(map);
73   - JSONArray areas = RemoteServerUtils.getAreas();
74   -
75   -
76   -
77   - for(Object object :depts){
78   - JSONObject dept = (JSONObject) object;
79   - List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds();
80   -
81   - for(String role:roles){
82   - if(dept.getString("code").equals(role)){
83   - if(dept.getString("name").contains("渣土办")){
84   -
85   - if(dept.getString("name").equals("治理部")){
86   - supervisionThreestep.setCreateBy(null);
87   - break;
88   - }
89   -
90   - String deptName = dept.getString("name").replace("渣土办", "");
91   -
92   - if(!deptName.isEmpty()){
93   -
94   - for(Object obj:areas){
95   - JSONObject area = (JSONObject)obj;
96   -
97   - if(area.getString("name").equals(deptName)){
98   -
99   - supervisionThreestep.setPlace(area.getString("code"));
100   - }
101   - }
102   - }
103   -
104   - }
105   - }
106   - }
  70 + }else{
107 71  
  72 +
  73 + Map<String, String> map = new HashMap<String, String>();
  74 + map.put("type", "CSUserDepartmentType");
  75 + JSONArray depts = RemoteServerUtils.getDict(map);
  76 + JSONArray areas = RemoteServerUtils.getAreas();
  77 +
  78 +
  79 +
  80 + for(Object object :depts){
  81 + JSONObject dept = (JSONObject) object;
  82 + List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds();
  83 +
  84 + for(String role:roles){
  85 + if(dept.getString("code").equals(role)){
  86 +
  87 + if(dept.getString("name").equals("治理部")){
  88 + supervisionThreestep.setCreateBy(null);
  89 + break;
  90 + }
  91 +
  92 + if(dept.getString("name").contains("渣土办")){
  93 +
  94 + String deptName = dept.getString("name").replace("渣土办", "");
  95 +
  96 + if(!deptName.isEmpty()){
  97 +
  98 + for(Object obj:areas){
  99 + JSONObject area = (JSONObject)obj;
  100 +
  101 + if(area.getString("name").equals(deptName)){
  102 +
  103 + supervisionThreestep.setPlace(area.getString("code"));
  104 + supervisionThreestep.setCreateBy(null);
  105 + }
  106 + }
  107 + }
  108 +
  109 + }
  110 + }
  111 + }
  112 +
  113 + }
108 114 }
109 115  
110   -
111 116 List<SupervisionThreestep> list = supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep);
112 117 return getDataTable(list);
113 118 }
... ...