youxiw2000 / trash · Commits

Commit 3a62b23c966cfb7915969fa59d8b3a5410027b79

Authored by youxiw2000
1 parent bfaee3cd

m

Inline Side-by-side
Showing 19 changed files with 106 additions and 68 deletions
trash-admin/src/main/resources/application-dev.yml
  View file @3a62b23
... ... @@ -20,7 +20,8 @@ trash:
20 20 #remotePath: http://175.6.47.84:8008
21 21 #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
22 22 #remotePath: http://cszhatu.natapp1.cc
23   - remotePath: http://183.66.242.6:14601
  23 + #remotePath: http://183.66.242.6:14601
  24 + remotePath: http://175.178.228.30:8008
24 25 token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
25 26  
26 27  
... ... @@ -33,7 +34,7 @@ spring:
33 34 # 主库数据源
34 35 master:
35 36 # url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
36   - url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
  37 + url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
37 38 username: root
38 39 password: root
39 40 # 从库数据源
... ...
trash-ui/dist.7z deleted 100644 → 0
View file @bfaee3c
No preview for this file type
trash-ui/dist.zip 0 → 100644
View file @3a62b23
No preview for this file type
trash-ui/public.7z deleted 100644 → 0
View file @bfaee3c
No preview for this file type
trash-ui/src/api/caseoffline.js
  View file @3a62b23
... ... @@ -63,7 +63,16 @@ export default {
63 63 // 表单参数
64 64 form: {},
65 65 // 表单校验
66   - rules: {
  66 + rules: {
  67 + type: [
  68 + {required: true, message: "必填", trigger: "blur"}
  69 + ],
  70 + place: [
  71 + {required: true, message: "必填", trigger: "blur"}
  72 + ],
  73 + siteType: [
  74 + {required: true, message: "必填", trigger: "blur"}
  75 + ]
67 76 },
68 77 caseType:null,
69 78 fileList:[],
... ...
trash-ui/src/main.js
  View file @3a62b23
... ... @@ -43,8 +43,8 @@ Vue.prototype.checkPer = checkPermi
43 43 Vue.use(plugins)
44 44 Vue.prototype.$aMapKey = "902732b0ff4758e4b39f0f34f0cb1cb0";// 高德地图key
45 45  
46   -
47 46 // Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
  47 +// Vue.prototype.remoteFrame = "http://175.178.228.30:14601"
48 48 Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
49 49  
50 50 Vue.prototype.msgSuccess = function (msg) {
... ...
trash-ui/src/views/activiti/task/index.vue
  View file @3a62b23
... ... @@ -309,7 +309,9 @@
309 309  
310 310 <!-- 会议管理 -->
311 311 <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body :close-on-click-modal="false">
312   - <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
  312 + <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
  313 +
  314 +
313 315 <div slot="footer" class="dialog-footer">
314 316 <el-button type="danger" @click="conferenceSubmitForm(1)">驳回</el-button>
315 317 <el-button type="primary" @click="conferenceSubmitForm(0)">通过</el-button>
... ...
trash-ui/src/views/casefile/violationCaseFile/index.vue
  View file @3a62b23
... ... @@ -229,7 +229,7 @@
229 229 <el-col :span="11">
230 230 <el-form-item label="违规类型" prop="violationType">
231 231 <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;">
232   - <el-option v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
  232 + <el-option v-for="item in caseType" v-if="item.status=='0'" :label="item.dictLabel" :value="item.dictValue" />
233 233 </el-select>
234 234 </el-form-item>
235 235 </el-col>
... ...
trash-ui/src/views/casefile/violationWarningInformation/index.vue
  View file @3a62b23
1 1 <template>
2 2 <div class="app-container">
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px">
4   - <el-form-item label="违规对象类型" prop="violationObjectType">
5   - <el-select v-model="queryParams.violationObjectType" placeholder="请选择违规对象类型" clearable size="small">
  4 + <el-form-item label="预警对象类型" prop="violationObjectType">
  5 + <el-select v-model="queryParams.violationObjectType" placeholder="请选择预警对象类型" clearable size="small">
6 6 <el-option label="工地" value="0" />
7 7 <el-option label="处理场所" value="1" />
8 8 <el-option label="企业" value="2" />
... ... @@ -13,15 +13,15 @@
13 13 <el-option v-for="item in areas" :label="item.name" :value="item.name" />
14 14 </el-select>
15 15 </el-form-item>
16   - <el-form-item label="违规类型" prop="violationType">
17   - <el-select v-model="queryParams.violationType" placeholder="请选择违规类型" clearable size="small">
  16 + <el-form-item label="预警类型" prop="violationType">
  17 + <el-select v-model="queryParams.violationType" placeholder="请选择预警类型" clearable size="small">
18 18 <el-option v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
19 19 </el-select>
20 20 </el-form-item>
21   - <el-form-item label="违规对象" prop="projectName">
  21 + <el-form-item label="预警对象" prop="projectName">
22 22 <el-input
23 23 v-model="queryParams.projectName"
24   - placeholder="请输入违规对象"
  24 + placeholder="请输入预警对象"
25 25 clearable
26 26 size="small"
27 27 @keyup.enter.native="handleQuery"
... ... @@ -86,13 +86,13 @@
86 86 <el-table-column type="selection" width="55" align="center" />
87 87 <el-table-column label="序号" align="center" type='index'/>
88 88 <el-table-column label="所属区域" align="center" prop="owningRegion" />
89   - <el-table-column label="违规对象" align="center" prop="projectName" />
90   - <el-table-column label="违规对象类型" align="center" prop="violationObjectType" >
  89 + <el-table-column label="预警对象" align="center" prop="projectName" />
  90 + <el-table-column label="预警对象类型" align="center" prop="violationObjectType" >
91 91 <template slot-scope="scope">
92 92 <span>{{scope.row.violationObjectType == 0 ? "工地" :scope.row.violationObjectType == 1 ?"处理场所":"企业"}}</span>
93 93 </template>
94 94 </el-table-column>
95   - <el-table-column label="违规类型" align="center" prop="violationType">
  95 + <el-table-column label="预警类型" align="center" prop="violationType">
96 96 <template slot-scope="scope">
97 97 <span>{{getCaseType(scope.row.violationType)}}</span>
98 98 </template>
... ... @@ -138,7 +138,7 @@
138 138 @pagination="getList"
139 139 />
140 140  
141   - <!-- 添加或修改违规预警信息对话框 -->
  141 + <!-- 添加或修改预警预警信息对话框 -->
142 142 <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body :close-on-click-modal="false">
143 143 <el-form ref="form" :model="form" :rules="rules" label-width="115px">
144 144 <el-row :gutter="2">
... ... @@ -148,8 +148,8 @@
148 148 </el-form-item>
149 149 </el-col>
150 150 <el-col :span="11">
151   - <el-form-item label="违规对象类型" prop="violationObjectType">
152   - <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;">
  151 + <el-form-item label="预警对象类型" prop="violationObjectType">
  152 + <el-select v-model="form.violationObjectType" placeholder="请选择预警对象类型" style="width: 100%;">
153 153 <el-option label="工地" value="0" />
154 154 <el-option label="处理场所" value="1" />
155 155 <el-option label="企业" value="2" />
... ... @@ -166,16 +166,16 @@
166 166 </el-form-item>
167 167 </el-col>
168 168 <el-col :span="11">
169   - <el-form-item label="违规类型" prop="violationType">
170   - <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;">
171   - <el-option v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
  169 + <el-form-item label="预警类型" prop="violationType">
  170 + <el-select v-model="form.violationType" placeholder="请选择预警类型" style="width: 100%;">
  171 + <el-option v-for="item in caseType" v-if="item.status=='0'" :label="item.dictLabel" :value="item.dictValue" />
172 172 </el-select>
173 173 </el-form-item>
174 174 </el-col>
175 175 </el-row>
176 176 <el-row :gutter="2">
177 177 <el-col :span="11">
178   - <el-form-item label="违规等级" prop="violationGrade">
  178 + <el-form-item label="预警等级" prop="violationGrade">
179 179 <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;">
180 180 <el-option label="一般类" value="一般类"/>
181 181 <el-option label="重点类" value="重点类" />
... ... @@ -194,7 +194,7 @@
194 194 </el-row>
195 195 <el-row :gutter="2">
196 196 <el-col :span="8" :offset="3">
197   - <el-button style="margin-left: 14px" type="primary" @click="createDescribe">生成违规描述</el-button>
  197 + <el-button style="margin-left: 14px" type="primary" @click="createDescribe">生成预警描述</el-button>
198 198 </el-col>
199 199 <el-col :span="11">
200 200 <el-form-item label="企业名称" prop="companyName">
... ... @@ -207,7 +207,7 @@
207 207 </el-row>
208 208 <el-row>
209 209 <el-col :span="22">
210   - <el-form-item label="违规描述" prop="describe">
  210 + <el-form-item label="预警描述" prop="describe">
211 211 <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="4"/>
212 212 </el-form-item>
213 213 </el-col>
... ...
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationInfo.vue
  View file @3a62b23
... ... @@ -7,8 +7,8 @@
7 7 </el-form-item>
8 8 </el-col>
9 9 <el-col :span="11">
10   - <el-form-item label="违规对象类型" prop="violationObjectType">
11   - <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;"
  10 + <el-form-item label="预警对象类型" prop="violationObjectType">
  11 + <el-select v-model="form.violationObjectType" placeholder="请选择预警对象类型" style="width: 100%;"
12 12 :disabled="true">
13 13 <el-option label="工地" value="0"/>
14 14 <el-option label="处理场所" value="1"/>
... ... @@ -25,15 +25,15 @@
25 25 </el-form-item>
26 26 </el-col>
27 27 <el-col :span="11">
28   - <el-form-item label="违规类型" prop="violationType">
29   - <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
  28 + <el-form-item label="预警类型" prop="violationType">
  29 + <el-select v-model="form.violationType" placeholder="请选择预警类型" style="width: 100%;" :disabled="true">
30 30 </el-select>
31 31 </el-form-item>
32 32 </el-col>
33 33 </el-row>
34 34 <el-row :gutter="2">
35 35 <el-col :span="11">
36   - <el-form-item label="违规等级" prop="violationGrade">
  36 + <el-form-item label="预警等级" prop="violationGrade">
37 37 <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
38 38 <el-option label="一般类" value="一般类"/>
39 39 <el-option label="重点类" value="重点类"/>
... ... @@ -83,7 +83,7 @@
83 83 </el-row>
84 84 <el-row>
85 85 <el-col :span="22">
86   - <el-form-item label="违规描述" prop="describe">
  86 + <el-form-item label="预警描述" prop="describe">
87 87 <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="5" :disabled="true"
88 88 style="white-space: pre-line"/>
89 89 </el-form-item>
... ...
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationTable.vue
  View file @3a62b23
... ... @@ -26,11 +26,11 @@
26 26 {{owningRegion!=""&&owningRegion!=null?owningRegion:"长沙市"}}
27 27 </template>
28 28 </el-table-column>
29   - <el-table-column property="type" label="案卷类型" header-align="center" align="center"></el-table-column>
30   - <el-table-column property="count" label="违规案卷数" header-align="center" align="center"></el-table-column>
31   - <el-table-column property="repCount" label="违规案卷回复数" header-align="center"
  29 + <el-table-column property="type" label="预警类型" header-align="center" align="center"></el-table-column>
  30 + <el-table-column property="count" label="预警案卷数" header-align="center" align="center"></el-table-column>
  31 + <el-table-column property="repCount" label="预警案卷回复数" header-align="center"
32 32 align="center"></el-table-column>
33   - <el-table-column property="repPct" label="违规案卷回复率" header-align="center" align="center"></el-table-column>
  33 + <el-table-column property="repPct" label="预警案卷回复率" header-align="center" align="center"></el-table-column>
34 34 </el-table>
35 35 </div>
36 36 </template>
... ...
trash-ui/src/views/h5/caseOffline/index.vue
  View file @3a62b23
... ... @@ -96,7 +96,7 @@
96 96 </el-select>
97 97 </el-form-item>
98 98 <el-form-item :label="form.siteType==0?'工地名称':form.siteType==1?'处理场所名称':'车牌号'" prop="siteName">
99   - <el-select v-model="form.siteName" placeholder="请选择类型" allow-create filterable
  99 + <el-select v-model="form.siteName" placeholder="请选择类型" allow-create filterable
100 100 :filter-method="getSite">
101 101 <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" />
102 102 </el-select>
... ... @@ -112,9 +112,20 @@
112 112 </el-form-item>
113 113  
114 114 <el-form-item label="附件" prop="attach">
115   - <a style="color:blue;font-size: 12px;" @click="uploadImageDialog=true;">选择附件</a>
116   - <el-input v-model="form.attach" type="hidden"></el-input>
117   - <a @click="downloadFile(img);" style="color: blue;" v-for="img,index in form.attach">附件 - {{index+1}}</a>
  115 + <a style="color:blue;font-size: 12px;" @click="uploadImageDialog=true;">选择附件</a>
  116 + <br/>
  117 + <el-image v-for="item in slides"
  118 + style="width: 40px; height: 40px; margin: 5px;"
  119 + :src="item.url"
  120 + :preview-src-list="[item.url]"
  121 + :z-index="2000">
  122 + </el-image>
  123 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;" v-for="item in videoSrc" >
  124 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  125 + </div>
  126 + <el-input v-model="form.attach" type="hidden"></el-input>
  127 + <div style="color: blue;" v-for="(img,index) in form.attach">{{ img.split("/")[img.split("/").length - 1] }}
  128 + <a @click="removeAttchItem(index,img)" style="color:red;">X</a></div>
118 129 </el-form-item>
119 130  
120 131 </el-form>
... ... @@ -136,7 +147,11 @@
136 147  
137 148  
138 149 <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose" width="300px">
139   - <el-upload multiple :headers="upload.headers" :action="upload.url" :file-list="fileList"
  150 + <el-upload
  151 + accept="image/*"
  152 + :headers="upload.headers"
  153 + :action="upload.url"
  154 + :file-list="fileList"
140 155 :on-success="uploadSuccess" :before-upload="beforeUpload">
141 156 <el-button size="small" type="primary">选择附件</el-button>
142 157 <div slot="tip" class="el-upload__tip">只能上传不超过 20MB 的jpg pdf word文件</div>
... ...
trash-ui/src/views/h5/task/threestepInfo.vue
  View file @3a62b23
... ... @@ -700,8 +700,8 @@
700 700 :z-index="2000">
701 701 </el-image>
702 702 <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
703   - v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
704   - <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  703 + v-if="sub_img.indexOf('.mp4') > -1 || sub_img.indexOf('.avi') > -1" >
  704 + <video width="100%" controls="controls" height="100%" :src="slides1(sub_img)"></video>
705 705 </div>
706 706 <a @click="downloadFile(sub_img);" style="color: blue;">附件1 - {{ index + 1 }}</a>
707 707  
... ... @@ -722,8 +722,8 @@
722 722 :z-index="2000">
723 723 </el-image>
724 724 <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
725   - v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
726   - <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  725 + v-if="sub_img.indexOf('.mp4') > -1 || sub_img.indexOf('.avi') > -1" >
  726 + <video width="100%" controls="controls" height="100%" :src="slides1(sub_img)"></video>
727 727 </div>
728 728 <a @click="downloadFile(sub_img);" style="color: blue;">附件2 - {{ index + 1 }}</a>
729 729  
... ... @@ -744,8 +744,8 @@
744 744 :z-index="2000">
745 745 </el-image>
746 746 <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
747   - v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
748   - <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  747 + v-if="sub_img.indexOf('.mp4') > -1 || sub_img.indexOf('.avi') > -1" >
  748 + <video width="100%" controls="controls" height="100%" :src="slides1(sub_img)"></video>
749 749 </div>
750 750 <a @click="downloadFile(sub_img);" style="color: blue;">附件3 - {{ index + 1 }}</a>
751 751  
... ...
trash-ui/src/views/h5/task/violationWarningInformationInfo.vue
  View file @3a62b23
... ... @@ -5,8 +5,8 @@
5 5 <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
6 6 </el-form-item>
7 7  
8   - <el-form-item label="违规对象类型" prop="violationObjectType">
9   - <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;" :disabled="true">
  8 + <el-form-item label="预警对象类型" prop="violationObjectType">
  9 + <el-select v-model="form.violationObjectType" placeholder="请选择预警对象类型" style="width: 100%;" :disabled="true">
10 10 <el-option label="工地" value="0" />
11 11 <el-option label="处理场所" value="1" />
12 12 <el-option label="企业" value="2" />
... ... @@ -19,12 +19,12 @@
19 19 </el-select>
20 20 </el-form-item>
21 21  
22   - <el-form-item label="违规类型" prop="violationType">
  22 + <el-form-item label="预警类型" prop="violationType">
23 23 <el-input :value="getCaseType(form.violationType)" :disabled="true"/>
24 24 </el-form-item>
25 25  
26 26  
27   - <el-form-item label="违规等级" prop="violationGrade">
  27 + <el-form-item label="预警等级" prop="violationGrade">
28 28 <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
29 29 <el-option label="一般类" value="一般类"/>
30 30 <el-option label="重点类" value="重点类"/>
... ... @@ -62,7 +62,7 @@
62 62 <el-input :value="form.readTime" :disabled="true"/>
63 63 </el-form-item>
64 64  
65   - <el-form-item label="违规描述" prop="describe">
  65 + <el-form-item label="预警描述" prop="describe">
66 66 <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="5" :disabled="true"style="white-space: pre-line"/>
67 67 </el-form-item>
68 68  
... ...
trash-ui/src/views/h5/violationWarningInformation/index.vue
  View file @3a62b23
1 1 <template>
2 2 <div class="app-container">
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px">
4   - <el-form-item label="违规对象类型" prop="violationObjectType">
5   - <el-select v-model="queryParams.violationObjectType" placeholder="请选择违规对象类型" clearable size="small">
  4 + <el-form-item label="预警对象类型" prop="violationObjectType">
  5 + <el-select v-model="queryParams.violationObjectType" placeholder="请选择预警对象类型" clearable size="small">
6 6 <el-option label="工地" value="0" />
7 7 <el-option label="处理场所" value="1" />
8 8 <el-option label="企业" value="2" />
... ... @@ -13,8 +13,8 @@
13 13 <el-option v-for="item in areas" :label="item.name" :value="item.name" />
14 14 </el-select>
15 15 </el-form-item>
16   - <el-form-item label="违规类型" prop="violationType">
17   - <el-select v-model="queryParams.violationType" placeholder="请选择违规类型" clearable size="small">
  16 + <el-form-item label="预警类型" prop="violationType">
  17 + <el-select v-model="queryParams.violationType" placeholder="请选择预警类型" clearable size="small">
18 18 <el-option v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
19 19  
20 20 getCaseType
... ... @@ -45,7 +45,7 @@
45 45 >
46 46 <el-row class="card_row">
47 47 <el-col :span="24" class="card_grid">
48   - <div class="card_title" style="font-weight: bold;">违规类型:{{getCaseType(item.violationType)}}</div>
  48 + <div class="card_title" style="font-weight: bold;">预警类型:{{getCaseType(item.violationType)}}</div>
49 49 </el-col>
50 50 </el-row>
51 51 <el-row class="card_row" style="margin-top:10px;margin-bottom:10px;">
... ... @@ -62,7 +62,7 @@
62 62  
63 63 <el-row class="card_row">
64 64 <el-col :span="12">
65   - <span >违规对象类型:{{item.violationObjectType == 0 ? "工地" :item.violationObjectType == 1 ?"处理场所":"企业"}}</span>
  65 + <span >预警对象类型:{{item.violationObjectType == 0 ? "工地" :item.violationObjectType == 1 ?"处理场所":"企业"}}</span>
66 66 </el-col>
67 67 <el-col :span="12" class="card_grid" >
68 68 <span >所属区域:{{item.owningRegion}}</span>
... ... @@ -86,15 +86,15 @@
86 86 @pagination="getList"
87 87 />
88 88  
89   - <!-- 添加或修改违规预警信息对话框 -->
  89 + <!-- 添加或修改预警预警信息对话框 -->
90 90 <el-dialog :title="title" :visible.sync="open" width="300px" append-to-body :close-on-click-modal="false">
91 91 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
92 92  
93 93 <el-form-item label="案卷编号" prop="number">
94 94 <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
95 95 </el-form-item>
96   - <el-form-item label="违规对象类型" prop="violationObjectType">
97   - <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;">
  96 + <el-form-item label="预警对象类型" prop="violationObjectType">
  97 + <el-select v-model="form.violationObjectType" placeholder="请选择预警对象类型" style="width: 100%;">
98 98 <el-option label="工地" value="0" />
99 99 <el-option label="处理场所" value="1" />
100 100 <el-option label="企业" value="2" />
... ... @@ -106,11 +106,11 @@
106 106 <el-option v-for="item in areas" :label="item.name" :value="item.code" @click.native="selectArea(item)"/>
107 107 </el-select>
108 108 </el-form-item>
109   - <el-form-item label="违规类型" prop="violationType">
  109 + <el-form-item label="预警类型" prop="violationType">
110 110 <el-input :value="getCaseType(form.violationType)" :disabled="true"/>
111 111 </el-form-item>
112 112  
113   - <el-form-item label="违规等级" prop="violationGrade">
  113 + <el-form-item label="预警等级" prop="violationGrade">
114 114 <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;">
115 115 <el-option label="一般类" value="一般类"/>
116 116 <el-option label="重点类" value="重点类" />
... ... @@ -122,14 +122,14 @@
122 122 </el-select>
123 123 </el-form-item>
124 124  
125   - <el-button type="primary" @click="createDescribe">生成违规描述</el-button>
  125 + <el-button type="primary" @click="createDescribe">生成预警描述</el-button>
126 126 <el-form-item label="企业名称" prop="companyName">
127 127 <el-select v-model="form.companyName" :filterable="true" :remote-method="companyLoadOptions" :loading="isLoadingCompany" placeholder="请输入项目名称" style="width: 100%;">
128 128 <el-option v-for="item in companyList" :key="item.name" :label="item.name" :value="item.name"></el-option>
129 129 </el-select>
130 130 </el-form-item>
131 131  
132   - <el-form-item label="违规描述" prop="describe">
  132 + <el-form-item label="预警描述" prop="describe">
133 133 <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="4"/>
134 134 </el-form-item>
135 135 <el-form-item label="推送对象">
... ...
trash-ui/vue.config.js
  View file @3a62b23
... ... @@ -40,8 +40,13 @@ module.exports = {
40 40 ['^' + process.env.VUE_APP_BASE_API]: ''
41 41 }
42 42 },
  43 + ['/voice']: {
  44 + target: `http://127.0.0.1:15001/`,
  45 + // target: `http://175.6.47.84:8008`,
  46 + changeOrigin: true,
  47 + },
43 48 ['/api']: {
44   - target: `http://183.66.242.6:14601`,
  49 + target: `http://175.178.228.30:8008`,
45 50 // target: `http://175.6.47.84:8008`,
46 51 changeOrigin: true,
47 52 }
... ...
trash-workFlow/src/main/java/com/trash/business/domain/TruckActivate.java
  View file @3a62b23
... ... @@ -29,6 +29,7 @@ public class TruckActivate
29 29 private String construction;
30 30  
31 31 private String constructionId;
  32 +
32 33 /** 车牌号
33 34 */
34 35 @Excel(name = "车牌号")
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
  View file @3a62b23
... ... @@ -132,7 +132,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
132 132 for (TruckActivate ta : list) {
133 133 if (ta.getAddress() == null) {
134 134 JSONObject construction = RemoteServerUtils.getConstructionLicenseById(ta.getConstructionId());
135   -
  135 + if(construction == null)
  136 + continue;
136 137 String routeName = "";
137 138 String earthName = "";
138 139 JSONArray eList = construction.getJSONArray("earthList");
... ... @@ -355,11 +356,13 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
355 356 threestepMapper.updateSupervisionThreestep(threestep);
356 357 }
357 358  
358   - active.setId(oldData.getId());// 更新已有车辆激活数据
359 359 active.setCreateBy(SecurityUtils.getUsername());
360 360 active.setCreateCount(oldData.getCreateCount() + 1);
361 361 successMessage += nos[i] + " ";
362   - truckActivateMapper.updateTruckActivate(active);
  362 + oldData.setCreateCount(oldData.getCreateCount() + 1);
  363 + oldData.setStatus(1L);
  364 + truckActivateMapper.updateTruckActivate(oldData);
  365 + truckActivateMapper.insertTruckActivate(active);
363 366 continue;
364 367 } else {
365 368  
... ...
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
  View file @3a62b23
... ... @@ -32,7 +32,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
32 32 </resultMap>
33 33  
34 34 <sql id="selectTruckActivateVo">
35   - select id, company, license_plate, time, construction,construction_id, status, earthsite, object_id, create_by, create_type, activate_time, create_time,create_count
  35 + select id, company, license_plate, time, construction,construction_id, status, earthsite,
  36 + object_id, create_by, create_type, activate_time, create_time,create_count
36 37 ,address,effective_from,effective_end,transport_start_time,transport_end_time,route_name,earth_name
37 38 from truck_activate
38 39 </sql>
... ... @@ -170,6 +171,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
170 171 <if test="time != null">#{time},</if>
171 172 <if test="construction != null">#{construction},</if>
172 173 <if test="constructionId != null and constructionId != ''"> #{constructionId},</if>
  174 +
173 175 <if test="status != null">#{status},</if>
174 176 <if test="earthsite != null">#{earthsite},</if>
175 177 <if test="objectId != null">#{objectId},</if>
... ...