From 16e6425b5acec7cdea6aa5f331b48b71f2afc32a Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期五, 31 三月 2023 00:00:00 +0800
Subject: [PATCH] 接口还没连好
---
ruoyi-ui/src/views/self/index.vue | 202 +++++++++++++++++++++++-----------------
ruoyi-ui/src/api/self/index.js | 45 ++++++++
2 files changed, 158 insertions(+), 89 deletions(-)
diff --git a/ruoyi-ui/src/api/self/index.js b/ruoyi-ui/src/api/self/index.js
index 0361f6d..0c0bb1c 100644
--- a/ruoyi-ui/src/api/self/index.js
+++ b/ruoyi-ui/src/api/self/index.js
@@ -1,6 +1,6 @@
import request from '@/utils/request'
-// 鏍规嵁id鏌ヨ涓汉璇︾粏淇℃伅
+// 鏌ヨ涓汉淇℃伅
export function getIndividualInfo(id) {
return request({
url: '/self/user' ,
@@ -12,7 +12,7 @@
// 鏌ョ湅鐢ㄦ埛涓昏鎴愬憳鍏崇郴
export function getIndividualRelation(Id) {
return request({
- url: '/self/user/relation' + Id,
+ url: '/self/user/relation' ,
method: 'get',
})
@@ -21,7 +21,7 @@
// 鍒犻櫎涓汉淇℃伅
export function delIndividual(Ids) {
return request({
- url: '/self/user' + Ids,
+ url: '/self/user' ,
method: 'delete'
})
}
@@ -44,3 +44,42 @@
data: data
})
}
+
+
+
+//鏌ヨ鎵�鏈変釜浜虹粡鍘�
+export function listExperience(query) {
+ return request({
+ url: '/zExperience/all',
+ method: 'get',
+ params: query
+ })
+}
+
+//淇敼涓汉缁忓巻
+export function updateExperience(data) {
+ return request({
+ url: '/zExperience',
+ method: 'put',
+ data: data
+ })
+}
+
+//澧炲姞涓汉缁忓巻
+export function addExperience(data)
+{
+ return request({
+ url: '/zExperience',
+ method: 'post',
+ data: data
+ })
+}
+
+//鍒犻櫎涓汉缁忓巻
+export function delExperience(ids)
+{
+ return request({
+ url: '/zExperience' +ids,
+ method: 'del',
+ })
+}
diff --git a/ruoyi-ui/src/views/self/index.vue b/ruoyi-ui/src/views/self/index.vue
index 385b656..18ace9a 100644
--- a/ruoyi-ui/src/views/self/index.vue
+++ b/ruoyi-ui/src/views/self/index.vue
@@ -14,7 +14,7 @@
<div style="padding-left:30px">
<el-container>
<el-col>
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="60px" label-position="left">
+ <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left">
<el-row :span="6">
<el-form-item label="濮撳悕" prop="nickName">
<el-input v-model="formData.nickName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}">
@@ -28,8 +28,8 @@
</el-form-item>
</el-row>
<el-row :span="8">
- <el-form-item label="韬唤璇佸彿" prop="field107">
- <el-input v-model="formData.field107" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable :style="{width: '100%'}">
+ <el-form-item label="韬唤璇佸彿" prop="idNum">
+ <el-input v-model="formData.idNum" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
</el-row>
@@ -48,14 +48,14 @@
</el-form-item>
</el-row>
<el-row :span="6">
- <el-form-item label="姘戞棌" prop="field105">
- <el-input v-model="formData.field105" placeholder="璇疯緭鍏ユ皯鏃�" clearable :style="{width: '100%'}">
+ <el-form-item label="姘戞棌" prop="nation">
+ <el-input v-model="formData.nation" placeholder="璇疯緭鍏ユ皯鏃�" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
</el-row>
<el-row :span="8">
- <el-form-item label="鑱旂郴鏂瑰紡" prop="field107">
- <el-input v-model="formData.field107" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" clearable :style="{width: '100%'}">
+ <el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber">
+ <el-input v-model="formData.phoneNumber" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
</el-row>
@@ -114,20 +114,20 @@
<el-col>
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" label-position="left">
<el-row :span="15">
- <el-form-item label="鎴风睄鍦板潃" prop="field108">
- <el-input v-model="formData.field108" placeholder="璇疯緭鍏ユ埛绫嶅湴鍧�" clearable :style="{width: '100%'}">
+ <el-form-item label="鎴风睄鍦板潃" prop="locationAddress">
+ <el-input v-model="formData.locationAddress" placeholder="璇疯緭鍏ユ埛绫嶅湴鍧�" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
</el-row>
<el-row :span="15">
- <el-form-item label="甯镐綇鍦板潃" prop="field110">
- <el-input v-model="formData.field110" placeholder="璇疯緭鍏ュ父浣忓湴鍧�" clearable :style="{width: '100%'}">
+ <el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress">
+ <el-input v-model="formData.alwaysAddress" placeholder="璇疯緭鍏ュ父浣忓湴鍧�" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
</el-row>
<el-row :span="15">
- <el-form-item label="鍗曚綅鍙婅亴鍔¤亴绉�" prop="field112">
- <el-input v-model="formData.field112" placeholder="璇疯緭鍏ュ崟浣嶅強鑱屽姟鑱岀О" clearable :style="{width: '100%'}">
+ <el-form-item label="鍗曚綅鍙婅亴鍔¤亴绉�" prop="position">
+ <el-input v-model="formData.position" placeholder="璇疯緭鍏ュ崟浣嶅強鑱屽姟鑱岀О" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
</el-row>
@@ -141,14 +141,14 @@
<el-col>
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" label-position="left">
<el-row :span="12">
- <el-form-item label="鎴风睄鍦板叕瀹夋満鍏�" prop="field109">
- <el-input v-model="formData.field109" placeholder="璇疯緭鍏ユ埛绫嶅湴鍏畨鏈哄叧" clearable :style="{width: '100%'}">
+ <el-form-item label="鎴风睄鍦板叕瀹夋満鍏�" prop="locationPolice">
+ <el-input v-model="formData.locationPolice" placeholder="璇疯緭鍏ユ埛绫嶅湴鍏畨鏈哄叧" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
</el-row>
<el-row :span="12">
- <el-form-item label="甯镐綇鍦板叕瀹夋満鍏�" prop="field111">
- <el-input v-model="formData.field111" placeholder="璇疯緭鍏ュ父浣忓湴鍏畨鏈哄叧" clearable :style="{width: '100%'}">
+ <el-form-item label="甯镐綇鍦板叕瀹夋満鍏�" prop=" alwaysPolice">
+ <el-input v-model="formData. alwaysPolice" placeholder="璇疯緭鍏ュ父浣忓湴鍏畨鏈哄叧" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
</el-row>
@@ -160,40 +160,78 @@
</el-container>
+ <div style="padding-top:30px">
+ <el-container>
+ <div style="width:100%"><h2 style="font-size:15px" >涓昏瀛︿範鍙婂伐浣滅粡鍘�</h2></div>
+ <el-button type="primary" icon="el-icon-edit" round></el-button>
+ <el-button type="primary" icon="el-icon-delete" round></el-button>
+ </el-container>
+ <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="16" align="center" />
+ <el-table-column label="璧锋鏃ユ湡" prop="startDate" sortable width="300" align="center" />
+ <el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content" sortable width="350" align="center" />
+ <el-table-column label="璇佹槑浜�" prop="witness" sortable width="300" align="center" />
+ <el-table-column label="鍒犻櫎" align="center" class-name="small-padding fixed-width" sortable width="100">
+
+ </el-table-column>
+ </el-table>
+ </div>
+
+ <div style="padding-top:30px">
<el-container>
- <div style="width:100%"><h2 style="font-size:15px" >涓昏瀛︿範鍙婂伐浣滅粡鍘�</h2></div>
+ <div style="width:100%"><h2 style="font-size:15px" >瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�</h2></div>
<el-button type="primary" icon="el-icon-edit" round></el-button>
- <el-button type="primary" icon="el-icon-delete" round></el-button>
+ <el-button type="primary" icon="el-icon-delete" round></el-button>
</el-container>
- <el-table v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
- <el-table-column label="璧锋鏃ユ湡" prop="time" sortable width="350" align="center" />
- <el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="circumstance" sortable width="400" align="center" />
- <el-table-column label="璇佹槑浜�" prop="witness" sortable width="350" align="center" />
- <el-table-column label="鍒犻櫎" align="center" class-name="small-padding fixed-width" sortable width="100">
- <template slot-scope="scope" v-if="scope.row.roleId !== 1">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
-
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
- <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
-
- </el-dropdown>
- </template>
+ <!-- :data =""鍐呯殑涓滆タ涓嶇煡閬撹涓嶈鏀�-->
+ <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="16" align="center" />
+ <el-table-column label="涓庢湰浜哄叧绯�" sortable width="270" align="center" />
+ <el-table-column label="濮撳悕" sortable width="270" align="center" />
+ <el-table-column label="鍗曚綅鍙婅亴鍔�" sortable width="270" align="center" />
+ <el-table-column label="鏀挎不闈㈣矊" sortable width="270" align="center">
</el-table-column>
</el-table>
+ </div>
+
+ <el-container>
+ <div style="width:100%"><h2 style="font-size:15px" >绉诲眳鍥斤紙澧冿級鎯呭喌</h2></div>
+
+ </el-container>
+
+ <div style="padding-top:30px">
+ <el-container>
+ <div style="width:100%"><h2 style="font-size:15px" >鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�</h2></div>
+ <el-button type="primary" icon="el-icon-edit" round></el-button>
+ <el-button type="primary" icon="el-icon-delete" round></el-button>
+ </el-container>
+ <!-- :data =""鍐呯殑涓滆タ涓嶇煡閬撹涓嶈鏀�-->
+ <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="16" align="center" />
+ <el-table-column label="璇佷欢鍚嶇О" sortable width="270" align="center" />
+ <el-table-column label="鎸佹湁鎯呭喌" sortable width="270" align="center" />
+ <el-table-column label="璇佷欢鍙风爜" sortable width="270" align="center" />
+ <el-table-column label="鏈夋晥鏈�" sortable width="270" align="center">
+ </el-table-column>
+ </el-table>
+ </div>
+ <div style="padding-top:30px">
+ <el-container>
+ <div style="width:100%"><h2 style="font-size:15px" >鍑哄浗锛堝锛夋儏鍐�</h2></div>
+ <el-button type="primary" icon="el-icon-edit" round></el-button>
+ <el-button type="primary" icon="el-icon-delete" round></el-button>
+ </el-container>
+ <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="16" align="center" />
+ <el-table-column label="璧锋鏃ユ湡" prop="startDate" sortable width="300" align="center" />
+ <el-table-column label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="content" sortable width="350" align="center" />
+ <el-table-column label="浜嬬敱锛堟梾娓搞�佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠栵級" prop="witness" sortable width="300" align="center" />
+ <el-table-column label="鍒犻櫎" align="center" class-name="small-padding fixed-width" sortable width="100">
+ </el-table-column>
+ </el-table>
+
+ </div>
<pagination
v-show="total>0"
:total="total"
@@ -206,7 +244,8 @@
</template>
<script>
-import {getIndividualInfo, getIndividualRelation, delIndividual, updateIndividual, addIndividual} from "@/api/self/index";
+import {getIndividualInfo, getIndividualRelation, delIndividual, updateIndividual, addIndividual,listExperience,updateExperience,
+ addExperience,delExperience} from "@/api/self/index";
export default {
name: 'index',
@@ -233,8 +272,8 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
- // 璧勪骇琛ㄦ牸鏁版嵁
- individualList: [],
+ // 涓汉缁忓巻鏁版嵁
+ experiencelList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -259,17 +298,19 @@
formData: {
nickName: undefined,
+ oldName: undefined,
sex: undefined,
nationality: undefined,
- oldName: undefined,
- field105: undefined,
+ nation: undefined,
maritalStatus: undefined,
- field107: undefined,
- field108: undefined,
- field109: undefined,
- field110: undefined,
- field111: undefined,
- field112: undefined,
+ idNum: undefined,
+ politicalOutlook: undefined,
+ phoneNumber: undefined,
+ locationAddress: undefined,
+ alwaysPolice: undefined,
+ alwaysAddress: undefined,
+ position: undefined,
+ locationPolice: undefined,
},
rules: {
nickName: [{
@@ -292,9 +333,14 @@
message: '璇疯緭鍏ユ浘鐢ㄥ悕',
trigger: 'blur'
}],
- field105: [{
+ nation: [{
required: true,
message: '璇疯緭鍏ユ皯鏃�',
+ trigger: 'blur'
+ }],
+ idNum: [{
+ // required: true,
+ message: '璇疯緭鍏ヨ韩浠借瘉鍙�',
trigger: 'blur'
}],
maritalStatus: [{
@@ -302,47 +348,44 @@
message: '璇疯緭鍏ュ濮荤姸鍐�',
trigger: 'blur'
}],
- field107: [{
+ phoneNumber: [{
// required: true,
message: '璇疯緭鍏ヨ仈绯绘柟寮�',
trigger: 'blur'
}],
- field108: [{
+ locationAddress: [{
// required: true,
message: '璇疯緭鍏ユ埛绫嶅湴鍧�',
trigger: 'blur'
}],
- field109: [{
+ locationPolice: [{
// required: true,
message: '璇疯緭鍏ユ埛绫嶅湴鍏畨鏈哄叧',
trigger: 'blur'
}],
- field110: [{
+ alwaysAddress: [{
// required: true,
message: '璇疯緭鍏ュ父浣忓湴鍧�',
trigger: 'blur'
}],
- field111: [{
+ alwaysPolice: [{
// required: true,
message: '璇疯緭鍏ュ父浣忓湴鍏畨鏈哄叧',
trigger: 'blur'
}],
- field112: [{
+ position: [{
// required: true,
message: '璇疯緭鍏ュ崟浣嶅強鑱屽姟鑱岀О',
trigger: 'blur'
}],
},
- // 鑿滃崟鍒楄〃
- menuOptions: [],
- // 閮ㄩ棬鍒楄〃
- deptOptions: [],
+
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
pageSize: 5,
- time:undefined,
- circumstance:undefined,
+ startDate:undefined,
+ content:undefined,
witness:undefined,
createTime:undefined
},
@@ -431,32 +474,19 @@
this.loading = true;
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- listIndividual(this.queryParams).then(response => {
+ listExperience(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.individualList = response.data.data;
+ this.experiencelList = response.data.data;
this.total = response.data.total;
this.loading = false;
}
+
);
},
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const Ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
- return delProperty(Ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 鏌ョ湅璇︾粏淇℃伅 */
- handleCheck(row){
- const id = row.id;
- this.$router.push("/family/note1/propertyInfo/" + id);
- },
+
}
}
</script>
--
Gitblit v1.9.1