m

youxiw2000
1 parent bfaee3cd
Showing 19 changed files with 106 additions and 68 deletions
trash-admin/src/main/resources/application-dev.yml
trash-ui/dist.7z
trash-ui/dist.zip
trash-ui/public.7z
trash-ui/src/api/caseoffline.js
trash-ui/src/main.js
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-ui/src/views/casefile/violationWarningInformation/index.vue
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationInfo.vue
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationTable.vue
trash-ui/src/views/h5/caseOffline/index.vue
trash-ui/src/views/h5/task/threestepInfo.vue
trash-ui/src/views/h5/task/violationWarningInformationInfo.vue
trash-ui/src/views/h5/violationWarningInformation/index.vue
trash-ui/vue.config.js
trash-workFlow/src/main/java/com/trash/business/domain/TruckActivate.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
@@ -20,7 +20,8 @@ trash:
     #remotePath: http://175.6.47.84:8008
     #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
     #remotePath: http://cszhatu.natapp1.cc
-    remotePath: http://183.66.242.6:14601
+    #remotePath: http://183.66.242.6:14601
+    remotePath: http://175.178.228.30:8008
     token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
@@ -33,7 +34,7 @@ spring:
             # 主库数据源
             master:
 #                url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
-                url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
                 password: root
             # 从库数据源
@@ -63,7 +63,16 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
+      rules: {
+        type: [
+          {required: true, message: "必填", trigger: "blur"}
+        ],
+        place: [
+          {required: true, message: "必填", trigger: "blur"}
+        ],
+        siteType: [
+          {required: true, message: "必填", trigger: "blur"}
+        ]
       },
       caseType:null,
       fileList:[],
@@ -43,8 +43,8 @@ Vue.prototype.checkPer = checkPermi
 Vue.use(plugins)
 Vue.prototype.$aMapKey = "902732b0ff4758e4b39f0f34f0cb1cb0";// 高德地图key
-
 // Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
+// Vue.prototype.remoteFrame = "http://175.178.228.30:14601"
 Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
 Vue.prototype.msgSuccess = function (msg) {
@@ -309,7 +309,9 @@
     <!--  会议管理  -->
     <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body :close-on-click-modal="false">
-      <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
+      <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
+      
+      
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="conferenceSubmitForm(1)">驳回</el-button>
         <el-button type="primary" @click="conferenceSubmitForm(0)">通过</el-button>
@@ -229,7 +229,7 @@
           <el-col :span="11">
             <el-form-item label="违规类型" prop="violationType">
               <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;">
-                <el-option  v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
+                <el-option  v-for="item in caseType" v-if="item.status=='0'" :label="item.dictLabel" :value="item.dictValue" />
               </el-select>
             </el-form-item>
           </el-col>
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px">
-      <el-form-item label="违规对象类型" prop="violationObjectType">
-        <el-select v-model="queryParams.violationObjectType" placeholder="请选择违规对象类型" clearable size="small">
+      <el-form-item label="预警对象类型" prop="violationObjectType">
+        <el-select v-model="queryParams.violationObjectType" placeholder="请选择预警对象类型" clearable size="small">
           <el-option label="工地" value="0" />
           <el-option label="处理场所" value="1" />
           <el-option label="企业" value="2" />
@@ -13,15 +13,15 @@
           <el-option  v-for="item in areas" :label="item.name" :value="item.name" />
         </el-select>
       </el-form-item>
-      <el-form-item label="违规类型" prop="violationType">
-        <el-select v-model="queryParams.violationType" placeholder="请选择违规类型" clearable size="small">
+      <el-form-item label="预警类型" prop="violationType">
+        <el-select v-model="queryParams.violationType" placeholder="请选择预警类型" clearable size="small">
           <el-option  v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
         </el-select>
       </el-form-item>
-      <el-form-item label="违规对象" prop="projectName">
+      <el-form-item label="预警对象" prop="projectName">
         <el-input
           v-model="queryParams.projectName"
-          placeholder="请输入违规对象"
+          placeholder="请输入预警对象"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -86,13 +86,13 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="所属区域" align="center" prop="owningRegion" />
-      <el-table-column label="违规对象" align="center" prop="projectName" />
-      <el-table-column label="违规对象类型" align="center" prop="violationObjectType" >
+      <el-table-column label="预警对象" align="center" prop="projectName" />
+      <el-table-column label="预警对象类型" align="center" prop="violationObjectType" >
         <template slot-scope="scope">
           <span>{{scope.row.violationObjectType == 0 ? "工地" :scope.row.violationObjectType == 1 ?"处理场所":"企业"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="违规类型" align="center" prop="violationType">
+      <el-table-column label="预警类型" align="center" prop="violationType">
         <template slot-scope="scope">
           <span>{{getCaseType(scope.row.violationType)}}</span>
         </template>
@@ -138,7 +138,7 @@
       @pagination="getList"
     />
-    <!-- 添加或修改违规预警信息对话框 -->
+    <!-- 添加或修改预警预警信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="115px">
         <el-row :gutter="2">
@@ -148,8 +148,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="违规对象类型" prop="violationObjectType">
-              <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;">
+            <el-form-item label="预警对象类型" prop="violationObjectType">
+              <el-select v-model="form.violationObjectType" placeholder="请选择预警对象类型" style="width: 100%;">
                 <el-option label="工地" value="0" />
                 <el-option label="处理场所" value="1" />
                 <el-option label="企业" value="2" />
@@ -166,16 +166,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="违规类型" prop="violationType">
-              <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;">
-                <el-option  v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
+            <el-form-item label="预警类型" prop="violationType">
+              <el-select v-model="form.violationType" placeholder="请选择预警类型" style="width: 100%;">
+                <el-option v-for="item in caseType"  v-if="item.status=='0'" :label="item.dictLabel" :value="item.dictValue" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="2">
           <el-col :span="11">
-            <el-form-item label="违规等级" prop="violationGrade">
+            <el-form-item label="预警等级" prop="violationGrade">
               <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;">
                 <el-option label="一般类" value="一般类"/>
                 <el-option label="重点类" value="重点类" />
@@ -194,7 +194,7 @@
         </el-row>
         <el-row :gutter="2">
           <el-col :span="8" :offset="3">
-            <el-button style="margin-left: 14px" type="primary" @click="createDescribe">生成违规描述</el-button>
+            <el-button style="margin-left: 14px" type="primary" @click="createDescribe">生成预警描述</el-button>
           </el-col>
           <el-col :span="11">
             <el-form-item label="企业名称" prop="companyName">
@@ -207,7 +207,7 @@
         </el-row>
         <el-row>
           <el-col :span="22">
-            <el-form-item label="违规描述" prop="describe">
+            <el-form-item label="预警描述" prop="describe">
               <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="4"/>
             </el-form-item>
           </el-col>
@@ -7,8 +7,8 @@
         </el-form-item>
       </el-col>
       <el-col :span="11">
-        <el-form-item label="违规对象类型" prop="violationObjectType">
-          <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;"
+        <el-form-item label="预警对象类型" prop="violationObjectType">
+          <el-select v-model="form.violationObjectType" placeholder="请选择预警对象类型" style="width: 100%;"
                      :disabled="true">
             <el-option label="工地" value="0"/>
             <el-option label="处理场所" value="1"/>
@@ -25,15 +25,15 @@
         </el-form-item>
       </el-col>
       <el-col :span="11">
-        <el-form-item label="违规类型" prop="violationType">
-          <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
+        <el-form-item label="预警类型" prop="violationType">
+          <el-select v-model="form.violationType" placeholder="请选择预警类型" style="width: 100%;" :disabled="true">
           </el-select>
         </el-form-item>
       </el-col>
     </el-row>
     <el-row :gutter="2">
       <el-col :span="11">
-        <el-form-item label="违规等级" prop="violationGrade">
+        <el-form-item label="预警等级" prop="violationGrade">
           <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
             <el-option label="一般类" value="一般类"/>
             <el-option label="重点类" value="重点类"/>
@@ -83,7 +83,7 @@
     </el-row>
     <el-row>
       <el-col :span="22">
-        <el-form-item label="违规描述" prop="describe">
+        <el-form-item label="预警描述" prop="describe">
           <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="5" :disabled="true"
                     style="white-space: pre-line"/>
         </el-form-item>
@@ -26,11 +26,11 @@
           {{owningRegion!=""&&owningRegion!=null?owningRegion:"长沙市"}}
         </template>
       </el-table-column>
-      <el-table-column property="type" label="案卷类型" header-align="center" align="center"></el-table-column>
-      <el-table-column property="count" label="违规案卷数" header-align="center" align="center"></el-table-column>
-      <el-table-column property="repCount" label="违规案卷回复数" header-align="center"
+      <el-table-column property="type" label="预警类型" header-align="center" align="center"></el-table-column>
+      <el-table-column property="count" label="预警案卷数" header-align="center" align="center"></el-table-column>
+      <el-table-column property="repCount" label="预警案卷回复数" header-align="center"
                        align="center"></el-table-column>
-      <el-table-column property="repPct" label="违规案卷回复率" header-align="center" align="center"></el-table-column>
+      <el-table-column property="repPct" label="预警案卷回复率" header-align="center" align="center"></el-table-column>
     </el-table>
   </div>
 </template>
@@ -96,7 +96,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="form.siteType==0?'工地名称':form.siteType==1?'处理场所名称':'车牌号'" prop="siteName">
-          <el-select v-model="form.siteName" placeholder="请选择类型" allow-create  filterable 
+          <el-select v-model="form.siteName" placeholder="请选择类型" allow-create  filterable
             :filter-method="getSite">
               <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" />
           </el-select>
@@ -112,9 +112,20 @@
         </el-form-item>
         <el-form-item label="附件" prop="attach">
-            <a style="color:blue;font-size: 12px;" @click="uploadImageDialog=true;">选择附件</a>
-            <el-input v-model="form.attach" type="hidden"></el-input>
-            <a @click="downloadFile(img);" style="color: blue;" v-for="img,index in form.attach">附件 - {{index+1}}</a>
+          <a style="color:blue;font-size: 12px;" @click="uploadImageDialog=true;">选择附件</a>
+          <br/>
+          <el-image v-for="item in slides"
+                    style="width: 40px; height: 40px; margin: 5px;"
+                    :src="item.url"
+                    :preview-src-list="[item.url]"
+                    :z-index="2000">
+          </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;" v-for="item in videoSrc" >
+            <video width="100%" controls="controls" height="100%" :src="item.url"></video>
+          </div>
+          <el-input v-model="form.attach" type="hidden"></el-input>
+          <div style="color: blue;" v-for="(img,index) in form.attach">{{ img.split("/")[img.split("/").length - 1] }}
+          <a  @click="removeAttchItem(index,img)" style="color:red;">X</a></div>
         </el-form-item>
       </el-form>
@@ -136,7 +147,11 @@
     <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose"  width="300px">
-      <el-upload multiple :headers="upload.headers" :action="upload.url" :file-list="fileList"
+      <el-upload
+        accept="image/*"
+        :headers="upload.headers"
+        :action="upload.url"
+        :file-list="fileList"
         :on-success="uploadSuccess" :before-upload="beforeUpload">
         <el-button size="small" type="primary">选择附件</el-button>
         <div slot="tip" class="el-upload__tip">只能上传不超过 20MB 的jpg pdf word文件</div>
@@ -700,8 +700,8 @@
                       :z-index="2000">
             </el-image>
             <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
-              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
-              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+              v-if="sub_img.indexOf('.mp4') > -1 || sub_img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(sub_img)"></video>
             </div>
             <a @click="downloadFile(sub_img);" style="color: blue;">附件1 - {{ index + 1 }}</a>
@@ -722,8 +722,8 @@
                       :z-index="2000">
             </el-image>
             <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
-              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
-              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+              v-if="sub_img.indexOf('.mp4') > -1 || sub_img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(sub_img)"></video>
             </div>
             <a @click="downloadFile(sub_img);" style="color: blue;">附件2 - {{ index + 1 }}</a>
@@ -744,8 +744,8 @@
                       :z-index="2000">
             </el-image>
             <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
-              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
-              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+              v-if="sub_img.indexOf('.mp4') > -1 || sub_img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(sub_img)"></video>
             </div>
             <a @click="downloadFile(sub_img);" style="color: blue;">附件3 - {{ index + 1 }}</a>
@@ -5,8 +5,8 @@
           <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="违规对象类型" prop="violationObjectType">
-          <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;" :disabled="true">
+        <el-form-item label="预警对象类型" prop="violationObjectType">
+          <el-select v-model="form.violationObjectType" placeholder="请选择预警对象类型" style="width: 100%;" :disabled="true">
             <el-option label="工地" value="0" />
             <el-option label="处理场所" value="1" />
             <el-option label="企业" value="2" />
@@ -19,12 +19,12 @@
           </el-select>
         </el-form-item>
-        <el-form-item label="违规类型" prop="violationType">
+        <el-form-item label="预警类型" prop="violationType">
             <el-input :value="getCaseType(form.violationType)" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="违规等级" prop="violationGrade">
+        <el-form-item label="预警等级" prop="violationGrade">
           <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
             <el-option label="一般类" value="一般类"/>
             <el-option label="重点类" value="重点类"/>
@@ -62,7 +62,7 @@
           <el-input :value="form.readTime" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="违规描述" prop="describe">
+        <el-form-item label="预警描述" prop="describe">
           <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="5" :disabled="true"style="white-space: pre-line"/>
         </el-form-item>
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px">
-      <el-form-item label="违规对象类型" prop="violationObjectType">
-        <el-select v-model="queryParams.violationObjectType" placeholder="请选择违规对象类型" clearable size="small">
+      <el-form-item label="预警对象类型" prop="violationObjectType">
+        <el-select v-model="queryParams.violationObjectType" placeholder="请选择预警对象类型" clearable size="small">
           <el-option label="工地" value="0" />
           <el-option label="处理场所" value="1" />
           <el-option label="企业" value="2" />
@@ -13,8 +13,8 @@
           <el-option  v-for="item in areas" :label="item.name" :value="item.name" />
         </el-select>
       </el-form-item>
-      <el-form-item label="违规类型" prop="violationType">
-        <el-select v-model="queryParams.violationType" placeholder="请选择违规类型" clearable size="small">
+      <el-form-item label="预警类型" prop="violationType">
+        <el-select v-model="queryParams.violationType" placeholder="请选择预警类型" clearable size="small">
           <el-option  v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
           getCaseType
@@ -45,7 +45,7 @@
             >
            <el-row class="card_row">
              <el-col :span="24" class="card_grid">
-              <div class="card_title" style="font-weight: bold;">违规类型:{{getCaseType(item.violationType)}}</div>
+              <div class="card_title" style="font-weight: bold;">预警类型:{{getCaseType(item.violationType)}}</div>
              </el-col>
            </el-row>
            <el-row class="card_row" style="margin-top:10px;margin-bottom:10px;">
@@ -62,7 +62,7 @@
            <el-row class="card_row">
              <el-col :span="12">
-                <span >违规对象类型:{{item.violationObjectType == 0 ? "工地" :item.violationObjectType == 1 ?"处理场所":"企业"}}</span>
+                <span >预警对象类型:{{item.violationObjectType == 0 ? "工地" :item.violationObjectType == 1 ?"处理场所":"企业"}}</span>
              </el-col>
              <el-col :span="12" class="card_grid" >
                <span >所属区域:{{item.owningRegion}}</span>
@@ -86,15 +86,15 @@
       @pagination="getList"
     />
-    <!-- 添加或修改违规预警信息对话框 -->
+    <!-- 添加或修改预警预警信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="300px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
             <el-form-item label="案卷编号" prop="number">
               <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
             </el-form-item>
-            <el-form-item label="违规对象类型" prop="violationObjectType">
-              <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;">
+            <el-form-item label="预警对象类型" prop="violationObjectType">
+              <el-select v-model="form.violationObjectType" placeholder="请选择预警对象类型" style="width: 100%;">
                 <el-option label="工地" value="0" />
                 <el-option label="处理场所" value="1" />
                 <el-option label="企业" value="2" />
@@ -106,11 +106,11 @@
                 <el-option  v-for="item in areas" :label="item.name" :value="item.code" @click.native="selectArea(item)"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="违规类型" prop="violationType">
+            <el-form-item label="预警类型" prop="violationType">
                 <el-input :value="getCaseType(form.violationType)" :disabled="true"/>
             </el-form-item>
-            <el-form-item label="违规等级" prop="violationGrade">
+            <el-form-item label="预警等级" prop="violationGrade">
               <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;">
                 <el-option label="一般类" value="一般类"/>
                 <el-option label="重点类" value="重点类" />
@@ -122,14 +122,14 @@
               </el-select>
             </el-form-item>
-            <el-button type="primary" @click="createDescribe">生成违规描述</el-button>
+            <el-button type="primary" @click="createDescribe">生成预警描述</el-button>
             <el-form-item label="企业名称" prop="companyName">
               <el-select v-model="form.companyName" :filterable="true" :remote-method="companyLoadOptions" :loading="isLoadingCompany" placeholder="请输入项目名称" style="width: 100%;">
                 <el-option v-for="item in companyList" :key="item.name" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="违规描述" prop="describe">
+            <el-form-item label="预警描述" prop="describe">
               <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="4"/>
             </el-form-item>
         <el-form-item label="推送对象">
@@ -40,8 +40,13 @@ module.exports = {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }
       },
+        ['/voice']: {
+          target: `http://127.0.0.1:15001/`,
+          // target: `http://175.6.47.84:8008`,
+          changeOrigin: true,
+        },
         ['/api']: {
-          target: `http://183.66.242.6:14601`,
+          target: `http://175.178.228.30:8008`,
           // target: `http://175.6.47.84:8008`,
           changeOrigin: true,
         }
@@ -29,6 +29,7 @@ public class TruckActivate
     private String construction;
     private String constructionId;
+    
     /** 车牌号
  */
     @Excel(name = "车牌号")
@@ -132,7 +132,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 		for (TruckActivate ta : list) {
 			if (ta.getAddress() == null) {
 				JSONObject construction = RemoteServerUtils.getConstructionLicenseById(ta.getConstructionId());
-				
+				if(construction == null)
+					continue;
 				String routeName = "";
 				String earthName = "";
 				JSONArray eList = construction.getJSONArray("earthList");
@@ -355,11 +356,13 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 					threestepMapper.updateSupervisionThreestep(threestep);
 				}
-				active.setId(oldData.getId());// 更新已有车辆激活数据
 				active.setCreateBy(SecurityUtils.getUsername());
 				active.setCreateCount(oldData.getCreateCount() + 1);
 				successMessage += nos[i] + " ";
-				truckActivateMapper.updateTruckActivate(active);
+				oldData.setCreateCount(oldData.getCreateCount() + 1);
+				oldData.setStatus(1L);
+				truckActivateMapper.updateTruckActivate(oldData);
+				truckActivateMapper.insertTruckActivate(active);
 				continue;
 			} else {
@@ -32,7 +32,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </resultMap>
     <sql id="selectTruckActivateVo">
-        select id, company, license_plate, time, construction,construction_id, status, earthsite, object_id, create_by, create_type, activate_time, create_time,create_count
+        select id, company, license_plate, time, construction,construction_id,  status, earthsite, 
+        object_id, create_by, create_type, activate_time, create_time,create_count
         ,address,effective_from,effective_end,transport_start_time,transport_end_time,route_name,earth_name
          from truck_activate
     </sql>
@@ -170,6 +171,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="time != null">#{time},</if>
             <if test="construction != null">#{construction},</if>
             <if test="constructionId != null  and constructionId != ''"> #{constructionId},</if>
+            
             <if test="status != null">#{status},</if>
             <if test="earthsite != null">#{earthsite},</if>
             <if test="objectId != null">#{objectId},</if>