From 79d870e1d8c88c01fa5075e3fb30ad9f0b6f37f7 Mon Sep 17 00:00:00 2001 From: yz3456 <2753272399@qq.com> Date: 星期四, 25 四月 2024 15:15:17 +0800 Subject: [PATCH] 修改完254、258、259、260、261错误 --- ruoyi-ui/src/views/self/show.vue | 1175 +++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 756 insertions(+), 419 deletions(-) diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue index 2259c78..5bddab2 100644 --- a/ruoyi-ui/src/views/self/show.vue +++ b/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 @@ -9,8 +7,9 @@ ></el-button> </el-backtop> <h1 style="font-size:21px;padding-top:30px;display: flex;"> - <span>涓汉绠�鍘�</span> - <div class="button-container" > + <span>涓汉璁颁簨鏈�</span> + <div class="button-container" ></div> + <!-- <div class="button-container" > <el-button size="mini" style="background: #E0EEFE; @@ -38,227 +37,388 @@ v-print="'#printable-content'" v-hasPermi="['family:note:export']" >鎵撳嵃</el-button> - </div> + </div> --> <div style="display: flex; align-items: center;"> <el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']" style="margin-left: 20px"> <div class="form" ><el-icon style="padding-right:100px;"></el-icon> <span class="text" style="width: 69px;height: 26px;font-size: 16px; - font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">涓汉璁颁簨鏈�</span></div> + font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">涓汉绠�鍘�</span></div> </el-button> </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"> - <div v-if="!isEditing"> - <el-avatar shape="square" style="width: 200px; height: 150px;"> - <el-image - class="el-upload-list__item-thumbnail" - v-if="!individualList.img" - src="default-avatar-url" - :fit="fit" - style="width: 100%; height: 100%;" - ></el-image> - <el-image - v-else - :src="'http://47.93.189.255:8080/' + individualList.img" - :fit="fit" - style="width: 100%; height: 100%;" - ></el-image> - </el-avatar> - </div> - <el-upload v-else - class="upload-demo" - action="#" - :auto-upload="false" - :http-request="requestUpload" - :limit="1" - :file-list="fileList" - > - <el-avatar shape="square" style="width: 200px; height: 150px;"> - <el-image - class="el-upload-list__item-thumbnail" - v-if="!individualList.img" - src="default-avatar-url" - :fit="fit" - style="width: 100%; height: 100%;" - ></el-image> - <el-image - v-else - :src="'http://47.93.189.255:8080/' + individualList.img" - :fit="fit" - style="width: 100%; height: 100%;" - ></el-image> - </el-avatar> - </el-upload> - <div class="edit-text" v-if="isEditing" @click="uploadImage">鐐瑰嚮鏇存崲鍥剧墖</div> - </div> + <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-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> - </div> + <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"> - <div style="padding-left:30px;padding-top:30px" > + <el-upload + action="" - </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="locationAddress" label-width="70px"> - <el-input v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> - </el-input> - </el-form-item> - </el-row> - <el-row :span="16"> - <el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress" label-width="70px"> - <el-input v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> - </el-input> - </el-form-item> - </el-row> - <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> + class="upload-demo" + :show-file-list="false" + :http-request="handleEnportm" + > + <el-button size="mini" type="primary" + plain + icon="el-icon-top" >瀵煎叆</el-button> - </el-form> - </el-col> - </el-container> + </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="requestUpload" + :file-list="fileList" + :on-change="handleChange" + :auto-upload="false" + ref="upload" + > + <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> + <el-button + style="margin-left: 10px" + size="small" + type="success" + + @click="picUpload" + >涓婁紶鍒版湇鍔″櫒</el-button> + <h4 class="form-header">鍏朵粬闄勪欢 </h4> + + + <el-upload + action="" + :file-list="fileListOther" + class="upload-demo" + multiple + ref="upload1" + :on-change="handleChange1" + :auto-upload="false" + list-type="picture-card" + :on-remove="handleRemove" + :http-request="requestUpload1m" + :show-file-list="true" + > + + <i slot="default" class="el-icon-plus"></i> + <div slot="file" slot-scope="{file}"> + <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 --> + <video + v-if="file.url.includes('.mp4')" + class="el-upload-list__item-thumbnail" + :src="file.url" + style="width: 147px; height: 147px" + fit="cover" + ></video> + <img v-else + class="el-upload-list__item-thumbnail" + :src="file.url" + alt="" + style="width: 100%; height: 100%" + fit="cover"></img> + + <span class="el-upload-list__item-actions"> + <span class="el-upload-list__item-name">{{ file.name }}</span> + <span + class="el-upload-list__item-preview" + @click="handleFileCardPreview(file)" + > + <i class="el-icon-zoom-in"></i> + </span> + + <span + + class="el-upload-list__item-delete" + @click="handleRemoveFile(file)" + > + <i class="el-icon-delete"></i> + </span> + </span> + + </div> + + </el-upload> + + <el-button + style="margin-left: 10px" + size="small" + type="success" + @click="fileUpload" + >涓婁紶鍒版湇鍔″櫒</el-button> + </el-form> + <h4 class="form-header"> </h4> + + <div slot="footer" class="dialog-footer"> + <el-button type="primary" @click="submitDataScopem">淇� 瀛�</el-button> + <el-button @click="cancelDataPer">鍙� 娑�</el-button> </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="locationPolice" label-width="110px"> - <el-input v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> - </el-input> - </el-form-item> - </el-row> - <el-row :span="12"> - <el-form-item label="甯镐綇鍦板叕瀹夋満鍏�" prop="alwaysPolice" label-width="110px"> - <el-input v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> - </el-input> - </el-form-item> - </el-row> - <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-form> - </el-col> - </el-container> - </div> - </el-container> + </el-dialog> + + <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� --> + <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body> + + </el-dialog> + +<!-- <MyComponent :key="componentKey" />--> + + <!-- 鍩烘湰淇℃伅--> + <!--鎶樺彔闈㈡澘--> - <el-collapse v-model="activeNames" @change="handleChange"> - <el-collapse-item title="绉诲眳鍥斤紙澧冿級鎯呭喌" name="3" > + <el-collapse v-model="activeNames" @change="handleChange5"> + <!-- <el-collapse-item title="绉诲眳鍥斤紙澧冿級鎯呭喌" name="3" > <div> <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form-item label="鏄惁鎷ユ湁澶栫睄銆佸澶栧眳鐣欐潈銆侀暱鏈熷眳鐣欒鍙�" > @@ -281,7 +441,7 @@ </div> - </el-collapse-item> + </el-collapse-item> --> <!--涓昏瀛︿範鍙婂伐浣滅粡鍘�--> <el-collapse-item name="1" > @@ -529,18 +689,14 @@ <el-tab-pane v-for="(item, index) in AutobiographyList" :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'宀�'+'('+item.term+')'"> <div>{{ item.content }}</div> -<!-- <div v-if="item.term === '濠村効'"> {{item.content}}</div>--> -<!-- <div v-if="item.term === '骞煎効'"> {{item.content}}</div>--> -<!-- <div v-if="item.term === '灏忓'"> {{item.content}}</div>--> -<!-- <div v-if="item.term === '鍒濅腑'"> {{item.content}}</div>--> -<!-- <div v-if="item.term === '楂樹腑'"> {{item.content}}</div>--> -<!-- <div v-if="item.term === '澶у'"> {{item.content}}</div>--> -<!-- <div v-if="item.term === '鐮旂┒鐢�'"> {{item.content}}</div>--> -<!-- <div v-if="item.term === '宸ヤ綔'"> {{item.content}}</div>--> -<!-- <div v-if="item.term === '缁撳鍚�'"> {{item.content}}</div>--> - <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='position: absolute;right:10px;top:5px;'> + <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='position: absolute;right:40px;top:5px;'> <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button> + + <el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(item)" style='position: absolute;right:10px;top:5px;'> + <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> + </el-button> + </el-tab-pane> </el-tabs></div> </el-contain> @@ -701,10 +857,10 @@ <!-- </el-select>--> <!-- </el-form-item>--> <el-form-item label="骞撮緞娈碉細" prop="ageBegin ageEnd" label-width="70px"> - <el-input v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" > + <el-input type="number" v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" > </el-input> <span> 宀� 鈥斺��</span> - <el-input v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" > + <el-input type="number" v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" > </el-input> <span> 宀� </span> </el-form-item> @@ -740,15 +896,23 @@ import axios from 'axios'; //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁� --鎺ュソ浜� -import {getIndividualList, addIndividual, updateIndividual, delIndividual, +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, + getAbroadList, addAbroad, updateAbroad, delAbroad, listType, + 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' @@ -759,6 +923,8 @@ data() { return { + uploadFileList: [], + uploadFileList1: [], // 閬僵灞� disabled: false, @@ -779,6 +945,7 @@ showSearch: true, // 鎬绘潯鏁� total: 0, + totalm: 0, //澶村儚涓婁紶 showBtnDealImg:true, noneBtnImg:false, @@ -829,7 +996,7 @@ // 寮瑰嚭灞傛爣棰� title: "", - // open:true, + open:false, // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛� openDataScope: false, menuExpand: false, @@ -839,7 +1006,11 @@ // 鏃ユ湡鑼冨洿 dateRange: [], // 鏁版嵁鑼冨洿閫夐」 - fot:[".jpg",".jif"], + // 鏁版嵁鑼冨洿閫夐」 + fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx', + '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'], + + fileList1:[], fileList:[], fileListOther:[], dsb:true, @@ -871,7 +1042,7 @@ momId:undefined, birth:undefined, familyId:undefined, - + url: '', //涓昏瀛︿範鍙婂伐浣滅粡鍘� id:undefined, @@ -897,7 +1068,7 @@ startTime:undefined, endTime:undefined, cause:undefined, - url: undefined, + //鑷紶 ageBegin:undefined, ageEnd:undefined, @@ -908,6 +1079,17 @@ menuOptions: [], // 閮ㄩ棬鍒楄〃 deptOptions: [], + queryParams1: { + pageNum: 1, + pageSize: 10, + happenTime:undefined, + people:undefined, + address:undefined, + title:undefined, + remark:undefined + }, + // 涓汉璁颁簨鏈〃鏍兼暟鎹� + noteList: [], // 鏌ヨ鍙傛暟 queryParams: { pageNum: 1, @@ -924,6 +1106,21 @@ }, // 琛ㄥ崟鏍¢獙 rules: { + happenTime: [{ + required: true, + message: '璇烽�夋嫨鏃堕棿', + trigger: 'blur' + }], + people: [{ + required: true, + message: '璇疯緭鍏ヤ汉鐗�', + trigger: 'blur' + }], + title: [{ + required: true, + message: '璇疯緭鍏ヤ簨浠舵爣棰�', + trigger: 'blur' + }], //鍩烘湰淇℃伅 nickName: [{ // required: true, @@ -1033,8 +1230,113 @@ }, methods: { + handleRemoveFile(file) { + for(let i = 0; i < this.fileListOther.length; i++) + { + if(this.fileListOther[i].url==file.url) + { + this.$delete(this.fileListOther,i); + this.$delete(this.uploadFileList1,i); + } + } + }, + handleRemove(file) { + for(let i = 0; i < this.fileList.length; i++) + { + if(this.fileList[i].url==file.url) + { + this.$delete(this.fileList,i); + this.$delete(this.uploadFileList,i); + } + } + }, + + fileUpload(){ + // var file = params.file; + + var formData = new FormData(); + this.$refs.upload1.submit(); + // formData.append('uploadFile', file); + if(this.uploadFileList1.length==0){ + this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!"); + return + } + this.uploadFileList1.forEach((elem)=>{ + formData.append("files", elem) + + }) + + let _this = this + + this.uploading = true; + uploadPic(formData).then(response => { + _this.uploadFileList1 = [] + _this.formDat.url = _this.formDat.url+","+response.fileNames + _this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!"); + }) + + }, + + picUpload() + { + var formData = new FormData(); + //alert(976) + //this.$refs.upload.submit(); + //alert(8) + //alert(this.uploadFileList.length) + if(this.uploadFileList.length==0){ + this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�"); + return} + //console.log(this.uploadFileList) + // alert(this.uploadFileList) + this.uploadFileList.forEach((elem)=>{ + formData.append("files", elem) + + }) + //alert(90) + let _this = this + //alert(9) + uploadPic(formData).then(response => { + // console.log(response,'123123123') + // console.log(_this.formDat.url,'666') + _this.formDat.url = _this.formDat.url+","+response.fileNames + + // alert(_this.formDat.url) + _this.uploadFileList = [] + _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛"); + + }); + }, + + handleChange(file, fileList1) { + //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍 + + // this.uploadFileList.push(file.raw); + console.log("=========5555=========") + console.log(file) + // console.log(this.uploadFileList) + // this.fileList = fileList + //alert(file) + this.uploadFileList.push(file.raw); + this.fileList.push({name:file.name,url:file.url}) + //alert(fileList1.length) + }, + handleChange1(file, fileOtherList1) { + //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍 + this.uploadFileList1.push(file.raw); + this.fileListOther.push({name:file.name,url:file.url}) + // this.uploadFileList.push(file.raw); + console.log("=========5555=========") + //console.log(file) + // console.log(this.uploadFileList) + // this.fileList = fileList + }, + + + // 鍙栨秷鎸夐挳 cancelData() { + // alert(23) this.dialogVisible.open = false; this.dialogVisible.relation1 = false; this.dialogVisible.certificate =false; @@ -1042,6 +1344,7 @@ this.dialogVisible.autobiography=false; this.isEdit1 = false; this.reset(); + // alert(32) // 娓呯┖formDat瀵硅薄鐨勬暟鎹� Object.keys(this.formDat).forEach(key => { this.formDat[key] = ''; @@ -1053,7 +1356,7 @@ }, //涓嬫媺 - handleChange(activeNames) { + handleChange5(activeNames) { // console.log(activeNames); this.reset(); }, @@ -1116,60 +1419,77 @@ /** 鏌ヨ瑙掕壊鍒楄〃 */ 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 => { //涓汉缁忓巻 + let _this = this; listExperience(this.queryParams).then(response => { // alert(123) // console.log(response.data) - this.experienceList = response.data; + _this.experienceList = response.data; // this.total = response.data.total; - this.loading = false; + _this.loading = false; } ); //鎴愬憳鍏崇郴 getIndividualRelation(this.queryParams).then(response => { // alert(123) // console.log(response.data) - this.relationList = response.data; + _this.relationList = response.data; // this.total = response.data.total; - this.loading = false; + _this.loading = false; } ); - //涓汉淇℃伅 - getIndividualList(this.queryParams).then(response => { - // alert(123) - // console.log(response.data) - this.individualList = response.data; - // this.total = response.data.total; - this.loading = false; - } - ); + getIndividualList(this.queryParams).then(response => { + // alert(123) + // console.log(response.data) + _this.individualList = response.data; + + // this.total = response.data.total; + _this.loading = false; + } + ); //鍑哄叆澧冭瘉浠舵儏鍐� getCertificateList(this.queryParams).then(response => { // alert(123) // console.log(response.data) - this.certificateList = response.data; + _this.certificateList = response.data; // this.total = response.data.total; - this.loading = false; + _this.loading = false; } ); //鍑哄浗鎯呭喌 getAbroadList(this.queryParams).then(response => { // alert(123) // console.log(response.data) - this.AbroadList = response.data; + _this.AbroadList = response.data; // this.total = response.data.total; - this.loading = false; + _this.loading = false; } ); //鏌ヨ涓汉鎵�鏈夎嚜浼� getAutobiographyList(this.queryParams).then(response => { // alert(123) // console.log(response.data) - this.AutobiographyList = response.data; + _this.AutobiographyList = response.data; // this.total = response.data.total; - this.loading = false; + _this.loading = false; }); //鏍规嵁涓嶅悓鏃舵鐨勪釜浜鸿嚜浼� @@ -1181,12 +1501,12 @@ // this.loading = false; // }); listType(this.queryParams).then(response => { - this.typeList = response.data; + _this.typeList = response.data; // this.total = response.data.total; // console.log( this.typeList ) // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions() - this.getTypeOptions(); - this.loading = false; + _this.getTypeOptions(); + _this.loading = false; } ); }, @@ -1262,7 +1582,143 @@ 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('files', 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.fileNames, "url":response.data.url}) + } + }) + }, + requestUpload1m(params) + { + var file = params.file; + var formData = new FormData(); + formData.append('files', 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.fileNames, 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 => { + console.log(this.formDat) + this.$modal.msgSuccess("鏂板鎴愬姛"); + this.getList(); + 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); @@ -1304,21 +1760,13 @@ 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 - }, + cancelDataPer() + { + this.open = false; + + // alert(123) + // alert(this.open) + }, /** 鏌ヨ鑷紶淇℃伅 */ getAutobiographyInfor() @@ -1346,12 +1794,15 @@ /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */ //鏂板涓昏缁忓巻鐨勪繚瀛� submitDataScope: function() { - this.$refs["elForm"].validate(valid => { + let _this = this + this.$refs["elForm1"].validate(valid => { if (valid) { - addExperience(this.formDat).then(response => { - this.$modal.msgSuccess("鏂板鎴愬姛"); - this.dialogVisible.open = false; - this.getList(); + //alert(1235) + _this.dialogVisible.open = false; + addExperience(_this.formDat).then(response => { + _this.$modal.msgSuccess("鏂板鎴愬姛"); + + _this.getList(); }); } }); @@ -1364,9 +1815,10 @@ submitDataScope2: function() { this.$refs["elForm"].validate(valid => { if (valid) { + this.dialogVisible.relation1 = false; addRelation(this.formDat).then(response => { this.$modal.msgSuccess("鏂板鎴愬姛"); - this.dialogVisible.relation1 = false; + this.getList(); }); } @@ -1458,99 +1910,12 @@ 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 - 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 => { - // 涓婁紶鎴愬姛锛岃幏鍙栨柊鍥剧墖鐨刄RL - 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 => { - if (valid) { + // this.$refs['elForm'].validate(valid => { + // if (valid) { const foundIndex = this.experienceList.findIndex(item => item.id === row.id); if (foundIndex !== -1) { const updatedData = Object.assign({}, this.experienceList[foundIndex], row); @@ -1563,15 +1928,15 @@ } else { this.$modal.msgError("淇敼澶辫触"); } - } - }); + //} + // }); this.$set(row, 'isEdit', false); this.$set(this.editStatus, row.id, false); }, //鎴愬憳鍏崇郴 saveRowRelationList(row) { - this.$refs['elForm'].validate(valid => { - if (valid) { + // this.$refs['elForm'].validate(valid => { + // if (valid) { const foundIndex = this.relationList.findIndex(item => item.id === row.id); if (foundIndex !== -1) { const updatedData = Object.assign({}, this.relationList[foundIndex], row); @@ -1584,15 +1949,15 @@ } else { this.$modal.msgError("淇敼澶辫触"); } - } - }); + // } + // }); this.$set(row, 'isEdit', false); this.$set(this.editStatus, row.id, false); }, //璇佷欢鎯呭喌 saveRowCertificateList(row) { - this.$refs['elForm'].validate(valid => { - if (valid) { + // this.$refs['elForm'].validate(valid => { + // if (valid) { const foundIndex = this.certificateList.findIndex(item => item.id === row.id); if (foundIndex !== -1) { const updatedData = Object.assign({}, this.certificateList[foundIndex], row); @@ -1605,15 +1970,15 @@ } else { this.$modal.msgError("淇敼澶辫触"); } - } - }); + // } + //}); this.$set(row, 'isEdit', false); this.$set(this.editStatus, row.id, false); }, //鍑哄浗鎯呭喌 saveRowAbroadList(row) { - this.$refs['elForm'].validate(valid => { - if (valid) { + // this.$refs['elForm'].validate(valid => { + // if (valid) { const foundIndex = this.AbroadList.findIndex(item => item.id === row.id); if (foundIndex !== -1) { const updatedData = Object.assign({}, this.AbroadList[foundIndex], row); @@ -1626,33 +1991,10 @@ } else { this.$modal.msgError("淇敼澶辫触"); } - } - }); + // } + // }); 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 - - uploadPic(formData).then(response => { - 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.fileListOther.push({name:response.data.fileName, url:response.data.url}) - - } - }) - }, /** 鍒犻櫎涓汉缁忓巻鎸夐挳鎿嶄綔 */ @@ -1695,18 +2037,23 @@ this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }).catch(() => {}); }, + /** 鍒犻櫎涓汉鑷紶鎸夐挳鎿嶄綔 */ + handleAutobiography(row) { + const Ids = row.id || this.ids; + this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() { + return delAutobiography(Ids); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); + }).catch(() => {}); + }, - /** 瀵煎嚭鎸夐挳鎿嶄綔 */ - handleExport() { - this.download('/self/user/export', { - ...this.queryParams - }, `self_${new Date().getTime()}.xlsx`) - } + } }; </script> -<style > +<style scoped=""> /*.uoloadSty {*/ /* width:110px;*/ /* height:110px;*/ @@ -1752,7 +2099,9 @@ .btn_edit{ background:center no-repeat url('../../assets/icons/edit.png') ; } - +.btn_del{ + background:center no-repeat url('../../assets/images/鍒犻櫎2.png') ; +} .button-container { text-align: right; display: flex; @@ -1766,18 +2115,6 @@ flex-shrink: 0; width: 30px; height: 28px; -} -.button2 { - background: center no-repeat url('../../assets/icons/add1.png') ; - margin-left: 66vw; -} -.button4 { - background: center no-repeat url('../../assets/icons/add1.png') ; - margin-left: 71.5vw; -} -.button5 { - background:center no-repeat url('../../assets/icons/add1.png') ; - margin-left: 71vw; } .form{ background:center/11% no-repeat url('../../assets/icons/form.png') ; -- Gitblit v1.9.1