| ruoyi-ui/src/layout/components/Navbar.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/store/modules/user.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/bignote/familyeventInfo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/device/equipmentInfo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/healthy/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/marry/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/note/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/note/propertyInfo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/self/memo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/self/show.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/system/user/profile/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/travel/edit.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/vue.config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-ui/src/layout/components/Navbar.vue
@@ -7,7 +7,7 @@ <div class="right-menu"> <template v-if="device!=='mobile'"> <search id="header-search" class="right-menu-item" /> <!-- <search id="header-search" class="right-menu-item" /> <el-tooltip content="源码地址" effect="dark" placement="bottom"> <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" /> @@ -16,7 +16,7 @@ <el-tooltip content="文档地址" effect="dark" placement="bottom"> <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" /> </el-tooltip> --> <screenfull id="screenfull" class="right-menu-item hover-effect" /> <el-tooltip content="布局大小" effect="dark" placement="bottom"> ruoyi-ui/src/store/modules/user.js
@@ -58,7 +58,8 @@ return new Promise((resolve, reject) => { getInfo().then(res => { const user = res.user const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; // (user.avatar == "" || user.avatar == null) ?: process.env.VUE_APP_BASE_API + user.avatar const avatar =require("@/assets/images/zhang.png") ; if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 commit('SET_ROLES', res.roles) commit('SET_PERMISSIONS', res.permissions) ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -48,6 +48,7 @@ multiple :http-request="requestUpload" :file-list="fileList" :on-change="handleChange" :disabled="!btn" :class="{ hide: !btn }" @@ -177,6 +178,7 @@ fileList:[ ], uploadFileList:[], fileListOther:[ ], @@ -397,15 +399,27 @@ this.isShow=false }, requestUpload(params) //自定义上传方法 handleChange(file, fileList) { //定义一个全局数组uploadFileList来做存储 this.uploadFileList.push(file.raw); console.log("=========5555=========") //console.log(file) console.log(this.uploadFileList) }, async requestUpload(params) { // alert(124) var file = params.file; var formData = new FormData(); formData.append('uploadFile', file); let _this = this //alert(34) this.uploading1 = true; uploadPic(formData).then(response => { await uploadPic(formData).then(response => { let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) _this.uploading1= false; console.log(_this.fot.includes(pth)) ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -40,8 +40,11 @@ </el-input> </el-form-item> <el-form-item label="是否注销" prop="status"> <el-select v-model="formData.status=== 1 ? '是':'否'" placeholder="请选择是否注销" clearable :style="{width: '100%'}" :disabled="dsb" > </el-select> <el-select v-model="formData.status" placeholder="请选择是/否" clearable :style="{width: '100%'}" :disabled="dsb" > <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value" ></el-option> </el-select> </el-form-item> <!-- <el-form-item label="家庭号" prop="familyId"> @@ -193,7 +196,7 @@ // 数据范围选项 fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx', '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'], fileList:[ ], fileListOther:[ @@ -214,6 +217,16 @@ url: undefined, happenTime:undefined }, typeOptions2: [ { value: '否', label: '否', }, { value: '是', label: '是', } ], desurl:'', dialogImageUrl: '', dialogVisible: false, @@ -290,6 +303,10 @@ getEquipmentInfo(id).then((response) => { this.formData = response.data; if(this.formData.status==1) this.formData.status = '是' else this.formData.status = '否' let paths = response.data.url.split(","); for(let i = 0; i < paths.length; i++) { @@ -336,18 +353,28 @@ this.formData.url = ul+","+uls this.$refs['elForm'].validate(valid => { if(this.formData.status=='是') this.formData.status = 1 else this.formData.status = 0 if (valid) { if (this.formData.id != undefined) { updateEquipment(this.formData).then(response => { this.$modal.msgSuccess("修改成功"); // this.open = false; if(this.formData.status==1) this.formData.status = '是' else this.formData.status = '否' this.btn=false }); } else { this.$modal.msgSuccess("修改失败"); if(this.formData.status==1) this.formData.status = '是' else this.formData.status = '否' } } }) @@ -459,7 +486,7 @@ updateEquipment(_this.formData).then(response => { this.$modal.msgSuccess("图片上传成功"); // this.open = false; }); })
@@ -126,7 +126,7 @@ </el-col> </el-row> <el-table v-loading="loading" :data="healthList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <el-table v-loading="loading" :data="healthList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <el-table-column type="selection" width="55" align="center" /> <el-table-column label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/> @@ -141,7 +141,7 @@ <el-table-column label="注意事项" prop="notice" sortable width="150" /> <el-table-column label="电子文件" prop="url" align="center" sortable width="150" > <template slot-scope="scope" > <div @click="handleCheck(scope.row)"> <div> <img class="el-upload-list__item-thumbnail" src="../../assets/images/deviceLis.png" ruoyi-ui/src/views/marry/index.vue
@@ -11,7 +11,7 @@ <el-divider /> <!-- 基本信息--> <h2 style="font-size:21px">基本情况</h2> <!-- <h2 style="font-size:21px">基本情况</h2> <el-container> <div style="padding-left:0px;width: 28%;" > <el-container > @@ -26,8 +26,7 @@ </el-row> <el-row :span="16"> <el-form-item label="出生日期" prop="birthday" label-width="75px"> <!-- <el-input v-model="marryList.birthday" placeholder="" type="date" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> --> <el-date-picker v-model="marryList.birthday" type="date" placeholder="请选择日期" @@ -119,47 +118,8 @@ <div style="padding-left:400px;padding-top:30px" > <el-container > <el-row :gutter="10" class="mb8"> <el-col > <el-button plain @click="handleEdit()" style="width: 80px;height: 32px;background: #E0EEFE;" v-if="isShow" v-hasPermi="['system:role:edit']" >编辑</el-button> <el-button v-if="isShow_2" style="width: 80px;height: 32px;background: #E0EEFE;" @click="submitForm" :disabled="dsb">完成</el-button> <br> </el-col> <el-col style="padding-top: 10px;"> <el-button plain style="width: 80px;height: 32px;background: #D2F3E0;" @click="handleExport" v-hasPermi="['family:note:export']" >导出</el-button></el-col> <el-col style="padding-top: 10px;"> <el-button plain style="width: 80px;height: 32px;background: #FFDDE3;" v-print="'#printable-content'" v-hasPermi="['family:note:export']" >打印</el-button></el-col> </el-row> </el-container> </div> <!-- </el-dialog> self:user:export--> </el-container> </el-container> --> <h2 style="font-size:16px " >配偶情况</h2> <el-container> <div style="padding-top:15px;width: 28%;" > @@ -259,8 +219,46 @@ </el-container> </div> <div style="padding-left:400px;padding-top:30px" > <el-container > <el-row :gutter="10" class="mb8"> <el-col > <el-button plain @click="handleEdit()" style="width: 80px;height: 32px;background: #E0EEFE;" v-if="isShow" v-hasPermi="['system:role:edit']" >编辑</el-button> <el-button v-if="isShow_2" style="width: 80px;height: 32px;background: #E0EEFE;" @click="submitForm" :disabled="dsb">完成</el-button> <br> </el-col> <el-col style="padding-top: 10px;"> <el-button plain style="width: 80px;height: 32px;background: #D2F3E0;" @click="handleExport" v-hasPermi="['family:note:export']" >导出</el-button></el-col> <el-col style="padding-top: 10px;"> <el-button plain style="width: 80px;height: 32px;background: #FFDDE3;" v-print="'#printable-content'" v-hasPermi="['family:note:export']" >打印</el-button></el-col> </el-row> </el-container> </div> <div style="padding-left:30px;padding-top:30px" > <el-container >
@@ -2,7 +2,7 @@ <div class="app-container"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form-item label="类型" prop="type"> <el-select v-model="queryParams.type" placeholder="请选择类别" clearable style="width: 200px; height: 35px; @@ -517,8 +517,9 @@ _this.typeOptions = [] getCategory().then(response=>{ console.log(response.data) // alert(9801) response.data.map(elem=>{ _this.typeOptions.push({"label":elem.type, "value":elem.type}) _this.typeOptions.push({"label":elem, "value":elem}) }) // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) @@ -679,7 +680,7 @@ }, /** 删除按钮操作 */ handleDelete(row) { alert(23) //alert(23) const Ids = row.id || this.ids; this.$modal.confirm('是否确认删除所选数据项？').then(function() { return delProperty(Ids); ruoyi-ui/src/views/note/propertyInfo.vue
@@ -304,10 +304,12 @@ { let _this = this getCategory().then(response=>{ response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) response.data.map(elem=>{ _this.typeOptions.push({"label":elem, "value":elem}) }) // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) // }) }) }, submitForm() { ruoyi-ui/src/views/self/memo.vue
@@ -1,323 +1,269 @@ <template> <div class="app-container"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form-item label="时间" prop="happenTime"> <el-date-picker v-model="dateRange" style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; opacity: 0.5;" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @keyup.enter.native="handleQuery" ></el-date-picker> </el-form-item> <el-form-item label="人物" prop="people"> <el-input v-model="queryParams.people" 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 label="地点" prop="address"> <el-input v-model="queryParams.address" 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 label="事件标题" prop="title"> <el-input v-model="queryParams.title" 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> <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3; border-radius: 7px 7px 7px 7px;opacity: 1; ">重置</el-button> </el-form-item> </el-form> <div> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> <div class="app-container" id="printable-content"> <h1 style="font-size:21px;padding-top:30px;display: flex;"> <span>个人简历</span> <div class="button-container" > <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:role:add']" >新增</el-button> </el-col> style="background: #E0EEFE; border-radius: 7px 7px 7px 7px;opacity: 1; margin-left: 20px;" @click="handleEdit()" v-if="isShow" v-hasPermi="['system:role:edit']" >编辑</el-button> <el-button v-if="isShow_2" size="mini" style=" width: 67px;height: 27px;background:#E0EEFE; border-radius: 7px 7px 7px 7px;opacity: 1;margin-left: 20px; "@click="submitForm" :disabled="dsb">完成</el-button> <el-col :span="1.5"> <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:role:remove']" >删除</el-button> </el-col> <el-col :span="1.5"> <el-button type="warning" plain icon="el-icon-download" size="mini" style=" width: 67px;height: 27px;background: #D2F3E0; border-radius: 7px 7px 7px 7px;opacity: 1;margin-left: 20px; " @click="handleExport" v-hasPermi="['family:note:export']" >导出</el-button> </el-col> <el-col :span="1.5"> <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportTemplate" style=" width: 67px;height: 27px;background: #FFDDE3; border-radius: 7px 7px 7px 7px;opacity: 1; margin-left: 20px;" v-print="'#printable-content'" v-hasPermi="['family:note:export']" >导入模板下载</el-button> </el-col> <el-col :span="1.5"> <el-upload action="" class="upload-demo" :show-file-list="false" :http-request="handleEnport" > <el-button size="mini" type="primary" plain icon="el-icon-top" >导入</el-button> </el-upload> </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> </div> <el-table v-loading="loading" :data="noteList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <el-table-column type="selection" :reserve-selection="true" width="55" align="center" /> <el-table-column fixed label="序号" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/> <el-table-column label="时间" prop="happenTime" sortable :show-overflow-tooltip="true" width="150" align="center" > <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template> </el-table-column> <el-table-column label="人物" prop="people" sortable :show-overflow-tooltip="true" width="150" align="center" > <template slot-scope="scope">{{scope.row.people? scope.row.people: '————'}}</template> </el-table-column> <el-table-column label="地点" prop="address" sortable :show-overflow-tooltip="true" width="160" align="center" > <template slot-scope="scope">{{scope.row.address? scope.row.address: '————'}}</template> </el-table-column> <el-table-column label="事件标题" prop="title" sortable :show-overflow-tooltip="true" width="160" align="center"> <template slot-scope="scope">{{scope.row.title? scope.row.title: '————'}}</template> </el-table-column> <el-table-column label="备注" prop="remark" sortable :show-overflow-tooltip="true" width="150" align="center"> <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template> </el-table-column> <el-table-column label="电子文件" prop="url" width="160" align="center"> <template slot-scope="scope" > <div @click="handleCheck(scope.row)"> <img class="el-upload-list__item-thumbnail" src="../../assets/images/deviceLis.png" alt="" style="width: 35px; height: 35px;" fit="cover" v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)" > <img v-else class="el-upload-list__item-thumbnail" src="../../assets/images/deviceA.png" alt="" style="width: 35px; height: 35px;" fit="cover" ></div> </template> </el-table-column> <!-- </el-table-column>--> <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width"> <template slot-scope="scope" v-if="scope.row.roleId !== 1"> <div class="button-container"> <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']" > <span style="font-size: 14px;">修改</span> </el-button> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']" ><span style="font-size: 14px;">删除</span></el-button> <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)"> <span style="font-size: 14px;">查看详情</span></el-button> </div> </template> </el-table-column> </el-table> <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" style="background: #FEF7FC;" @pagination="getList" /> <!-- 添加个人记事本配置对话框 --> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> <el-form-item label="时间" prop="happenTime"> <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期" :editable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" ></el-date-picker></el-form-item> <el-form-item label="人物" prop="people"> <el-input v-model="formDat.people" placeholder="请输入人物" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="地点" prop="address"> <el-input v-model="formDat.address" placeholder="请输入地点" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="事件标题" prop="title"> <el-input v-model="formDat.title" placeholder="请输入时间标题" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="备注" prop="remark"> <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input> </el-form-item> <h4 class="form-header">相关图片 </h4> <el-upload action="#" accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif" list-type="picture-card" multiple :http-request="requestUpload" :file-list="fileList" > <i slot="default" class="el-icon-plus"></i> <div slot="file" slot-scope="{ file }"> <template v-if="fileList"> <img class="el-upload-list__item-thumbnail" :src="file.url" alt="" style="width: 100%; height: 100%; object-fit: cover;" fit="cover" :preview-src-list="[file.url]" > </template> <span class="el-upload-list__item-actions"> <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)" > <i class="el-icon-zoom-in"></i> </span> <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)" > <i class="el-icon-delete"></i> </span> </span> </div> </el-upload> <h4 class="form-header">其他附件 </h4> <el-upload action="" :file-list="fileListOther" class="upload-demo" multiple :on-remove="handleRemove" :http-request="requestUpload1" :show-file-list="true" > <el-button type="primary">点击上传</el-button> <div v-if="uploading1" class="upload-status">正在上传...</div> <template #tip> <div class="el-upload__tip"> </div> </template> </el-upload> </el-form> <h4 class="form-header"> </h4> <div slot="footer" class="dialog-footer"> <el-button type="primary" @click="submitDataScope">保 存</el-button> <el-button @click="cancelData">取 消</el-button> >打印</el-button> </div> </el-dialog> <!-- 分配角色数据权限对话框 --> <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body> </h1> <el-divider /> <h2 style="font-size:16px">基本信息</h2> <el-container> <div > <el-container> <el-col > <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left" v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" > <el-row :span="6"> <el-form-item label="姓名" prop="nickName" label-width="40px"> <el-input v-model="individualList.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="6"> <el-form-item label="曾用名" prop="oldName" label-width="60px"> <el-input v-model="individualList.oldName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="6"> <el-form-item label="身份证号" prop="idNum" label-width="70px"> <el-input v-model="individualList.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-form> </el-col> </el-container> </div> <div style="padding-left:60px"> <el-container> <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left"> <el-row :span="5"> <el-form-item label="性别" prop="sex" label-width="40px"> <!-- <el-input v-model="individualList.sex === 1 ? '男':'女' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">--> <!-- </el-input>--> <template v-if="!isEditing"> <el-input v-model="individualList.sex === 1 ? inds='男':inds='女'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> </template> <template v-else> <el-select v-model="inds" placeholder="请选择性别" clearable :style="{width: '100%'}" :disabled="dsb"> <el-option label="男" value='1'></el-option> <el-option label="女" value='0'></el-option> </el-select> </template> </el-form-item> </el-row> <el-row :span="5"> <el-form-item label="民族" prop="nation"label-width="40px"> <el-input v-model="individualList.nation" placeholder="" clearable :style="{width: '100%'}":disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="5"> <el-form-item label="联系方式" prop="phoneNumber" label-width="70px"> <el-input v-model="individualList.phoneNumber" placeholder="" clearable :style="{width: '100%'}":disabled="dsb"> </el-input> </el-form-item> </el-row> </el-form> </el-col> </el-container> </div> <div style="padding-left:60px"> <el-container> <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left":disabled="dsb"> <el-row :span="5"> <el-form-item label="国籍" prop="nationality" label-width="40px"> <el-input v-model="individualList.nationality" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="5"> <el-form-item label="婚姻状况" prop="maritalStatus" label-width="70px"> <template v-if="!isEditing" > <el-input v-if="individualList.maritalStatus===0" placeholder="未婚"></el-input> <el-input v-if="individualList.maritalStatus===1" placeholder="已婚"></el-input> <el-input v-if="individualList.maritalStatus===2" placeholder="未婚"></el-input> </el-dialog> </template> <template v-else> <el-select v-model="mrs" placeholder="请选择性别" clearable :style="{width: '100%'}"> <el-option label="未婚" value='0'></el-option> <el-option label="已婚" value='1'></el-option> <el-option label="离婚" value='2'></el-option> </el-select> </template> </el-form-item> </el-row> </div> </el-form> </el-col> </el-container> </div> <div style="padding-left:100px;padding-top:30px"> <el-col :span="6" :data="individualList"> <div class="block" :model="individualList"> <el-upload ref="uploadDemo" action="" :file-list="fileList" list-type="picture-card" accept="image/*" :multiple="false" :http-request="requestUpload" :on-success="handleSucess" :limit="1"> <el-avatar shape="square" style="width: 200px;;height: 200px;" > <el-image :src="'https://www.bendudu.com:8080/'+ individualList.url" :fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);" ></el-image> </el-avatar> </el-upload> </div> </el-col> </div> <div style="padding-left:30px;padding-top:30px" > </div> <!-- </el-dialog> self:user:export--> </el-container> <el-container> <div> <el-container> <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left"> <el-row :span="16" > <el-form-item label="单位" prop="unit" label-width="40px"> <el-input v-model="individualList.unit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="16"> <el-form-item label="户籍地址" prop="locationAddress" label-width="70px"> <el-input type="textarea" v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="28"> <el-form-item label="常住地址" prop="alwaysAddress" label-width="70px"> <el-input type="textarea" v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-form> </el-col> </el-container> </div> <div style="padding-left:60px"> <el-container> <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left"> <el-row :span="12" > <el-form-item label="职务职称" prop="position" label-width="70px"> <el-input v-model="individualList.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="12"> <el-form-item label="户籍地公安机关" prop="locationPolice" label-width="110px"> <el-input type="textarea" v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="12"> <el-form-item label="常住地公安机关" prop="alwaysPolice" label-width="110px"> <el-input type="textarea" v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-form> </el-col> </el-container> </div> </el-container> <!--折叠面板--> <el-collapse > <el-collapse-item title="移居国（境）情况" name="3" > <div> <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form-item label="是否拥有外籍、境外居留权、长期居留许可" > <el-radio-group v-model="individualList.outStatus" style="margin-bottom: 0;color: #FEF7FC;" :disabled="dsb"> <el-radio :label="1">是</el-radio> <el-radio :label="0">否</el-radio> </el-radio-group> <el-container > <el-row :span="7"> <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form-item label="证件号码" prop="idNo" label-width="70px"> <el-input v-model="individualList.idNo" style="color: #FEF7FC;" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-form> </el-row> </el-container> </el-form-item> </el-form> </div> </el-collapse-item> </el-collapse> </div> </template> <script> import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role"; import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"; //导入接口函数 import { getIndividualList, addIndividual, updateIndividual, delIndividual, listExperience, addExperience, updateExperience, delExperience, getIndividualRelation, addRelation, updateRelation, delRelation, getCertificateList, addCertificate, updateCertificate, delCertificate, getAbroadList, addAbroad, updateAbroad, delAbroad, listType, getAutobiographyList, getAutobiographyTermList, addAutobiography, updateAutobiography,delAutobiography, getCategory, } from "@/api/self/index"; import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic} from "@/api/memo/index"; import { Notification, MessageBox, Message, Loading } from 'element-ui' @@ -328,11 +274,14 @@ return { // 遮罩层 disabled: false, inds:undefined, //婚姻类别 mrs:undefined, loading: true, formData:[], // 选中数组 ids: [], fit:['cover'], // 非单个禁用 single: true, // 非多个禁用 @@ -359,12 +308,108 @@ fot:[".jpg",".jif"], fileList:[], fileListOther:[], dsb:true, btn:false, uploading: false, uploading1: false, fit:['fill'], keyword:'', rules: { //基本信息 nickName: [{ // required: true, message: '请输入姓名', trigger: 'blur' }], oldName: [{ // required: true, message: '请输入曾用名', trigger: 'blur' }], idNum: [{ // required: true, message: '请输入身份证号', trigger: 'blur' }], nationality: [{ // required: true, message: '请输入国籍', trigger: 'blur' }], maritalStatus: [{ // required: true, message: '请输入婚姻状况', trigger: 'blur' }], locationAddress: [{ // required: true, message: '请输入户籍地址', trigger: 'blur' }], alwaysAddress: [{ // required: true, message: '请输入常住地址', trigger: 'blur' }], unit: [{ // required: true, message: '请输入单位', trigger: 'blur' }], position: [{ // required: true, message: '请输入职务职称', trigger: 'blur' }], locationPolice: [{ // required: true, message: '请输入户籍地公安机关', trigger: 'blur' }], alwaysPolice: [{ // required: true, message: '请输入常住地公安机关', trigger: 'blur' }], //主要学习及工作经历 startDate: [{ required: true, message: '请输入起始日期', trigger: 'blur' }], endDate: [{ // required: true, message: '请输入结束日期', trigger: 'blur' }], content: [{ required: true, message: '请输入文本', trigger: 'blur' }], witness: [{ required: true, message: '请输入证明人', trigger: 'blur' }], //自传 term: [{ required: true, message: '请输入时期', trigger: 'blur' }], ageBegin: [{ required: true, message: '', trigger: 'blur' }], ageEnd: [{ required: true, message: '', trigger: 'blur' }], }, formDat: { //个人记事本详情 id:undefined, @@ -375,6 +420,7 @@ remark:undefined, url: undefined, }, individualList:[], // 菜单列表 menuOptions: [], // 部门列表 @@ -427,66 +473,44 @@ }], }, typeOptions: [], isShow:true, dsb:true, btn: false, isShow_2:false, isEdit1:false, isEditing: false, fileList:[] }; }, created() { this.getList(); this.getCateInfor() // for (let i = 0; i < this.contactList.length; i++) { // this.formDat[i] = this.contactList[i]; // } }, methods: { // 取消按钮 cancelData() { this.open = false; this.reset(); }, //隔行变色 tableRowClassName({ row, rowIndex }) { if (rowIndex % 2 == 0) { return "statistics-warning-row1"; } else { return "statistics-warning-row"; } }, /** 查询记录列表 */ getList() { this.loading = true; this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0] this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1] // console.log(this.queryParams) // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listNote(this.queryParams).then(response => { // alert(123) // console.log(response.data) this.noteList = response.data.data; this.total = response.data.total; this.loading = false; } ); }, /** 查询类别信息 */ getCateInfor() { let _this = this getCategory().then(response=>{ //个人信息 getIndividualList(this.queryParams).then(response => { // alert(123) // console.log(response.data) _this.individualList = response.data; response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) }) }) // this.total = response.data.total; _this.loading = false; } ); }, handleRemove(file) { for(let i = 0; i < this.fileList.length; i++) { if(this.fileList[i].url==file.url) this.$delete(this.fileList,i); } }, // 取消按钮 cancel() { this.open = false; @@ -496,201 +520,171 @@ { return row.id }, // 取消按钮（数据权限） cancelDataScope() { this.openDataScope = false; this.reset(); // 编辑按钮 handleEdit() { this.dsb = false this.btn = true this.isShow=false this.isShow_2=true this.isEditing=true if(this.individualList.maritalStatus == 0) this.mrs = '未婚' else if(this.individualList.maritalStatus == 1) this.mrs = '已婚' else this.mrs = '离婚'// this.isEdit=false }, // 表单重置 reset() { if (this.$refs.menu != undefined) { this.$refs.menu.setCheckedKeys([]); } this.menuExpand = false, this.menuNodeAll = false, this.deptExpand = true, this.deptNodeAll = false, this.form = { roleId: undefined, roleName: undefined, roleKey: undefined, roleSort: 0, status: "0", menuIds: [], deptIds: [], menuCheckStrictly: true, deptCheckStrictly: true, remark: undefined }; this.resetForm("form"); /** 导出按钮操作 */ handleExport() { this.download('/self/user/export', { ...this.queryParams }, `self_${new Date().getTime()}.xlsx`) }, //个人基本信息 submitForm() { if(this.inds=='1') this.individualList.sex = 1; else this.individualList.sex = 0; if(this.mrs=='0') this.individualList.maritalStatus = 0 else if(this.mrs == '1') this.individualList.maritalStatus = 1 else this.individualList.maritalStatus = 2 // alert(10) // let ul = this.fileList.map(function (elem){ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") // }).join(",") // let uls = this.fileListOther.map(function (elem){ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") // }).join(",") // // this.individualList.url = ul+","+uls // console.log(this.individualList) this.$refs['elForm'].validate(valid => { if (valid) { if (this.individualList.userId !== undefined) { updateIndividual(this.individualList).then(response => { this.$modal.msgSuccess("修改成功"); // 强制更新相关组件 this.individualList={...this.individualList} // this.open = false; this.dsb = true this.btn=false this.isShow_2=false this.isShow=true this.isEditing = false }); } else { this.$modal.msgSuccess("修改失败"); } } }) // 刷新页面 // window.location.reload(); }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; this.getList(); }, /** 重置按钮操作 */ resetQuery() { this.dateRange = []; this.resetForm("queryForm"); this.handleQuery(); }, // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) console.log(this.ids) this.single = selection.length!=1 this.multiple = !selection.length }, // //每次改变input框值时就改变this.myTableData的值 // inputChange() { //循环每一项 只要content的值含有输入的searchVal值，就加进newList；反之，就无东西加进newList // let newlist = this.formDat.filter( // (item) => item.content.indexOf(this.searchVal) > -1 // ); // this.contactList = newlist; // }, /** 新增按钮操作 */ handleAdd() { this.reset(); this.open = true; this.title = "添加个人记事本详细信息"; }, /** 查看详细信息 */ handleCheck(row){ const id = row.id; this.$router.push("/self/self/memoInfo/" + id); }, /** 修改按钮操作 */ handleUpdate(row) { const id = row.id; let jd = true this.$router.push({ path:"/self/self/memoInfo/" + id, query:{ detail:jd } }); }, handlePictureCardPreview(file) { this.dialogImageUrl = file.url; this.dialogVisible = true; }, /** 提交按钮（数据权限） */ submitDataScope: function() { let ul = this.fileList.map(function (elem){ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }).join(",") let uls = this.fileListOther.map(function (elem){ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }).join(",") this.formDat.url = ul+","+uls this.$refs["elForm"].validate(valid => { if (valid) { addNote(this.formDat).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false; // 清空formDat对象的数据 Object.keys(this.formDat).forEach(key => { this.formDat[key] = ''; }); for(let i = 0; i <= this.fileList.length; i++) { this.handleRemove(this.fileList[0]); } for(let i = 0; i < this.fileListOther.length; i++){ this.handleRemoveFile(this.fileListOther[0]); } this.getList(); }); } }); }, requestUpload(params) requestUpload(params) { var file = params.file; var formData = new FormData(); formData.append('uploadFile', file); let _this = this this.uploading = true; // console.log(this.individualList) this.$refs.uploadDemo.clearFiles(); // alert(234) uploadPic(formData).then(response => { // alert(response.data.url) // alert(response.data.originalFilename) let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) this.uploading = false; this.$modal.msgSuccess("上传成功"); if(_this.fot.includes(pth) === true) { _this.fileList.push({name:response.data.fileName, "url":response.data.url}) } }) }, requestUpload1(params) { var file = params.file; var formData = new FormData(); formData.append('uploadFile', file); let _this = this this.uploading1 = true; uploadPic(formData).then(response => { let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) this.uploading1 = false; this.$modal.msgSuccess("上传成功"); if(_this.fot.includes(pth) !== true) { _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) else{ _this.fileList.push({name:response.data.fileName, url:response.data.url}) } _this.individualList.img = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") _this.individualList.url = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") updateIndividual(_this.individualList).then(response => { // 将选中选项的文本设置为"term"字段的值 // this.formDat.term = selectedOption.value; // this.formDat.id = selectedOption.id; console.log("1") _this.$modal.msgSuccess("修改成功"); _this.dialogVisible.autobiography = false; _this.isEdit1 = false; _this.getList(); }).catch(error => { console.log(error); _this.isEdit1 = false; _this.dialogVisible.autobiography = false; }); }) }, /** 删除按钮操作 */ handleDelete(row) { const Ids = row.id || this.ids; this.$modal.confirm('是否确认删除数据项？').then(function() { return delNote(Ids); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); }).catch(() => {}); }, /** 导出按钮操作 */ handleExport() { const Ids = this.ids; if(Ids.length==0) { this.download('/zSelfNote/export', { ...this.queryParams }, `zSelfNote${new Date().getTime()}.xlsx`) }else{ this.download('/zSelfNote/export1/'+Ids, { }, //头像修改 uploadImage() { const inputElement = document.createElement("input"); inputElement.type = "file"; inputElement.accept = "image/*"; inputElement.style.display = "none"; document.body.appendChild(inputElement); }, `zSelfNote${new Date().getTime()}.xlsx`) } inputElement.addEventListener("change", () => { const file = inputElement.files[0]; if (file) { const formData = new FormData(); formData.append("image", file); // 调用uploadPic接口上传图片 axios.post("/common/upload", formData, { headers: { "Content-Type": "multipart/form-data" } }).then(response => { // 上传成功，获取新图片的URL const newImageUrl = response.data.img; // 假设individualList是一个对象，更新individualList.img this.individualList.img = newImageUrl; // 假设fileList是一个数组，更新fileList中对应的图片URL // const index = this.fileList.findIndex(item => item.id === fileId); // this.fileList[index].url = newImageUrl; // 清除input元素并移除事件监听 document.body.removeChild(inputElement); inputElement.removeEventListener("change", null); }).catch(error => { console.error("上传失败:", error); // 清除input元素并移除事件监听 document.body.removeChild(inputElement); inputElement.removeEventListener("change", null); }); } }); // 触发点击事件，显示文件选择对话框 inputElement.click(); }, handleExportTemplate(){ this.download('/zSelfNote/model', { }, `zSelfNote${new Date().getTime()}.xlsx`) }, /** 导入操作*/ handleEnport(params){ var file = params.file; var formData = new FormData(); formData.append('excelImport', file); let _this = this enload(formData).then(response => { _this.getList(); Message({ message: "导入成功", type: 'warning' }) }).catch(() => { Message({ message: "导入失败", type: 'error' })}); } } }; </script> ruoyi-ui/src/views/self/show.vue
@@ -1,7 +1,5 @@ <template> <div class="app-container" id="printable-content"> <!-- 刷新页面 --> <!-- <MyComponent :key="componentKey" />--> <div class="app-container"> <!-- 回到顶部--> <el-backtop :bottom="150" :right="30"> <el-button type="primary" circle @@ -48,202 +46,325 @@ </div> </h1> <el-divider /> <!-- 基本信息--> <h2 style="font-size:16px">基本信息</h2> <el-container> <div > <el-container > <el-col > <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left" v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" > <el-row :span="6"> <el-form-item label="姓名" prop="nickName" label-width="40px"> <el-input v-model="individualList.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="6"> <el-form-item label="曾用名" prop="oldName" label-width="60px"> <el-input v-model="individualList.oldName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="6"> <el-form-item label="身份证号" prop="idNum" label-width="70px"> <el-input v-model="individualList.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-form> </el-col> </el-container> </div> <div style="padding-left:60px"> <el-container> <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left"> <el-row :span="5"> <el-form-item label="性别" prop="sex" label-width="40px"> <!-- <el-input v-model="individualList.sex === 1 ? '男':'女' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">--> <!-- </el-input>--> <template v-if="!isEditing"> <el-input v-model="individualList.sex === 1 ? inds='男':inds='女'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> </template> <template v-else> <el-select v-model="inds" placeholder="请选择性别" clearable :style="{width: '100%'}" :disabled="dsb"> <el-option label="男" value='1'></el-option> <el-option label="女" value='0'></el-option> </el-select> </template> </el-form-item> </el-row> <el-row :span="5"> <el-form-item label="民族" prop="nation"label-width="40px"> <el-input v-model="individualList.nation" placeholder="" clearable :style="{width: '100%'}":disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="5"> <el-form-item label="联系方式" prop="phoneNumber" label-width="70px"> <el-input v-model="individualList.phoneNumber" placeholder="" clearable :style="{width: '100%'}":disabled="dsb"> </el-input> </el-form-item> </el-row> </el-form> </el-col> </el-container> </div> <div style="padding-left:60px"> <el-container> <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left":disabled="dsb"> <el-row :span="5"> <el-form-item label="国籍" prop="nationality" label-width="40px"> <el-input v-model="individualList.nationality" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="5"> <el-form-item label="婚姻状况" prop="maritalStatus" label-width="70px"> <template v-if="!isEditing" > <el-input v-if="individualList.maritalStatus===0" placeholder="未婚"></el-input> <el-input v-if="individualList.maritalStatus===1" placeholder="已婚"></el-input> <el-input v-if="individualList.maritalStatus===2" placeholder="未婚"></el-input> <!-- 刷新页面 --> <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch"> </template> <template v-else> <el-select v-model="mrs" placeholder="请选择性别" clearable :style="{width: '100%'}"> <el-option label="未婚" value='0'></el-option> <el-option label="已婚" value='1'></el-option> <el-option label="离婚" value='2'></el-option> </el-select> </template> </el-form-item> </el-row> <el-form-item label="时间" prop="happenTime"> <el-date-picker v-model="dateRange" style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; opacity: 0.5;" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @keyup.enter.native="handleQuery" ></el-date-picker> </el-form-item> <el-form-item label="人物" prop="people"> <el-input v-model="queryParams1.people" 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> </el-col> </el-container> </div> <div style="padding-left:100px;padding-top:30px"> <el-col :span="6" :data="individualList"> <div class="block" :model="individualList"> <el-form-item label="地点" prop="address"> <el-input v-model="queryParams1.address" 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 label="事件标题" prop="title"> <el-input v-model="queryParams1.title" 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> <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3; border-radius: 7px 7px 7px 7px;opacity: 1; ">重置</el-button> </el-form-item> </el-form> <div> <el-upload ref="uploadDemo" action="" :file-list="fileList1" list-type="picture-card" accept="image/*" :multiple="false" :http-request="requestUpload" :on-success="handleSucess" :limit="1"> <el-avatar shape="square" style="width: 200px;;height: 200px;" > <el-image :src="'https://www.bendudu.com:8080/'+ individualList.url" :fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);" ></el-image> </el-avatar> </el-upload> <div class="edit-text" v-if="isEditing" @click="uploadImage">点击更换图片</div> </div> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd1" v-hasPermi="['system:role:add']" >新增</el-button> </el-col> <el-col :span="1.5"> <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete1" v-hasPermi="['system:role:remove']" >删除</el-button> </el-col> <el-col :span="1.5"> <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportm" v-hasPermi="['family:note:export']" >导出</el-button> </el-col> <el-col :span="1.5"> <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportTemplatem" v-hasPermi="['family:note:export']" >导入模板下载</el-button> </el-col> <el-col :span="1.5"> <el-upload action="" class="upload-demo" :show-file-list="false" :http-request="handleEnportm" > <el-button size="mini" type="primary" plain icon="el-icon-top" >导入</el-button> </el-upload> </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> </div> <el-table v-loading="loading" :data="noteList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <el-table-column type="selection" :reserve-selection="true" width="55" align="center" /> <el-table-column fixed label="序号" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/> <el-table-column label="时间" prop="happenTime" sortable :show-overflow-tooltip="true" width="150" align="center" > <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template> </el-table-column> <el-table-column label="人物" prop="people" sortable :show-overflow-tooltip="true" width="150" align="center" > <template slot-scope="scope">{{scope.row.people? scope.row.people: '————'}}</template> </el-table-column> <el-table-column label="地点" prop="address" sortable :show-overflow-tooltip="true" width="160" align="center" > <template slot-scope="scope">{{scope.row.address? scope.row.address: '————'}}</template> </el-table-column> <el-table-column label="事件标题" prop="title" sortable :show-overflow-tooltip="true" width="160" align="center"> <template slot-scope="scope">{{scope.row.title? scope.row.title: '————'}}</template> </el-table-column> <el-table-column label="备注" prop="remark" sortable :show-overflow-tooltip="true" width="150" align="center"> <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template> </el-table-column> <el-table-column label="电子文件" prop="url" width="160" align="center"> <template slot-scope="scope" > <div @click="handleCheck1(scope.row)"> <img class="el-upload-list__item-thumbnail" src="../../assets/images/deviceLis.png" alt="" style="width: 35px; height: 35px;" fit="cover" v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)" > <img v-else class="el-upload-list__item-thumbnail" src="../../assets/images/deviceA.png" alt="" style="width: 35px; height: 35px;" fit="cover" ></div> </template> </el-table-column> <!-- </el-table-column>--> <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width"> <template slot-scope="scope" v-if="scope.row.roleId !== 1"> <div class="button-container"> <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate1(scope.row)" v-hasPermi="['system:role:edit']" > <span style="font-size: 14px;">修改</span> </el-button> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete1(scope.row)" v-hasPermi="['system:role:remove']" ><span style="font-size: 14px;">删除</span></el-button> <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck1(scope.row)"> <span style="font-size: 14px;">查看详情</span></el-button> </div> </template> </el-table-column> </el-table> <pagination v-show="totalm>0" :total="totalm" :page.sync="queryParams1.pageNum" :limit.sync="queryParams1.pageSize" style="background: #FEF7FC;" @pagination="getList" /> <!-- 添加个人记事本配置对话框 --> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> <el-form-item label="时间" prop="happenTime"> <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期" :editable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" ></el-date-picker></el-form-item> <el-form-item label="人物" prop="people"> <el-input v-model="formDat.people" placeholder="请输入人物" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="地点" prop="address"> <el-input v-model="formDat.address" placeholder="请输入地点" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="事件标题" prop="title"> <el-input v-model="formDat.title" placeholder="请输入时间标题" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="备注" prop="remark"> <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input> </el-form-item> <h4 class="form-header">相关图片 </h4> <el-upload action="#" accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif" list-type="picture-card" multiple :http-request="requestUploadm" :file-list="fileList" > <i slot="default" class="el-icon-plus"></i> <div slot="file" slot-scope="{ file }"> <template v-if="fileList"> <img class="el-upload-list__item-thumbnail" :src="file.url" alt="" style="width: 100%; height: 100%; object-fit: cover;" fit="cover" :preview-src-list="[file.url]" > </template> <span class="el-upload-list__item-actions"> <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)" > <i class="el-icon-zoom-in"></i> </span> <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)" > <i class="el-icon-delete"></i> </span> </span> </div> </el-upload> <h4 class="form-header">其他附件 </h4> <el-upload action="" :file-list="fileListOther" class="upload-demo" multiple :on-remove="handleRemove" :http-request="requestUpload1m" :show-file-list="true" > <el-button type="primary">点击上传</el-button> <div v-if="uploading1" class="upload-status">正在上传...</div> <template #tip> <div class="el-upload__tip"> </div> </template> </el-upload> </el-form> <h4 class="form-header"> </h4> <div slot="footer" class="dialog-footer"> <el-button type="primary" @click="submitDataScopem">保 存</el-button> <el-button @click="cancelData">取 消</el-button> </div> </el-dialog> <div style="padding-left:30px;padding-top:30px" > <!-- 分配角色数据权限对话框 --> <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body> </div> <!-- </el-dialog> self:user:export--> </el-container> <el-container> <div> <el-container> <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left"> <el-row :span="16" > <el-form-item label="单位" prop="unit" label-width="40px"> <el-input v-model="individualList.unit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="16"> <el-form-item label="户籍地址" prop="locationAddress" label-width="70px"> <el-input type="textarea" v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-dialog> <el-row :span="28"> <el-form-item label="常住地址" prop="alwaysAddress" label-width="70px"> <el-input type="textarea" v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <!-- <MyComponent :key="componentKey" />--> <!-- 基本信息--> </el-form> </el-col> </el-container> </div> <div style="padding-left:60px"> <el-container> <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left"> <el-row :span="12" > <el-form-item label="职务职称" prop="position" label-width="70px"> <el-input v-model="individualList.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="12"> <el-form-item label="户籍地公安机关" prop="locationPolice" label-width="110px"> <el-input type="textarea" v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="12"> <el-form-item label="常住地公安机关" prop="alwaysPolice" label-width="110px"> <el-input type="textarea" v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-form> </el-col> </el-container> </div> </el-container> <!--折叠面板--> <el-collapse v-model="activeNames" @change="handleChange"> <el-collapse-item title="移居国（境）情况" name="3" > <!-- <el-collapse-item title="移居国（境）情况" name="3" > <div> <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form-item label="是否拥有外籍、境外居留权、长期居留许可" > @@ -266,7 +387,7 @@ </div> </el-collapse-item> </el-collapse-item> --> <!--主要学习及工作经历--> <el-collapse-item name="1" > @@ -730,7 +851,14 @@ getAutobiographyList, getAutobiographyTermList, addAutobiography, updateAutobiography,delAutobiography, getCategory, } from "@/api/self/index"; import { delFamilyevent, uploadPic } from '../../api/bignote' // import { listRole, getRole, delRole, addRole, updateRole, dataScope,changeRoleStatus, deptTreeSelect } from "@/api/system/role"; // import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"; //导入接口函数 import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic} from "@/api/memo/index"; import { Notification, MessageBox, Message, Loading } from 'element-ui' //import { delFamilyevent, uploadPic } from '../../api/bignote' import { blobValidate } from '../../utils/ruoyi' @@ -761,6 +889,7 @@ showSearch: true, // 总条数 total: 0, totalm: 0, //头像上传 showBtnDealImg:true, noneBtnImg:false, @@ -824,7 +953,7 @@ // 数据范围选项 fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx', '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'], fileList:[], fileListOther:[], dsb:true, @@ -893,6 +1022,17 @@ menuOptions: [], // 部门列表 deptOptions: [], queryParams1: { pageNum: 1, pageSize: 10, happenTime:undefined, people:undefined, address:undefined, title:undefined, remark:undefined }, // 个人记事本表格数据 noteList: [], // 查询参数 queryParams: { pageNum: 1, @@ -1101,6 +1241,22 @@ /** 查询角色列表 */ getList() { this.loading = true; this.queryParams1.happenStartTime = this.dateRange.length > 0 && this.dateRange[0] this.queryParams1.happenEndTime = this.dateRange.length > 0 && this.dateRange[1] // console.log(this.queryParams) // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listNote(this.queryParams1).then(response => { alert(321) // console.log(response.data) this.noteList = response.data.data; this.totalm = response.data.total; this.loading = false; } ); this.loading = true; // console.log(this.queryParams) // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => { //个人经历 @@ -1122,16 +1278,15 @@ _this.loading = false; } ); //个人信息 getIndividualList(this.queryParams).then(response => { // alert(123) // console.log(response.data) _this.individualList = response.data; getIndividualList(this.queryParams).then(response => { // alert(123) // console.log(response.data) _this.individualList = response.data; // this.total = response.data.total; _this.loading = false; } ); // this.total = response.data.total; _this.loading = false; } ); //出入境证件情况 getCertificateList(this.queryParams).then(response => { // alert(123) @@ -1249,7 +1404,141 @@ this.single = selection.length!=1 this.multiple = !selection.length }, /** 新增按钮操作 */ handleAdd1() { this.reset(); this.open = true; this.title = "添加个人记事本详细信息"; }, /** 查看详细信息 */ handleCheck1(row){ const id = row.id; this.$router.push("/self/self/memoInfo/" + id); }, /** 修改按钮操作 */ handleUpdate1(row) { const id = row.id; let jd = true this.$router.push({ path:"/self/self/memoInfo/" + id, query:{ detail:jd } }); }, requestUploadm(params) { var file = params.file; var formData = new FormData(); formData.append('uploadFile', file); let _this = this this.uploading = true; uploadPic(formData).then(response => { let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) this.uploading = false; this.$modal.msgSuccess("上传成功"); if(_this.fot.includes(pth) === true) { _this.fileList.push({name:response.data.fileName, "url":response.data.url}) } }) }, requestUpload1m(params) { var file = params.file; var formData = new FormData(); formData.append('uploadFile', file); let _this = this this.uploading1 = true; uploadPic(formData).then(response => { let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) this.uploading1 = false; this.$modal.msgSuccess("上传成功"); if(_this.fot.includes(pth) !== true) { _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) } }) }, /** 导出按钮操作 */ handleExportm() { const Ids = this.ids; if(Ids.length==0) { this.download('/zSelfNote/export', { ...this.queryParams }, `zSelfNote${new Date().getTime()}.xlsx`) }else{ this.download('/zSelfNote/export1/'+Ids, { }, `zSelfNote${new Date().getTime()}.xlsx`) } }, handleExportTemplatem(){ this.download('/zSelfNote/model', { }, `zSelfNote${new Date().getTime()}.xlsx`) }, /** 导入操作*/ handleEnportm(params){ var file = params.file; var formData = new FormData(); formData.append('excelImport', file); let _this = this enload(formData).then(response => { _this.getList(); Message({ message: "导入成功", type: 'warning' }) }).catch(() => { Message({ message: "导入失败", type: 'error' })}); }, /** 提交按钮（数据权限） */ submitDataScopem: function() { let ul = this.fileList.map(function (elem){ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }).join(",") let uls = this.fileListOther.map(function (elem){ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }).join(",") this.formDat.url = ul+","+uls this.$refs["elForm"].validate(valid => { if (valid) { addNote(this.formDat).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false; // 清空formDat对象的数据 Object.keys(this.formDat).forEach(key => { this.formDat[key] = ''; }); for(let i = 0; i <= this.fileList.length; i++) { this.handleRemove(this.fileList[0]); } for(let i = 0; i < this.fileListOther.length; i++){ this.handleRemoveFile(this.fileListOther[0]); } this.getList(); }); } }); }, /** 删除按钮操作 */ handleDelete1(row) { const Ids = row.id || this.ids; this.$modal.confirm('是否确认删除数据项？').then(function() { return delNote(Ids); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); }).catch(() => {}); }, //个人记事本 toMemo(){ this.$router.push("/self/self/memo/" + this.individualList.userId); @@ -1291,21 +1580,7 @@ saveAs(blob, filename) }) }, // 编辑按钮 handleEdit() { this.dsb = false this.btn = true this.isShow=false this.isShow_2=true this.isEditing=true if(this.individualList.maritalStatus == 0) this.mrs = '未婚' else if(this.individualList.maritalStatus == 1) this.mrs = '已婚' else this.mrs = '离婚'// this.isEdit=false }, /** 查询自传信息 */ getAutobiographyInfor() @@ -1446,95 +1721,8 @@ this.$set(this.editStatus, row.id, true); }, //修改后的保存 //个人基本信息 submitForm() { if(this.inds=='1') this.individualList.sex = 1; else this.individualList.sex = 0; if(this.mrs=='0') this.individualList.maritalStatus = 0 else if(this.mrs == '1') this.individualList.maritalStatus = 1 else this.individualList.maritalStatus = 2 // let ul = this.fileList.map(function (elem){ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") // }).join(",") // let uls = this.fileListOther.map(function (elem){ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") // }).join(",") // // this.individualList.url = ul+","+uls // console.log(this.individualList) this.$refs['elForm'].validate(valid => { if (valid) { if (this.individualList.userId !== undefined) { updateIndividual(this.individualList).then(response => { this.$modal.msgSuccess("修改成功"); // 强制更新相关组件 this.individualList={...this.individualList} // this.open = false; this.dsb = true this.btn=false this.isShow_2=false this.isShow=true this.isEditing = false }); } else { this.$modal.msgSuccess("修改失败"); } } }) // 刷新页面 // window.location.reload(); }, //头像修改 uploadImage() { const inputElement = document.createElement("input"); inputElement.type = "file"; inputElement.accept = "image/*"; inputElement.style.display = "none"; document.body.appendChild(inputElement); inputElement.addEventListener("change", () => { const file = inputElement.files[0]; if (file) { const formData = new FormData(); formData.append("image", file); // 调用uploadPic接口上传图片 axios.post("/common/upload", formData, { headers: { "Content-Type": "multipart/form-data" } }).then(response => { // 上传成功，获取新图片的URL const newImageUrl = response.data.img; // 假设individualList是一个对象，更新individualList.img this.individualList.img = newImageUrl; // 假设fileList是一个数组，更新fileList中对应的图片URL // const index = this.fileList.findIndex(item => item.id === fileId); // this.fileList[index].url = newImageUrl; // 清除input元素并移除事件监听 document.body.removeChild(inputElement); inputElement.removeEventListener("change", null); }).catch(error => { console.error("上传失败:", error); // 清除input元素并移除事件监听 document.body.removeChild(inputElement); inputElement.removeEventListener("change", null); }); } }); // 触发点击事件，显示文件选择对话框 inputElement.click(); }, //主要经历 saveRowExperienceList(row) { this.$refs['elForm'].validate(valid => { @@ -1619,50 +1807,6 @@ this.$set(row, 'isEdit', false); this.$set(this.editStatus, row.id, false); }, requestUpload(params) { var file = params.file; var formData = new FormData(); formData.append('uploadFile', file); let _this = this // console.log(this.individualList) this.$refs.uploadDemo.clearFiles(); // alert(234) uploadPic(formData).then(response => { // alert(response.data.url) // alert(response.data.originalFilename) let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) if(_this.fot.includes(pth) === true) { _this.fileList.push({name:response.data.fileName, "url":response.data.url}) } else{ _this.fileList.push({name:response.data.fileName, url:response.data.url}) } _this.individualList.img = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") _this.individualList.url = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") updateIndividual(_this.individualList).then(response => { // 将选中选项的文本设置为"term"字段的值 // this.formDat.term = selectedOption.value; // this.formDat.id = selectedOption.id; console.log("1") _this.$modal.msgSuccess("修改成功"); _this.dialogVisible.autobiography = false; _this.isEdit1 = false; _this.getList(); }).catch(error => { console.log(error); _this.isEdit1 = false; _this.dialogVisible.autobiography = false; }); }) }, /** 删除个人经历按钮操作 */ handleExperienceDelete(row) { @@ -1715,12 +1859,7 @@ }).catch(() => {}); }, /** 导出按钮操作 */ handleExport() { this.download('/self/user/export', { ...this.queryParams }, `self_${new Date().getTime()}.xlsx`) } } }; </script> ruoyi-ui/src/views/system/user/profile/index.vue
@@ -8,8 +8,14 @@ </div> <div> <div class="text-center"> <userAvatar :user="user" /> </div > <el-avatar shape="square" style="width: 200px;;height: 200px;" > <el-image :src="'https://www.bendudu.com:8080/'+ user.url" :fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);" ></el-image> </el-avatar> </div > <ul class="list-group list-group-striped"> <li class="list-group-item"> 用户名称 @@ -45,9 +51,9 @@ <span>基本资料</span> </div> <el-tabs v-model="activeTab" > <el-tab-pane label="基本资料" name="userinfo"> <!-- <el-tab-pane label="基本资料" name="userinfo"> <userInfo :user="user" /> </el-tab-pane> </el-tab-pane> --> <el-tab-pane label="修改密码" name="resetPwd"> <resetPwd /> </el-tab-pane> @@ -260,7 +266,7 @@ user: {}, roleGroup: {}, postGroup: {}, activeTab: "userinfo", activeTab: "resetPwd", activeTab1:"家根网" }; }, @@ -401,6 +407,7 @@ // }); getIndividualList().then(response => { this.user = response.data; // console.log(this.user) // alert(890) this.fid = response.data.familyId // alert(this.fid) ruoyi-ui/src/views/travel/edit.vue
@@ -68,7 +68,7 @@ // 数据范围选项 fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx', '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'], fileList:[ ], fileListOther:[ @@ -114,7 +114,8 @@ trigger: 'blur' }], groupTotal: [{ // required: true, required: true, message: '请输入团费', trigger: 'blur' }], ruoyi-ui/vue.config.js
@@ -35,8 +35,8 @@ proxy: { // detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // target: `https://10.39.18.174:8080/`, target: 'https://www.bendudu.com:8080/', target: `https://10.39.18.174:8080/`, // target: 'https://www.bendudu.com:8080/', changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''
