m

youxiw2000
1 parent 97214904
Showing 14 changed files with 211 additions and 218 deletions
trash-admin/src/main/resources/application-dev.yml
trash-ui/src/api/business/threestep.js
trash-ui/src/api/caseOfflineInfo.js
trash-ui/src/api/threestepInfo.js
trash-ui/src/layout/index.vue
trash-ui/src/layout/index3.vue → trash-ui/src/layout/index4.vue
trash-ui/src/views/business/threestep/threestepInfo.vue
trash-ui/src/views/caseOffline/caseOffline/caseOfflineInfo.vue
trash-ui/src/views/h5/caseOffline/caseOfflineInfo.vue
trash-ui/src/views/h5/task/threestepInfo.vue
trash-ui/src/views/h5/task/violationCaseFileInfo.vue
trash-ui/src/views/h5/threestep/index.vue
trash-ui/vue.config.js
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
@@ -16,10 +16,10 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-    #remotePath: http://183.66.242.6:6001 
-    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0MzI3NzQ1ODkyfQ.4BrpgD9i_1TwjLRGqa3wo4Ikx8t8Gcl3FzHfjL_uolPnNMm2rd7fCvrUoBBN4Qp4cMGzg9h2Nt4NNx8PYThTaQ
-    remotePath: http://183.66.242.6:14601
-    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
+    remotePath: http://183.66.242.6:6001 
+    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0MzI3NzQ1ODkyfQ.4BrpgD9i_1TwjLRGqa3wo4Ikx8t8Gcl3FzHfjL_uolPnNMm2rd7fCvrUoBBN4Qp4cMGzg9h2Nt4NNx8PYThTaQ
+    #remotePath: http://183.66.242.6:14601
+    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
 # 数据源配置
 spring:
@@ -81,3 +81,12 @@ export function exportThreestep(query) {
     params: query
   })
 }
+
+// 导出【请填写功能名称】
+export function getBase64(query) {
+  return request({
+    url: '/business/threestep/getBase64',
+    method: 'get',
+    params: query
+  })
+}
@@ -90,6 +90,8 @@ export default {
       workflow:"workflow_caseoffline",
       data:{},
       adviceList:[],
+        showPic:false,
+        picImage:null,
     };
   },
   created() {
@@ -120,6 +122,17 @@ export default {
     },
       downloadFile(path) {
+        if(path.indexOf(".jpg") > -1){
+
+           getBase64({"path":path}).then(res=>{
+             if(res){
+               this.picImage = "data:image/jpg;base64," + res;
+               this.showPic = true;
+             }
+           });
+
+          return;
+        }
         window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
       },
     /** 修改按钮操作 */
+
+  import {getThreestep,
+          getBase64,
+  } from "@/api/business/threestep";
+
+  import {getToken} from "@/utils/auth";
+
+
+  import {
+    getArea,
+    truckList,
+  } from "@/api/dict";
+
+
+  export default {
+    name: "ThreestepInfo",
+    props: {
+      businessKey: {
+        type: String
+      }
+    },
+    data() {
+      return{
+        areas:[],
+        labelName : "工地名称",
+        labelName2: "绑定消纳场",
+        infoData:{type:0},
+        loading:null,
+        showPic:false,
+        picImage:null,
+      }
+    },
+    created() {
+      this.loading = true;
+      this.getInfo();
+
+
+    },
+    methods:{
+     downloadFile(path) {
+       if(path.indexOf(".jpg") > -1){
+
+          getBase64({"path":path}).then(res=>{
+            if(res){
+              this.picImage = "data:image/jpg;base64," + res;
+              this.showPic = true;
+            }
+          });
+
+         return;
+       }
+
+
+       window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
+     },
+
+      getInfo() {
+        let id;
+        if(this.businessKey.split(":").length == 2){
+          id = this.businessKey.split(":")[1];
+        }else{
+          id = this.businessKey;
+        }
+
+        getThreestep(id).then(response => {
+          this.infoData = response.data;
+
+          this.selectType(this.infoData.type);
+          this.infoData.type = this.infoData.type + "";
+
+
+          getArea().then(res => {
+                  this.areas = res.result;
+                  this.loading = false;
+                  for(let i =0;i<this.areas.length;i++){
+                    if(Number(this.infoData.place) == this.areas[i].code){
+                      this.infoData.place = this.areas[i].name;
+                    }
+                  }
+                });
+
+          let query = {
+            'page':1,
+            'size':9999,
+            'valid':0
+          }
+          truckList(query).then(res=>{
+            this.truckList = res.result.list;
+
+            let trucks = "";
+
+            for(let i in this.truckList){
+                if(this.infoData.companyTrucks.split(",").indexOf(this.truckList[i].id ) > -1){
+                  trucks += this.truckList[i].licenseplateNo + ",";
+                }
+            }
+            this.infoData.companyTrucks = trucks;
+
+          });
+
+
+        });
+      },
+      selectType(value) {
+        if (value == "0") {
+          this.labelName = "工地名称";
+          this.labelName2 = "绑定消纳场";
+        } else {
+          this.labelName = "消纳场名称";
+          this.labelName2 = "绑定工地";
+        }
+      },
+    }
+
+}
 <template>
+  <div :class="classObj" class="app-wrapper">
+    <sidebar class="sidebar-container" />
+    <div :class="{hasTagsView:needTagsView}" class="main-container">
+        <tags-view v-if="needTagsView" />
       <app-main />
+      
+      </div>
+  </div>
 </template>
 <script>
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <sidebar class="sidebar-container" />
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-        <tags-view v-if="needTagsView" />
       <app-main />
-      
-      </div>
-  </div>
 </template>
 <script>
 <template>
+    <div>
     <el-form ref="form" label-width="120px"  v-loading="loading">
       <el-row type="flex" justify="center">
         <el-col :span="12">
@@ -414,107 +415,15 @@
                </el-col>
              </el-row>
     </el-form>
+    
+      <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">
+        <img :src="picImage" width="100%" height="400px" />
+      </el-dialog>
+    </div>
 </template>
-<script>
-  import {getThreestep} from "@/api/business/threestep";
-  import {getToken} from "@/utils/auth";
-
-
-  import {
-    getArea,
-    truckList,
-  } from "@/api/dict";
-
-
-  export default {
-    name: "ThreestepInfo",
-    props: {
-      businessKey: {
-        type: String
-      }
-    },
-    data() {
-      return{
-        areas:[],
-        labelName : "工地名称",
-        labelName2: "绑定消纳场",
-        infoData:{type:0},
-        loading:null,
-      }
-    },
-    created() {
-      this.loading = true;
-      this.getInfo();
-
-
-    },
-    methods:{
-     downloadFile(path) {
-       window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
-     },
-      getInfo() {
-        let id;
-        if(this.businessKey.split(":").length == 2){
-          id = this.businessKey.split(":")[1];
-        }else{
-          id = this.businessKey;
-        }
-
-        getThreestep(id).then(response => {
-          this.infoData = response.data;
-
-          this.selectType(this.infoData.type);
-          this.infoData.type = this.infoData.type + "";
-
-
-          getArea().then(res => {
-                  this.areas = res.result;
-                  this.loading = false;
-                  for(let i =0;i<this.areas.length;i++){
-                    if(Number(this.infoData.place) == this.areas[i].code){
-                      this.infoData.place = this.areas[i].name;
-                    }
-                  }
-                });
-
-          let query = {
-            'page':1,
-            'size':9999,
-            'valid':0
-          }
-          truckList(query).then(res=>{
-            this.truckList = res.result.list;
-
-            let trucks = "";
-
-            for(let i in this.truckList){
-                if(this.infoData.companyTrucks.split(",").indexOf(this.truckList[i].id ) > -1){
-                  trucks += this.truckList[i].licenseplateNo + ",";
-                }
-            }
-            this.infoData.companyTrucks = trucks;
-
-          });
-
-
-        });
-      },
-      selectType(value) {
-        if (value == "0") {
-          this.labelName = "工地名称";
-          this.labelName2 = "绑定消纳场";
-        } else {
-          this.labelName = "消纳场名称";
-          this.labelName2 = "绑定工地";
-        }
-      },
-    }
-
-}
-
-</script>
+<script src="../../../api/threestepInfo">
 <style>
 </style>
 <template>
+  <div>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="案卷类型" prop="type">
           <el-input v-model="form.type" type="textarea"  :rows="3" disabled />
@@ -48,6 +49,10 @@
       </el-form>
+    <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">
+      <img :src="picImage" width="100%" height="400px" />
+    </el-dialog>
+  </div>
 </template>
 <script src="../../../api/caseOfflineInfo">
 <template>
+  <div>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="案卷类型" prop="type">
           <el-input v-model="form.type" type="textarea"  :rows="3" disabled />
@@ -47,7 +48,11 @@
         </el-table>
-      </el-form>
+      </el-form>    
+      <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">
+      <img :src="picImage" width="100%" height="400px" />
+    </el-dialog>
+  </div>
 </template>
 <script src="../../../api/caseOfflineInfo" >
 <template>
+  <div>
+
+
     <el-form ref="form" label-width="100px"  v-loading="loading">
         <el-row >
@@ -410,7 +413,7 @@
                 <el-form-item label="抽查时间" v-if="infoData.checkEndTime">
                         <el-input v-model="infoData.checkEndTime" :maxlength="20" show-word-limit  disabled />
                 </el-form-item>
-           
+
               <el-row type="flex" justify="center" v-if="infoData.subSubReason">
@@ -458,107 +461,15 @@
                </el-col>
              </el-row>
     </el-form>
-</template>
-<script>
-  import {getThreestep} from "@/api/business/threestep";
-
-  import {getToken} from "@/utils/auth";
-
-
-  import {
-    getArea,
-    truckList,
-  } from "@/api/dict";
-
-
-  export default {
-    name: "ThreestepInfo",
-    props: {
-      businessKey: {
-        type: String
-      }
-    },
-    data() {
-      return{
-        areas:[],
-        labelName : "工地名称",
-        labelName2: "绑定消纳场",
-        infoData:{type:0},
-        loading:null,
-      }
-    },
-    created() {
-      this.loading = true;
-      this.getInfo();
-
-
-    },
-    methods:{
-     downloadFile(path) {
-       window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
-     },
-
-      getInfo() {
-        let id;
-        if(this.businessKey.split(":").length == 2){
-          id = this.businessKey.split(":")[1];
-        }else{
-          id = this.businessKey;
-        }
-
-        getThreestep(id).then(response => {
-          this.infoData = response.data;
-
-          this.selectType(this.infoData.type);
-          this.infoData.type = this.infoData.type + "";
-
-
-          getArea().then(res => {
-                  this.areas = res.result;
-                  this.loading = false;
-                  for(let i =0;i<this.areas.length;i++){
-                    if(Number(this.infoData.place) == this.areas[i].code){
-                      this.infoData.place = this.areas[i].name;
-                    }
-                  }
-                });
-
-          let query = {
-            'page':1,
-            'size':9999,
-            'valid':0
-          }
-          truckList(query).then(res=>{
-            this.truckList = res.result.list;
-
-            let trucks = "";
-
-            for(let i in this.truckList){
-                if(this.infoData.companyTrucks.split(",").indexOf(this.truckList[i].id ) > -1){
-                  trucks += this.truckList[i].licenseplateNo + ",";
-                }
-            }
-            this.infoData.companyTrucks = trucks;
-
-          });
-
-
-        });
-      },
-      selectType(value) {
-        if (value == "0") {
-          this.labelName = "工地名称";
-          this.labelName2 = "绑定消纳场";
-        } else {
-          this.labelName = "消纳场名称";
-          this.labelName2 = "绑定工地";
-        }
-      },
-    }
-
-}
+    <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">
+      <img :src="picImage" width="100%" height="400px" />
+    </el-dialog>
+  </div>
+
+</template>
+<script src="../../../api/threestepInfo">
 </script>
 <style>
@@ -119,6 +119,7 @@
     <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0" width="300px">
       <img :src="img" width="100%" height="750px" />
     </el-dialog>
+
   </el-form>
 </template>
@@ -145,7 +145,7 @@
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">过水槽照片</a>
             <el-input v-model="form.img0" type="hidden"></el-input>
-            <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>
+             <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>
           </el-col>
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">洗车平台照片</a>
@@ -294,16 +294,12 @@
 </template>
-<script>
-
-</script>
-
 <script src="../../../api/three_step.js" />
 <style scope>
   .el-select-dropdown__item{
     width:300px;
   }
-  
+
   .card_title{
     word-break: break-all;
   }
@@ -41,8 +41,8 @@ module.exports = {
         }
       },
         ['/api']: {
-          target: `http://183.66.242.6:14601`,
-          // target: `http://183.66.242.6:6001`,
+          // target: `http://183.66.242.6:14601`,
+          target: `http://183.66.242.6:6001`,
           changeOrigin: true,
         },
 package com.trash.business.controller;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -11,6 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.Base64Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -375,4 +378,30 @@ public class SupervisionThreestepController extends BaseController
 	        e.printStackTrace();
 	    }
     }
+    
+    @RequestMapping(value = "/getBase64")
+    public String getBase64(@RequestParam("path") String path) throws IOException {  
+	    try
+	    {
+	        String realFileName = path.split("/")[path.split("/").length-1];
+	        String filePath = trashConfig.getUploadPath() + path.replace("/profile/upload", "");
+	        
+	        File file = new File(filePath);
+	        
+	        
+	        FileInputStream fileInputStream = new FileInputStream(file);
+	        
+	        byte[] bytes = new byte[fileInputStream.available()];
+	        
+	        fileInputStream.read(bytes);
+	        
+	        return Base64Utils.encodeToString(bytes);
+
+	    }
+	    catch (Exception e)
+	    {
+	        e.printStackTrace();
+	    }
+	    return null;
+    }
 }