youxiw2000 / trash · Commits

Commit cb6cea095a9a9f2a775a09f96b218057216fd3e9

Authored by youxiw2000
1 parent ca96f4fa
build: skipped

m

Inline Side-by-side
Showing 57 changed files with 481 additions and 231 deletions
trash-admin/src/main/resources/application.yml
  View file @cb6cea0
... ... @@ -6,6 +6,20 @@ logging:
6 6  
7 7 # Spring配置
8 8 spring:
  9 + #kafka配置
  10 + kafka:
  11 + bootstrap-servers: 183.66.242.6:9101
  12 + producer:
  13 + x-serializer: org.apache.kafka.common.serialization.StringSerializer
  14 + value-serializer: org.apache.kafka.common.serialization.StringSerializer
  15 + buffer-memory: 33554432
  16 + acks: all
  17 + consumer:
  18 + enable-auto-commit: true
  19 + group-id: trash
  20 + key-serializer: org.apache.kafka.common.serialization.StringSerializer
  21 + value-serializer: org.apache.kafka.common.serialization.StringSerializer
  22 +
9 23 # 资源信息
10 24 messages:
11 25 # 国际化资源文件路径
... ...
trash-common/src/main/java/com/trash/common/utils/file/FileUploadUtils.java
  View file @cb6cea0
... ... @@ -139,7 +139,7 @@ public class FileUploadUtils {
139 139 public static final String extractFilename(MultipartFile file) {
140 140 String fileName = file.getOriginalFilename();
141 141 String extension = getExtension(file);
142   - fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
  142 + fileName = DateUtils.getNowDate().getTime() + "/" + fileName;
143 143 return fileName;
144 144 }
145 145  
... ...
trash-common/src/main/java/com/trash/common/utils/poi/ExcelUtil.java
  View file @cb6cea0
... ... @@ -124,6 +124,19 @@ public class ExcelUtil<T>
124 124 this.clazz = clazz;
125 125 }
126 126  
  127 + public void init(List<T> list, String sheetName, Type type,List<String> withOut)
  128 + {
  129 + if (list == null)
  130 + {
  131 + list = new ArrayList<T>();
  132 + }
  133 + this.list = list;
  134 + this.sheetName = sheetName;
  135 + this.type = type;
  136 + createExcelField(withOut);
  137 + createWorkbook();
  138 + }
  139 +
127 140 public void init(List<T> list, String sheetName, Type type)
128 141 {
129 142 if (list == null)
... ... @@ -308,10 +321,16 @@ public class ExcelUtil&lt;T&gt;
308 321 * @return 结果
309 322 */
310 323 public AjaxResult exportExcel(List<T> list, String sheetName)
311   - {
  324 + {
312 325 this.init(list, sheetName, Type.EXPORT);
313 326 return exportExcel();
314 327 }
  328 +
  329 + public AjaxResult exportExcel(List<T> list, String sheetName,List<String> withOut)
  330 + {
  331 + this.init(list, sheetName, Type.EXPORT,withOut);
  332 + return exportExcel();
  333 + }
315 334  
316 335 /**
317 336 * 对list数据源将其里面的数据导入到excel表单
... ... @@ -870,6 +889,37 @@ public class ExcelUtil&lt;T&gt;
870 889 }
871 890 return o;
872 891 }
  892 +
  893 + private void createExcelField(List<String> withOut)
  894 + {
  895 + this.fields = new ArrayList<Object[]>();
  896 + List<Field> tempFields = new ArrayList<>();
  897 + tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
  898 + tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
  899 + for (Field field : tempFields)
  900 + {
  901 + if(withOut.indexOf(field.getName()) > -1){
  902 + continue;
  903 + }
  904 + // 单注解
  905 + if (field.isAnnotationPresent(Excel.class))
  906 + {
  907 + putToField(field, field.getAnnotation(Excel.class));
  908 + }
  909 +
  910 + // 多注解
  911 + if (field.isAnnotationPresent(Excels.class))
  912 + {
  913 + Excels attrs = field.getAnnotation(Excels.class);
  914 + Excel[] excels = attrs.value();
  915 + for (Excel excel : excels)
  916 + {
  917 + putToField(field, excel);
  918 + }
  919 + }
  920 + }
  921 + this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
  922 + }
873 923  
874 924 /**
875 925 * 得到所有定义字段
... ...
trash-daily/src/main/java/com/trash/information_sharing/controller/InformationSharingController.java
  View file @cb6cea0
... ... @@ -50,6 +50,9 @@ public class InformationSharingController extends BaseController
50 50 public AjaxResult export(InformationSharing informationSharing)
51 51 {
52 52 List<InformationSharing> list = informationSharingService.selectInformationSharingList(informationSharing);
  53 + for(int i = 0;i<list.size();i++){
  54 + list.get(i).setId((long)i+1);
  55 + }
53 56 ExcelUtil<InformationSharing> util = new ExcelUtil<InformationSharing>(InformationSharing.class);
54 57 return util.exportExcel(list, "information_sharing");
55 58 }
... ...
trash-daily/src/main/java/com/trash/report/controller/WorkReportController.java
  View file @cb6cea0
... ... @@ -51,6 +51,9 @@ public class WorkReportController extends BaseController
51 51 public AjaxResult export(WorkReport workReport)
52 52 {
53 53 List<WorkReport> list = workReportService.selectWorkReportList(workReport);
  54 + for(int i = 0;i<list.size();i++){
  55 + list.get(i).setId((long)i+1);
  56 + }
54 57 ExcelUtil<WorkReport> util = new ExcelUtil<WorkReport>(WorkReport.class);
55 58 return util.exportExcel(list, "report");
56 59 }
... ...
trash-daily/src/main/java/com/trash/situation/controller/DailySituationController.java
  View file @cb6cea0
... ... @@ -51,6 +51,9 @@ public class DailySituationController extends BaseController
51 51 public AjaxResult export(DailySituation dailySituation)
52 52 {
53 53 List<DailySituation> list = dailySituationService.selectDailySituationList(dailySituation);
  54 + for(int i = 0;i<list.size();i++){
  55 + list.get(i).setId((i+1)+"");
  56 + }
54 57 ExcelUtil<DailySituation> util = new ExcelUtil<DailySituation>(DailySituation.class);
55 58 return util.exportExcel(list, "situation");
56 59 }
... ...
trash-daily/src/main/java/com/trash/situation/domain/DailySituation.java
  View file @cb6cea0
... ... @@ -52,7 +52,11 @@ public class DailySituation extends BaseEntity
52 52  
53 53 private String warningCaseFileInfo;
54 54  
  55 + private String desc1;
55 56  
  57 + private String desc2;
  58 +
  59 + private String desc3;
56 60  
57 61  
58 62 public Date getUpdateTime() {
... ... @@ -142,8 +146,34 @@ public class DailySituation extends BaseEntity
142 146 {
143 147 return numberOfVehicles;
144 148 }
  149 +
  150 +
  151 +
  152 + public String getDesc1() {
  153 + return desc1;
  154 + }
  155 +
  156 + public void setDesc1(String desc1) {
  157 + this.desc1 = desc1;
  158 + }
  159 +
  160 + public String getDesc2() {
  161 + return desc2;
  162 + }
  163 +
  164 + public void setDesc2(String desc2) {
  165 + this.desc2 = desc2;
  166 + }
  167 +
  168 + public String getDesc3() {
  169 + return desc3;
  170 + }
  171 +
  172 + public void setDesc3(String desc3) {
  173 + this.desc3 = desc3;
  174 + }
145 175  
146   - @Override
  176 + @Override
147 177 public String toString() {
148 178 return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
149 179 .append("id", getId())
... ...
trash-daily/src/main/java/com/trash/toollist/controller/DailyToolListController.java
  View file @cb6cea0
... ... @@ -51,6 +51,9 @@ public class DailyToolListController extends BaseController
51 51 public AjaxResult export(DailyToolList dailyToolList)
52 52 {
53 53 List<DailyToolList> list = dailyToolListService.selectDailyToolListList(dailyToolList);
  54 + for(int i = 0;i<list.size();i++){
  55 + list.get(i).setId((long)i+1);
  56 + }
54 57 ExcelUtil<DailyToolList> util = new ExcelUtil<DailyToolList>(DailyToolList.class);
55 58 return util.exportExcel(list, "toollist");
56 59 }
... ...
trash-daily/src/main/resources/mapper/situation/DailySituationMapper.xml
  View file @cb6cea0
... ... @@ -14,6 +14,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
14 14 <result property="numberOfVehicles" column="Number_of_vehicles" />
15 15 <result property="caseFileInfo" column="case_file_info" />
16 16 <result property="warningCaseFileInfo" column="warning_case_file_info" />
  17 + <result property="desc1" column="desc1" />
  18 + <result property="desc2" column="desc2" />
  19 + <result property="desc3" column="desc3" />
17 20 <result property="createBy" column="create_by" />
18 21 <result property="createTime" column="create_time" />
19 22 <result property="updateTime" column="update_time" />
... ... @@ -21,7 +24,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
21 24 </resultMap>
22 25  
23 26 <sql id="selectDailySituationVo">
24   - select id, title, operator, date, weather, Consumption_site_situation, Number_of_vehicles,case_file_info,warning_case_file_info, create_time, update_time,create_by from daily_situation
  27 + select id, title, operator, date, weather, Consumption_site_situation, Number_of_vehicles,case_file_info,warning_case_file_info, create_time, update_time,create_by,desc1,desc2,desc3 from daily_situation
25 28 </sql>
26 29  
27 30 <select id="selectDailySituationList" parameterType="DailySituation" resultMap="DailySituationResult">
... ... @@ -53,6 +56,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
53 56 <if test="createTime != null">create_time,</if>
54 57 <if test="updateTime != null">update_time,</if>
55 58 <if test="createBy != null">create_by,</if>
  59 + <if test="desc1 != null">desc1,</if>
  60 + <if test="desc2 != null">desc2,</if>
  61 + <if test="desc3 != null">desc3,</if>
56 62 </trim>
57 63 <trim prefix="values (" suffix=")" suffixOverrides=",">
58 64 <if test="id != null and id != ''">#{id},</if>
... ... @@ -66,7 +72,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
66 72 <if test="caseFileInfo != null">#{caseFileInfo},</if>
67 73 <if test="createTime != null">#{createTime},</if>
68 74 <if test="updateTime != null">#{updateTime},</if>
69   - <if test="createBy != null">#{createBy}</if>
  75 + <if test="createBy != null">#{createBy},</if>
  76 + <if test="desc1 != null">#{desc1},</if>
  77 + <if test="desc2 != null">#{desc2},</if>
  78 + <if test="desc3 != null">#{desc3},</if>
70 79 </trim>
71 80 </insert>
72 81  
... ... @@ -83,6 +92,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
83 92 <if test="caseFileInfo != null">case_file_info = #{caseFileInfo},</if>
84 93 <if test="createTime != null">create_time = #{createTime},</if>
85 94 <if test="updateTime != null">update_time = #{updateTime},</if>
  95 + <if test="desc1 != null">desc1 = #{desc1},</if>
  96 + <if test="desc2 != null">desc2 = #{desc2},</if>
  97 + <if test="desc3 != null">desc3 = #{desc3},</if>
86 98 </trim>
87 99 where id = #{id}
88 100 </update>
... ...
trash-ui/src/api/dict.js
  View file @cb6cea0
... ... @@ -103,8 +103,7 @@ export function updateDriver(data) {
103 103 // });
104 104 }
105 105  
106   -export function contractList() {
107   - let data = {page:1,size:9999}; //,contractStatus:1,auditStatus:1
  106 +export function contractList(data) {
108 107 return requestRemote({
109 108 url: '/api/siteservice/cs/sitecontract/ledger/list',
110 109 method: 'post',
... ...
trash-ui/src/layout/index4.vue renamed to trash-ui/src/layout/index6.vue
  View file @cb6cea0
trash-ui/src/views/TrashData/TrashData/index.vue
  View file @cb6cea0
... ... @@ -46,7 +46,7 @@
46 46 </el-row>
47 47  
48 48 <el-table v-loading="loading" :data="TrashDataList" @selection-change="handleSelectionChange">
49   - <el-table-column label="序号" align="center" prop="id" />
  49 + <el-table-column label="序号" align="center" type="index" />
50 50 <el-table-column label="所属区域" align="center" prop="place" />
51 51 <el-table-column label="一般弃土产生量(万吨)" align="center" prop="param1" />
52 52 <el-table-column label="四类建筑垃圾产生量(万吨)" align="center" prop="param2" />
... ...
trash-ui/src/views/activiti/task/index.vue
  View file @cb6cea0
... ... @@ -32,7 +32,7 @@
32 32 <el-row type="flex" justify="center">
33 33 <el-col>
34 34 <el-form-item label="补充说明">
35   - <el-input type="textarea" v-model="form.subReason"/>
  35 + <el-input type="textarea" v-model="form.subReason" maxlength=100 show-word-limit='true'/>
36 36 </el-form-item>
37 37 </el-col>
38 38 </el-row>
... ... @@ -92,21 +92,21 @@
92 92 </p>
93 93 </el-col>
94 94 <el-col :span="6">
95   - <a style="color:blue;font-size: 12px;" @click="showFileUpload(5)">摄像头视频截图1</a>
  95 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(5)">{{form.type==0?"摄像头视频截图1":"洗车设施照片"}}</a>
96 96 <el-input v-model="form.sub_img5" type="hidden"></el-input>
97 97 <p v-for="img in form.sub_img5">{{ img.split(":")[0] }}<a @click="removeImage(5,img)" style="color:red">
98 98 x</a>
99 99 </p>
100 100 </el-col>
101 101 <el-col :span="6">
102   - <a style="color:blue;font-size: 12px;" @click="showFileUpload(6)">摄像头视频截图2</a>
  102 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(6)">{{form.type==0?"摄像头视频截图2":"雾炮机"}}</a>
103 103 <el-input v-model="form.sub_img6" type="hidden"></el-input>
104 104 <p v-for="img in form.sub_img6">{{ img.split(":")[0] }}<a @click="removeImage(6,img)" style="color:red">
105 105 x</a>
106 106 </p>
107 107 </el-col>
108 108 <el-col :span="6">
109   - <a style="color:blue;font-size: 12px;" @click="showFileUpload(7)">摄像头视频截图3</a>
  109 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(7)">{{form.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}}</a>
110 110 <el-input v-model="form.sub_img7" type="hidden"></el-input>
111 111 <p v-for="img in form.sub_img7">{{ img.split(":")[0] }}<a @click="removeImage(7,img)" style="color:red">
112 112 x</a>
... ...
trash-ui/src/views/business/CompanyCredit/index.vue
  View file @cb6cea0
... ... @@ -77,7 +77,7 @@
77 77 </el-row>
78 78  
79 79 <el-table v-loading="loading" :data="creditList" @selection-change="handleSelectionChange" :cell-style="colStyle" border>
80   - <el-table-column label="序号" align="center" prop="id" />
  80 + <el-table-column label="序号" align="center" type="index" />
81 81 <el-table-column label="运输企业" align="center" prop="name" />
82 82 <el-table-column label="失信时间" align="center" prop="time" width="180" v-if="queryParams.status==0">
83 83 <template slot-scope="scope">
... ... @@ -149,7 +149,7 @@
149 149  
150 150 <el-dialog title="历史失信" :visible.sync="infoDialog" width="800px" append-to-body center="true">
151 151 <el-table v-loading="loading" :data="creditListInfo" :cell-style="colStyle" border>
152   - <el-table-column label="序号" align="center" prop="id" />
  152 + <el-table-column label="序号" align="center" type="index" />
153 153 <el-table-column label="失信时间" align="center" prop="time" width="180">
154 154 <template slot-scope="scope">
155 155 <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
... ...
trash-ui/src/views/business/ConstructionCredit/index.vue
  View file @cb6cea0
... ... @@ -73,7 +73,7 @@
73 73  
74 74 <el-table v-loading="loading" :data="creditList" @selection-change="handleSelectionChange" :cell-style="colStyle"
75 75 border>
76   - <el-table-column label="序号" align="center" prop="id" />
  76 + <el-table-column label="序号" align="center" type="index" />
77 77 <el-table-column label="工地名称" align="center" prop="name" />
78 78 <el-table-column label="建筑垃圾类型" align="center" prop="type" />
79 79 <el-table-column label="失信时间" align="center" prop="time" width="180" v-if="queryParams.status==0">
... ... @@ -142,7 +142,7 @@
142 142  
143 143 <el-dialog title="历史失信" :visible.sync="infoDialog" width="800px" append-to-body>
144 144 <el-table v-loading="loading" :data="creditListInfo" :cell-style="colStyle" border>
145   - <el-table-column label="序号" align="center" prop="id" />
  145 + <el-table-column label="序号" align="center" type="index" />
146 146 <el-table-column label="失信时间" align="center" prop="time" width="180" />
147 147 <el-table-column label="情况说明" align="center" prop="reason" />
148 148 <el-table-column label="操作历史" align="center" prop="lostCredit">
... ... @@ -316,7 +316,7 @@
316 316 getData(stauts) {
317 317 this.queryParams.status = 0;
318 318 this.queryParams.lostCredit = stauts;
319   - this.getList();
  319 + this.init();
320 320 },
321 321 getHistoryData() {
322 322 this.queryParams.status = 1;
... ... @@ -412,12 +412,12 @@
412 412 let data = [{creditStatus:this.form.lostCredit,objectId:this.form.objectId}];
413 413  
414 414 updateConstructionsites(data).then(response=>{
415   - this.updateForm.id = this.form.id;
416   - updateCredit(this.updateForm).then(response => {
417   - this.msgSuccess("撤销成功");
418   - this.isEdit = false;
419   - this.init();
420   - });
  415 + this.updateForm.id = this.form.id;
  416 + updateCredit(this.updateForm).then(response => {
  417 + this.msgSuccess("撤销成功");
  418 + this.isEdit = false;
  419 + this.init();
  420 + });
421 421 });
422 422 } else {
423 423 this.form.lostCredit = 1;
... ...
trash-ui/src/views/business/DriverCredit/index.vue
  View file @cb6cea0
... ... @@ -59,7 +59,7 @@
59 59 </el-row>
60 60  
61 61 <el-table v-loading="loading" :data="creditList" @selection-change="handleSelectionChange" :cell-style="colStyle" border>
62   - <el-table-column label="序号" align="center" prop="id" />
  62 + <el-table-column label="序号" align="center" type="index" />
63 63 <el-table-column label="驾驶员姓名" align="center" prop="name" />
64 64 <el-table-column label="证件号码" align="center" prop="idNumber" />
65 65 <el-table-column label="失信时间" align="center" prop="time" width="180" v-if="queryParams.status==0">
... ... @@ -128,7 +128,7 @@
128 128  
129 129 <el-dialog title="历史失信" :visible.sync="infoDialog" width="800px" append-to-body>
130 130 <el-table v-loading="loading" :data="creditListInfo" :cell-style="colStyle" border>
131   - <el-table-column label="序号" align="center" prop="id" />
  131 + <el-table-column label="序号" align="center" type="index" />
132 132 <el-table-column label="失信时间" align="center" prop="time" width="180">
133 133 <template slot-scope="scope">
134 134 <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
... ...
trash-ui/src/views/business/EarthSitesCredit/index.vue
  View file @cb6cea0
... ... @@ -70,7 +70,7 @@
70 70 </el-row>
71 71  
72 72 <el-table v-loading="loading" :data="creditList" @selection-change="handleSelectionChange" :cell-style="colStyle" border>
73   - <el-table-column label="序号" align="center" prop="id" />
  73 + <el-table-column label="序号" align="center" type="index" />
74 74 <el-table-column label="消纳场名称" align="center" prop="name" />
75 75 <el-table-column label="消纳场类型" align="center" prop="type" />
76 76 <el-table-column label="失信时间" align="center" prop="time" width="180" v-if="queryParams.status==0">
... ... @@ -145,7 +145,7 @@
145 145  
146 146 <el-dialog title="历史失信" :visible.sync="infoDialog" width="800px" append-to-body>
147 147 <el-table v-loading="loading" :data="creditListInfo" :cell-style="colStyle" border>
148   - <el-table-column label="序号" align="center" prop="id" />
  148 + <el-table-column label="序号" align="center" type="index" />
149 149 <el-table-column label="失信时间" align="center" prop="time" width="180" />
150 150 <el-table-column label="情况说明" align="center" prop="reason" />
151 151 <el-table-column label="操作历史" align="center" prop="lostCredit">
... ...
trash-ui/src/views/business/TruckCredit/index.vue
  View file @cb6cea0
... ... @@ -67,7 +67,7 @@
67 67  
68 68 <el-table v-loading="loading" :data="creditList" @selection-change="handleSelectionChange" :cell-style="colStyle"
69 69 border>
70   - <el-table-column label="序号" align="center" prop="id" />
  70 + <el-table-column label="序号" align="center" type="index" />
71 71 <el-table-column label="企业运输" align="center" prop="companyId" />
72 72 <el-table-column label="车牌号码" align="center" prop="licensePlate" />
73 73 <el-table-column label="失信时间" align="center" prop="time" width="180" v-if="queryParams.status==0">
... ... @@ -131,7 +131,7 @@
131 131  
132 132 <el-dialog title="历史失信" :visible.sync="infoDialog" width="800px" append-to-body center="true">
133 133 <el-table v-loading="loading" :data="creditListInfo" :cell-style="colStyle" border>
134   - <el-table-column label="序号" align="center" prop="id" />
  134 + <el-table-column label="序号" align="center" type="index" />
135 135 <el-table-column label="失信时间" align="center" prop="time" width="180" >
136 136 <template slot-scope="scope">
137 137 <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
... ...
trash-ui/src/views/business/dayWorkReport/index.vue
  View file @cb6cea0
... ... @@ -60,15 +60,13 @@
60 60 </el-row>
61 61  
62 62 <el-table v-loading="loading" :data="threestepList" @selection-change="handleSelectionChange">
63   - <el-table-column label="序号" align="center" prop="id" />
  63 + <el-table-column label="序号" align="center" type="index" />
64 64 <el-table-column label="日期" align="center" prop="createTime" />
65 65 <el-table-column label="工地名称" align="center" prop="name" />
66   - <el-table-column label="项目类型" align="center" prop="type" />
67 66 <el-table-column label="所属区域" align="center" prop="place" />
68 67 <el-table-column label="开工状态" align="center" prop="status" />
69 68 <el-table-column label="申请开工时间" align="center" prop="selfCheckTime" width="180"/>
70 69 <el-table-column label="消纳场名称" align="center" prop="ename" />
71   - <el-table-column label="消纳场类型" align="center" prop="etype" />
72 70 <el-table-column label="所属区域" align="center" prop="eplace" />
73 71 <el-table-column label="开工状态" align="center" prop="estatus" />
74 72 <el-table-column label="申请开工时间" align="center" prop="eselfCheckTime" width="180"/>
... ...
trash-ui/src/views/business/supervisionSpecial/index.vue
  View file @cb6cea0
... ... @@ -36,7 +36,7 @@
36 36  
37 37 <el-table v-loading="loading" :data="SupervisionSpecialList" @selection-change="handleSelectionChange">
38 38 <el-table-column type="selection" width="55" align="center" />
39   - <el-table-column label="序号" align="center" prop="id" />
  39 + <el-table-column label="序号" align="center" type="index" />
40 40 <el-table-column label="所属区域" align="center" prop="place" />
41 41 <el-table-column label="填报日期" align="center" prop="createTime" width="180">
42 42 <template slot-scope="scope">
... ...
trash-ui/src/views/business/threestep/index.vue
  View file @cb6cea0
... ... @@ -48,7 +48,7 @@
48 48  
49 49 <el-row :gutter="10" class="mb8">
50 50 <el-col :span="1.5">
51   - <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['business:threestep:add']" v-if="new Date().getHours() > 7 && new Date().getHours() < 24">新增</el-button>
  51 + <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['business:threestep:add']" v-if="this.queryParams.pageStatus==0 && new Date().getHours() > 7 && new Date().getHours() < 24">新增</el-button>
52 52 </el-col>
53 53 <el-col :span="1.5">
54 54 <el-button size="mini" @click="handleExport" v-hasPermi="['business:threestep:export']">导出</el-button>
... ... @@ -57,7 +57,7 @@
57 57 </el-row>
58 58  
59 59 <el-table v-loading="loading" :data="threestepList" @selection-change="handleSelectionChange">
60   - <el-table-column label="序号" align="center" prop="id" />
  60 + <el-table-column label="序号" align="center" type='index'/>
61 61  
62 62 <el-table-column label="项目类型" align="center" prop="type">
63 63 <template slot-scope="scope">
... ... @@ -71,17 +71,17 @@
71 71  
72 72 <el-table-column label="自查时间" align="center" prop="selfCheckTime" width="180">
73 73 <template slot-scope="scope">
74   - <span>{{ parseTime(scope.row.selfCheckTime, '{y}-{m}-{d}') }}</span>
  74 + <span>{{scope.row.selfCheckTime}}</span>
75 75 </template>
76 76 </el-table-column>
77 77 <el-table-column label="巡查时间" align="center" prop="checkTime" width="180">
78 78 <template slot-scope="scope">
79   - <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d}') }}</span>
  79 + <span>{{ scope.row.checkTime}}</span>
80 80 </template>
81 81 </el-table-column>
82 82 <el-table-column label="抽查时间" align="center" prop="checkEndTime" width="180" v-if="queryParams.pageStatus==1">
83 83 <template slot-scope="scope">
84   - <span>{{ parseTime(scope.row.checkEndTime, '{y}-{m}-{d}') }}</span>
  84 + <span>{{ scope.row.checkEndTime }}</span>
85 85 </template>
86 86 </el-table-column>
87 87 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
... ... @@ -157,7 +157,7 @@
157 157 <el-row type="flex" justify="center" v-if="form.type == 0">
158 158 <el-col :span="12">
159 159 <el-form-item label="运输企业" prop="companys">
160   - <el-select v-model="form.companys" filterable multiple reserve-keyword @change="checkCompany">
  160 + <el-select v-model="form.companys" filterable multiple @change="checkCompany">
161 161 <el-option v-for="item in companyList" :label="item.name" :value="item.name" :key="item.id"
162 162 />
163 163 </el-select>
... ... @@ -194,73 +194,73 @@
194 194 <el-col :span="6">
195 195 <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">过水槽照片</a>
196 196 <el-input v-model="form.img0" type="hidden"></el-input>
197   - <p v-for="img,index in form.img0">过水槽照片 - {{index+1}}<a @click="removeImage(0,img)" style="color:red"> x</a></p>
  197 + <p v-for="img,index in form.img0">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(0,img)" style="color:red"> x</a></p>
198 198 </el-col>
199 199 <el-col :span="6">
200 200 <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">洗车平台照片</a>
201 201 <el-input v-model="form.img1" type="hidden"></el-input>
202   - <p v-for="img,index in form.img1">洗车平台照片 - {{index+1}}<a @click="removeImage(1,img)" style="color:red"> x</a></p>
  202 + <p v-for="img,index in form.img1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(1,img)" style="color:red"> x</a></p>
203 203 </el-col>
204 204 <el-col :span="6">
205 205 <a style="color:blue;font-size: 12px;" @click="showFileUpload(2)">出入口照片</a>
206 206 <el-input v-model="form.img2" type="hidden"></el-input>
207   - <p v-for="img,index in form.img2">出入口照片 - {{index+1}}<a @click="removeImage(2,img)" style="color:red"> x</a></p>
  207 + <p v-for="img,index in form.img2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(2,img)" style="color:red"> x</a></p>
208 208 </el-col>
209 209 <el-col :span="6">
210 210 <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">沉淀池照片</a>
211 211 <el-input v-model="form.img3" type="hidden"></el-input>
212   - <p v-for="img,index in form.img3">沉淀池照片 - {{index+1}}<a @click="removeImage(3,img)" style="color:red"> x</a></p>
  212 + <p v-for="img,index in form.img3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(3,img)" style="color:red"> x</a></p>
213 213 </el-col>
214 214 </el-row>
215 215 <el-row type="flex" justify="center" v-if="form.type != null">
216 216 <el-col :span="6">
217 217 <a style="color:blue;font-size: 12px;" @click="showFileUpload(4)">硬质路面照片</a>
218 218 <el-input v-model="form.img4" type="hidden"></el-input>
219   - <p v-for="img,index in form.img4">硬质路面照片 - {{index+1}}<a @click="removeImage(4,img)" style="color:red"> x</a></p>
  219 + <p v-for="img,index in form.img4">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(4,img)" style="color:red"> x</a></p>
220 220 </el-col>
221 221 <el-col :span="6">
222 222 <a style="color:blue;font-size: 12px;" @click="showFileUpload(5)">{{form.type==0?"摄像头视频截图1":"洗车设施照片"}}</a>
223 223 <el-input v-model="form.img5" type="hidden"></el-input>
224   - <p v-for="img,index in form.img5">{{form.type==0?"摄像头视频截图1":"洗车设施照片"}} - {{index+1}}<a @click="removeImage(5,img)" style="color:red"> x</a></p>
  224 + <p v-for="img,index in form.img5">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(5,img)" style="color:red"> x</a></p>
225 225 </el-col>
226 226 <el-col :span="6">
227 227 <a style="color:blue;font-size: 12px;" @click="showFileUpload(6)">{{form.type==0?"摄像头视频截图2":"雾炮机"}}</a>
228 228 <el-input v-model="form.img6" type="hidden"></el-input>
229   - <p v-for="img,index in form.img6">{{form.type==0?"摄像头视频截图2":"雾炮机"}} - {{index+1}}<a @click="removeImage(6,img)" style="color:red"> x</a></p>
  229 + <p v-for="img,index in form.img6">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(6,img)" style="color:red"> x</a></p>
230 230 </el-col>
231 231 <el-col :span="6">
232 232 <a style="color:blue;font-size: 12px;" @click="showFileUpload(7)">{{form.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}}</a>
233 233 <el-input v-model="form.img7" type="hidden"></el-input>
234   - <p v-for="img,index in form.img7">{{form.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}} - {{index+1}}<a @click="removeImage(7,img)" style="color:red"> x</a></p>
  234 + <p v-for="img,index in form.img7">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(7,img)" style="color:red"> x</a></p>
235 235 </el-col>
236 236 </el-row>
237 237 <el-row type="flex" justify="center" v-if="form.type != null">
238 238 <el-col :span="5">
239 239 <a style="color:blue;font-size: 12px;" @click="showFileUpload(8)">其他1</a>
240 240 <el-input v-model="form.img8" type="hidden"></el-input>
241   - <p v-for="img,index in form.img8">其他1 - {{index+1}}<a @click="removeImage(8,img)" style="color:red"> x</a></p>
  241 + <p v-for="img,index in form.img8">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(8,img)" style="color:red"> x</a></p>
242 242 </el-col>
243 243 <el-col :span="5">
244 244 <a style="color:blue;font-size: 12px;" @click="showFileUpload(9)">其他2</a>
245 245 <el-input v-model="form.img9" type="hidden"></el-input>
246   - <p v-for="img,index in form.img9">其他2 - {{index+1}}<a @click="removeImage(9,img)" style="color:red"> x</a></p>
  246 + <p v-for="img,index in form.img9">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(9,img)" style="color:red"> x</a></p>
247 247 </el-col>
248 248 <el-col :span="5">
249 249 <a style="color:blue;font-size: 12px;" @click="showFileUpload(10)">其他3</a>
250 250 <el-input v-model="form.img10" type="hidden"></el-input>
251   - <p v-for="img,index in form.img10">其他3 - {{index+1}}<a @click="removeImage(10,img)" style="color:red"> x</a>
  251 + <p v-for="img,index in form.img10">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(10,img)" style="color:red"> x</a>
252 252 </p>
253 253 </el-col>
254 254 <el-col :span="5">
255 255 <a style="color:blue;font-size: 12px;" @click="showFileUpload(11)">其他4</a>
256 256 <el-input v-model="form.img11" type="hidden"></el-input>
257   - <p v-for="img,index in form.img11">其他4 - {{index+1}}<a @click="removeImage(11,img)" style="color:red"> x</a>
  257 + <p v-for="img,index in form.img11">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(11,img)" style="color:red"> x</a>
258 258 </p>
259 259 </el-col>
260 260 <el-col :span="4">
261 261 <a style="color:blue;font-size: 12px;" @click="showFileUpload(12)">其他5</a>
262 262 <el-input v-model="form.img12" type="hidden"></el-input>
263   - <p v-for="img,index in form.img12">其他5 - {{index+1}}<a @click="removeImage(12,img)" style="color:red"> x</a>
  263 + <p v-for="img,index in form.img12">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(12,img)" style="color:red"> x</a>
264 264 </p>
265 265 </el-col>
266 266 </el-row>
... ... @@ -281,24 +281,24 @@
281 281  
282 282 <el-form ref="form" :model="form" :rules="rules" label-width="100px" v-if="this.queryParams.pageStatus==1">
283 283 <el-form-item label="补充说明">
284   - <el-input type="textarea" v-model="form.subSubReason"></el-input>
  284 + <el-input type="textarea" v-model="form.subSubReason" ></el-input>
285 285 </el-form-item>
286 286  
287 287 <el-row type="flex" justify="center">
288 288 <el-col :span="8">
289 289 <a style="color:blue;font-size: 12px;" @click="showFileUpload(91)">附件1</a>
290 290 <el-input v-model="form.attchItem1" type="hidden"></el-input>
291   - <p v-for="img,index in form.attchItem1">附件1 - {{index+1}}<a @click="removeAttchItem(1,img)" style="color:red"> x</a></p>
  291 + <p v-for="img,index in form.attchItem1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(1,img)" style="color:red"> x</a></p>
292 292 </el-col>
293 293 <el-col :span="8">
294 294 <a style="color:blue;font-size: 12px;" @click="showFileUpload(92)">附件2</a>
295 295 <el-input v-model="form.attchItem2" type="hidden"></el-input>
296   - <p v-for="img,index in form.attchItem2">附件2 - {{index+1}}<a @click="removeAttchItem(2,img)" style="color:red"> x</a></p>
  296 + <p v-for="img,index in form.attchItem2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(2,img)" style="color:red"> x</a></p>
297 297 </el-col>
298 298 <el-col :span="8">
299 299 <a style="color:blue;font-size: 12px;" @click="showFileUpload(93)">附件3</a>
300 300 <el-input v-model="form.attchItem3" type="hidden"></el-input>
301   - <p v-for="img,index in form.attchItem3">附件3 - {{index+1}}<a @click="removeAttchItem(3,img)" style="color:red"> x</a></p>
  301 + <p v-for="img,index in form.attchItem3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(3,img)" style="color:red"> x</a></p>
302 302 </el-col>
303 303 </el-row>
304 304  
... ... @@ -371,11 +371,8 @@
371 371 return {
372 372 // 遮罩层
373 373 loading: true,
374   -
375 374 reUpdate : false,
376   -
377 375 info: false,
378   -
379 376 infoData: null,
380 377 businessKey:null,
381 378 picSample: false,
... ... @@ -456,7 +453,7 @@
456 453 companys: [{
457 454 required: true,
458 455 message: '请填写完整',
459   - trigger: 'blur'
  456 + trigger: 'change'
460 457 }, ],
461 458 objectId: [{
462 459 required: true,
... ... @@ -476,7 +473,7 @@
476 473 companyTrucks: [{
477 474 required: true,
478 475 message: '请填写完整',
479   - trigger: 'blur'
  476 + trigger: 'change'
480 477 }, ],
481 478 objectId: [{
482 479 required: true,
... ... @@ -523,6 +520,29 @@
523 520 }
524 521 });
525 522  
  523 + let query = {
  524 + 'page':1,
  525 + 'size':9999,
  526 + }
  527 +
  528 + companyList(query).then(response => {
  529 +
  530 + let companys = response.result.list;
  531 + this.companyList = companys;
  532 + let ids = [];
  533 +
  534 + for(let i = 0 ;i<companys.length;i++){
  535 + ids.push(companys[i].id);
  536 + }
  537 + query.companyID = ids + "";
  538 + query.valid = 0;
  539 +
  540 + truckList(query).then(res=>{
  541 + this.truckList = res.result.list;
  542 + });
  543 + });
  544 +
  545 +
526 546 this.getList(0);
527 547 },
528 548 methods: {
... ... @@ -538,8 +558,6 @@
538 558 return;
539 559 }
540 560  
541   -
542   -
543 561 if(this.form.type == 0){
544 562 this.form.name = item.constructionSiteName;
545 563 this.form.objectId = item.constructionSiteID;
... ... @@ -552,46 +570,16 @@
552 570 this.form.objectId = item.earthSiteID;
553 571 }
554 572  
555   -
556   - if(this.form.type == 0){
557   - let query = {
558   - 'page':1,
559   - 'size':9999,
560   - }
561   -
562   - companyList(query).then(response => {
563   -
564   - let companys = response.result.list;
565   - this.companyList = companys;
566   - let ids = [];
567   -
568   - for(let i = 0 ;i<companys.length;i++){
569   - ids.push(companys[i].id);
570   - }
571   - query.companyID = ids + "";
572   - query.valid = 0;
573   -
574   - truckList(query).then(res=>{
575   - this.truckList = res.result.list;
576   - });
577   - });
578   - }
579   -
580   -
581 573 for(let i =0;i<this.remoteData.length ;i++){
582 574  
583 575 if(this.remoteData[i].name == this.form.name){
584 576 this.form.place = Number(this.remoteData[i].areaCode);
585 577 break;
586 578 }
587   -
588 579 }
589 580  
590 581 this.form.contractId = item.id;
591 582 this.bindname = this.form.earthsitesName;
592   -
593   -
594   -
595 583 },
596 584 checkCompany(item){
597 585  
... ... @@ -770,10 +758,10 @@
770 758 },
771 759  
772 760 uploadSuccess(res, file, fileList) {
773   - if(res.code){
774   - this.$message(res.message);
775   - return;
776   - }
  761 + if(res.code){
  762 + this.$message(res.message);
  763 + return;
  764 + }
777 765 if(this.picIndex > 90){
778 766 let target = "attchItem" + (this.picIndex-90);
779 767 if (!this.form[target]) {
... ... @@ -817,7 +805,6 @@
817 805 handleClose() {
818 806 this.uploadImageDialog = false;
819 807 this.fileList = [];
820   - this.reset();
821 808 },
822 809 selectType(value) {
823 810 if (value == "0") {
... ... @@ -889,8 +876,13 @@
889 876 })
890 877 }
891 878  
892   - contractList().then(res=>{
  879 + let query = {
  880 + "page": 1,
  881 + "size": 9999,
  882 + "auditStatus":1,
  883 + };
893 884  
  885 + contractList(query).then(res=>{
894 886 this.contractList = res.result.list;
895 887 this.filterContract = this.contractList
896 888 });
... ... @@ -946,6 +938,7 @@
946 938 phone: null
947 939 };
948 940 this.resetForm("form");
  941 + this.filterConract();
949 942 },
950 943 /** 搜索按钮操作 */
951 944 handleQuery() {
... ... @@ -1118,7 +1111,7 @@
1118 1111 /** 导出按钮操作 */
1119 1112 handleExport() {
1120 1113 const queryParams = this.queryParams;
1121   - this.$confirm('是否确认导出所有报工自查数据项?', "警告", {
  1114 + this.$confirm('是否确认导出所有报工数据项?', "警告", {
1122 1115 confirmButtonText: "确定",
1123 1116 cancelButtonText: "取消",
1124 1117 type: "warning"
... ...
trash-ui/src/views/business/threestep/threestepInfo.vue
  View file @cb6cea0
... ... @@ -75,7 +75,7 @@
75 75 </el-col>
76 76 <el-col :span="20">
77 77 <el-row v-for="img,index in infoData.img0.split(',')" style="margin-bottom:10px;">
78   - <a @click="downloadFile(img);" style="color: blue;">过水槽照片 - {{index+1}}</a>
  78 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
79 79 </el-row>
80 80 </el-col>
81 81 </el-row>
... ... @@ -85,7 +85,7 @@
85 85 </el-col>
86 86 <el-col :span="20">
87 87 <el-row v-for="img,index in infoData.img1.split(',')" style="margin-bottom:10px;">
88   - <a @click="downloadFile(img);" style="color: blue;">洗车平台照片 - {{index+1}}</a>
  88 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
89 89 </el-row>
90 90 </el-col>
91 91 </el-row>
... ... @@ -95,7 +95,7 @@
95 95 </el-col>
96 96 <el-col :span="20">
97 97 <el-row v-for="img,index in infoData.img2.split(',')" style="margin-bottom:10px;">
98   - <a @click="downloadFile(img);" style="color: blue;">出入口照片 - {{index+1}}</a>
  98 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
99 99 </el-row>
100 100 </el-col>
101 101 </el-row>
... ... @@ -105,7 +105,7 @@
105 105 </el-col>
106 106 <el-col :span="20">
107 107 <el-row v-for="img,index in infoData.img3.split(',')" style="margin-bottom:10px;">
108   - <a @click="downloadFile(img);" style="color: blue;">沉淀池照片 - {{index+1}}</a>
  108 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
109 109 </el-row>
110 110 </el-col>
111 111 </el-row>
... ... @@ -115,7 +115,7 @@
115 115 </el-col>
116 116 <el-col :span="20">
117 117 <el-row v-for="img,index in infoData.img4.split(',')" style="margin-bottom:10px;">
118   - <a @click="downloadFile(img);" style="color: blue;">硬质路面照片 - {{index+1}}</a>
  118 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
119 119 </el-row>
120 120 </el-col>
121 121 </el-row>
... ... @@ -125,7 +125,7 @@
125 125 </el-col>
126 126 <el-col :span="20">
127 127 <el-row v-for="img,index in infoData.img5.split(',')" style="margin-bottom:10px;">
128   - <a @click="downloadFile(img);" style="color: blue;">{{infoData.type==0?"摄像头视频截图1":"洗车设施照片"}} - {{index+1}}</a>
  128 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
129 129 </el-row>
130 130 </el-col>
131 131 </el-row>
... ... @@ -135,7 +135,7 @@
135 135 </el-col>
136 136 <el-col :span="20">
137 137 <el-row v-for="img,index in infoData.img6.split(',')" style="margin-bottom:10px;">
138   - <a @click="downloadFile(img);" style="color: blue;">{{infoData.type==0?"摄像头视频截图2":"雾炮机"}} - {{index+1}}</a>
  138 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
139 139 </el-row>
140 140 </el-col>
141 141 </el-row>
... ... @@ -145,7 +145,7 @@
145 145 </el-col>
146 146 <el-col :span="20">
147 147 <el-row v-for="img,index in infoData.img7.split(',')" style="margin-bottom:10px;">
148   - <a @click="downloadFile(img);" style="color: blue;">{{infoData.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}} - {{index+1}}</a>
  148 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
149 149 </el-row>
150 150 </el-col>
151 151 </el-row>
... ... @@ -155,7 +155,7 @@
155 155 </el-col>
156 156 <el-col :span="20">
157 157 <el-row v-for="img,index in infoData.img8.split(',')" style="margin-bottom:10px;">
158   - <a @click="downloadFile(img);" style="color: blue;">其他1 - {{index+1}}</a>
  158 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
159 159 </el-row>
160 160 </el-col>
161 161 </el-row>
... ... @@ -165,7 +165,7 @@
165 165 </el-col>
166 166 <el-col :span="20">
167 167 <el-row v-for="img,index in infoData.img9.split(',')" style="margin-bottom:10px;">
168   - <a @click="downloadFile(img);" style="color: blue;">其他2 - {{index+1}}</a>
  168 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
169 169 </el-row>
170 170 </el-col>
171 171 </el-row>
... ... @@ -175,7 +175,7 @@
175 175 </el-col>
176 176 <el-col :span="20">
177 177 <el-row v-for="img,index in infoData.img10.split(',')" style="margin-bottom:10px;">
178   - <a @click="downloadFile(img);" style="color: blue;">其他3 - {{index+1}}</a>
  178 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
179 179 </el-row>
180 180 </el-col>
181 181 </el-row>
... ... @@ -185,7 +185,7 @@
185 185 </el-col>
186 186 <el-col :span="20">
187 187 <el-row v-for="img,index in infoData.img11.split(',')" style="margin-bottom:10px;">
188   - <a @click="downloadFile(img);" style="color: blue;">其他4 - {{index+1}}</a>
  188 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
189 189 </el-row>
190 190 </el-col>
191 191 </el-row>
... ... @@ -195,7 +195,7 @@
195 195 </el-col>
196 196 <el-col :span="20">
197 197 <el-row v-for="img,index in infoData.img12.split(',')" style="margin-bottom:10px;">
198   - <a @click="downloadFile(img);" style="color: blue;">其他5 - {{index+1}}</a>
  198 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
199 199 </el-row>
200 200 </el-col>
201 201 </el-row>
... ... @@ -203,7 +203,6 @@
203 203 <el-row type="flex" justify="center" v-if="infoData.checkTime">
204 204 <el-col>
205 205 <el-form-item label="巡查时间">
206   -
207 206 <el-input v-model="infoData.checkTime" :maxlength="20" show-word-limit disabled />
208 207 </el-form-item>
209 208 </el-col>
... ... @@ -238,8 +237,8 @@
238 237 履职情况照片
239 238 </el-col>
240 239 <el-col :span="20">
241   - <el-row v-for="sub_img,index in infoData.sub_img0.split(',')" style="margin-bottom:10px;">
242   - <a @click="downloadFile(sub_img);" style="color: blue;">履职情况照片 - {{index+1}}</a>
  240 + <el-row v-for="img,index in infoData.sub_img0.split(',')" style="margin-bottom:10px;">
  241 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
243 242 </el-row>
244 243 </el-col>
245 244 </el-row>
... ... @@ -248,8 +247,8 @@
248 247 水枪水嘴照片
249 248 </el-col>
250 249 <el-col :span="20">
251   - <el-row v-for="sub_img,index in infoData.sub_img1.split(',')" style="margin-bottom:10px;">
252   - <a @click="downloadFile(sub_img);" style="color: blue;">水枪水嘴照片 - {{index+1}}</a>
  250 + <el-row v-for="img,index in infoData.sub_img1.split(',')" style="margin-bottom:10px;">
  251 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
253 252 </el-row>
254 253 </el-col>
255 254 </el-row>
... ... @@ -258,8 +257,8 @@
258 257 照明照片
259 258 </el-col>
260 259 <el-col :span="20">
261   - <el-row v-for="sub_img,index in infoData.sub_img2.split(',')" style="margin-bottom:10px;">
262   - <a @click="downloadFile(sub_img);" style="color: blue;">照明照片 - {{index+1}}</a>
  260 + <el-row v-for="img,index in infoData.sub_img2.split(',')" style="margin-bottom:10px;">
  261 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
263 262 </el-row>
264 263 </el-col>
265 264 </el-row>
... ... @@ -268,8 +267,8 @@
268 267 视频监控照片
269 268 </el-col>
270 269 <el-col :span="20">
271   - <el-row v-for="sub_img,index in infoData.sub_img3.split(',')" style="margin-bottom:10px;">
272   - <a @click="downloadFile(sub_img);" style="color: blue;">视频监控照片 - {{index+1}}</a>
  270 + <el-row v-for="img,index in infoData.sub_img3.split(',')" style="margin-bottom:10px;">
  271 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
273 272 </el-row>
274 273 </el-col>
275 274 </el-row>
... ... @@ -278,8 +277,8 @@
278 277 洗车机照片
279 278 </el-col>
280 279 <el-col :span="20">
281   - <el-row v-for="sub_img,index in infoData.sub_img4.split(',')" style="margin-bottom:10px;">
282   - <a @click="downloadFile(sub_img);" style="color: blue;">洗车机照片 - {{index+1}}</a>
  280 + <el-row v-for="img,index in infoData.sub_img4.split(',')" style="margin-bottom:10px;">
  281 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
283 282 </el-row>
284 283 </el-col>
285 284 </el-row>
... ... @@ -288,8 +287,8 @@
288 287 {{infoData.type==0?"摄像头视频截图1":"洗车设施照片"}}
289 288 </el-col>
290 289 <el-col :span="20">
291   - <el-row v-for="sub_img,index in infoData.sub_img5.split(',')" style="margin-bottom:10px;">
292   - <a @click="downloadFile(sub_img);" style="color: blue;">{{infoData.type==0?"摄像头视频截图1":"洗车设施照片"}} - {{index+1}}</a>
  290 + <el-row v-for="img,index in infoData.sub_img5.split(',')" style="margin-bottom:10px;">
  291 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
293 292 </el-row>
294 293 </el-col>
295 294 </el-row>
... ... @@ -298,8 +297,8 @@
298 297 {{form.type==0?"摄像头视频截图2":"雾炮机"}}
299 298 </el-col>
300 299 <el-col :span="20">
301   - <el-row v-for="sub_img,index in infoData.sub_img6.split(',')" style="margin-bottom:10px;">
302   - <a @click="downloadFile(sub_img);" style="color: blue;">{{form.type==0?"摄像头视频截图2":"雾炮机"}} - {{index+1}}</a>
  300 + <el-row v-for="img,index in infoData.sub_img6.split(',')" style="margin-bottom:10px;">
  301 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
303 302 </el-row>
304 303 </el-col>
305 304 </el-row>
... ... @@ -308,8 +307,8 @@
308 307 {{form.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}}
309 308 </el-col>
310 309 <el-col :span="20">
311   - <el-row v-for="sub_img,index in infoData.sub_img7.split(',')" style="margin-bottom:10px;">
312   - <a @click="downloadFile(sub_img);" style="color: blue;">{{form.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}} - {{index+1}}</a>
  310 + <el-row v-for="img,index in infoData.sub_img7.split(',')" style="margin-bottom:10px;">
  311 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
313 312 </el-row>
314 313 </el-col>
315 314 </el-row>
... ... @@ -318,8 +317,8 @@
318 317 其他1
319 318 </el-col>
320 319 <el-col :span="20">
321   - <el-row v-for="sub_img,index in infoData.sub_img8.split(',')" style="margin-bottom:10px;">
322   - <a @click="downloadFile(sub_img);" style="color: blue;">其他1 - {{index+1}}</a>
  320 + <el-row v-for="img,index in infoData.sub_img8.split(',')" style="margin-bottom:10px;">
  321 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
323 322 </el-row>
324 323 </el-col>
325 324 </el-row>
... ... @@ -328,8 +327,8 @@
328 327 其他2
329 328 </el-col>
330 329 <el-col :span="20">
331   - <el-row v-for="sub_img,index in infoData.sub_img9.split(',')" style="margin-bottom:10px;">
332   - <a @click="downloadFile(sub_img);" style="color: blue;">其他2 - {{index+1}}</a>
  330 + <el-row v-for="img,index in infoData.sub_img9.split(',')" style="margin-bottom:10px;">
  331 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
333 332 </el-row>
334 333 </el-col>
335 334 </el-row>
... ... @@ -338,8 +337,8 @@
338 337 其他3
339 338 </el-col>
340 339 <el-col :span="20">
341   - <el-row v-for="sub_img,index in infoData.sub_img10.split(',')" style="margin-bottom:10px;">
342   - <a @click="downloadFile(sub_img);" style="color: blue;">其他3 - {{index+1}}</a>
  340 + <el-row v-for="img,index in infoData.sub_img10.split(',')" style="margin-bottom:10px;">
  341 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
343 342 </el-row>
344 343 </el-col>
345 344 </el-row>
... ... @@ -348,8 +347,8 @@
348 347 其他4
349 348 </el-col>
350 349 <el-col :span="20">
351   - <el-row v-for="sub_img,index in infoData.sub_img11.split(',')" style="margin-bottom:10px;">
352   - <a @click="downloadFile(sub_img);" style="color: blue;">其他4 - {{index+1}}</a>
  350 + <el-row v-for="img,index in infoData.sub_img11.split(',')" style="margin-bottom:10px;">
  351 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
353 352 </el-row>
354 353 </el-col>
355 354 </el-row>
... ... @@ -358,8 +357,8 @@
358 357 其他5
359 358 </el-col>
360 359 <el-col :span="20">
361   - <el-row v-for="sub_img,index in infoData.sub_img12.split(',')" style="margin-bottom:10px;">
362   - <a @click="downloadFile(sub_img);" style="color: blue;">其他5 - {{index+1}}</a>
  360 + <el-row v-for="img,index in infoData.sub_img12.split(',')" style="margin-bottom:10px;">
  361 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
363 362 </el-row>
364 363 </el-col>
365 364 </el-row>
... ... @@ -390,8 +389,8 @@
390 389 附件1
391 390 </el-col>
392 391 <el-col :span="20">
393   - <el-row v-for="sub_img,index in infoData.attchItem1.split(',')" style="margin-bottom:10px;">
394   - <a @click="downloadFile(sub_img);" style="color: blue;">附件1 - {{index+1}}</a>
  392 + <el-row v-for="img,index in infoData.attchItem1.split(',')" style="margin-bottom:10px;">
  393 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
395 394 </el-row>
396 395 </el-col>
397 396 </el-row>
... ... @@ -400,8 +399,8 @@
400 399 附件2
401 400 </el-col>
402 401 <el-col :span="20">
403   - <el-row v-for="sub_img,index in infoData.attchItem2.split(',')" style="margin-bottom:10px;">
404   - <a @click="downloadFile(sub_img);" style="color: blue;">附件2 - {{index+1}}</a>
  402 + <el-row v-for="img,index in infoData.attchItem2.split(',')" style="margin-bottom:10px;">
  403 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
405 404 </el-row>
406 405 </el-col>
407 406 </el-row>
... ... @@ -410,8 +409,8 @@
410 409 附件3
411 410 </el-col>
412 411 <el-col :span="20">
413   - <el-row v-for="sub_img,index in infoData.attchItem3.split(',')" style="margin-bottom:10px;">
414   - <a @click="downloadFile(sub_img);" style="color: blue;">附件3 - {{index+1}}</a>
  412 + <el-row v-for="img,index in infoData.attchItem3.split(',')" style="margin-bottom:10px;">
  413 + <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
415 414 </el-row>
416 415 </el-col>
417 416 </el-row>
... ... @@ -456,8 +455,8 @@
456 455 downloadFile(path) {
457 456 window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
458 457 },
459   -
460 458 getInfo() {
  459 + debugger;
461 460 let id;
462 461 if(this.businessKey.split(":").length == 2){
463 462 id = this.businessKey.split(":")[1];
... ...
trash-ui/src/views/business/truckActivate/index.vue
  View file @cb6cea0
... ... @@ -66,7 +66,7 @@
66 66 </el-row>
67 67  
68 68 <el-table v-loading="loading" :data="truckActivateList" @selection-change="handleSelectionChange">
69   - <el-table-column label="序号" align="center" prop="id" />
  69 + <el-table-column label="序号" align="center" type="index" />
70 70 <el-table-column label="所属企业" align="center" prop="company" />
71 71 <el-table-column label="车牌号" align="center" prop="licensePlate" />
72 72 <el-table-column label="所属工地" align="center" prop="construction" />
... ...
trash-ui/src/views/caseOffline/caseOffline/index.vue
  View file @cb6cea0
... ... @@ -47,7 +47,7 @@
47 47 </el-row>
48 48  
49 49 <el-table v-loading="loading" :data="caseOfflineList" @selection-change="handleSelectionChange">
50   - <el-table-column label="序号" align="center" prop="id" />
  50 + <el-table-column label="序号" align="center" type="index" />
51 51 <el-table-column label="案卷编号" align="center" prop="number" />
52 52 <el-table-column label="案卷类型" align="center" prop="type" />
53 53 <el-table-column label="所属区域" align="center" prop="place" />
... ...
trash-ui/src/views/daily/report/index.vue
  View file @cb6cea0
1 1 <template>
2 2 <div class="app-container">
3   - <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
  3 + <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px" @submit.native.prevent>
4 4 <el-form-item label="标题" prop="title">
5 5 <el-input
6 6 v-model="queryParams.title"
7 7 placeholder="请输入标题"
8   -
9 8 size="small"
10   -
  9 + type="text"
11 10 />
12   - </el-form-item>
  11 + </el-form-item>
13 12 <el-form-item>
14 13 <el-button type="cyan" size="mini" @click="handleQuery">搜索</el-button>
15 14 </el-form-item>
... ... @@ -50,7 +49,6 @@
50 49 v-hasPermi="['daily:report:export']"
51 50 >导出</el-button>
52 51 </el-col>
53   - <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
54 52 </el-row>
55 53  
56 54 <el-table v-loading="loading" :data="reportList" border @selection-change="handleSelectionChange">
... ... @@ -122,7 +120,7 @@
122 120 <el-form-item label="报表内容">
123 121 <editor v-model="form.reportContent" :min-height="192"/>
124 122 </el-form-item>
125   - <a v-if="form.attachmentLink!='' " style="color: blue;margin-left: 10px;" @click="download">附件下载</a> <a style="color: red;" @click="form.attachmentLink='';" v-if="form.attachmentLink!=''">删除</a>
  123 + <a v-if="form.attachmentLink!='' " style="color: blue;margin-left: 10px;" @click="downloadFile(form.attachmentLink)">附件下载</a> <a style="color: red;" @click="form.attachmentLink='';" v-if="form.attachmentLink!=''">删除</a>
126 124 <el-row>
127 125 <el-col :span="6">
128 126 <el-form-item label="附件" v-if="form.attachmentLink==''">
... ... @@ -244,6 +242,9 @@ export default {
244 242 },
245 243 methods: {
246 244  
  245 + downloadFile(path) {
  246 + window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
  247 + },
247 248 getList() {
248 249 this.loading = true;
249 250 listReport(this.queryParams).then(response => {
... ... @@ -253,11 +254,11 @@ export default {
253 254 });
254 255 },
255 256 uploadSuccess(res, file, fileList) {
256   -
257   - if(res.code){
258   - this.$message(res.message);
259   - return;
260   - }
  257 +
  258 + if(res.code){
  259 + this.$message(res.message);
  260 + return;
  261 + }
261 262 this.fileList = [];
262 263  
263 264 this.fileList.push(file);
... ...
trash-ui/src/views/daily/situation/index.vue
  View file @cb6cea0
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.title"
7 7 placeholder="请输入标题"
8   -
  8 +
9 9 size="small"
10 10  
11 11 />
... ... @@ -14,7 +14,7 @@
14 14 <el-input
15 15 v-model="queryParams.operator"
16 16 placeholder="请输入操作人"
17   -
  17 +
18 18 size="small"
19 19  
20 20 />
... ... @@ -143,6 +143,17 @@
143 143 <editor v-model="form.warningCaseFileInfo" :min-height="192"/>
144 144 </el-form-item>
145 145  
  146 + <el-form-item label="抽查预警信息(案卷情况)回复情况" prop="desc1">
  147 + <editor v-model="form.desc1" :min-height="192"/>
  148 + </el-form-item>
  149 +
  150 + <el-form-item label="'三无'违规情况" prop="desc2">
  151 + <editor v-model="form.desc2" :min-height="192"/>
  152 + </el-form-item>
  153 +
  154 + <el-form-item label="特发时间处置等其他情况" prop="desc3">
  155 + <editor v-model="form.desc3" :min-height="192"/>
  156 + </el-form-item>
146 157  
147 158 </el-form>
148 159 <div slot="footer" class="dialog-footer" >
... ... @@ -207,9 +218,6 @@ export default {
207 218 consumptionSiteSituation: [
208 219 { required: true, message: "不能为空", trigger: "blur" }
209 220 ],
210   - numberOfVehicles: [
211   - { required: true, message: "不能为空", trigger: "blur" }
212   - ],
213 221 }
214 222 };
215 223 },
... ...
trash-ui/src/views/h5/dayWorkReport/index.vue
  View file @cb6cea0
... ... @@ -39,7 +39,7 @@
39 39 </el-row>
40 40  
41 41 <el-table v-loading="loading" :data="threestepList" @selection-change="handleSelectionChange">
42   - <el-table-column label="序号" align="center" prop="id" />
  42 + <el-table-column label="序号" align="center" type="index" />
43 43 <el-table-column label="工地名称" align="center" prop="name" />
44 44 <el-table-column label="项目类型" align="center" prop="type" />
45 45 <el-table-column label="管辖区" align="center" prop="place" />
... ...
trash-ui/src/views/h5/task/threestepInfo.vue
  View file @cb6cea0
... ... @@ -74,7 +74,7 @@
74 74 </el-col>
75 75 <el-col :span="20">
76 76 <el-row v-for="img,index in infoData.img0.split(',')" style="margin-bottom:10px;">
77   - <a @click="downloadFile(img);" style="color: blue;">过水槽照片 - {{index+1}}</a>
  77 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
78 78 </el-row>
79 79 </el-col>
80 80 </el-row>
... ... @@ -85,7 +85,7 @@
85 85 </el-col>
86 86 <el-col :span="20">
87 87 <el-row v-for="img,index in infoData.img1.split(',')" style="margin-bottom:10px;">
88   - <a @click="downloadFile(img);" style="color: blue;">洗车平台照片 - {{index+1}}</a>
  88 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
89 89 </el-row>
90 90 </el-col>
91 91 </el-row>
... ... @@ -96,7 +96,7 @@
96 96 </el-col>
97 97 <el-col :span="20">
98 98 <el-row v-for="img,index in infoData.img2.split(',')" style="margin-bottom:10px;">
99   - <a @click="downloadFile(img);" style="color: blue;">出入口照片 - {{index+1}}</a>
  99 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
100 100  
101 101 </el-row>
102 102 </el-col>
... ... @@ -108,7 +108,7 @@
108 108 </el-col>
109 109 <el-col :span="20">
110 110 <el-row v-for="img,index in infoData.img3.split(',')" style="margin-bottom:10px;">
111   - <a @click="downloadFile(img);" style="color: blue;">沉淀池照片 - {{index+1}}</a>
  111 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
112 112  
113 113 </el-row>
114 114 </el-col>
... ... @@ -120,7 +120,7 @@
120 120 </el-col>
121 121 <el-col :span="20">
122 122 <el-row v-for="img,index in infoData.img4.split(',')" style="margin-bottom:10px;">
123   - <a @click="downloadFile(img);" style="color: blue;">硬质路面照片 - {{index+1}}</a>
  123 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
124 124  
125 125 </el-row>
126 126 </el-col>
... ... @@ -132,7 +132,7 @@
132 132 </el-col>
133 133 <el-col :span="20">
134 134 <el-row v-for="img,index in infoData.img5.split(',')" style="margin-bottom:10px;">
135   - <a @click="downloadFile(img);" style="color: blue;">摄像头视频截图1 - {{index+1}}</a>
  135 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
136 136  
137 137 </el-row>
138 138 </el-col>
... ... @@ -144,7 +144,7 @@
144 144 </el-col>
145 145 <el-col :span="20">
146 146 <el-row v-for="img,index in infoData.img6.split(',')" style="margin-bottom:10px;">
147   - <a @click="downloadFile(img);" style="color: blue;">摄像头视频截图2 - {{index+1}}</a>
  147 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
148 148  
149 149 </el-row>
150 150 </el-col>
... ... @@ -156,7 +156,7 @@
156 156 </el-col>
157 157 <el-col :span="20">
158 158 <el-row v-for="img,index in infoData.img7.split(',')" style="margin-bottom:10px;">
159   - <a @click="downloadFile(img);" style="color: blue;">摄像头视频截图3 - {{index+1}}</a>
  159 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
160 160  
161 161 </el-row>
162 162 </el-col>
... ... @@ -168,7 +168,7 @@
168 168 </el-col>
169 169 <el-col :span="20">
170 170 <el-row v-for="img,index in infoData.img8.split(',')" style="margin-bottom:10px;">
171   - <a @click="downloadFile(img);" style="color: blue;">其他1 - {{index+1}}</a>
  171 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
172 172  
173 173 </el-row>
174 174 </el-col>
... ... @@ -180,7 +180,7 @@
180 180 </el-col>
181 181 <el-col :span="20">
182 182 <el-row v-for="img,index in infoData.img9.split(',')" style="margin-bottom:10px;">
183   - <a @click="downloadFile(img);" style="color: blue;">其他2 - {{index+1}}</a>
  183 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
184 184  
185 185 </el-row>
186 186 </el-col>
... ... @@ -192,7 +192,7 @@
192 192 </el-col>
193 193 <el-col :span="20">
194 194 <el-row v-for="img,index in infoData.img10.split(',')" style="margin-bottom:10px;">
195   - <a @click="downloadFile(img);" style="color: blue;">其他3 - {{index+1}}</a>
  195 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
196 196  
197 197 </el-row>
198 198 </el-col>
... ... @@ -204,7 +204,7 @@
204 204 </el-col>
205 205 <el-col :span="20">
206 206 <el-row v-for="img,index in infoData.img11.split(',')" style="margin-bottom:10px;">
207   - <a @click="downloadFile(img);" style="color: blue;">其他4 - {{index+1}}</a>
  207 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
208 208  
209 209 </el-row>
210 210 </el-col>
... ... @@ -216,7 +216,7 @@
216 216 </el-col>
217 217 <el-col :span="20">
218 218 <el-row v-for="img,index in infoData.img12.split(',')" style="margin-bottom:10px;">
219   - <a @click="downloadFile(img);" style="color: blue;">其他5 - {{index+1}}</a>
  219 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
220 220  
221 221 </el-row>
222 222 </el-col>
... ... @@ -264,8 +264,8 @@
264 264 履职情况照片
265 265 </el-col>
266 266 <el-col :span="20">
267   - <el-row v-for="sub_img,index in infoData.sub_img0.split(',')" style="margin-bottom:10px;">
268   - <a @click="downloadFile(sub_img);" style="color: blue;">履职情况照片 - {{index+1}}</a>
  267 + <el-row v-for="img,index in infoData.sub_img0.split(',')" style="margin-bottom:10px;">
  268 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
269 269  
270 270 </el-row>
271 271 </el-col>
... ... @@ -276,8 +276,8 @@
276 276 水枪水嘴照片
277 277 </el-col>
278 278 <el-col :span="20">
279   - <el-row v-for="sub_img,index in infoData.sub_img1.split(',')" style="margin-bottom:10px;">
280   - <a @click="downloadFile(sub_img);" style="color: blue;">水枪水嘴照片 - {{index+1}}</a>
  279 + <el-row v-for="img,index in infoData.sub_img1.split(',')" style="margin-bottom:10px;">
  280 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
281 281  
282 282 </el-row>
283 283 </el-col>
... ... @@ -288,8 +288,8 @@
288 288 照明照片
289 289 </el-col>
290 290 <el-col :span="20">
291   - <el-row v-for="sub_img,index in infoData.sub_img2.split(',')" style="margin-bottom:10px;">
292   - <a @click="downloadFile(sub_img);" style="color: blue;">照明照片 - {{index+1}}</a>
  291 + <el-row v-for="img,index in infoData.sub_img2.split(',')" style="margin-bottom:10px;">
  292 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
293 293  
294 294 </el-row>
295 295 </el-col>
... ... @@ -300,8 +300,8 @@
300 300 视频监控照片
301 301 </el-col>
302 302 <el-col :span="20">
303   - <el-row v-for="sub_img,index in infoData.sub_img3.split(',')" style="margin-bottom:10px;">
304   - <a @click="downloadFile(sub_img);" style="color: blue;">视频监控照片 - {{index+1}}</a>
  303 + <el-row v-for="img,index in infoData.sub_img3.split(',')" style="margin-bottom:10px;">
  304 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
305 305  
306 306 </el-row>
307 307 </el-col>
... ... @@ -312,8 +312,8 @@
312 312 洗车机照片
313 313 </el-col>
314 314 <el-col :span="20">
315   - <el-row v-for="sub_img,index in infoData.sub_img4.split(',')" style="margin-bottom:10px;">
316   - <a @click="downloadFile(sub_img);" style="color: blue;">洗车机照片 - {{index+1}}</a>
  315 + <el-row v-for="img,index in infoData.sub_img4.split(',')" style="margin-bottom:10px;">
  316 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
317 317  
318 318 </el-row>
319 319 </el-col>
... ... @@ -324,8 +324,8 @@
324 324 摄像头视频截图1
325 325 </el-col>
326 326 <el-col :span="20">
327   - <el-row v-for="sub_img,index in infoData.sub_img5.split(',')" style="margin-bottom:10px;">
328   - <a @click="downloadFile(sub_img);" style="color: blue;">摄像头视频截图1 - {{index+1}}</a>
  327 + <el-row v-for="img,index in infoData.sub_img5.split(',')" style="margin-bottom:10px;">
  328 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
329 329  
330 330 </el-row>
331 331 </el-col>
... ... @@ -336,8 +336,8 @@
336 336 摄像头视频截图2
337 337 </el-col>
338 338 <el-col :span="20">
339   - <el-row v-for="sub_img,index in infoData.sub_img6.split(',')" style="margin-bottom:10px;">
340   - <a @click="downloadFile(sub_img);" style="color: blue;">摄像头视频截图2 - {{index+1}}</a>
  339 + <el-row v-for="img,index in infoData.sub_img6.split(',')" style="margin-bottom:10px;">
  340 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
341 341  
342 342 </el-row>
343 343 </el-col>
... ... @@ -348,8 +348,8 @@
348 348 摄像头视频截图3
349 349 </el-col>
350 350 <el-col :span="20">
351   - <el-row v-for="sub_img,index in infoData.sub_img7.split(',')" style="margin-bottom:10px;">
352   - <a @click="downloadFile(sub_img);" style="color: blue;">摄像头视频截图3 - {{index+1}}</a>
  351 + <el-row v-for="img,index in infoData.sub_img7.split(',')" style="margin-bottom:10px;">
  352 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
353 353  
354 354 </el-row>
355 355 </el-col>
... ... @@ -360,8 +360,8 @@
360 360 其他1
361 361 </el-col>
362 362 <el-col :span="20">
363   - <el-row v-for="sub_img,index in infoData.sub_img8.split(',')" style="margin-bottom:10px;">
364   - <a @click="downloadFile(sub_img);" style="color: blue;">其他1 - {{index+1}}</a>
  363 + <el-row v-for="img,index in infoData.sub_img8.split(',')" style="margin-bottom:10px;">
  364 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
365 365  
366 366 </el-row>
367 367 </el-col>
... ... @@ -372,8 +372,8 @@
372 372 其他2
373 373 </el-col>
374 374 <el-col :span="20">
375   - <el-row v-for="sub_img,index in infoData.sub_img9.split(',')" style="margin-bottom:10px;">
376   - <a @click="downloadFile(sub_img);" style="color: blue;">其他2 - {{index+1}}</a>
  375 + <el-row v-for="img,index in infoData.sub_img9.split(',')" style="margin-bottom:10px;">
  376 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
377 377  
378 378 </el-row>
379 379 </el-col>
... ... @@ -384,8 +384,8 @@
384 384 其他3
385 385 </el-col>
386 386 <el-col :span="20">
387   - <el-row v-for="sub_img,index in infoData.sub_img10.split(',')" style="margin-bottom:10px;">
388   - <a @click="downloadFile(sub_img);" style="color: blue;">其他3 - {{index+1}}</a>
  387 + <el-row v-for="img,index in infoData.sub_img10.split(',')" style="margin-bottom:10px;">
  388 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
389 389  
390 390 </el-row>
391 391 </el-col>
... ... @@ -396,8 +396,8 @@
396 396 其他4
397 397 </el-col>
398 398 <el-col :span="20">
399   - <el-row v-for="sub_img,index in infoData.sub_img11.split(',')" style="margin-bottom:10px;">
400   - <a @click="downloadFile(sub_img);" style="color: blue;">其他4 - {{index+1}}</a>
  399 + <el-row v-for="img,index in infoData.sub_img11.split(',')" style="margin-bottom:10px;">
  400 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
401 401  
402 402 </el-row>
403 403 </el-col>
... ... @@ -408,8 +408,8 @@
408 408 其他5
409 409 </el-col>
410 410 <el-col :span="20">
411   - <el-row v-for="sub_img,index in infoData.sub_img12.split(',')" style="margin-bottom:10px;">
412   - <a @click="downloadFile(sub_img);" style="color: blue;">其他5 - {{index+1}}</a>
  411 + <el-row v-for="img,index in infoData.sub_img12.split(',')" style="margin-bottom:10px;">
  412 + <a @click="downloadFile(img);" style="color: blue;">{{img}}</a>
413 413  
414 414 </el-row>
415 415 </el-col>
... ...
trash-ui/src/views/h5/truckActivate/index.vue
  View file @cb6cea0
... ... @@ -64,7 +64,7 @@
64 64  
65 65  
66 66 <!-- <el-table v-loading="loading" :data="truckActivateList" @selection-change="handleSelectionChange">
67   - <el-table-column label="序号" align="center" prop="id" />
  67 + <el-table-column label="序号" align="center" type="index" />
68 68 <el-table-column label="所属企业" align="center" prop="company" />
69 69 <el-table-column label="车牌号" align="center" prop="licensePlate" />
70 70 <el-table-column label="所属工地" align="center" prop="construction" />
... ...
trash-ui/src/views/otherData/otherData/index.vue
  View file @cb6cea0
... ... @@ -45,7 +45,7 @@
45 45 </el-row>
46 46  
47 47 <el-table v-loading="loading" :data="otherDataList" @selection-change="handleSelectionChange">
48   - <el-table-column label="序号" align="center" prop="id" />
  48 + <el-table-column label="序号" align="center" type="index" />
49 49 <el-table-column label="所属区域" align="center" prop="place" />
50 50 <el-table-column label="资料类别" align="center" prop="type" />
51 51 <el-table-column label="填报日期" align="center" prop="time" width="180">
... ...
trash-ui/vue.config.js
  View file @cb6cea0
... ... @@ -41,8 +41,8 @@ module.exports = {
41 41 }
42 42 },
43 43 ['/api']: {
44   - //target: `http://183.66.242.6:14601`,
45   - target: `http://183.66.242.6:6001`,
  44 + target: `http://183.66.242.6:14601`,
  45 + // target: `http://183.66.242.6:6001`,
46 46 changeOrigin: true,
47 47 },
48 48  
... ...
trash-workFlow/src/main/java/com/trash/business/controller/CompanyCreditController.java
  View file @cb6cea0
1 1 package com.trash.business.controller;
2 2  
  3 +import java.util.ArrayList;
3 4 import java.util.List;
4 5  
5 6 import com.trash.business.domain.ConstructionCredit;
... ... @@ -80,8 +81,21 @@ public class CompanyCreditController extends BaseController
80 81 public AjaxResult export(CompanyCredit companyCredit)
81 82 {
82 83 List<CompanyCredit> list = companyCreditService.selectCompanyCreditList(companyCredit);
  84 +
  85 + for(int i = 0;i<list.size();i++){
  86 + list.get(i).setId((long)i+1);
  87 + }
  88 +
83 89 ExcelUtil<CompanyCredit> util = new ExcelUtil<CompanyCredit>(CompanyCredit.class);
84   - return util.exportExcel(list, "credit");
  90 +
  91 +
  92 + List<String> withOut = new ArrayList<String>();
  93 +
  94 + if(companyCredit.getStatus() == 1){
  95 + withOut.add("time");
  96 + }
  97 +
  98 + return util.exportExcel(list, "企业失信",withOut);
85 99 }
86 100  
87 101 /**
... ...
trash-workFlow/src/main/java/com/trash/business/controller/ConstructionCreditController.java
  View file @cb6cea0
1 1 package com.trash.business.controller;
2 2  
  3 +import java.util.ArrayList;
3 4 import java.util.List;
4 5  
5 6 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -70,9 +71,16 @@ public class ConstructionCreditController extends BaseController
70 71 }else{
71 72 list = constructionCreditService.selectConstructionCreditList(constructionCredit);
72 73 }
73   -
  74 + for(int i = 0;i<list.size();i++){
  75 + list.get(i).setId((long)i+1);
  76 + }
  77 + List<String> withOut = new ArrayList<String>();
  78 +
  79 + if(constructionCredit.getStatus() == 1){
  80 + withOut.add("time");
  81 + }
74 82 ExcelUtil<ConstructionCredit> util = new ExcelUtil<ConstructionCredit>(ConstructionCredit.class);
75   - return util.exportExcel(list, "credit");
  83 + return util.exportExcel(list, "工地失信",withOut);
76 84 }
77 85  
78 86 /**
... ...
trash-workFlow/src/main/java/com/trash/business/controller/ConstructionSignController.java
  View file @cb6cea0
... ... @@ -54,6 +54,10 @@ public class ConstructionSignController extends BaseController
54 54 public AjaxResult export(ConstructionSign constructionSign)
55 55 {
56 56 List<ConstructionSign> list = constructionSignService.selectConstructionSignList(constructionSign);
  57 +
  58 + for(int i = 0;i<list.size();i++){
  59 + list.get(i).setId((long)i+1);
  60 + }
57 61 ExcelUtil<ConstructionSign> util = new ExcelUtil<ConstructionSign>(ConstructionSign.class);
58 62 return util.exportExcel(list, "sign");
59 63 }
... ...
trash-workFlow/src/main/java/com/trash/business/controller/DriverCreditController.java
  View file @cb6cea0
1 1 package com.trash.business.controller;
2 2  
  3 +import java.util.ArrayList;
3 4 import java.util.List;
4 5  
5 6 import com.trash.business.domain.ConstructionCredit;
... ... @@ -74,8 +75,17 @@ public class DriverCreditController extends BaseController
74 75 public AjaxResult export(DriverCredit driverCredit)
75 76 {
76 77 List<DriverCredit> list = driverCreditService.selectDriverCreditList(driverCredit);
  78 +
  79 + for(int i = 0;i<list.size();i++){
  80 + list.get(i).setId((long)i+1);
  81 + }
  82 + List<String> withOut = new ArrayList<String>();
  83 +
  84 + if(driverCredit.getStatus() == 1){
  85 + withOut.add("time");
  86 + }
77 87 ExcelUtil<DriverCredit> util = new ExcelUtil<DriverCredit>(DriverCredit.class);
78   - return util.exportExcel(list, "credit");
  88 + return util.exportExcel(list, "驾驶员失信",withOut);
79 89 }
80 90  
81 91 /**
... ...
trash-workFlow/src/main/java/com/trash/business/controller/EarthsitesCreditController.java
  View file @cb6cea0
1 1 package com.trash.business.controller;
2 2  
  3 +import java.util.ArrayList;
3 4 import java.util.List;
4 5  
5 6 import com.trash.business.domain.ConstructionCredit;
... ... @@ -60,8 +61,17 @@ public class EarthsitesCreditController extends BaseController
60 61 list = earthsitesCreditService.selectEarthsitesCreditHistory(earthsitesCredit);
61 62 }else
62 63 list = earthsitesCreditService.selectEarthsitesCreditList(earthsitesCredit);
  64 +
  65 + for(int i = 0;i<list.size();i++){
  66 + list.get(i).setId((long)i+1);
  67 + }
  68 + List<String> withOut = new ArrayList<String>();
  69 +
  70 + if(earthsitesCredit.getStatus() == 1){
  71 + withOut.add("time");
  72 + }
63 73 ExcelUtil<EarthsitesCredit> util = new ExcelUtil<EarthsitesCredit>(EarthsitesCredit.class);
64   - return util.exportExcel(list, "credit");
  74 + return util.exportExcel(list, "消纳场失信",withOut);
65 75 }
66 76  
67 77 /**
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionSpecialController.java
  View file @cb6cea0
... ... @@ -54,6 +54,10 @@ public class SupervisionSpecialController extends BaseController
54 54 public AjaxResult export(SupervisionSpecial supervisionSpecial)
55 55 {
56 56 List<SupervisionSpecial> list = supervisionSpecialService.selectSupervisionSpecialList(supervisionSpecial);
  57 +
  58 + for(int i = 0;i<list.size();i++){
  59 + list.get(i).setId(i +"");
  60 + }
57 61 ExcelUtil<SupervisionSpecial> util = new ExcelUtil<SupervisionSpecial>(SupervisionSpecial.class);
58 62 return util.exportExcel(list, "SupervisionSpecial");
59 63 }
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @cb6cea0
1 1 package com.trash.business.controller;
2 2  
3 3 import java.io.IOException;
  4 +import java.util.ArrayList;
4 5 import java.util.Date;
5 6 import java.util.List;
6 7 import java.util.Map;
... ... @@ -118,6 +119,12 @@ public class SupervisionThreestepController extends BaseController
118 119 {
119 120 List<SupervisionThreestep> list = supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep);
120 121  
  122 +
  123 +
  124 + for(int i = 0;i<list.size();i++){
  125 + list.get(i).setId((long)i+1);
  126 + }
  127 +
121 128 JSONArray array = RemoteServerUtils.getAreas();
122 129  
123 130 for(Object object :array){
... ... @@ -125,16 +132,20 @@ public class SupervisionThreestepController extends BaseController
125 132 for(SupervisionThreestep sThreestep : list){
126 133 if(jsonObject.getString("code").equals(sThreestep.getPlace())){
127 134 sThreestep.setPlace(jsonObject.getString("name"));
128   -
129 135 }
130   -
131 136 }
132   -
133 137 }
  138 + List<String> withOut = new ArrayList<String>();
  139 + String str ="报工自查";
  140 + if(supervisionThreestep.getStatus() == null){
  141 + withOut.add("checkEndTime");
  142 + str ="报工抽查";
  143 + }
  144 +
134 145  
135 146 ExcelUtil<SupervisionThreestep> util = new ExcelUtil<SupervisionThreestep>(SupervisionThreestep.class);
136 147  
137   - return util.exportExcel(list, "threestep");
  148 + return util.exportExcel(list, str,withOut);
138 149 }
139 150  
140 151 /**
... ...
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
  View file @cb6cea0
... ... @@ -58,7 +58,10 @@ public class TruckActivateController extends BaseController
58 58 public AjaxResult export(TruckActivate truckActivate)
59 59 {
60 60 List<TruckActivate> list = truckActivateService.selectTruckActivateList(truckActivate);
61   -
  61 +
  62 + for(int i = 0;i<list.size();i++){
  63 + list.get(i).setId((long)i+1);
  64 + }
62 65 for(TruckActivate t:list){
63 66 if(t.getActivateTime() == null){
64 67 t.setIsAct("未激活");
... ...
trash-workFlow/src/main/java/com/trash/business/controller/TruckCreditController.java
  View file @cb6cea0
1 1 package com.trash.business.controller;
2 2  
  3 +import java.util.ArrayList;
3 4 import java.util.List;
4 5  
5 6 import com.trash.business.domain.ConstructionCredit;
... ... @@ -81,8 +82,17 @@ public class TruckCreditController extends BaseController
81 82 public AjaxResult export(TruckCredit truckCredit)
82 83 {
83 84 List<TruckCredit> list = truckCreditService.selectTruckCreditList(truckCredit);
  85 +
  86 + for(int i = 0;i<list.size();i++){
  87 + list.get(i).setId((long)i+1);
  88 + }
  89 + List<String> withOut = new ArrayList<String>();
  90 +
  91 + if(truckCredit.getStatus() == 1){
  92 + withOut.add("time");
  93 + }
84 94 ExcelUtil<TruckCredit> util = new ExcelUtil<TruckCredit>(TruckCredit.class);
85   - return util.exportExcel(list, "credit");
  95 + return util.exportExcel(list, "车辆失信",withOut);
86 96 }
87 97  
88 98 /**
... ...
trash-workFlow/src/main/java/com/trash/business/domain/ConstructionCredit.java
  View file @cb6cea0
... ... @@ -38,7 +38,6 @@ public class ConstructionCredit extends BaseEntity
38 38  
39 39 private Long status;
40 40  
41   - @Excel(name = "状态" , readConverterExp = "0=撤销失信,1=失信")
42 41 private Long lostCredit;
43 42  
44 43 private String objectId;
... ...
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionThreestep.java
  View file @cb6cea0
... ... @@ -35,7 +35,7 @@ public class SupervisionThreestep extends BaseEntity
35 35  
36 36 /** 自查时间 */
37 37 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
38   - @Excel(name = "自查时间", width = 30, dateFormat = "yyyy-MM-dd")
  38 + @Excel(name = "自查时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
39 39 private Date selfCheckTime;
40 40  
41 41 /** 基础数据ID */
... ... @@ -46,13 +46,13 @@ public class SupervisionThreestep extends BaseEntity
46 46  
47 47 /** 检查时间 */
48 48 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
49   - @Excel(name = "巡查时间", width = 30, dateFormat = "yyyy-MM-dd")
  49 + @Excel(name = "巡查时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
50 50 private Date checkTime;
51 51  
52 52  
53 53 /** 检查时间 */
54 54 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
55   - @Excel(name = "抽查时间", width = 30, dateFormat = "yyyy-MM-dd")
  55 + @Excel(name = "抽查时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
56 56 private Date checkEndTime;
57 57  
58 58 /** 消纳场名称 */
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @cb6cea0
... ... @@ -532,6 +532,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
532 532 supervisionThreestep.setSelfCheckTime(DateUtils.getNowDate());
533 533 supervisionThreestep.setCreateBy(SecurityUtils.getUsername());
534 534 supervisionThreestep.setStatus(0L);
  535 + supervisionThreestep.setSelfCheckTime(new Date());
535 536  
536 537 supervisionThreestepMapper.insertSupervisionThreestep(supervisionThreestep);
537 538  
... ... @@ -606,7 +607,12 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
606 607 truckActivate.setObjectId(truck); //设置ID
607 608  
608 609 List<TruckActivate> taList = truckActivateService.selectTruckActivateList(truckActivate);
609   -
  610 +
  611 + if(taList.size() == 1){
  612 + if(taList.get(0).getActivateTime() != null){ //已激活
  613 + continue;
  614 + }
  615 + }
610 616  
611 617 truckActivate.setConstruction(construct.getName());
612 618 truckActivate.setEarthsite(construct.getEarthsitesName());
... ... @@ -620,11 +626,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
620 626 truckActivate.setCompany(truckInfo.getString("companyName"));
621 627  
622 628  
623   - if(taList.size() == 1){
624   - if(taList.get(0).getActivateTime() != null){ //已激活
625   - continue;
626   - }
627   - }
628 629  
629 630 if(truckObject.getInteger("vehicleStatus") == 1){
630 631 truckActivate.setActivateTime(new Date());
... ...
trash-workFlow/src/main/java/com/trash/caseOffline/controller/CaseOfflineController.java
  View file @cb6cea0
... ... @@ -57,7 +57,10 @@ public class CaseOfflineController extends BaseController
57 57 public AjaxResult export(CaseOffline caseOffline)
58 58 {
59 59 List<CaseOffline> list = caseOfflineService.selectCaseOfflineList(caseOffline);
60   -
  60 +
  61 + for(int i = 0;i<list.size();i++){
  62 + list.get(i).setId((long)i+1);
  63 + }
61 64 JSONArray areas = RemoteServerUtils.getAreas();
62 65  
63 66 for(CaseOffline co:list){
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ReplyApprovalProcessController.java
  View file @cb6cea0
... ... @@ -59,6 +59,11 @@ public class ReplyApprovalProcessController extends BaseController
59 59 public AjaxResult export(ReplyApprovalProcess replyApprovalProcess)
60 60 {
61 61 List<ReplyApprovalProcess> list = replyApprovalProcessService.selectReplyApprovalProcessList(replyApprovalProcess);
  62 +
  63 + for(int i = 0;i<list.size();i++){
  64 + list.get(i).setId((long)i+1);
  65 + }
  66 +
62 67 ExcelUtil<ReplyApprovalProcess> util = new ExcelUtil<ReplyApprovalProcess>(ReplyApprovalProcess.class);
63 68 return util.exportExcel(list, "replyApprovalProcess");
64 69 }
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationCaseFileController.java
  View file @cb6cea0
... ... @@ -60,6 +60,10 @@ public class ViolationCaseFileController extends BaseController
60 60 public AjaxResult export(ViolationCaseFile violationCaseFile)
61 61 {
62 62 List<ViolationCaseFile> list = violationCaseFileService.selectViolationCaseFileList(violationCaseFile);
  63 +
  64 + for(int i = 0;i<list.size();i++){
  65 + list.get(i).setId((long)i+1);
  66 + }
63 67 ExcelUtil<ViolationCaseFile> util = new ExcelUtil<ViolationCaseFile>(ViolationCaseFile.class);
64 68 return util.exportExcel(list, "平台违规案卷数据");
65 69 }
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
  View file @cb6cea0
... ... @@ -60,6 +60,10 @@ public class ViolationWarningInformationController extends BaseController
60 60 public AjaxResult export(ViolationWarningInformation violationWarningInformation)
61 61 {
62 62 List<ViolationWarningInformation> list = violationWarningInformationService.selectViolationWarningInformationList(violationWarningInformation);
  63 +
  64 + for(int i = 0;i<list.size();i++){
  65 + list.get(i).setId((long)i+1);
  66 + }
63 67 ExcelUtil<ViolationWarningInformation> util = new ExcelUtil<ViolationWarningInformation>(ViolationWarningInformation.class);
64 68 return util.exportExcel(list, "violationWarningInformation");
65 69 }
... ...
trash-workFlow/src/main/java/com/trash/office/controller/ConferenceController.java
  View file @cb6cea0
... ... @@ -56,6 +56,10 @@ public class ConferenceController extends BaseController
56 56 public AjaxResult export(Conference conference)
57 57 {
58 58 List<Conference> list = conferenceService.selectConferenceList(conference);
  59 +
  60 + for(int i = 0;i<list.size();i++){
  61 + list.get(i).setId((long)i+1);
  62 + }
59 63 ExcelUtil<Conference> util = new ExcelUtil<Conference>(Conference.class);
60 64 return util.exportExcel(list, "会议管理");
61 65 }
... ...
trash-workFlow/src/main/java/com/trash/office/controller/ContractManagementController.java
  View file @cb6cea0
... ... @@ -54,6 +54,10 @@ public class ContractManagementController extends BaseController
54 54 public AjaxResult export(ContractManagement contractManagement)
55 55 {
56 56 List<ContractManagement> list = contractManagementService.selectContractManagementList(contractManagement);
  57 +
  58 + for(int i = 0;i<list.size();i++){
  59 + list.get(i).setId((long)i+1);
  60 + }
57 61 ExcelUtil<ContractManagement> util = new ExcelUtil<ContractManagement>(ContractManagement.class);
58 62 return util.exportExcel(list, "合同管理");
59 63 }
... ...
trash-workFlow/src/main/java/com/trash/office/controller/HandleAffairsCommonController.java
  View file @cb6cea0
... ... @@ -56,6 +56,10 @@ public class HandleAffairsCommonController extends BaseController
56 56 public AjaxResult export(HandleAffairsCommon handleAffairsCommon)
57 57 {
58 58 List<HandleAffairsCommon> list = handleAffairsCommonService.selectHandleAffairsCommonList(handleAffairsCommon);
  59 +
  60 + for(int i = 0;i<list.size();i++){
  61 + list.get(i).setId((long)i+1);
  62 + }
59 63 ExcelUtil<HandleAffairsCommon> util = new ExcelUtil<HandleAffairsCommon>(HandleAffairsCommon.class);
60 64 return util.exportExcel(list, "办文办事-普通");
61 65 }
... ...
trash-workFlow/src/main/java/com/trash/office/controller/HandleAffairsController.java
  View file @cb6cea0
... ... @@ -54,6 +54,10 @@ public class HandleAffairsController extends BaseController {
54 54 @GetMapping("/export")
55 55 public AjaxResult export(HandleAffairs handleAffairs) {
56 56 List<HandleAffairs> list = handleAffairsService.selectHandleAffairsList(handleAffairs);
  57 +
  58 + for(int i = 0;i<list.size();i++){
  59 + list.get(i).setId((long)i+1);
  60 + }
57 61 ExcelUtil<HandleAffairs> util = new ExcelUtil<HandleAffairs>(HandleAffairs.class);
58 62 return util.exportExcel(list, "办文办事");
59 63 }
... ...
trash-workFlow/src/main/java/com/trash/office/controller/HandleAffairsXfController.java
  View file @cb6cea0
... ... @@ -56,6 +56,10 @@ public class HandleAffairsXfController extends BaseController
56 56 public AjaxResult export(HandleAffairsXf handleAffairsXf)
57 57 {
58 58 List<HandleAffairsXf> list = handleAffairsXfService.selectHandleAffairsXfList(handleAffairsXf);
  59 +
  60 + for(int i = 0;i<list.size();i++){
  61 + list.get(i).setId((long)i+1);
  62 + }
59 63 ExcelUtil<HandleAffairsXf> util = new ExcelUtil<HandleAffairsXf>(HandleAffairsXf.class);
60 64 return util.exportExcel(list, "办文办事信访类");
61 65 }
... ...
trash-workFlow/src/main/java/com/trash/office/controller/LeaveApplicationController.java
  View file @cb6cea0
... ... @@ -57,6 +57,10 @@ public class LeaveApplicationController extends BaseController
57 57 public AjaxResult export(LeaveApplication leaveApplication)
58 58 {
59 59 List<LeaveApplication> list = leaveApplicationService.selectLeaveApplicationList(leaveApplication);
  60 +
  61 + for(int i = 0;i<list.size();i++){
  62 + list.get(i).setId((long)i+1);
  63 + }
60 64 ExcelUtil<LeaveApplication> util = new ExcelUtil<LeaveApplication>(LeaveApplication.class);
61 65 return util.exportExcel(list, "请假申请");
62 66 }
... ...
trash-workFlow/src/main/java/com/trash/office/controller/LogisticsManagementController.java
  View file @cb6cea0
... ... @@ -58,10 +58,18 @@ public class LogisticsManagementController extends BaseController
58 58 {
59 59 if(logisticsManagement.getType().equals("0")) {
60 60 List<LogisticsManagementSeal> list = logisticsManagementService.selectLogisticsManagementSealList(logisticsManagement);
  61 +
  62 + for(int i = 0;i<list.size();i++){
  63 + list.get(i).setId((long)i+1);
  64 + }
61 65 ExcelUtil<LogisticsManagementSeal> util = new ExcelUtil<>(LogisticsManagementSeal.class);
62 66 return util.exportExcel(list, "后勤管理");
63 67 }else{
64 68 List<LogisticsManagementGoods> list = logisticsManagementService.selectLogisticsManagementGoodsList(logisticsManagement);
  69 +
  70 + for(int i = 0;i<list.size();i++){
  71 + list.get(i).setId((long)i+1);
  72 + }
65 73 ExcelUtil<LogisticsManagementGoods> util = new ExcelUtil<>(LogisticsManagementGoods.class);
66 74 return util.exportExcel(list, "后勤管理");
67 75 }
... ...
trash-workFlow/src/main/java/com/trash/other/controller/OtherDataController.java
  View file @cb6cea0
... ... @@ -54,6 +54,10 @@ public class OtherDataController extends BaseController
54 54 public AjaxResult export(OtherData otherData)
55 55 {
56 56 List<OtherData> list = otherDataService.selectOtherDataList(otherData);
  57 +
  58 + for(int i = 0;i<list.size();i++){
  59 + list.get(i).setId((long)i+1);
  60 + }
57 61 ExcelUtil<OtherData> util = new ExcelUtil<OtherData>(OtherData.class);
58 62 return util.exportExcel(list, "otherData");
59 63 }
... ...
trash-workFlow/src/main/java/com/trash/other/controller/ProjectCheckController.java
  View file @cb6cea0
... ... @@ -54,6 +54,10 @@ public class ProjectCheckController extends BaseController
54 54 public AjaxResult export(ProjectCheck projectCheck)
55 55 {
56 56 List<ProjectCheck> list = projectCheckService.selectProjectCheckList(projectCheck);
  57 +
  58 + for(int i = 0;i<list.size();i++){
  59 + list.get(i).setId((long)i+1);
  60 + }
57 61 ExcelUtil<ProjectCheck> util = new ExcelUtil<ProjectCheck>(ProjectCheck.class);
58 62 return util.exportExcel(list, "projectCheck");
59 63 }
... ...
trash-workFlow/src/main/java/com/trash/other/controller/TrashDataController.java
  View file @cb6cea0
... ... @@ -54,6 +54,10 @@ public class TrashDataController extends BaseController
54 54 public AjaxResult export(TrashData trashData)
55 55 {
56 56 List<TrashData> list = trashDataService.selectTrashDataList(trashData);
  57 +
  58 + for(int i = 0;i<list.size();i++){
  59 + list.get(i).setId((long)i+1);
  60 + }
57 61 for(TrashData data:list){
58 62 data.setSeason(data.getYear() + data.getSeason());
59 63 String per = ((data.getParam3() / data.getParam1()) * 100) + "%";
... ...