Commit 5b4fc23c06c8c064a90a8bfaa2e5de0203b0b056
1 parent
4ee00068
m
Showing
6 changed files
with
74 additions
and
7 deletions
sql/threestep_history.sql
0 → 100644
| 1 | +/* | ||
| 2 | + Navicat Premium Data Transfer | ||
| 3 | + | ||
| 4 | + Source Server : rrr | ||
| 5 | + Source Server Type : MySQL | ||
| 6 | + Source Server Version : 100508 (10.5.8-MariaDB) | ||
| 7 | + Source Host : localhost:3306 | ||
| 8 | + Source Schema : trash | ||
| 9 | + | ||
| 10 | + Target Server Type : MySQL | ||
| 11 | + Target Server Version : 100508 (10.5.8-MariaDB) | ||
| 12 | + File Encoding : 65001 | ||
| 13 | + | ||
| 14 | + Date: 18/08/2023 16:39:46 | ||
| 15 | +*/ | ||
| 16 | + | ||
| 17 | +SET NAMES utf8mb4; | ||
| 18 | +SET FOREIGN_KEY_CHECKS = 0; | ||
| 19 | + | ||
| 20 | +-- ---------------------------- | ||
| 21 | +-- Table structure for threestep_history | ||
| 22 | +-- ---------------------------- | ||
| 23 | +DROP TABLE IF EXISTS `threestep_history`; | ||
| 24 | +CREATE TABLE `threestep_history` ( | ||
| 25 | + `id` int NOT NULL AUTO_INCREMENT COMMENT '序号', | ||
| 26 | + `name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称', | ||
| 27 | + `type` int NULL DEFAULT NULL COMMENT '类型', | ||
| 28 | + `project_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '作业类型', | ||
| 29 | + `place` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所属区域', | ||
| 30 | + `reason` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '开停工原因', | ||
| 31 | + `status` int NULL DEFAULT 0 COMMENT '1开工 3停工', | ||
| 32 | + `object_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '基础数据ID', | ||
| 33 | + `create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人', | ||
| 34 | + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', | ||
| 35 | + `person` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '执法部门负责人', | ||
| 36 | + `person_number` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系方式', | ||
| 37 | + `person1` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '管理部门负责人', | ||
| 38 | + `person1_number` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系方式', | ||
| 39 | + PRIMARY KEY (`id`) USING BTREE | ||
| 40 | +) ENGINE = InnoDB AUTO_INCREMENT = 115 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; | ||
| 41 | + | ||
| 42 | +SET FOREIGN_KEY_CHECKS = 1; |
trash-ui/dist.rar
No preview for this file type
trash-ui/src/api/truck_active.js
| @@ -116,8 +116,6 @@ export default { | @@ -116,8 +116,6 @@ export default { | ||
| 116 | if(window.location.search){ | 116 | if(window.location.search){ |
| 117 | let params = window.location.search.replace("?",""); | 117 | let params = window.location.search.replace("?",""); |
| 118 | let arr = params.split("&"); | 118 | let arr = params.split("&"); |
| 119 | - let type = -1; | ||
| 120 | - let name = null; | ||
| 121 | for(let j in arr){ | 119 | for(let j in arr){ |
| 122 | if(arr[j].split("=")[0] == "objType"){ | 120 | if(arr[j].split("=")[0] == "objType"){ |
| 123 | this.queryParams.activateStatus = arr[j].split("=")[1]; | 121 | this.queryParams.activateStatus = arr[j].split("=")[1]; |
| @@ -126,6 +124,7 @@ export default { | @@ -126,6 +124,7 @@ export default { | ||
| 126 | this.queryParams.construction = arr[j].split("=")[1]; | 124 | this.queryParams.construction = arr[j].split("=")[1]; |
| 127 | } | 125 | } |
| 128 | } | 126 | } |
| 127 | + } | ||
| 129 | 128 | ||
| 130 | 129 | ||
| 131 | let dep = {type: "CSUserDepartmentType"}; | 130 | let dep = {type: "CSUserDepartmentType"}; |
trash-ui/src/api/truck_credit.js
| @@ -201,6 +201,7 @@ import h5Page from '@/views/h5/Pagination'; | @@ -201,6 +201,7 @@ import h5Page from '@/views/h5/Pagination'; | ||
| 201 | status: null, | 201 | status: null, |
| 202 | lostCredit: null | 202 | lostCredit: null |
| 203 | }; | 203 | }; |
| 204 | + this.queryParams.licensePlate = null; | ||
| 204 | this.resetForm("form"); | 205 | this.resetForm("form"); |
| 205 | }, | 206 | }, |
| 206 | /** 搜索按钮操作 */ | 207 | /** 搜索按钮操作 */ |
| @@ -211,7 +212,6 @@ import h5Page from '@/views/h5/Pagination'; | @@ -211,7 +212,6 @@ import h5Page from '@/views/h5/Pagination'; | ||
| 211 | /** 重置按钮操作 */ | 212 | /** 重置按钮操作 */ |
| 212 | resetQuery() { | 213 | resetQuery() { |
| 213 | this.resetForm("queryForm"); | 214 | this.resetForm("queryForm"); |
| 214 | - console.log(this.queryParams); | ||
| 215 | this.handleQuery(); | 215 | this.handleQuery(); |
| 216 | }, | 216 | }, |
| 217 | // 多选框选中数据 | 217 | // 多选框选中数据 |
trash-ui/src/api/warningInfo.js
| @@ -227,6 +227,32 @@ export default { | @@ -227,6 +227,32 @@ export default { | ||
| 227 | getCompanyList(this.remoteQueryData).then(res => { | 227 | getCompanyList(this.remoteQueryData).then(res => { |
| 228 | this.companyList = res.data; | 228 | this.companyList = res.data; |
| 229 | }); | 229 | }); |
| 230 | + | ||
| 231 | + if(window.location.search){ | ||
| 232 | + let params = window.location.search.replace("?",""); | ||
| 233 | + let arr = params.split("&"); | ||
| 234 | + let type = -1; | ||
| 235 | + let name = null; | ||
| 236 | + for(let j in arr){ | ||
| 237 | + if(arr[j].split("=")[0] == "objType"){ | ||
| 238 | + if(arr[j].split("=")[1] == "company"){ | ||
| 239 | + type = 1; | ||
| 240 | + this.queryParams.violationObjectType = "2"; | ||
| 241 | + }else if(arr[j].split("=")[1] == "construction"){ | ||
| 242 | + type = 0; | ||
| 243 | + this.queryParams.violationObjectType = "0"; | ||
| 244 | + }else if(arr[j].split("=")[1] == "earthSite"){ | ||
| 245 | + type = 0; | ||
| 246 | + this.queryParams.violationObjectType = "1"; | ||
| 247 | + } | ||
| 248 | + } | ||
| 249 | + if(arr[j].split("=")[0] == "objValue"){ | ||
| 250 | + name = arr[j].split("=")[1]; | ||
| 251 | + } | ||
| 252 | + } | ||
| 253 | + } | ||
| 254 | + | ||
| 255 | + | ||
| 230 | this.getList(); | 256 | this.getList(); |
| 231 | }, | 257 | }, |
| 232 | methods: { | 258 | methods: { |
| @@ -556,9 +582,9 @@ export default { | @@ -556,9 +582,9 @@ export default { | ||
| 556 | 582 | ||
| 557 | let companyName = formData.companyName ? formData.companyName : ""; | 583 | let companyName = formData.companyName ? formData.companyName : ""; |
| 558 | let projectName = formData.projectName ? formData.projectName : ""; | 584 | let projectName = formData.projectName ? formData.projectName : ""; |
| 559 | - | 585 | + |
| 560 | this.form.describe = code + companyName + "在" + projectName + "出现" + formData.violationType; | 586 | this.form.describe = code + companyName + "在" + projectName + "出现" + formData.violationType; |
| 561 | - | 587 | + |
| 562 | this.rules.companyName = null; | 588 | this.rules.companyName = null; |
| 563 | this.rules.projectName = null; | 589 | this.rules.projectName = null; |
| 564 | } | 590 | } |
trash-ui/src/main.js
| @@ -37,8 +37,8 @@ Vue.prototype.handleTree = handleTree | @@ -37,8 +37,8 @@ Vue.prototype.handleTree = handleTree | ||
| 37 | Vue.prototype.parseStatus = parseStatus | 37 | Vue.prototype.parseStatus = parseStatus |
| 38 | Vue.prototype.checkPer = checkPermi | 38 | Vue.prototype.checkPer = checkPermi |
| 39 | 39 | ||
| 40 | -// Vue.prototype.remoteFrame = "http://183.66.242.6:14601" | ||
| 41 | -Vue.prototype.remoteFrame = "http://175.6.47.84:8008" | 40 | +Vue.prototype.remoteFrame = "http://183.66.242.6:14601" |
| 41 | +// Vue.prototype.remoteFrame = "http://175.6.47.84:8008" | ||
| 42 | 42 | ||
| 43 | Vue.prototype.msgSuccess = function (msg) { | 43 | Vue.prototype.msgSuccess = function (msg) { |
| 44 | this.$message({ showClose: true, message: msg, type: "success" }); | 44 | this.$message({ showClose: true, message: msg, type: "success" }); |