Merge branch 'nan' of sckj/mz-cloud into master

ruoyi-ui/src/components/xxtjEcharts/EchartsBox4/index.vue

@@ -293,6 +293,7 @@ export default {
               itemStyle: {
                 normal: {
                   lineStyle: {
+	                  width: 3,
                     type: "dashed", //线条样式
                     color: {
                       //设置渐变
@@ -314,10 +315,17 @@ export default {
                       global: true, // 缺省为 false
                     },
                   },
-                  label: {
-                    show: true,
-                    position: "center", // 文字显示的位置
-                  },
+	                label: {
+		                show: true,
+		                position: 'middle', // 文字显示的位置
+		                formatter: '指标线：' + zbz,
+		                textStyle: {
+			                color: 'red',//标注线终点文字颜色
+			                fontSize:16,
+			                fontWeight:400,
+			                padding: [0, 0, 0, 0],//文字间距
+		                }
+	                },
                 },
               },
               data: [

ruoyi-web/src/components/ImageUpload/index.vue

@@ -79,7 +79,7 @@ const uploadList = ref([]);
 const dialogImageUrl = ref("");
 const dialogVisible = ref(false);
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // 上传的图片服务器地址
+const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/portal/jlDept/uploadFile"); // 上传的图片服务器地址
 const headers = ref({ Authorization: "Bearer " + getToken() });
 const fileList = ref([]);
 const showTip = computed(
@@ -190,4 +190,4 @@ function listToString(list, separator) {
 :deep(.hide .el-upload--picture-card) {
     display: none;
 }
-</style>
+</style>

ruoyi-web/src/views/gljtsq/sqzltx/index.vue

@@ -18,24 +18,24 @@
 				<el-form-item label="申请人姓名" prop="sqrXm">
 					<el-input v-model="form.sqrXm" placeholder="请输入申请人姓名"/>
 				</el-form-item>
+				<el-form-item label="身份证号" prop="sqrZjhm">
+					<el-input v-model="form.sqrZjhm" @input="changeLrZjhm(form.sqrZjhm)" placeholder="请输入申请人身份证号" />
+				</el-form-item>
 				<el-form-item label="性别" prop="xb">
 					<el-select v-model="form.xb" placeholder="请选择性别">
 						<el-option v-for="dict in C0007" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
 					</el-select>
 				</el-form-item>
-				<el-form-item label="联系电话" prop="sqrLxdh">
-					<el-input v-model="form.sqrLxdh" placeholder="请输入申请人联系电话"/>
-				</el-form-item>
-				<el-form-item label="身份证号" prop="sqrZjhm">
-					<el-input v-model="form.sqrZjhm" placeholder="请输入申请人身份证号" maxlength="18"/>
-				</el-form-item>
 				<el-form-item label="出生日期" prop="csrq">
 					<el-date-picker v-model="form.csrq" type="date" value-format="YYYYMMDD" placeholder="请选择出生日期" clearable/>
 				</el-form-item>
+				<el-form-item label="联系电话" prop="sqrLxdh">
+					<el-input v-model="form.sqrLxdh" placeholder="请输入申请人联系电话"/>
+				</el-form-item>
 				<el-form-item label="行政区划" prop="xzqh">
 					<RegionCascaderSelect v-model="form.xzqh" style="width: 100%" valueProp="code" :isDataRoot="true" :checkStrictly="false"/>
 				</el-form-item>
-				<el-form-item class="el-form-item2" label="居住地址" prop="jzdz">
+				<el-form-item label="居住地址" prop="jzdz">
 					<el-input v-model="form.jzdz" placeholder="请输入居住地址"/>
 				</el-form-item>
 
@@ -55,16 +55,6 @@
 						</el-option>
 					</el-select>
 				</el-form-item>
-
-				<el-form-item label="是否补发" prop="isBf">
-					<el-select v-model="form.isBf" placeholder="请选择是否补发">
-						<el-option v-for="dict in CZ035" :key="dict.value" :label="dict.label" :value="dict.value">
-						</el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item v-if="form.isBf== 1" label="补发月数" prop="bfys">
-					<number placeholder="补发月数" v-model="form.bfys" :min="0" :max="10000"/>
-				</el-form-item>
 				<el-form-item label="开户银行" prop="khyh">
 					<el-cascader :props="props" :options="C0044" v-model="form.khyh" placeholder="请选择开户银行">
 					</el-cascader>
@@ -75,7 +65,7 @@
 				<el-form-item label="开户名称" prop="khmc">
 					<el-input v-model="form.khmc" placeholder="请输入开户名称"/>
 				</el-form-item>
-				<el-form-item class="el-form-item3" label="附件">
+				<el-form-item label="附件" prop="fj">
 					<file-upload v-model="form.fj"/>
 				</el-form-item>
 				<el-form-item label="头像" prop="tx">
@@ -97,7 +87,7 @@
 import { getCurrentInstance, reactive, ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { addGlbt } from '@/api/home';
-import { Regular, chineseOne, idCard } from '@/utils/regular';
+import { chineseOne, idCard } from '@/utils/regular';
 
 const { proxy } = getCurrentInstance();
 const { C0007, C0032, CZ035, C0044 } = proxy.useDict('C0007', 'C0032', 'CZ035', 'C0044');
@@ -143,14 +133,19 @@ const rules = reactive({
 	dbrLxdh: [
 		{ max: 18, message: '代办人联系电话不能超过18个字符', trigger: 'blur', },
 	],
-	isBf: [
-		{ required: true, message: '是否补发不能为空', trigger: 'blur' },
-	],
 	tx: [
 		{ required: false, message: '头像不能为空', trigger: 'blur' }
 	],
 });
 
+// 通过证件号码自动补全性别、出生日期
+function changeLrZjhm(value) {
+	if (value.length == 18) {
+		this.form.csrq = value.substring(6, 14)
+		this.form.xb = Number(value.substring(16, 1)) % 2 == 0 ? '2' : '1'
+	}
+}
+
 async function onSubmit(formEl) {
 	if (!formEl) return;
 	await formEl.validate((valid, fields) => {
@@ -271,12 +266,6 @@ async function onSubmit(formEl) {
 			}
 		}
 
-		.el-form-item3 {
-			.el-form-item__content {
-				line-height: 20px;
-			}
-		}
-
 		.submitBtn {
 			width: 12%;
 			margin: 0 auto;