Merge branch 'dev' of http://101.95.0.106:8888/youxiw20000/trash into dev

youxiw2000
2 parents fde1575a 01d717cc
Showing 5 changed files with 107 additions and 114 deletions
trash-ui/src/api/vio_casefile.js
trash-ui/src/views/casefile/violationCaseFile/violationCaseFileInfo.vue
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationInfo.vue
trash-ui/src/views/h5/violationCaseFile/index.vue
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationCaseFileServiceImpl.java
-
-import { listViolationCaseFile, getViolationCaseFile,
-        delViolationCaseFile, addViolationCaseFile,
-        updateViolationCaseFile, exportViolationCaseFile } from "@/api/casefile/violationCaseFile";
+import {
+  addViolationCaseFile,
+  delViolationCaseFile,
+  exportViolationCaseFile,
+  getViolationCaseFile,
+  listViolationCaseFile,
+  updateViolationCaseFile
+} from "@/api/casefile/violationCaseFile";
 import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
  
 import h5Info from "@/views/h5/task/violationCaseFileInfo";
 import h5Page from "@/views/h5/Pagination";
  
-  import {
-    earthsitesList,
-    constructionsitesList,
-    getDict,
-    getArea,
-    companyList,
-    truckList,
-  } from "@/api/dict";
+import {companyList, constructionsitesList, earthsitesList, getArea,} from "@/api/dict";
  
  
 export default {
   name: "ViolationCaseFile",
-  components: { violationCaseFileInfo,
-   h5Page,
-   h5Info},
+  components: {
+    violationCaseFileInfo,
+    h5Page,
+    h5Info
+  },
   data() {
     return {
       // 遮罩层
@@ -62,73 +61,68 @@ export default {
         readTime: null
       },
       // 表单参数
-      form: {
-
-      },
-      place:null,
+      form: {},
+      place: null,
       // 表单校验
       rules: {
-        number :[
-          { required: true, message: "必填", trigger: "blur" }
+        number: [
+          {required: true, message: "必填", trigger: "blur"}
         ],
-        violationObjectType :[
-          { required: true, message: "必填", trigger: "blur" }
+        violationObjectType: [
+          {required: true, message: "必填", trigger: "blur"}
         ],
-        owningRegion :[
-          { required: true, message: "必填", trigger: "blur" }
+        owningRegion: [
+          {required: true, message: "必填", trigger: "blur"}
         ],
-        violationType :[
-          { required: true, message: "必填", trigger: "blur" }
+        violationType: [
+          {required: true, message: "必填", trigger: "blur"}
         ],
       },
-      caseType:[{code:0,name:"进入非专用车辆"},
-      {code:1,name:"无许可手续（工）"},
-      {code:2,name:"无许可手续（消）"},
-      {code:3,name:"黄土覆盖情况"},
-      {code:4,name:"出入口路面污染"},
-      {code:5,name:"出入口道路硬化"},
-      {code:6,name:"车辆冲洗是否到位"},
-      {code:7,name:"雾炮机是否正常开启"},
-      {code:8,name:"使用费专用车运输"},
-      {code:9,name:"监控点位未对准"},
-      {code:10,name:"未报开工作业"},
-      {code:11,name:"视频设备离线超时报警"},
-      {code:12,name:"三无车辆进入工地"},
-      {code:13,name:"未按时间作业"},
-      {code:14,name:"未报开工作业"},
-      {code:15,name:"视频设备离线超时报警"},
-      {code:16,name:"三无车辆进入处理场所"},
-      {code:17,name:"未到指定的处理场所作业"},
-      {code:18,name:"离线运输报警（工）"},
-      {code:19,name:"离线运输报警（消）"},
-      {code:20,name:"未激活车辆作业"},
-      {code:21,name:"未核准作业车辆作业"},
-      {code:22,name:"未按线路行驶"},
-      {code:23,name:"闯禁行驶"},
-      {code:24,name:"失信车辆作业"},
-      {code:25,name:"其他1"},
-      {code:26,name:"其他2"},
-      {code:27,name:"其他3"},
-      {code:28,name:"其他4"},
-      {code:29,name:"其他5"}],
+      caseType: [{code: 0, name: "进入非专用车辆"},
+        {code: 1, name: "三无车辆运输"},
+        {code: 3, name: "黄土覆盖情况"},
+        {code: 4, name: "出入口路面污染"},
+        {code: 5, name: "出入口道路硬化"},
+        {code: 6, name: "车辆冲洗是否到位"},
+        {code: 7, name: "雾炮机是否正常开启"},
+        {code: 8, name: "使用费专用车运输"},
+        {code: 9, name: "监控点位未对准"},
+        {code: 10, name: "未报开工作业"},
+        {code: 11, name: "视频设备离线超时报警"},
+        {code: 12, name: "三无车辆进入工地"},
+        {code: 13, name: "未按时间作业"},
+        {code: 14, name: "未报开工作业"},
+        {code: 15, name: "视频设备离线超时报警"},
+        {code: 16, name: "三无车辆进入处理场所"},
+        {code: 17, name: "未到指定的处理场所作业"},
+        {code: 18, name: "离线运输报警（工）"},
+        {code: 19, name: "离线运输报警（消）"},
+        {code: 20, name: "未激活车辆作业"},
+        {code: 21, name: "未核准作业车辆作业"},
+        {code: 22, name: "未按线路行驶"},
+        {code: 23, name: "闯禁行驶"},
+        {code: 24, name: "失信车辆作业"},
+        {code: 25, name: "其他1"},
+        {code: 26, name: "其他2"},
+        {code: 27, name: "其他3"},
+        {code: 28, name: "其他4"},
+        {code: 29, name: "其他5"}],
  
-      projectNameList:[
-      ],
+      projectNameList: [],
       isLoading: false,
-      fileEntityList:[],
-      companyList:[
-      ],
+      fileEntityList: [],
+      companyList: [],
       remoteQueryData: {
         "page": 1,
         "size": 9999
       },
-      areas:[],
-      data:{},
+      areas: [],
+      data: {},
       isLoadingCompany: false,
-      idInfo:null,
-      openInfo:false,
+      idInfo: null,
+      openInfo: false,
       slide1: [],
-      videoSrc:[]
+      videoSrc: []
     };
   },
   watch: {
@@ -144,7 +138,7 @@ export default {
               this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
             }
           }
-          if(item.name.indexOf(".mp4") > -1 || item.name.indexOf(".avi") > -1){
+          if (item.name.indexOf(".mp4") > -1 || item.name.indexOf(".avi") > -1) {
             if (item.raw != null) {
               this.videoSrc.push(URL.createObjectURL(item.raw));
             } else {
@@ -157,7 +151,7 @@ export default {
     }
   },
   created() {
-    getArea().then(res=>{
+    getArea().then(res => {
  
       this.areas = res.result;
     });
@@ -166,23 +160,22 @@ export default {
     constructionsitesList(this.remoteQueryData).then(res => {
       this.projectNameList = res.result.list;
       earthsitesList(this.remoteQueryData).then(res => {
-         for(var i in res.result.list){
-           this.projectNameList.push(res.result.list[i]);
-         }
+        for (var i in res.result.list) {
+          this.projectNameList.push(res.result.list[i]);
+        }
       });
     });
  
  
     companyList(this.remoteQueryData).then(res => {
-       this.companyList = res.result.list;
+      this.companyList = res.result.list;
     });
  
  
-
     this.getList();
   },
   methods: {
-    selectArea(item){
+    selectArea(item) {
  
       this.form.owningRegion = item.name;
       this.form.projectName = null;
@@ -242,10 +235,10 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    handleInfo(row){
+    handleInfo(row) {
       this.idInfo = row.id + "";
       this.openInfo = true;
       this.title = "平台违规案卷详情";
@@ -276,7 +269,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
  
-          if(this.form.sendObject == "运输企业" && this.form.companyName == null){
+          if (this.form.sendObject == "运输企业" && this.form.companyName == null) {
  
             this.$message("请选择相关企业");
  
@@ -291,7 +284,7 @@ export default {
           formData.append('fileList', null);
           //将新增的文件放入formData
           this.fileEntityList.forEach(item => {
-            if(item.id==null){
+            if (item.id == null) {
               formData.append('fileList', item.raw)
             }
           })
@@ -300,7 +293,7 @@ export default {
             formData.append("uploadFilesList", null);
             this.fileEntityList.forEach(item => {
               delete item.params;
-              if(item != "null" && item != null){
+              if (item != "null" && item != null) {
                 formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName"));
               }
             })
@@ -326,31 +319,31 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('是否确认删除平台违规案卷编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delViolationCaseFile(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delViolationCaseFile(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有平台违规案卷数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportViolationCaseFile(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportViolationCaseFile(queryParams);
+      }).then(response => {
+        this.download(response.message);
+      })
     },
     /** 生成案卷编号 */
-    getNumber(){
+    getNumber() {
       const now = new Date();
       const year = now.getFullYear().toString().slice(-2); // 提取后两位数
       const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1;
@@ -368,9 +361,9 @@ export default {
       setTimeout(() => {
         // 模拟异步加载数据
         const data = [
-          { name:'项目1' },
-          { name:'项目2' },
-          { name:'项目3' }
+          {name: '项目1'},
+          {name: '项目2'},
+          {name: '项目3'}
         ].filter(item => item.name.includes(query))
         this.projectNameList = data
         this.isLoading = false
@@ -382,9 +375,9 @@ export default {
       setTimeout(() => {
         // 模拟异步加载数据
         const data = [
-          { name:'公司1' },
-          { name:'公司2' },
-          { name:'公司3' }
+          {name: '公司1'},
+          {name: '公司2'},
+          {name: '公司3'}
         ].filter(item => item.name.includes(query))
         this.companyList = data
         this.isLoadingCompany = false
@@ -457,9 +450,9 @@ export default {
       a.click()
     },
     /** 生成违规描述 */
-    createDescribe(){
-      this.rules.companyName = [{ required: true, message: "必填", trigger: "blur" }]
-      this.rules.projectName = [{ required: true, message: "必填", trigger: "blur" }]
+    createDescribe() {
+      this.rules.companyName = [{required: true, message: "必填", trigger: "blur"}]
+      this.rules.projectName = [{required: true, message: "必填", trigger: "blur"}]
       this.$refs["form"].validate(valid => {
         if (valid) {
           let formData = this.form;
@@ -471,7 +464,7 @@ export default {
           const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
           const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
           const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`;
-          this.form.describe =code + formData.companyName + "在" + formData.projectName + "出现" + formData.violationType;
+          this.form.describe = code + formData.companyName + "在" + formData.projectName + "出现" + formData.violationType;
           this.rules.companyName = null;
           this.rules.projectName = null;
         }
@@ -113,11 +113,11 @@
             type="text"
             icon="el-icon-view"
             @click="openImage(scope.row.replyImg)"
-            v-if="scope.row.replyImg!=null"
+            v-if="scope.row.replyImg!=null && scope.row.replyImg!='undefined'"
             v-hasPermi="['casefile:violationWarningInformation:view']"
           >查看
           </el-button>
-          <span v-if="scope.row.replyImg==null">暂无</span>
+          <span v-if="scope.row.replyImg==null || scope.row.replyImg=='undefined'">暂无</span>
         </template>
       </el-table-column>
     </el-table>
@@ -111,11 +111,11 @@
             type="text"
             icon="el-icon-view"
             @click="openImage(scope.row.replyImg)"
-            v-if="scope.row.replyImg!=null"
+            v-if="scope.row.replyImg!=null && scope.row.replyImg!='undefined'"
             v-hasPermi="['casefile:violationWarningInformation:edit']"
           >查看
           </el-button>
-          <span v-if="scope.row.replyImg==null">暂无</span>
+          <span v-if="scope.row.replyImg==null || scope.row.replyImg=='undefined'">暂无</span>
         </template>
       </el-table-column>
     </el-table>
@@ -238,7 +238,7 @@
   </div>
 </template>
  
-<script src="../../../api/vio_casefile">
+<script src="@/api/vio_casefile">
 </script>
 <style scope>
   .el-select-dropdown__item{
@@ -128,7 +128,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
         		i = 2;
         	}
         }
-        if(violationCaseFile.getViolationType().equals("三无车辆进入工地")||violationCaseFile.getViolationType().equals("三无车辆进入消纳场")){
+        if(violationCaseFile.getViolationType().equals("三无车辆进入工地")||violationCaseFile.getViolationType().equals("三无车辆进入消纳场")||violationCaseFile.getViolationType().equals("三无车辆运输")){
             i = 2;
         }