字体图标库更新

public/iconfont/demo_index.html

@@ -55,6 +55,18 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe649;</span>
+                <div class="name">提示</div>
+                <div class="code-name">&amp;#xe649;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe648;</span>
+                <div class="name">标签-关闭</div>
+                <div class="code-name">&amp;#xe648;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe647;</span>
                 <div class="name">下拉</div>
                 <div class="code-name">&amp;#xe647;</div>
@@ -408,9 +420,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1641819815848') format('woff2'),
-       url('iconfont.woff?t=1641819815848') format('woff'),
-       url('iconfont.ttf?t=1641819815848') format('truetype');
+  src: url('iconfont.woff2?t=1641955164800') format('woff2'),
+       url('iconfont.woff?t=1641955164800') format('woff'),
+       url('iconfont.ttf?t=1641955164800') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -437,6 +449,24 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-tishi"></span>
+            <div class="name">
+              提示
+            </div>
+            <div class="code-name">.icon-tishi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-biaoqian-guanbi"></span>
+            <div class="name">
+              标签-关闭
+            </div>
+            <div class="code-name">.icon-biaoqian-guanbi
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-xiala"></span>
             <div class="name">
               下拉
@@ -969,6 +999,22 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tishi"></use>
+                </svg>
+                <div class="name">提示</div>
+                <div class="code-name">#icon-tishi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-biaoqian-guanbi"></use>
+                </svg>
+                <div class="name">标签-关闭</div>
+                <div class="code-name">#icon-biaoqian-guanbi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xiala"></use>
                 </svg>
                 <div class="name">下拉</div>

public/iconfont/iconfont.css

 @font-face {
   font-family: "iconfont"; /* Project id 2961960 */
-  src: url('iconfont.woff2?t=1641819815848') format('woff2'),
-       url('iconfont.woff?t=1641819815848') format('woff'),
-       url('iconfont.ttf?t=1641819815848') format('truetype');
+  src: url('iconfont.woff2?t=1641955164800') format('woff2'),
+       url('iconfont.woff?t=1641955164800') format('woff'),
+       url('iconfont.ttf?t=1641955164800') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-tishi:before {
+  content: "\e649";
+}
+
+.icon-biaoqian-guanbi:before {
+  content: "\e648";
+}
+
 .icon-xiala:before {
   content: "\e647";
 }

public/iconfont/iconfont.json

@@ -6,6 +6,20 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "27150195",
+      "name": "提示",
+      "font_class": "tishi",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "27143085",
+      "name": "标签-关闭",
+      "font_class": "biaoqian-guanbi",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
       "icon_id": "27111425",
       "name": "下拉",
       "font_class": "xiala",

src/views/Home/Home.vue

@@ -278,12 +278,15 @@ export default {
       // this.$router.pushToTab("/zzwcj")
       // this.$router.pushToTab('/fingerprintIndex/R4300000000002021125008/admin')
       // 跳到全部人员库，打开新增人员弹窗
+      // this.$router.pushToTab({
+      //   path: "/AllPersonnelBaseIndex",
+      //   query: {
+      //     xzry: true,
+      //   },
+      // });
       this.$router.pushToTab({
-        path: "/AllPersonnelBaseIndex",
-        query: {
-          xzry: true,
-        },
-      });
+        path: "/xzry"
+      })
     },
     gozljc (type) {
       if (!this.roleArr.includes("D")) return;
@@ -467,7 +470,7 @@ export default {
   font-size: 18px;
   color: #999999;
   line-height: 24px;
-  font-family:HarmonyOS_Sans_SC ;
+  font-family: HarmonyOS_Sans_SC;
 }
 .main .title1 {
   font-size: 36px;

src/views/drFPTX/Index.vue

@@ -24,6 +24,7 @@
       </el-radio>
     </el-radio-group>
     <div class='choose'>
+      <div class="chooseTip">
         <div class="wjlx">
           <div class="left">
             <el-radio-group v-model="wjlx">
@@ -64,6 +65,11 @@
             </div>
           </div>
         </div>
+        <div class="tip">
+          <span class="iconfont">&#xe649;</span>提示：当选择多个逻辑库时，工作流以最小ID逻辑库为准！
+        </div>
+      </div>
+
       <el-button
         :class="selectArr.length?'selected':'noselected'"
         @click="submitUpload"
@@ -1442,6 +1448,10 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: flex-end;
+  .chooseTip {
+    display: flex;
+    align-items: center;
+  }
   .wjlx {
     display: flex;
     width: 609px;
@@ -1450,6 +1460,17 @@ export default {
     border-radius: 6px;
     margin-top: 24px;
   }
+  .tip {
+    margin-left: 24px;
+    margin-top: 24px;
+    color: #f8980a;
+    font-family: HarmonyOS_Sans_SC;
+    font-size: 14px;
+    span {
+      font-size: 14px;
+      margin-right: 5px;
+    }
+  }
 
   .left {
     width: 242px;