From e103f6c980d575765eb7aa7aaee9426749c30e9e Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期一, 25 九月 2023 20:41:00 +0800
Subject: [PATCH] 完善模块搜索框样式
---
ruoyi-ui/src/views/self/memo.vue | 41 -
ruoyi-ui/src/views/homeRoot/personInfo.vue | 358 ++++++++++++--------
ruoyi-ui/src/views/travel/index.vue | 12
ruoyi-ui/src/views/components/superMindmap.vue | 14
ruoyi-ui/src/views/contacts/index.vue | 36 -
ruoyi-ui/src/views/contacts/contactsInfo.vue | 4
ruoyi-ui/src/views/economy/index.vue | 15
ruoyi-ui/src/views/pet/index.vue | 15
ruoyi-ui/src/views/secret/index.vue | 15
ruoyi-ui/src/views/wish/index.vue | 78 +---
ruoyi-ui/src/views/collection/index.vue | 130 ++++---
ruoyi-ui/src/views/doctor/index.vue | 75 +---
ruoyi-ui/src/views/honor/index.vue | 31 -
ruoyi-ui/src/views/mindMap/index.vue | 1
ruoyi-ui/src/views/device/index.vue | 25 +
ruoyi-ui/src/views/clean/index.vue | 20
ruoyi-ui/src/views/homeRoot/index.vue | 2
ruoyi-ui/src/views/healthy/healthYear.vue | 20
ruoyi-ui/src/views/selfeconomy/index.vue | 43 -
ruoyi-ui/src/views/note/index.vue | 30 +
20 files changed, 521 insertions(+), 444 deletions(-)
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index ccaf984..01aca6c 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -6,7 +6,10 @@
v-model="queryParams.kind"
placeholder="鎵�鏈夌被鍨�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
>
<el-option
v-for="dict in typeOptions"
@@ -20,7 +23,10 @@
v-model="queryParams.suitable"
placeholder="璇疯緭鍏ラ�傜敤浜�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -29,7 +35,10 @@
v-model="queryParams.type"
placeholder="璇疯緭鍏ョ被鍒�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -38,7 +47,10 @@
v-model="queryParams.method"
placeholder="璇疯緭鍏ヤ繚娲佹柟娉�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 6920c8f..b648a7f 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -1,56 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
- <el-input
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- placeholder="鍦ㄢ�滄敹钘忓拰鑽ｈ獕鈥濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <!-- <el-input
- v-model="searchVal"
- placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @input="inputChange">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <div class="outer-table">
- 姝ょ埗缁勪欢寮曠敤瀛愮粍浠秚ablemax
- <tablemax label="myLabel" :tableData="contactList">
- <template v-slot:table>
- <el-table-column label="鎿嶄綔" width="180">
- <template slot-scope="scope">
- <el-button @click="handleCheck(scope.row)" type="text" size="small"
- >璋冪敤</el-button
- >
- </template>
- </el-table-column>
- </template>
- </tablemax>
- </div>-->
-
-
- <!-- v-model="queryParams.id"
-
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- @keyup.enter.native="handleQuery"
- -->
- </el-form-item>
-
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
@@ -58,8 +8,7 @@
height: 30px;
background: #FFFFFF;
border-radius: 14px 14px 14px 14px;
- opacity: 0.5;
- border: 1px solid rgba(0,0,0,0.25);"
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -70,34 +19,94 @@
<el-form-item label="绫诲埆" prop="type">
<el-select v-model="queryParams.type" placeholder="鎵�鏈夌被鍒�" clearable
- style="width: 240px" @keyup.enter.native="handleQuery">
+ style="width: 233px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery"
+ >
<el-option v-for="item in typeOptions"
:key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
-
+ <el-form-item label="鍚嶇О" prop="name" >
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ悕绉�"
+ clearable
+ style="width: 233px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鏉ユ簮" prop="source" >
+ <el-input
+ v-model="queryParams.source"
+ placeholder="璇疯緭鍏ユ潵婧�"
+ clearable
+ style="width: 233px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
<el-form-item label="鎸佹湁鑰�" prop="owner" >
<el-input
v-model="queryParams.owner"
placeholder="璇疯緭鍏ユ寔鏈夎��"
clearable
- style="width: 240px"
+ style="width: 233px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
-
+ <el-form-item label="浠峰��" prop="price" >
+ <el-input
+ v-model="queryParams.price"
+ placeholder="璇疯緭鍏ヤ环鍊�"
+ clearable
+ style="width: 233px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
<el-form-item label="瀛樻斁浣嶇疆" prop="location">
<el-input
v-model="queryParams.location"
placeholder="璇疯緭鍏ュ瓨鏀句綅缃�"
clearable
- style="width: 240px"
+ style="width: 233px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
-
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input
+ v-model="queryParams.remark"
+ placeholder="璇疯緭鍏ュ娉�"
+ clearable
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
<el-form-item>
<el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
@@ -471,9 +480,12 @@
pageNum: 1,
pageSize: 10,
type:undefined,
+ name:undefined,
+ source:undefined,
owner:undefined,
+ price:undefined,
location:undefined,
- // happenTime:undefined,
+ remark:undefined,
},
// searchVal:"",
diff --git a/ruoyi-ui/src/views/components/superMindmap.vue b/ruoyi-ui/src/views/components/superMindmap.vue
index e2a3a91..9e57849 100644
--- a/ruoyi-ui/src/views/components/superMindmap.vue
+++ b/ruoyi-ui/src/views/components/superMindmap.vue
@@ -160,7 +160,7 @@
return B茅zier_curve_generator({source: start, target: end});
})
.attr("fill", "none")
- .attr("stroke", "#c3c3c3")
+ .attr("stroke", "#EBA4AA")
// 铏氱嚎
// .attr("stroke-dasharray", "8")
.attr("stroke-width", 1);
@@ -194,12 +194,12 @@
.attr("r", 4)
.attr("fill", function (d) {
if (d.data.childrenTemp) {
- return 'red'
+ return '#EBA4AA'
} else {
return 'white'
}
})
- .attr("stroke", "red")
+ .attr("stroke", "#EBA4AA")
.attr("stroke-width", 1);
//缁樺埗鏍囨敞(鑺傜偣鍓嶇殑鐭╁舰)
groups.append("rect")
@@ -211,7 +211,7 @@
}
)
.attr("height", 22)
- .attr("fill", "grey")
+ .attr("fill", "#FFFFFF")
// 娣诲姞鍦嗚
.attr("rx", 4)
//缁樺埗閾炬帴鏂瑰紡
@@ -219,8 +219,8 @@
.attr("x", 12)
.attr("y", -5)
.attr("dy", 10)
- .attr("fill", 'white')
- .attr("font-size", 12)
+ .attr("fill", '#F6739F')
+ .attr("font-size", 14)
.text(function (d) {
return d.data.link;
})
@@ -269,6 +269,8 @@
function (d) {
if (d.data.prop === that.active) {
return '#409EFF'
+ }else{
+ return '#8296C5'
}
}
)
diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue
index 02af3b4..4185d38 100644
--- a/ruoyi-ui/src/views/contacts/contactsInfo.vue
+++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -89,6 +89,8 @@
multiple
:http-request="requestUpload"
:file-list="fileList"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
>
<div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -140,6 +142,8 @@
:on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
>
<div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 3e5506c..140a220 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -1,29 +1,16 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
- <el-input
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <!-- v-model="queryParams.id"-->
- </el-form-item>
<el-form-item label="瀹朵汉濮撳悕" prop="myName" >
<el-input
v-model="queryParams.myName"
placeholder="璇疯緭鍏ュ浜哄鍚�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -35,7 +22,10 @@
v-model="queryParams.nickName"
placeholder="璇疯緭鍏ラ�氳褰曚腑绉板懠"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -46,7 +36,10 @@
v-model="queryParams.name"
placeholder="璇疯緭鍏ュ鍚�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -56,7 +49,10 @@
v-model="queryParams.work"
placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
>
<i slot="prefix" class="el-input__icon el-icon-search"></i>
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 51d2577..2e06301 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -5,7 +5,10 @@
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 240px;"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -18,7 +21,10 @@
v-model="queryParams.name"
placeholder="璇疯緭鍏ヨ澶囧悕绉�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -27,7 +33,10 @@
v-model="queryParams.buyer"
placeholder="璇疯緭鍏ヨ喘涔颁汉"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -36,7 +45,10 @@
v-model="queryParams.location"
placeholder="璇疯緭鍏ュ瓨鏀惧湴鐐�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
@@ -47,7 +59,10 @@
v-model="queryParams.content"
placeholder="璇疯緭鍏ヤ簨椤瑰唴瀹�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 0581c3a..9674f64 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -1,59 +1,12 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
- <el-input
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- placeholder="鍦ㄢ�滃搴皬鍖荤敓鈥濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <!-- <el-input
- v-model="searchVal"
- placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @input="inputChange">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <div class="outer-table">
- 姝ょ埗缁勪欢寮曠敤瀛愮粍浠秚ablemax
- <tablemax label="myLabel" :tableData="contactList">
- <template v-slot:table>
- <el-table-column label="鎿嶄綔" width="180">
- <template slot-scope="scope">
- <el-button @click="handleCheck(scope.row)" type="text" size="small"
- >璋冪敤</el-button
- >
- </template>
- </el-table-column>
- </template>
- </tablemax>
- </div>-->
-
-
- <!-- v-model="queryParams.id"
-
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- @keyup.enter.native="handleQuery"
- -->
- </el-form-item>
-
<el-form-item label="绫诲埆" prop="type">
<el-select v-model="queryParams.type" placeholder="鎵�鏈夌被鍒�" clearable
- style="width: 240px" @keyup.enter.native="handleQuery">
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;" @keyup.enter.native="handleQuery">
<el-option v-for="item in typeOptions"
:key="item.value" :label="item.label" :value="item.value"/>
</el-select>
@@ -64,7 +17,10 @@
v-model="queryParams.symptom"
placeholder="璇疯緭鍏ョ棁鐘�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -75,7 +31,10 @@
v-model="queryParams.cmedical"
placeholder="璇疯緭鍏ヤ腑鍖诲鏂�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -85,7 +44,10 @@
v-model="queryParams.effect"
placeholder="璇疯緭鍏ュ姛鏁�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -95,7 +57,10 @@
v-model="queryParams.suitable"
placeholder="璇疯緭鍏ラ�傜敤浜�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
>
<i slot="prefix" class="el-input__icon el-icon-search"></i>
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index d1fed0e..50f4ac7 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -5,7 +5,10 @@
<el-form-item label="鏃堕棿" prop="createTime">
<el-date-picker
v-model="dateRange"
- style="width: 240px;"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -18,7 +21,10 @@
v-model="queryParams.usePeople"
placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -29,7 +35,10 @@
v-model="queryParams.useFor"
placeholder="璇疯緭鍏ョ敤閫�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
diff --git a/ruoyi-ui/src/views/healthy/healthYear.vue b/ruoyi-ui/src/views/healthy/healthYear.vue
index 2b07be1..6beb163 100644
--- a/ruoyi-ui/src/views/healthy/healthYear.vue
+++ b/ruoyi-ui/src/views/healthy/healthYear.vue
@@ -5,7 +5,10 @@
<el-form-item label="浣撴鏃堕棿" prop="checkTime">
<el-date-picker
v-model="dateRange"
- style="width: 240px;"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -18,7 +21,10 @@
v-model="queryParams.hospital"
placeholder="璇疯緭鍏ュ氨鐥呭尰闄�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -27,7 +33,10 @@
v-model="queryParams.type"
placeholder="璇疯緭鍏ョ被鍒�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -37,7 +46,10 @@
v-model="queryParams.title"
placeholder="璇疯緭鍏ラ鍚�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
diff --git a/ruoyi-ui/src/views/homeRoot/index.vue b/ruoyi-ui/src/views/homeRoot/index.vue
index b56146b..8b6a15f 100644
--- a/ruoyi-ui/src/views/homeRoot/index.vue
+++ b/ruoyi-ui/src/views/homeRoot/index.vue
@@ -343,7 +343,7 @@
},
getPersonInfo(id)
{
- this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
+ // this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
//alert(id)
},
generation_2(){
diff --git a/ruoyi-ui/src/views/homeRoot/personInfo.vue b/ruoyi-ui/src/views/homeRoot/personInfo.vue
index c222436..e47a606 100644
--- a/ruoyi-ui/src/views/homeRoot/personInfo.vue
+++ b/ruoyi-ui/src/views/homeRoot/personInfo.vue
@@ -1,242 +1,225 @@
<template>
<div class="app-container" >
<div class="wrapper" style="overflow: auto;">
- <div id="building" >
- <el-form ref="elForm" :model="personInfos" :rules="rules" size="medium" label-position="center" label-width="100px">
+ <div id="building" v-show="personInfos[1]">
+ <el-form ref="elForm" :model="personInfos" :rules="rules" size="medium" label-position="center" label-width="100px">
<el-container>
<div style="padding-left:30px;padding-top: 50px">
- <el-container>
<el-col :span="6" :data="personInfos">
<div class="block" :model="personInfos" >
<el-col v-model="personInfos[0].url" prop="url">
<el-avatar shape="square" :size=200 >
<el-image
:src="'http://47.93.189.255:8080/'+ personInfos[0].url"
- :fit="fit"
style="width: 100%;height: 100%;"
></el-image>
</el-avatar>
</el-col>
</div>
</el-col>
- </el-container>
</div>
<div style="padding-left:30px;padding-top: 15px">
- <el-container>
- <el-row>
- <el-cow :span="8">
+ <el-col>
+ <el-row :span="8">
<el-form-item label="濮撳悕" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].nickName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="韬唤" prop="identity" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].identity" placeholder="璇疯緭鍏ヨ韩浠�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鏇剧敤鍚�" prop="oldName" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].oldName" placeholder="璇疯緭鍏ユ浘鐢ㄥ悕" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鐢熻倴" prop="shengXiao" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].shengXiao" placeholder="璇疯緭鍏ョ敓鑲�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鏄熷骇" prop="constellation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].constellation" placeholder="璇疯緭鍏ユ槦搴�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
-
- </el-row>
- </el-container>
+ </el-row>
+ </el-col>
</div>
<div style="padding-left:30px;padding-top: 15px">
- <el-container>
- <el-row>
- <el-cow :span="8">
+ <el-col>
+ <el-row :span="8">
<el-form-item label="鎬у埆" prop="sex" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].sex === 1 ? '鐢�':'濂�'" placeholder="璇疯緭鍏ユ�у埆" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="姘戞棌" prop="nation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].nation" placeholder="璇疯緭鍏ユ皯鏃�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].phoneNumber" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="寰俊鍙�" prop="wxNo" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].wxNo" placeholder="璇疯緭鍏ュ井淇″彿" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鍗曚綅" prop="unit" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].unit" placeholder="璇疯緭鍏ュ崟浣�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- </el-row>
- </el-container>
+ </el-row>
+ </el-col>
</div>
<div style="padding-left:30px;padding-top: 15px">
- <el-container>
- <el-row>
- <el-cow :span="8">
+ <el-col>
+ <el-row :span="8">
<el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].maritalStatus === 1 ? '宸插':'鏈'" placeholder="璇疯緭鍏ュ濮荤姸鍐�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="閰嶅伓" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].nickName" placeholder="璇疯緭鍏ラ厤鍋�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鎴风睄鍦板潃" prop="locationAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].locationAddress" placeholder="璇疯緭鍏ユ埛绫嶅湴鍧�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].alwaysAddress" placeholder="璇疯緭鍏ュ父浣忓湴鍧�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鑱屽姟鑱岀О" prop="position" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].position" placeholder="璇疯緭鍏ヨ亴鍔¤亴绉�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- </el-row>
- </el-container>
+ </el-row>
+ </el-col>
</div>
</el-container>
<el-divider />
- <el-container>
+ <el-container >
<div style="padding-left:30px;padding-top: 10px">
- <el-container>
- <el-row>
- <el-cow :span="8">
- <el-form-item label="濮撳悕" prop="nickName" label-width="50px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-col>
+ <el-row :span="8">
+ <el-form-item label="濮撳悕" prop="nickName" label-width="50px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;" >
<el-input v-model="personInfos[1].nickName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="韬唤" prop="identity" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].identity" placeholder="璇疯緭鍏ヨ韩浠�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鏇剧敤鍚�" prop="oldName" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].oldName" placeholder="璇疯緭鍏ユ浘鐢ㄥ悕" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鐢熻倴" prop="shengXiao" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].shengXiao" placeholder="璇疯緭鍏ョ敓鑲�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鏄熷骇" prop="constellation" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].constellation" placeholder="璇疯緭鍏ユ槦搴�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
-
- </el-row>
- </el-container>
+ </el-row>
+ </el-col>
</div>
<div style="padding-left:30px;padding-top: 10px">
- <el-container>
- <el-row>
- <el-cow :span="8">
+ <el-col>
+ <el-row :span="8">
<el-form-item label="鎬у埆" prop="sex" label-width="45px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].sex=== 1 ? '鐢�':'濂�'" placeholder="璇疯緭鍏ユ�у埆" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="姘戞棌" prop="nation" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].nation" placeholder="璇疯緭鍏ユ皯鏃�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].phoneNumber" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="寰俊鍙�" prop="wxNo" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].wxNo" placeholder="璇疯緭鍏ュ井淇″彿" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鍗曚綅" prop="unit" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].unit" placeholder="璇疯緭鍏ュ崟浣�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- </el-row>
- </el-container>
+ </el-row>
+ </el-col>
</div>
<div style="padding-left:30px;padding-top: 10px">
- <el-container>
- <el-row>
- <el-cow :span="8">
+ <el-col>
+ <el-row :span="8">
<el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].maritalStatus === 1 ? '宸插':'鏈'" placeholder="璇疯緭鍏ュ濮荤姸鍐�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="閰嶅伓" prop="nickName" label-width="50px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[0].nickName" placeholder="璇疯緭鍏ラ厤鍋�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鎴风睄鍦板潃" prop="locationAddress" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].locationAddress" placeholder="璇疯緭鍏ユ埛绫嶅湴鍧�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].alwaysAddress" placeholder="璇疯緭鍏ュ父浣忓湴鍧�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- <el-cow :span="8">
+ </el-row>
+ <el-row :span="8">
<el-form-item label="鑱屽姟鑱岀О" prop="position" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="personInfos[1].position" placeholder="璇疯緭鍏ヨ亴鍔¤亴绉�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
- </el-cow>
- </el-row>
- </el-container>
+ </el-row>
+ </el-col>
</div>
<div style="padding-left:30px;padding-top: 45px">
<el-container>
@@ -246,7 +229,6 @@
<el-avatar shape="square" :size=200 >
<el-image
:src="'http://47.93.189.255:8080/'+ personInfos[1].url"
- :fit="fit"
style="width: 100%;height: 100%;"
></el-image>
</el-avatar>
@@ -257,22 +239,153 @@
</div>
</el-container>
</el-form>
+ </div>
+
+ <div id="building2" v-show="!personInfos[1]">
+ <el-form ref="elForm" :model="personInfo1" :rules="rules" size="medium" label-position="center" label-width="100px">
+ <el-container>
+ <div style="padding-left:30px;padding-top: 50px">
+ <el-container>
+ <el-col :span="6" :data="personInfo1">
+ <div class="block" :model="personInfo1" >
+ <el-col v-model="personInfo1.url" prop="url">
+ <el-avatar shape="square" :size=200 >
+ <el-image
+ :src="'http://47.93.189.255:8080/'+ personInfo1.url"
+ style="width: 100%;height: 100%;"
+ ></el-image>
+ </el-avatar>
+ </el-col>
+ </div>
+ </el-col>
+ </el-container>
+ </div>
+ <div style="padding-left:30px;padding-top: 15px">
+ <el-container>
+ <el-col>
+ <el-row :span="8">
+ <el-form-item label="濮撳悕" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.nickName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="8">
+ <el-form-item label="韬唤" prop="identity" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.identity" placeholder="璇疯緭鍏ヨ韩浠�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="8">
+ <el-form-item label="鏇剧敤鍚�" prop="oldName" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.oldName" placeholder="璇疯緭鍏ユ浘鐢ㄥ悕" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="8">
+ <el-form-item label="鐢熻倴" prop="shengXiao" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.shengXiao" placeholder="璇疯緭鍏ョ敓鑲�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="8">
+ <el-form-item label="鏄熷骇" prop="constellation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.constellation" placeholder="璇疯緭鍏ユ槦搴�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+
+ </el-col>
+ </el-container>
+ </div>
+ <div style="padding-left:30px;padding-top: 15px">
+ <el-container>
+ <el-col>
+ <el-row :span="8">
+ <el-form-item label="鎬у埆" prop="sex" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.sex === 1 ? '鐢�':'濂�'" placeholder="璇疯緭鍏ユ�у埆" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="8">
+ <el-form-item label="姘戞棌" prop="nation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.nation" placeholder="璇疯緭鍏ユ皯鏃�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="8">
+ <el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.phoneNumber" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="8">
+ <el-form-item label="寰俊鍙�" prop="wxNo" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.wxNo" placeholder="璇疯緭鍏ュ井淇″彿" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="8">
+ <el-form-item label="鍗曚綅" prop="unit" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.unit" placeholder="璇疯緭鍏ュ崟浣�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ </el-col>
+ </el-container>
+ </div>
+ <div style="padding-left:30px;padding-top: 15px">
+ <el-container>
+ <el-col>
+ <el-row :span="8">
+ <el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.maritalStatus === 1 ? '宸插':'鏈'" placeholder="璇疯緭鍏ュ濮荤姸鍐�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="8">
+ <el-form-item label="閰嶅伓" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.spouseId" placeholder="璇疯緭鍏ラ厤鍋�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="8">
+ <el-form-item label="鎴风睄鍦板潃" prop="locationAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.locationAddress" placeholder="璇疯緭鍏ユ埛绫嶅湴鍧�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="8">
+ <el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.alwaysAddress" placeholder="璇疯緭鍏ュ父浣忓湴鍧�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="8">
+ <el-form-item label="鑱屽姟鑱岀О" prop="position" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="personInfo1.position" placeholder="璇疯緭鍏ヨ亴鍔¤亴绉�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ </el-col>
+ </el-container>
+ </div>
+ </el-container>
+ </el-form>
</div>
+
</div>
</div>
</template>
<script>
import {getRoot} from "@/api/root/index";
-import {listExperience} from "@/api/self";
export default {
name: "index",
data(){
return{
// 閬僵灞�
disabled: false,
- personInfos:[],
+ personInfos:{},
+ personInfo1:{},
loading: true,
dsb:true,
formData:{
@@ -320,51 +433,7 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
- createTime: [{
- required: true,
- message: '璇疯緭鍏ュ垱寤烘椂闂�',
- trigger: 'blur'
- }],
- type: [{
- required: true,
- message: '璇疯緭鍏ョ被鍨�',
- trigger: 'blur'
- }],
- name: [{
- required: true,
- message: '璇疯緭鍏ュ悕绉�',
- trigger: 'blur'
- }],
- grade: [{
- required: true,
- message: '璇疯緭鍏ョ骇鍒�',
- trigger: 'blur'
- }],
- idNo: [{
- required: true,
- message: '璇疯緭鍏ヨ瘉浠跺彿/涓撲笟',
- trigger: 'blur'
- }],
- validityDate: [{
- // required: true,
- message: '璇疯緭鍏ユ湁鏁堟椂闂�',
- trigger: 'blur'
- }],
- getDate: [{
- // required: true,
- message: '璇疯緭鍏ヨ幏寰楁椂闂�',
- trigger: 'blur'
- }],
- location: [{
- // required: true,
- message: '璇疯緭鍏ュ瓨鏀句綅缃�',
- trigger: 'blur'
- }],
- remark: [{
- // required: true,
- message: '璇疯緭鍏ュ娉�',
- trigger: 'blur'
- }],
+
},
}
}
@@ -378,9 +447,12 @@
{
// alert(id)
getRoot(id).then(response => {
- console.log(response.data)
+ // console.log(response.data)
//杩欓噷鏄か濡荤殑淇℃伅锛屽凡缁忔嬁鍒颁簡
this.personInfos = response.data
+ this.personInfo1 = response.data[0]
+ console.log(this.personInfo1.nickName)
+
});
}
@@ -398,7 +470,7 @@
background-position: top left;
background-repeat: no-repeat;
}
-#building {
+#building building2{
/*璁剧疆閫忔槑搴�*/
/*opacity: 0.9;*/
background: rgba(255,255,255,0.8);
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index f5d1839..a2cb18e 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -1,25 +1,12 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
- <el-input
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- placeholder="鍦ㄢ�滆瘉浠躲�佽崳瑾夈�佽祫璐ㄢ�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
-
- </el-form-item>
<el-form-item label="鍚嶇О" prop="name">
<el-select v-model="queryParams.name" placeholder="鎵�鏈夊悕绉�" clearable
- style="width: 240px" @keyup.enter.native="handleQuery">
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;" @keyup.enter.native="handleQuery">
<el-option v-for="item in typeOptions"
:key="item.value" :label="item.label" :value="item.value"/>
</el-select>
@@ -29,7 +16,10 @@
v-model="queryParams.type"
placeholder="鎵�鏈夌被鍒�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
>
<el-option
@@ -48,7 +38,10 @@
v-model="queryParams.grade"
placeholder="璇疯緭鍏ョ骇鍒�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
diff --git a/ruoyi-ui/src/views/mindMap/index.vue b/ruoyi-ui/src/views/mindMap/index.vue
index e49c78d..6b3c31a 100644
--- a/ruoyi-ui/src/views/mindMap/index.vue
+++ b/ruoyi-ui/src/views/mindMap/index.vue
@@ -131,7 +131,6 @@
/*padding-left: -20px;*/
}
.text{
- /*background-color: #FEF7FC;*/
opacity: 0.75;
margin-top: -20px;
padding: 20px;
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index f4fefc4..1c3447e 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -6,7 +6,10 @@
v-model="queryParams.type"
placeholder="璇疯緭鍏ョ被鍨�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -16,7 +19,10 @@
v-model="queryParams.title"
placeholder="璇疯緭鍏ユ爣棰�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -25,7 +31,10 @@
v-model="queryParams.location"
placeholder="璇疯緭鍏ュ瓨鍌ㄥ湴鍧�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -34,7 +43,10 @@
v-model="queryParams.holder"
placeholder="璇疯緭鍏ユ寔鏈変汉"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -43,7 +55,10 @@
v-model="queryParams.address"
placeholder="璇疯緭鍏ュ叿浣撲綅缃�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -51,7 +66,10 @@
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index d374cd3..5366a81 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -6,7 +6,10 @@
v-model="queryParams.sex"
placeholder="璇烽�夋嫨鎬у埆"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
>
<el-option
v-for="dict in typeOptions"
@@ -20,7 +23,10 @@
v-model="queryParams.name"
placeholder="璇疯緭鍏ュ悕瀛�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -29,7 +35,10 @@
v-model="queryParams.idNum"
placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 492ba2b..db06122 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -5,7 +5,10 @@
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 240px;"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -18,7 +21,10 @@
v-model="queryParams.type"
placeholder="璇疯緭鍏ョ被鍒�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -28,7 +34,10 @@
v-model="queryParams.accNo"
placeholder="璇疯緭鍏ヨ处鍙�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index c9ca71b..2a5ab88 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -1,32 +1,14 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-<!-- -->
-<!-- <el-input-->
-<!-- v-model:phone="queryParams.phone"-->
-<!-- placeholder=""-->
-<!-- clearable-->
-<!-- style="width: 240px"-->
-<!-- @keyup.enter.native="handleQuery">-->
-<!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
-<!-- </el-input>-->
-<!-- -->
- <el-form-item label="" prop="address title remark people happenTime" >
- <el-input v-model="keyword" placeholder="鍦ㄢ�滀釜浜鸿浜嬫湰鈥濅腑鎼滅储" clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
- </el-form-item>
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 197px;
- height: 30px;
- background: #FFFFFF;
- border-radius: 14px 14px 14px 14px;
- opacity: 0.5;
- border: 1px solid rgba(0,0,0,0.25);"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -40,7 +22,10 @@
v-model="queryParams.people"
placeholder="璇疯緭鍏ヤ汉鐗�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -51,7 +36,10 @@
v-model="queryParams.address"
placeholder="璇疯緭鍏ュ湴鐐�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -61,7 +49,10 @@
v-model="queryParams.title"
placeholder="璇疯緭鍏ヤ簨浠舵爣棰�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 4232ff2..e6613ca 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -2,33 +2,13 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-row>
- <el-form-item label="" prop="type incomeName timeLimit happenTime " >
- <el-input
- v-model:type="queryParams.type"
- v-model:incomeName="queryParams.incomeName"
- v-model:timeLimit="queryParams.timeLimit"
- v-model:happenTime="queryParams.happenTime"
-
- placeholder="鍦ㄢ�滆储浜р�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
-
-
-
- </el-form-item>
-
<el-form-item label="鏃ユ湡" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 197px;
- height: 30px;
- background: #FFFFFF;
- border-radius: 14px 14px 14px 14px;
- opacity: 0.5;
- border: 1px solid rgba(0,0,0,0.25);"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -42,7 +22,10 @@
v-model="queryParams.type"
placeholder="璇疯緭鍏ヨ储浜х被鍒�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -53,7 +36,10 @@
v-model="queryParams.incomeName"
placeholder="璇疯緭鍏ヨ储浜у悕绉�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -65,7 +51,10 @@
v-model="queryParams.timeLimit"
placeholder="璇疯緭鍏ユ湡闄�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index d38569a..c0e5aad 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -5,7 +5,10 @@
<el-form-item label="鏃堕棿" prop="startTime" >
<el-date-picker
v-model="dateRange"
- style="width: 240px;"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd HH-MM"
type="daterange"
range-separator="-"
@@ -16,9 +19,12 @@
<el-form-item label="鎬诲ぉ鏁�" prop="usePeople" >
<el-input
v-model="queryParams.usePeople"
- placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉"
+ placeholder="璇疯緭鍏ユ�诲ぉ鏁�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index c355eca..1c5b5e1 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -1,56 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
- <el-input
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- placeholder="鍦ㄢ�滅櫨骞村績鎰库�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <!-- <el-input
- v-model="searchVal"
- placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @input="inputChange">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <div class="outer-table">
- 姝ょ埗缁勪欢寮曠敤瀛愮粍浠秚ablemax
- <tablemax label="myLabel" :tableData="contactList">
- <template v-slot:table>
- <el-table-column label="鎿嶄綔" width="180">
- <template slot-scope="scope">
- <el-button @click="handleCheck(scope.row)" type="text" size="small"
- >璋冪敤</el-button
- >
- </template>
- </el-table-column>
- </template>
- </tablemax>
- </div>-->
-
-
- <!-- v-model="queryParams.id"
-
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- @keyup.enter.native="handleQuery"
- -->
- </el-form-item>
-
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
@@ -58,8 +8,7 @@
height: 30px;
background: #FFFFFF;
border-radius: 14px 14px 14px 14px;
- opacity: 0.5;
- border: 1px solid rgba(0,0,0,0.25);"
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -73,7 +22,10 @@
v-model="queryParams.title"
placeholder="璇疯緭鍏ョ悊鎯虫爣棰�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -83,7 +35,10 @@
v-model="queryParams.beneficiary"
placeholder="璇疯緭鍏ュ彈鎯犱汉"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -93,7 +48,10 @@
v-model="queryParams.heir"
placeholder="璇疯緭鍏ョ户鎵夸汉"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -103,14 +61,20 @@
v-model="queryParams.cause"
placeholder="璇疯緭鍏ュ師鍥�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
<el-form-item label="鏄惁鏈夋晥" prop="isEffective">
<el-select v-model="queryParams.isEffective" placeholder="璇烽�夋嫨鏄惁鏈夋晥" clearable
- style="width: 240px" @keyup.enter.native="handleQuery">
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;" @keyup.enter.native="handleQuery">
<el-option v-for="item in typeOptions"
:key="item.value" :label="item.label" :value="item.value"/>
</el-select>
--
Gitblit v1.9.1