From b767cea8ee6bf2e782c7727ad9ccfd1d69b4f8cb Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期二, 08 七月 2025 13:55:58 +0800
Subject: [PATCH] qx
---
src/views/index.vue | 4 ++--
src/views/system/tijian/index.vue | 12 ++++++++++++
src/views/system/tijianall/index.vue | 1 +
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/views/index.vue b/src/views/index.vue
index 1ea2590..dd2537c 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,9 +1,9 @@
<template>
<div class="centre">
<!-- 浠婃棩閫氱煡 -->
- <div style="display: flex; justify-content: center; align-items: center;">
+ <!-- <div style="display: flex; justify-content: center; align-items: center;">
<h4>浠婃棩閫氱煡</h4>
- </div>
+ </div> -->
<div class="notice-area">
<el-carousel :interval="2000" direction="vertical" :autoplay="true" :loop="true" height="120px"
v-if="groupedNoticeList.length > 0" class="carousel">
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index fc87b65..b290a15 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -146,6 +146,7 @@
},
trigger: 'blur',
},
+<<<<<<< HEAD
]">
<span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
璇佷欢鍙风爜
@@ -153,6 +154,17 @@
<el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
@input="handleIdCardInput" />
<!-- <i style="
+=======
+ trigger: 'blur',
+ },
+ ]">
+ <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
+ 璇佷欢鍙风爜
+ </span>
+ <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ @input="handleIdCardInput" maxlength="18"/>
+ <!-- <i style="
+>>>>>>> 0c23ed71897641b9ee66d81082cbc999e0c5f0ae
font-size: 1rem;
position: absolute;
right: -20px;
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index 6dc5ab7..b1ba7bb 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -232,6 +232,7 @@
placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
@input="handleIdCardInput"
style="width: 190px"
+ maxlength="18"
/>
<!-- <i
style="font-size: 17px; margin-left: 3px"
--
Gitblit v1.8.0