Merge remote-tracking branch 'origin/dev' into dev

273548560@qq.com
2 parents a4a79e4a 19ee0fb4
Showing 16 changed files with 124 additions and 35 deletions
trash-ui/src/api/driver_credit.js
trash-ui/src/api/truck_credit.js
trash-ui/src/layout/inde3x.vue → trash-ui/src/layout/index4.vue
trash-ui/src/views/activiti/task/bd.css
trash-ui/src/views/activiti/task/constructsiteInfo.vue
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/caseOffline/caseOffline/index.vue
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-ui/src/views/casefile/violationWarningInformation/index.vue
trash-ui/src/views/h5/caseOffline/index.vue
trash-ui/src/views/h5/truckActivate/index.vue
trash-ui/src/views/h5/violationCaseFile/index.vue
trash-ui/src/views/h5/violationWarningInformation/index.vue
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
trash-workFlow/src/main/java/com/trash/business/service/impl/ConstructionSignServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
@@ -83,7 +83,7 @@ export default {
         this.getNamesData();
-      let data = {};
+      let data = {valid:0};
         driverList(data).then(res=>{
           this.driverList = res.list;
@@ -10,6 +10,7 @@
     historyCredit
   } from "@/api/business/truck";
+import h5Page from '@/views/h5/Pagination';
   import {
     companyList,
+  .bd_padding{
+
+    padding:5px;
+  }
+
+  .bd_right {
+    border-right: 1px solid black;
+    height: 100%;
+  }
+
+  .bd_left {
+    border-left: 1px solid black;
+  }
+
+  .bd_top {
+    border-top: 1px solid black;
+  }
+
+  .bd_bottom {
+    border-bottom: 1px solid black;
+  }
 \ No newline at end of file
 <template>
   <div v-loading="loading">
-    <el-button @click="printBody">打印</el-button>
+    <el-button @click="printBody" :style="{'display':hide}">打印</el-button>
     <div id="printItem">
     <el-row style="border: 1px solid black;" type="flex" align="middle" justify="center">
       <el-col :span="1" class="bd_padding">
@@ -156,7 +156,7 @@
       <el-col :span="1" class="bd_padding bd_right">分管领导意见</el-col>
         <el-col :span="23" >
           <el-row class="bd_padding">{{signData.sign3Text}}</el-row>
-          <el-row >
+          <el-row class="bd_padding">
             <label style="float: right;">签字:<img :src="signData.sign3" width="100px" height="40px"  v-if="signData.sign3"/>{{signData.sign3Time}}</label>
           </el-row>
       </el-col>
@@ -166,7 +166,7 @@
       <el-col :span="1" class="bd_right bd_padding">渣土事务中心负责人意见</el-col>
         <el-col :span="23" >
           <el-row class="bd_padding">{{signData.sign4Text}}</el-row>
-          <el-row >
+          <el-row class="bd_padding">
             <label style="float: right;">签字:<img :src="signData.sign4" width="100px" height="40px"  v-if="signData.sign4"/>{{signData.sign4Time}}</label>
           </el-row>
       </el-col>
@@ -201,6 +201,7 @@ import store from &quot;@/store&quot;;
     },
     data() {
       return {
+        hide:'block',
         sign: store.getters.avatar, //裁剪图片的地址
         areas: [],
         loading: null,
@@ -290,8 +291,14 @@ import store from &quot;@/store&quot;;
     },
     methods: {
       printBody(){
+
+        let body = document.body;
+
         document.body.innerHTML = document.getElementById("printItem").innerHTML;
+
         window.print();
+
+        window.location.reload();
       },
       getInfo() {
         let id;
@@ -751,7 +751,7 @@ export default {
       if (this.definitionKey == "workflow_constructsite") {
         if (this.form.status == 1) {
-          let objId = this.businessKey + "&";
+          let objId = this.businessKey.split(":")[1];
           let query = {
             objectId: objId,
           };
@@ -7,7 +7,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属区域" prop="place">
-      <el-select v-model="queryParams.place" placeholder="请选择案卷类型"  size="small">
+      <el-select v-model="queryParams.place" placeholder="请选择所属区域"  size="small">
           <el-option v-for="item in areas" :label="item.name" :value="item.code" />
         </el-select>
       </el-form-item>
@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px">
       <el-form-item label="所属区域" prop="owningRegion">
-        <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型"  size="small">
+        <el-select v-model="queryParams.owningRegion" placeholder="请选择所属区域"  size="small">
           <el-option  v-for="item in areas" :label="item.name" :value="item.name" />
         </el-select>
@@ -9,7 +9,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属区域" prop="owningRegion">
-        <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型" clearable size="small">
+        <el-select v-model="queryParams.owningRegion" placeholder="请选择所属区域" clearable size="small">
           <el-option  v-for="item in areas" :label="item.name" :value="item.name" />
         </el-select>
       </el-form-item>
@@ -7,7 +7,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属区域" prop="place">
-      <el-select v-model="queryParams.place" placeholder="请选择案卷类型"  size="small">
+      <el-select v-model="queryParams.place" placeholder="请选择所属区域"  size="small">
           <el-option v-for="item in areas" :label="item.name" :value="item.code" />
         </el-select>
       </el-form-item>
@@ -54,22 +54,15 @@
     </el-row>
-   <el-card class="box-card" v-for="item in truckActivateList" style="margin-bottom: 10px;">
+   <el-card class="box-card" v-for="item in truckActivateList" style="margin-bottom: 10px;padding: 10px;">
       <el-row class="card_row">
-        <el-col :span="12" class="card_grid">
+        <el-col :span="24" class="card_grid">
         <div class="card_title" style="font-weight: bold;">{{item.licensePlate}}</div>
         </el-col>
-        <el-col :span="12" class="card_grid" >
-          <span v-if="item.activateTime!=null" style="float:right;margin-top:20px;">已激活</span>
-          <el-button  v-if="item.activateTime==null"
-            style="float:right;"
-            @click="handleUpdate(item)"
-          >手动激活</el-button>
-        </el-col>
       </el-row>
-      <el-row class="card_row" style="margin-top: 5px;">
+      <el-row class="card_row" style="margin-top: 20px;">
         <el-col :span="24">
           <div>{{item.company}}</div>
         </el-col>
@@ -80,6 +73,14 @@
          <div>{{item.construction}}</div>
        </el-col>
      </el-row>
+
+     <el-row class="card_row" style="margin-top: 20px;">
+       <el-col :span="24" class="card_grid" >
+         <span v-if="" style="margin-top:20px;">{{item.activateTime!=null ? '激活时间:' + item.activateTime : "未激活"}}</span>
+       </el-col>
+     </el-row>
+
+
     </el-card>
     <h5Page
@@ -126,4 +127,4 @@
   .el-select-dropdown__item{
     width:300px;
   }
-</style>
 \ No newline at end of file
+</style>
@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="所属区域" prop="owningRegion">
-        <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型"  size="small">
+        <el-select v-model="queryParams.owningRegion" placeholder="请选择所属区域"  size="small">
           <el-option  v-for="item in areas" :label="item.name" :value="item.name" />
         </el-select>
@@ -9,7 +9,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属区域" prop="owningRegion">
-        <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型" clearable size="small">
+        <el-select v-model="queryParams.owningRegion" placeholder="请选择所属区域" clearable size="small">
           <el-option  v-for="item in areas" :label="item.name" :value="item.name" />
         </el-select>
       </el-form-item>
@@ -129,7 +129,7 @@ public class SupervisionThreestepController extends BaseController
         	}
         	for(String out:outside){
-        		if(out.equals(m.get("place"))){
+        		if(out.equals(m.get("eplace"))){
         			if(m.get("status").equals("开工")){
         				m.put("estatus", "开工");
         				m.put("eselfCheckTime", m.get("selfCheckTime"));
@@ -68,6 +68,10 @@ public class ConstructionSignServiceImpl implements IConstructionSignService
         String sign = SecurityUtils.getLoginUser().getUser().getAvatar();
+        if(sign.contains("null")){
+        	sign = null;
+        }
+        
         if (constructionSign.getIdx() == 0) {
         	constructionSign.setSign1(sign);
         	constructionSign.setSign1Time(DateUtils.getNowDate());
@@ -611,37 +611,92 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				JSONObject area = (JSONObject)object;
-				if(outside[i].equals(area.getString("name"))){
-					outside[i] = area.getString("code");
-				}
-				
+//				if(outside[i].equals(area.getString("name"))){
+//					outside[i] = area.getString("code");
+//				}
 			}
-			
 		}
 		if(supervisionThreestep.getStatus() == 1 && supervisionThreestep.getType() == 0){
+			
+			JSONObject earthList = RemoteServerUtils.getEarthSitesInfo( supervisionThreestep.getEarthsitesId());
+			
+			String eplace = null;
+			
+			if(earthList != null && earthList.size() > 0){
+				eplace = ((JSONObject)earthList).getString("areaName");
+			}
+			
+			
 			for(String out:outside){
-        		if(out.equals(supervisionThreestep.getPlace())){
-        			
-        			
+        		if(out.equals(eplace)){
         			supervisionThreestep.setId(null);
+        			
+        			SupervisionThreestep sp = new SupervisionThreestep();
         			String name = supervisionThreestep.getName();
         			String objId = supervisionThreestep.getObjectId();
         			String eName = supervisionThreestep.getEarthsitesName();
         			String eId = supervisionThreestep.getEarthsitesId();
-        			supervisionThreestep.setCompanys(null);
-        			supervisionThreestep.setCompanyTrucks(null);
-        			supervisionThreestep.setType(1L);
+        			
+        			String start, end;
+
+        			Date date = new Date();
+
+        			if (new Date().getHours() < 8) {
+        				end = yearFomat.format(date);
+        				date.setDate(date.getDate() - 1);
+        				start = yearFomat.format(date);
+        			} else {
+        				start = yearFomat.format(date);
+        				date.setDate(date.getDate() + 1);
+        				end = yearFomat.format(date);
+        			}
+
+        			end += " 4:00:00";
+        			start += " 8:00:00";
+
+        			try {
+        				sp.setWorkStartTime(yearFomat.parse(start));
+        				sp.setWorkEndTime(yearFomat.parse(end));
+        			} catch (Exception e) {
+        				// TODO Auto-generated catch block
+        				e.printStackTrace();
+        			}
+        			
+        			sp.setEarthsitesId(objId);
+        			sp.setEarthsitesName(name);
+        			sp.setName(eName);
+        			sp.setObjectId(eId);
+        			sp.setType(1L);
+        			
+        			SupervisionThreestep todayData = supervisionThreestepMapper.selectTodayData(sp);
+        			
+        			if(todayData != null){
+        				return j;
+        			}
         			supervisionThreestep.setEarthsitesId(objId);
         			supervisionThreestep.setEarthsitesName(name);
         			supervisionThreestep.setName(eName);
         			supervisionThreestep.setObjectId(eId);
-        			supervisionThreestep.setCheckTime(new Date());
+        			
+        			
+        			supervisionThreestep.setCompanys(null);
+        			supervisionThreestep.setCompanyTrucks(null);
+        			supervisionThreestep.setType(1L);
+        			supervisionThreestep.setPlace(eplace);
+        			
+
+
         			supervisionThreestepMapper.insertSupervisionThreestep(supervisionThreestep);
+
+        			supervisionThreestep.setCheckTime(new Date());
+        			
+        			supervisionThreestepMapper.updateSupervisionThreestep(supervisionThreestep);
+        			
         			return j;
         		}