Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

b163f632 · 米嘉伟 · a0f228b6 · 32364d89 · b163f632 · b163f632
Commit b163f632 authored Jan 11, 2022 by 米嘉伟
Showing with 78 additions and 28 deletions

src/assets/img/rgrd/chachong-rg.png
+0 -0

src/assets/img/rgrd/chachong.png
+0 -0

src/views/bzxxgl/fhxxTT.vue
+25 -9

src/views/cxyrd/TT.vue
+26 -9

src/views/rgrd/rgTT.vue
+24 -7

vue.config.js
+3 -3

No files found.
--- a/src/assets/img/rgrd/查重.png
+++ b/src/assets/img/rgrd/查重.png
--- a/src/assets/img/rgrd/编组 170.png
+++ b/src/assets/img/rgrd/编组 170.png
--- a/src/views/bzxxgl/fhxxTT.vue
+++ b/src/views/bzxxgl/fhxxTT.vue
 <!--
 * @Author: your name
 * @Date: 2021-12-03 15:35:26
- * @LastEditTime: 2021-12-28 14:55:57
+ * @LastEditTime: 2022-01-11 18:21:34
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
@@ -10,7 +10,10 @@
    <div class="fhxxLT fhxxTT" id="fhxxLT">
        <div :class="{ bzActive: isShowbzDialogBg || loading_sd, tt: true }">
            <div class="header">
-                <div class="label">复核信息-查重</div>
+                <div class="label">
+                  <img src="@/assets/img/rgrd/chachong-rg.png" alt="" />
+                  <span>复核信息-查重</span>
+                </div>
                <div class="btns" @click="openFhxxTT">
                    <span class="iconfont">&#xe644;</span>
                    <span>复核详情</span>
@@ -1772,7 +1775,7 @@ export default {
        width: 100%;
        height: 100vh;
        background-color: #ffffff;
-        padding: 0 24px 24px 24px;
+        padding: 0 0 24px 0;
        display: flex;
        flex-direction: column;
        overflow: hidden;
@@ -1780,21 +1783,34 @@ export default {

    .header {
        border-bottom: 1px solid #eeeeee;
-        height: 52px;
-        padding-bottom: 10px;
+        box-shadow: 0px 1px 10px 0px rgba(5, 95, 231, 0.3);
+        padding: 0 24px;
+        padding-bottom: 10px!important;
        display: flex;
        flex-direction: row;
        justify-content: space-between;
-
+        align-items: center;
        .label {
            align-self: flex-start;
-            height: 22px;
            font-size: 20px;
            font-family: HarmonyOS_Sans_SC-Bold, HarmonyOS_Sans_SC;
            font-weight: bold;
            color: #FA9500;
            line-height: 22px;
            margin-top: 14px;
+            > img {
+              width: 210px;
+              height: 40px;
+            }
+            > span {
+              position: absolute;
+              top: 18px;
+              left: 50px;
+              font-size: 20px;
+              font-family: HarmonyOS_Sans_SC_Bold;
+              color: #ffffff;
+              z-index: 3;
+            }
        }

        .btns {
@@ -1859,8 +1875,8 @@ export default {

        .data {
            width: 100%;
-            height: 200px;
-            padding: 0 70px 0 70px;
+            height: 186px;
+            padding: 0 94px 0 94px;
            display: flex;
            z-index: 333;
            flex-direction: row;

--- a/src/views/cxyrd/TT.vue
+++ b/src/views/cxyrd/TT.vue
@@ -2,7 +2,10 @@
  <div style="width: 100%">
    <div :class="{ bzActive: isShowbzDialogBg || loading_sd, tt: true }">
      <div class="header">
-        <div class="label">查重</div>
+        <div class="label">
+          <img src="@/assets/img/rgrd/chachong.png" alt="" />
+          <span>查重</span>
+        </div>
        <div class="btns">
          <div class="bz-btn" @click="Bz">比中</div>
          <div class="rd-btn" @click="Rdwc">认定完成</div>
@@ -1901,28 +1904,42 @@ div {
  width: 100%;
  height: 100vh;
  background-color: #ffffff;
-  padding: 0 24px 24px 24px;
+  padding: 0 0px 24px 0px;
  display: flex;
  flex-direction: column;
  overflow: hidden;
 }
 .header {
+  box-shadow: 0px 1px 10px 0px rgba(5, 95, 231, 0.3);
  border-bottom: 2px solid #eeeeee;
-  height: 52px;
+  padding: 0 24px;
  padding-bottom: 10px;
  display: flex;
  flex-direction: row;
  justify-content: space-between;
+  align-items: center;
  .label {
    align-self: flex-start;
-    width: 32px;
-    height: 22px;
    font-size: 16px;
    font-family: HarmonyOS_Sans_SC-Bold, HarmonyOS_Sans_SC;
    font-weight: bold;
    color: #fa9500;
    line-height: 22px;
    margin-top: 14px;
+    position: relative;
+    > img {
+      width: 120px;
+      height: 40px;
+    }
+    > span {
+      position: absolute;
+      top: 5px;
+      left: 30px;
+      font-size: 20px;
+      font-family: HarmonyOS_Sans_SC_Bold;
+      color: #ffffff;
+      z-index: 3;
+    }
  }
  .btns {
    align-self: flex-end;
@@ -1982,8 +1999,8 @@ div {
  flex-direction: column;
  .data {
    width: 100%;
-    height: 200px;
-    padding: 0 70px 0 70px;
+    height: 186px;
+    padding: 0 94px 0 94px;
    display: flex;
    z-index: 333;
    flex-direction: row;
@@ -2148,7 +2165,7 @@ div {
  }
  .imgs {
    width: inherit;
-    height: 700px;
+    height: 6px;
    display: flex;
    flex-direction: row;
    .fingers {
@@ -2195,7 +2212,7 @@ div {
      .finger-data {
        margin-top: -10px;
        height: 700px;
-        width: 1500px!important;
+        width: 1500px !important;
        //overflow: scroll;
        overflow: hidden;
        .hands {

--- a/src/views/rgrd/rgTT.vue
+++ b/src/views/rgrd/rgTT.vue
@@ -2,7 +2,10 @@
  <div style="width: 100%">
    <div :class="{ bzActive: isShowbzDialogBg || loading_sd, tt: true }">
      <div class="header">
-        <div class="label">人工认定-查重</div>
+        <div class="label">
+          <img src="@/assets/img/rgrd/chachong-rg.png" alt="" />
+          <span>人工认定-查重</span>
+        </div>
        <div class="btns">
          <div class="bz-btn" @click="Bz">比中</div>
          <div class="rd-btn" @click="Rdwc">认定完成</div>
@@ -1839,27 +1842,41 @@ div {
  width: 100%;
  height: 100vh;
  background-color: #ffffff;
-  padding: 0 24px 24px 24px;
+  padding: 0 0 24px 0;
  display: flex;
  flex-direction: column;
  overflow: hidden;
 }
 .header {
+  box-shadow: 0px 1px 10px 0px rgba(5, 95, 231, 0.3);
  border-bottom: 2px solid #eeeeee;
-  height: 52px;
-  padding-bottom: 10px;
+  padding-bottom: 10px!important;
+  padding: 0 24px;
  display: flex;
  flex-direction: row;
  justify-content: space-between;
+  align-items: center;
  .label {
    align-self: flex-start;
-    height: 22px;
    font-size: 16px;
    font-family: HarmonyOS_Sans_SC-Bold, HarmonyOS_Sans_SC;
    font-weight: bold;
    color: #fa9500;
    line-height: 22px;
    margin-top: 14px;
+    > img {
+      width: 210px;
+      height: 40px;
+    }
+    > span {
+      position: absolute;
+      top: 18px;
+      left: 50px;
+      font-size: 20px;
+      font-family: HarmonyOS_Sans_SC_Bold;
+      color: #ffffff;
+      z-index: 3;
+    }
  }
  .btns {
    align-self: flex-end;
@@ -1919,8 +1936,8 @@ div {
  flex-direction: column;
  .data {
    width: 100%;
-    height: 200px;
-    padding: 0 70px 0 70px;
+    height: 186px;
+    padding: 0 94px 0 94px;
    display: flex;
    z-index: 333;
    flex-direction: row;

--- a/vue.config.js
+++ b/vue.config.js
 /*
 * @Author: your name
 * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2022-01-10 23:29:48
+ * @LastEditTime: 2022-01-11 18:24:00
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 * @FilePath: \指纹系统\founder_vue\vue.config.js
@@ -129,9 +129,9 @@ module.exports = {

      "/security": {
        // target: "http://192.168.128.106:8765", // 湖南-王
-        target: "http://192.168.128.114:8765/", // 张 认定
+        // target: "http://192.168.128.114:8765/", // 张 认定
        // target: "http://www.meetfood.cn:2390", // 湖南-王
-        // target: "http://zwpt.xzclub.top:9333",
+        target: "http://zwpt.xzclub.top:9333/",
        // target: "http://192.168.128.109:8765",
        ws: true,
        changeOrigin: true,