D

src/views/util/InPortBigDetail.vue

@@ -165,11 +165,12 @@
             <el-form-item label="稽核车种:" :label-width="formLabelWidth">
               <el-select
                   style="margin-left: 0px; width: 180px"
-                  v-model="form.kindText"
+                  v-model="form.scheckking"
                   filterable
                   allow-create
                   default-first-option
                   :reserve-keyword="false"
+                  clearable
                   placeholder=""
               >
                 <el-option
@@ -186,11 +187,12 @@
             <el-form-item label="稽核车型:" :label-width="formLabelWidth">
               <el-select
                   style="margin-left: 0px; width: 180px"
-                  v-model="form.scheckTypeText"
+                  v-model="form.schecktype"
                   filterable
                   allow-create
                   default-first-option
                   :reserve-keyword="false"
+                  clearable
                   placeholder=""
               >
                 <el-option
@@ -207,11 +209,13 @@
             <el-form-item label="稽核信息:" :label-width="formLabelWidth">
               <el-select
                   style="margin-left: 0px; width: 180px"
-                  v-model="form.scheckmemo"
+                  v-model="form.scheckmemoSelected"
                   filterable
                   allow-create
                   default-first-option
                   :reserve-keyword="false"
+                  clearable
+                  v-on:change="formSelectedMemo"
                   placeholder=""
               >
                 <el-option
@@ -225,11 +229,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="5">
-            <el-input v-model="form.scheckmemoTwo" autocomplete="off" ></el-input>
+            <el-input v-model="form.scheckmemo" autocomplete="off" ></el-input>
           </el-col>
           <el-button type="primary" style="margin-left: 10px;width: 80px;height: 30px" @click="staCheck()">站级稽核</el-button>
-
-
         </el-row>
       </div>
       <div>
@@ -274,9 +276,16 @@ export default {
       total: '',
       pageTotal: '',
       printTableData: [],
+
+      checkFormFirst: {
+        // dt: '',
+      }, //弹窗中的数据
       form: {
         // dt: '',
       }, //弹窗中的数据
+      checkFormSecond: {
+        // dt: '',
+      }, //弹窗中的数据
       // form: {}, //弹窗中的数据
       formLabelWidth: '100px',
       listno: '',
@@ -287,6 +296,7 @@ export default {
       typeTypeForm: [], //车型类型列表
 
       checkTextTypeForm: [], //稽核信息类型列表
+      sign: '',
       tableData: [],
       inPortSrc: '',
       inPortPlateSrc: '',
@@ -329,6 +339,9 @@ export default {
     next();
   },
   methods: {
+    formSelectedMemo(){
+      this.form.scheckmemo = this.form.scheckmemoSelected
+    },
     getDetail(pageNum){
 
     },
@@ -341,16 +354,39 @@ export default {
         return this.$route.params;
       }
     },
+    // init() {
+    //   this.changeIndex = localStorage.getItem("changeIndex")
+    //   this.pageNum = localStorage.getItem("pageNum")
+    //   this.pageSize = localStorage.getItem("pageSize")
+    //   this.tableData = JSON.parse(localStorage.getItem("tableData"))
+    //   this.total = localStorage.getItem("total")
+    //   this.pageTotal = Math.ceil(this.total / this.pageSize)
+    //   this.form = this.tableData[this.changeIndex]
+    //   this.inPortDTO = JSON.parse(localStorage.getItem("inPortDTO"))
+    //   this.getInPortjavaImage()
+    //   this.getInPortPlateImage()
+    // },
     init() {
-      this.pageNum = this.$route.query.pageNum
+      this.changeIndex = localStorage.getItem("changeIndexInPortS")
-      this.pageSize = this.$route.query.pageSize
+      this.pageNum = localStorage.getItem("pageNumInPortS")
-      this.changeIndex = this.$route.query.changeIndex
+      this.pageSize = localStorage.getItem("pageSizeInPortS")
-      this.total = this.$route.query.total
+      this.tableData = JSON.parse(localStorage.getItem("tableDataInPortS"))
-      this.tableData = JSON.parse(this.$route.query.tableData)
+      this.total = localStorage.getItem("totalInPortS")
       this.pageTotal = Math.ceil(this.total / this.pageSize)
       this.form = this.tableData[this.changeIndex]
+      this.inPortDTO = JSON.parse(localStorage.getItem("inPortDTOS"))
       this.getInPortjavaImage()
       // this.getInPortPlateImage()
+
+      // this.pageNum = this.$route.query.pageNum
+      // this.pageSize = this.$route.query.pageSize
+      // this.changeIndex = this.$route.query.changeIndex
+      // this.total = this.$route.query.total
+      // this.tableData = JSON.parse(this.$route.query.tableData)
+      // this.pageTotal = Math.ceil(this.total / this.pageSize)
+      // this.form = this.tableData[this.changeIndex]
+      // this.getInPortjavaImage()
+      // this.getInPortPlateImage()
       // this.javaImageTest()
       // this.pageNum = this.$route.params.pageNum
       // this.pageSize = this.$route.params.pageSize
@@ -371,6 +407,71 @@ export default {
           this.tableData = []
     },
 
+    network(){ //分页查询
+      this.$http.post("/inPort/page", this.inPortDTO).then(res=>{
+        if(res.statusCode == '200'){
+          this.total = res.data.total
+          this.pageTotal = Math.ceil(this.total / this.pageSize)
+          res.data.records.forEach((item)=> {
+            item.classdate = this.dateFormatter(item.classdate)
+            item.dt = this.dateTimeFormatter(item.dt)
+          })
+          this.tableData = res.data.records
+          this.form = this.tableData[this.changeIndex]
+        }
+      }).catch(()=>{
+        console.log('数据加载失败,请重新加载！')
+      })
+    },
+
+    dateFormatter(classdate) {
+      if (classdate) {
+        const dateMat = new Date(classdate);
+        const Y = dateMat.getFullYear() + "-";
+        const M =
+            dateMat.getMonth() + 1 < 10
+                ? "0" + (dateMat.getMonth() + 1) + "-"
+                : dateMat.getMonth() + 1 + "-";
+        const D =
+            dateMat.getDate() < 10
+                ? "0" + dateMat.getDate()
+                : dateMat.getDate();
+        return Y + M + D;
+      }
+    },
+
+    dateTimeFormatter(dt) {
+      if (dt) {
+        const dateMat = new Date(dt);
+        const Y = dateMat.getFullYear() + "-";
+        const M =
+            dateMat.getMonth() + 1 < 10
+                ? "0" + (dateMat.getMonth() + 1) + "-"
+                : dateMat.getMonth() + 1 + "-";
+        const D =
+            dateMat.getDate() < 10
+                ? "0" + dateMat.getDate() + " "
+                : dateMat.getDate() + " ";
+
+        const H =
+            dateMat.getHours() < 10
+                ? "0" + dateMat.getHours() + ":"
+                : dateMat.getHours() + ":";
+
+        const F =
+            dateMat.getMinutes() < 10
+                ? "0" + dateMat.getMinutes() + ":"
+                : dateMat.getMinutes() + ":";
+
+        const S =
+            dateMat.getSeconds() < 10
+                ? "0" + dateMat.getSeconds()
+                : dateMat.getSeconds();
+
+        return Y + M + D + H + F + S;
+      }
+    },
+
     getInPortjavaImage() {     //入口图像获取
       let listno = this.tableData[this.changeIndex].listno
       let transferFlag = 0
@@ -399,10 +500,28 @@ export default {
     first() {
       this.pageNum = 1
       this.changeIndex = 0
-      this.form = this.tableData[this.changeIndex]
+      this.inPortDTO.pageNum = this.pageNum
+      this.network()
+      // this.form = this.tableData[this.changeIndex]
       // this.listno = this.tableData[this.changeIndex].listno
+      // this.inPortTipMessageVisible = false
+      // this.inPortSrc = ''
+      // this.inPortSrcList = []
+      // this.inPortPlateTipMessageVisible = false
+      // this.inPortPlateSrc = ''
+      // this.inPortPlateSrcList = []
       this.getInPortjavaImage()
-      this.getInPortPlateImage()
+      // this.getInPortPlateImage()
+      localStorage.setItem("pageNumInPortS",this.pageNum)
+      localStorage.setItem("changeIndexInPortS",this.changeIndex)
+
+
+
+
+      // this.form = this.tableData[this.changeIndex]
+      // // this.listno = this.tableData[this.changeIndex].listno
+      // this.getInPortjavaImage()
+      // this.getInPortPlateImage()
     },
     upRow() {
       if (this.pageNum == 1 && this.changeIndex == 0) {
@@ -411,17 +530,47 @@ export default {
       } else if (this.pageNum > 1 && this.changeIndex == 0) {
         this.pageNum = this.pageNum - 1
         this.changeIndex = this.pageSize - 1
-        this.form = this.tableData[this.changeIndex]
+
+        this.inPortDTO.pageNum = this.pageNum
+        this.network()
+        // this.form = this.tableData[this.changeIndex]
+        // this.listno = this.tableData[this.changeIndex].listno
+        // this.inPortTipMessageVisible = false
+        // this.inPortSrc = ''
+        // this.inPortSrcList = []
+        // this.inPortPlateTipMessageVisible = false
+        // this.inPortPlateSrc = ''
+        // this.inPortPlateSrcList = []
         this.getInPortjavaImage()
-        this.getInPortPlateImage()
+        // this.getInPortPlateImage()
-        // this.javaImageTest()
+        localStorage.setItem("pageNumInPortS",this.pageNum)
+        localStorage.setItem("changeIndexInPortS",this.changeIndex)
+
+        // this.form = this.tableData[this.changeIndex]
+        // this.getInPortjavaImage()
+        // this.getInPortPlateImage()
+        // // this.javaImageTest()
 
       } else {
         this.changeIndex = this.changeIndex - 1
         this.form = this.tableData[this.changeIndex]
+
+        // this.inPortDTO.pageNum = this.pageNum
+        // this.network()
+        // this.form = this.tableData[this.changeIndex]
+        // this.listno = this.tableData[this.changeIndex].listno
+        // this.inPortTipMessageVisible = false
+        // this.inPortSrc = ''
+        // this.inPortSrcList = []
+        // this.inPortPlateTipMessageVisible = false
+        // this.inPortPlateSrc = ''
+        // this.inPortPlateSrcList = []
         this.getInPortjavaImage()
-        this.getInPortPlateImage()
+        // this.getInPortPlateImage()
-        // this.javaImageTest()
+        localStorage.setItem("changeIndexInPortS",this.changeIndex)
+        // this.getInPortjavaImage()
+        // this.getInPortPlateImage()
+        // // this.javaImageTest()
       }
     },
     downRow() {
@@ -431,24 +580,72 @@ export default {
       } else if (this.pageNum < this.pageTotal && this.changeIndex == (this.pageSize - 1)) {
         this.pageNum = this.pageNum - 1 + 2
         this.changeIndex = 0
-        this.form = this.tableData[this.changeIndex]
+
+        this.inPortDTO.pageNum = this.pageNum
+        this.network()
+        // this.form = this.tableData[this.changeIndex]
+        // this.listno = this.tableData[this.changeIndex].listno
+        // this.inPortTipMessageVisible = false
+        // this.inPortSrc = ''
+        // this.inPortSrcList = []
+        // this.inPortPlateTipMessageVisible = false
+        // this.inPortPlateSrc = ''
+        // this.inPortPlateSrcList = []
         this.getInPortjavaImage()
-        this.getInPortPlateImage()
+        // this.getInPortPlateImage()
-        // this.javaImageTest45()
+        localStorage.setItem("pageNumInPortS",this.pageNum)
+        localStorage.setItem("changeIndexInPortS",this.changeIndex)
+
+
+        // this.form = this.tableData[this.changeIndex]
+        // this.getInPortjavaImage()
+        // this.getInPortPlateImage()
+        // // this.javaImageTest45()
       } else {
         this.changeIndex = this.changeIndex - 1 + 2
         this.form = this.tableData[this.changeIndex]
+
+        // this.inPortDTO.pageNum = this.pageNum
+        // this.network()
+        // this.form = this.tableData[this.changeIndex]
+        // this.listno = this.tableData[this.changeIndex].listno
+        // this.inPortTipMessageVisible = false
+        // this.inPortSrc = ''
+        // this.inPortSrcList = []
+        // this.inPortPlateTipMessageVisible = false
+        // this.inPortPlateSrc = ''
+        // this.inPortPlateSrcList = []
         this.getInPortjavaImage()
-        this.getInPortPlateImage()
+        // this.getInPortPlateImage()
-        // this.javaImageTest45()
+        localStorage.setItem("changeIndexInPortS",this.changeIndex)
+
+        // this.getInPortjavaImage()
+        // this.getInPortPlateImage()
+        // // this.javaImageTest45()
       }
     },
     last() {
       this.pageNum = this.pageTotal
       this.changeIndex = this.total - ((this.pageNum - 1) * this.pageSize) - 1
-      this.form = this.tableData[this.changeIndex]
+
+      this.inPortDTO.pageNum = this.pageNum
+      this.network()
+      // this.form = this.tableData[this.changeIndex]
+      // this.listno = this.tableData[this.changeIndex].listno
+      // this.inPortTipMessageVisible = false
+      // this.inPortSrc = ''
+      // this.inPortSrcList = []
+      // this.inPortPlateTipMessageVisible = false
+      // this.inPortPlateSrc = ''
+      // this.inPortPlateSrcList = []
       this.getInPortjavaImage()
-      this.getInPortPlateImage()
+      // this.getInPortPlateImage()
+      localStorage.setItem("pageNumInPortS",this.pageNum)
+      localStorage.setItem("changeIndexInPortS",this.changeIndex)
+
+      // this.form = this.tableData[this.changeIndex]
+      // this.getInPortjavaImage()
+      // this.getInPortPlateImage()
     },
     startPlay() {
       this.timer = setInterval(() => {
@@ -456,11 +653,69 @@ export default {
       }, 1000)
     },
     staCheck() {
+      let listno = this.tableData[this.changeIndex].listno
+      // let listno = '1F0C1E252B738D3BE5'
+      this.$http.get("/specCheckSta/getSignByListno", {
+            params: {
+              listno: listno
+            },
+          }
+      ).then(res => {
+          this.sign = res.data
+          if(this.sign == null){
+            this.checkFormFirst.listno = this.tableData[this.changeIndex].listno
+            this.checkFormFirst.kind = this.form.scheckking
+            this.checkFormFirst.type = this.form.schecktype
+
+            this.checkFormFirst.memo = this.form.scheckmemo
+
+            this.checkFormFirst.man = localStorage.getItem("man")
+            this.checkFormFirst.mannoString = localStorage.getItem("manno")
+            this.$http.post("/specCheckSta/save",this.checkFormFirst).then(res=>{
+              if(res.statusCode == '200'){
                 ElMessage({
-        message: '稽核成功！',
+                  message: '一次稽核成功！',
                   type: 'success',
                 })
+                // this.addDialogFormVisible=false
+                // this.network()
+              }
+            }).catch(()=>{
+              console.log('一次稽核失败！')
+            })
+          }
+          if(this.sign == 1){
+            this.checkFormSecond.listno = this.tableData[this.changeIndex].listno
+            this.checkFormSecond.rkind = this.form.scheckking
+            this.checkFormSecond.rtype = this.form.schecktype
+
+            this.checkFormSecond.rmemo = this.form.scheckmemo
 
+            this.checkFormSecond.rman = localStorage.getItem("man")
+            this.checkFormSecond.rMannoString = localStorage.getItem("manno")
+            this.$http.post("/specCheckSta/update",this.checkFormSecond).then(res=>{
+              if(res.statusCode == '200'){
+                ElMessage({
+                  message: '二次稽核成功！',
+                  type: 'success',
+                })
+                // this.modifyDialogFormVisible=false
+                // this.network()
+              }
+            }).catch(()=>{
+              console.log('二次稽核失败！')
+            })
+          }
+          if(this.sign == 2){
+            ElMessage({
+              message: '已经完成两次稽核！',
+              type: 'warning',
+            })
+          }
+        }
+      ).catch(() => {
+        console.log('获取标记号失败！')
+      })
     },
     endPlay() {
       clearInterval(this.timer)
@@ -544,8 +799,19 @@ export default {
   },
   watch:{
     '$route'(to,from){
-      this.clearData();
+      if(this.changeIndex != localStorage.getItem("changeIndexInPortS") ||
+          this.pageNum != localStorage.getItem("pageNumInPortS") ||
+          this.pageSize != localStorage.getItem("pageSizeInPortS")){
+        // console.log(JSON.stringify(to))
+        // console.log("陈旭东JSON.parse(to):",JSON.parse(to))
+        // console.log("陈旭东to.name:" + to.name)
+        // console.log("陈旭东to.path:" + to.path)
         this.init();
+      }
+      // this.$forceUpdate();
+    // }
+      // this.clearData();
+      // this.init();
       // this.$forceUpdate();
     }
   },

src/views/util/InPortManage.vue

@@ -51,6 +51,7 @@
                   style="margin-left: 0px; width: 180px"
                   v-model="inPortDTO.subCompany"
                   filterable
+                  disabled="true"
                   clearable
                   allow-create
                   default-first-option
@@ -71,22 +72,25 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="站名：" :label-width="formLabelWidth" prop="sta">
+            <el-form-item label="站名：" :label-width="formLabelWidth" prop="stanos">
               <el-select
+                  class="tags-select-input"
                   style="margin-left: 0px; width: 180px"
-                  v-model="inPortDTO.sta"
+                  collapse-tags
+                  collapse-tags-tooltip
+                  v-model="inPortDTO.stanos"
                   filterable
-                  clearable
                   allow-create
+                  multiple
                   default-first-option
                   :reserve-keyword="false"
                   placeholder=""
               >
                 <el-option
                     v-for="item in nameTypeForm"
-                    :key="item.staname"
+                    :key="item.stano"
                     :label="item.staname"
-                    :value="item.staname"
+                    :value="item.stano"
                 >
                 </el-option>
               </el-select>
@@ -473,12 +477,26 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="稽核信息:" :label-width="formLabelWidth">
-                  <el-input v-model="props.row.scheckmemo" autocomplete="off" readonly></el-input>
+                  <el-input
+                      style="width: 180px"
+                      v-model="props.row.scheckmemo"
+                      autocomplete="off"
+                      autosize
+                      type="textarea"
+                      readonly>
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="稽核信息:" :label-width="formLabelWidth" prop="roadName">
-                  <el-input v-model="props.row.srcheckmemo" autocomplete="off" readonly></el-input>
+                  <el-input
+                      style="width: 180px"
+                      v-model="props.row.srcheckmemo"
+                      autocomplete="off"
+                      autosize
+                      type="textarea"
+                      readonly>
+                  </el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -577,7 +595,7 @@ export default {
       inPortDTO: {
         road: '',         //路段
         subCompany: '',         //分公司
-        sta: '',           //站名
+        stanos: '',           //站名
         portno: '',                 //车道
         classDateTBegin: '',        //统计日期(起始)
         classDateTEnd: '',          //统计日期(结束)
@@ -718,16 +736,21 @@ export default {
       this.nameTypeGet()
     },
     nameTypeGet(){ //查询所属路段站名全部类型
-      this.$http.get("/nameType/nameTypeAllSelected",{
+      this.$http.get("/userType/getMessageByManNO",{
         params: {
-          roadname: this.inPortDTO.road,
+          manNO: localStorage.getItem("manno"),
+          // manNO: 2,
         }
       }).then(res=>{
         if(res.statusCode == '200'){
-          this.nameTypeForm = res.data
+          this.nameTypeForm = res.data.nameTableSelectedVOList
-          if(this.nameTypeForm.length == 1){
+          localStorage.setItem("stanosIPS", JSON.stringify(res.data.stanos))
-            this.inPortDTO.sta = this.nameTypeForm[0].staname
+          this.inPortDTO.stanos = res.data.stanos
-          }
+
+          // this.nameTypeForm = res.data
+          // if(this.nameTypeForm.length == 1){
+          //   this.inPortDTO.stanos = this.nameTypeForm[0].staname
+          // }
         }
       }).catch(()=>{
         console.log('所属路段站名类型加载失败！')
@@ -851,8 +874,8 @@ export default {
       if(this.inPortDTO.subCompany != ""){
         this.queryCriteriaData = " 分公司="+this.inPortDTO.subCompany
       }
-      if(this.inPortDTO.sta != ""){
+      if(this.inPortDTO.stanos != ""){
-        this.queryCriteriaData = this.queryCriteriaData + ",站名="+this.inPortDTO.sta
+        this.queryCriteriaData = this.queryCriteriaData + ",站名="+this.inPortDTO.stanos
       }
       if(this.inPortDTO.portno != ""){
         this.queryCriteriaData = this.queryCriteriaData + ",车道="+this.inPortDTO.portno
@@ -921,12 +944,16 @@ export default {
       this.loading = true
       this.inPortDTO.pageNum = this.pageNum
       this.inPortDTO.pageSize = this.pageSize
+      if( this.inPortDTO.stanos.length == 0 && localStorage.getItem("manno") != "admin" && localStorage.getItem("manno") != null){
+        this.inPortDTO.stanos = JSON.parse(localStorage.getItem("stanosIPS"))
+      }
       if(this.inPortDTO.classDateCBegin != null && this.inPortDTO.classDateCBegin != ""){
         this.inPortDTO.classDateCBegin = moment(this.inPortDTO.classDateCBegin).format('YYYY-MM-DD HH:mm:ss');
       }
       if(this.inPortDTO.classDateCEnd != null && this.inPortDTO.classDateCEnd != ""){
         this.inPortDTO.classDateCEnd = moment(this.inPortDTO.classDateCEnd).format('YYYY-MM-DD HH:mm:ss');
       }
+      localStorage.setItem("inPortDTOS", JSON.stringify(this.inPortDTO))
       // this.inPortDTO.classno = this.inPortDTO.classno
       this.$refs[inPortDTO].validate((valid)=>{
         if(valid){
@@ -937,6 +964,8 @@ export default {
               res.data.records.forEach((item)=> {
                 item.classdate = this.dateFormatter(item.classdate)
                 item.dt = this.dateTimeFormatter(item.dt)
+                item.scheckdatemark = this.dateTimeFormatter(item.scheckdatemark)
+                item.srcheckdatemark = this.dateTimeFormatter(item.srcheckdatemark)
               })
               this.tableData = res.data.records
               this.loading = false
@@ -1149,7 +1178,13 @@ export default {
     },
 
     goInPortDetail (row) {
-      this.changeIndex = row.index
+      localStorage.setItem("changeIndexInPortS",row.index)
+      localStorage.setItem("tableDataInPortS",JSON.stringify(this.tableData))
+      localStorage.setItem("pageNumInPortS",this.pageNum)
+      localStorage.setItem("pageSizeInPortS",this.pageSize)
+      localStorage.setItem("totalInPortS",this.total)
+
+      // this.changeIndex = row.index
       // this.inPortPassId = this.tableData[this.changeIndex].passId
       // state: { myData }
       this.$router.push({
@@ -1158,11 +1193,11 @@ export default {
         query: {
           // listno: listno,
           // passId: this.inPortPassId,
-          pageNum: this.pageNum,
+          // pageNum: this.pageNum,
-          pageSize: this.pageSize,
+          // pageSize: this.pageSize,
-          changeIndex: this.changeIndex,
+          // changeIndex: this.changeIndex,
-          total: this.total,
+          // total: this.total,
-          tableData: JSON.stringify(this.tableData),
+          // tableData: JSON.stringify(this.tableData),
           // tableData: this.tableData,
           // row: JSON.stringify(row),
         },