冲突

src/App.vue

@@ -14,7 +14,7 @@
 
 <script>
 export default {
-  created() {
+  created () {
     // console.log(document.body.scrollHeight)
     var lett = this;
     document.onkeydown = function (e) {
@@ -99,7 +99,7 @@ export default {
   font-family: MicrosoftYaHei;
   color: #333333;
   p {
-    line-height: 4rem!important;
+    line-height: 4rem !important;
   }
 }
 .el-message-box__btns {
@@ -136,7 +136,7 @@ export default {
   padding-bottom: 0.625rem;
   vertical-align: middle;
   background-color: #fff;
-  height: 190px !important;
+  // height: 190px !important;
   border-radius: 0.25rem;
   border: 0.0625rem solid #ebeef5;
   font-size: 1.125rem;

src/views/Editor/modules/ajzwbjLeft.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 09:42:07
- * @LastEditTime: 2021-12-13 17:29:13
+ * @LastEditTime: 2021-12-13 21:33:22
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue

src/views/Editor/modules/imageEdAJ.scss

@@ -1230,17 +1230,27 @@ $canvasWidth: var(--canvasWidth, 670px);
       }
 
       .preview-source {
-        z-index: 9999;
+        z-index: 99999;
         position: absolute;
-        left: 25px;
-        top: 55px;
+        left: 0;
+        top: 0;
         border: 1px solid #ccc;
-        width: 80px;
-        height: 80px;
-
+        width: 144px;
+        height: 144px;
+        box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
+        overflow: hidden;
         img {
           object-fit: contain;
         }
+        
+        .block_small {
+          width: 100%;
+          height: 100%;
+          border: 1px solid #055fe7;
+          position: absolute;
+          top: 0;
+          left: 0;
+        }
       }
     }
   }

src/views/zljc/Index.vue

@@ -177,7 +177,23 @@
           :width="width1"
         >
           <template slot="header">
-            <span class="sx">时限</span> <span class="djsLine"></span> <span class="cs">超时</span>
+            <span class="sx">时限</span> <span class="djsLine"></span> <span class="cs">超时</span><span
+              class='px'
+              @click="px"
+            ><i class="el-icon-d-caret"></i></span>
+          </template>
+          <template slot-scope="scope">
+            <div
+              class='djsType0'
+              v-if="scope.row.type==0"
+            >{{ scope.row.djs | daojishi }}</div>
+            <div
+              class='djsType1'
+              v-else-if="scope.row.type==1"
+            >{{scope.row.djs | daojishi }}</div>
+            <div v-else>
+              <p>---</p>
+            </div>
           </template>
         </el-table-column>
         <el-table-column
@@ -204,11 +220,19 @@
           width="auto"
         >
           <template slot-scope="scope">
-            <div v-if="scope.row.inspectionFlag==2"><span class='cg'>/</span></div>
+            <div v-if="scope.row.inspectionFlag==2">
+              <div class='czBtn cg'>/</div>
+            </div>
             <div
               v-else
               @click="goShenHe(scope.row)"
-            ><span class="iconfont icon-shenhe1"></span></div>
+            >
+              <div class='czBtn shBtn'>
+                检查
+              </div>
+              <!-- <span class="iconfont icon-shenhe1">
+              </span> -->
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -256,7 +280,7 @@ export default {
       width4: 120,
       width1: 220,
       width2: 160,
-      width3: 90,
+      width3: 110,
       height: 550,
       tableDate: [],
       // 当前页数
@@ -297,23 +321,53 @@ export default {
         .post("/api/zljc/queryAll", reqParam)
         .then((response) => {
           if (response.data.code === 0) {
+
             // console.log(response.data.ret)
             this.tableDate = response.data.ret.rows;
             this.total = response.data.ret.total;
-            console.info("查询结果===>", this.tableDate);
+            console.log("查询结果===>", this.tableDate);
+            // 给每一列生成一个时间戳
+            this.tableDate.forEach(el => {
+              // el.djs = Date.now();//模拟后端发的时间戳
+              this.daojishi(el);//调用定时器
+            })
+            console.log("查询结果===>", this.tableDate);
             // this.userInfo = this.getUserInfo(this.tableDate);
           } else {
             this.$message.error(response.data.message);
           }
         });
     },
+    // 时限排序
+    px () {
+      this.formInline.type == 0 ? this.formInline.type = 1 : this.formInline.type = 0
+      this.search()
+    },
+    // 倒计时定时器
+    daojishi (row) {
+      clearInterval(row.countDown)
+      row.countDown = setInterval(() => {
+        if (row.type == 1) {
+          row.djs = row.djs - 1000;
+        } else if (row.type == 0) {
+          row.djs = Number(row.djs) + 1000;
+        }
+
+      }, 1000);
+    },
+    // 清除所有定时器
+    clearAll (list) {
+      list.forEach(el => {
+        clearInterval(el.countDown)
+      })
+    },
     clear () {
       this.formInline = {
         barcode: '', // 条码号
         inspectionFlag: null, // 检查结果选择
         codeDwCode: '', // 捺印单位
         nysj: null,// 捺印时间
-        type: 1,// 1 升序 0 降序
+        type: 0,// 1 升序 0 降序
       }
       this.search()
     },
@@ -435,6 +489,35 @@ export default {
   mounted () {
     this.search();
   },
+  filters: {
+    daojishi: function (mistiming) {
+      //也可以传截止的具体时间，改一下参数
+      // var newtime = new Date() //获取当前时间
+      // var storptime = new Date(storptimes) //获取截止时间
+      // var mistiming = storptime.getTime() - newtime.getTime() //   获取截止时间距离现在的毫秒差
+      if (mistiming > 0) {
+        var days = Math.floor(mistiming / 1000 / 60 / 60 / 24); //获取天数
+        var hours = Math.floor(mistiming / 1000 / 60 / 60 % 24); // 获取小时
+        var minutes = Math.floor(mistiming / 1000 / 60 % 60); //获取分钟数
+        var seconds = Math.floor(mistiming / 1000 % 60); //获取秒数
+
+        // 判断天、时、分、秒是不是两位数，如果是直接输出，如果不是在前边加个0;
+        days < 10 ? days = "0" + days : days;
+        hours < 10 ? hours = "0" + hours : hours;
+        minutes < 10 ? minutes = "0" + minutes : minutes;
+        seconds < 10 ? seconds = "0" + seconds : seconds;
+
+        // 第一种连接方法
+        // var rels = days + "天" + hours + "时" + minutes + "分" + seconds + "秒";
+        // 第二种连接方法
+        var rels = `${days}天${hours}时${minutes}分${seconds}秒`
+      }
+
+      // 判断时间差是不是正数，就是截止时间是不是比现在的时间晚
+      var mis = mistiming > 0 ? rels : "已超时"
+      return mis
+    }
+  },
   computed: {
     /**
      * @description: 计算总页数
@@ -454,6 +537,34 @@ export default {
 // table表的高度
 $tableHeight: var(--tableHeight, 550px);
 
+.czBtn {
+  width: 72px;
+  height: 28px;
+  border-radius: 4px;
+  line-height: 28px;
+  text-align: center;
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+}
+
+.shBtn {
+  border: 1px solid #fe0000;
+  color: #fe0000;
+}
+.cg {
+  color: #00b47a;
+}
+.djsType0 {
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: #e60012;
+}
+.djsType1 {
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: #009f6c;
+}
+
 .sx {
   font-size: 14px;
   font-family: MicrosoftYaHei;
@@ -473,10 +584,9 @@ $tableHeight: var(--tableHeight, 550px);
   color: #e60012;
   margin-left: 10px;
 }
-.cg {
-  font-size: 14px;
-  font-family: MicrosoftYaHei;
-  color: #00b47a;
+.px {
+  margin-left: 10px;
+  color: #b1b6c2;
 }
 .jcjgSpan {
   display: inline-block;
@@ -599,10 +709,22 @@ $tableHeight: var(--tableHeight, 550px);
       height: 32px;
       background: #055fe7;
       border-radius: 4px;
+      color: #fff;
     }
   }
 }
 /deep/.el-table tr {
   height: 55px;
 }
+/deep/.el-table th > .cell {
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  font-weight: normal;
+  color: #282f3c;
+}
+/deep/.el-table td > .cell {
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: #333333;
+}
 </style>
\ No newline at end of file