From 880a49e093fbba2c1e39cdd598268766c99082fe Mon Sep 17 00:00:00 2001 From: Tcsm <1377977403@qq.com> Date: 星期二, 10 十月 2023 20:58:46 +0800 Subject: [PATCH] 加上了成长经历阅历的自传的修改功能,固定序号 --- ruoyi-ui/src/views/self/show.vue | 49 +++---- ruoyi-ui/src/views/genealogy/index.vue | 218 ++++-------------------------------- ruoyi-ui/src/views/collection/collectionInfo.vue | 42 +++++- ruoyi-ui/src/views/bignote/index.vue | 2 ruoyi-ui/src/api/self/index.js | 10 + ruoyi-ui/src/views/pet/index.vue | 2 ruoyi-ui/src/views/secret/index.vue | 2 7 files changed, 94 insertions(+), 231 deletions(-) diff --git a/ruoyi-ui/src/api/self/index.js b/ruoyi-ui/src/api/self/index.js index acb9597..13417ea 100644 --- a/ruoyi-ui/src/api/self/index.js +++ b/ruoyi-ui/src/api/self/index.js @@ -219,6 +219,16 @@ }) } +//鍒犻櫎涓汉鑷紶 +export function delAutobiography(ids) +{ + return request({ + url: '/zAutobiography/' +ids , + method: 'delete', + }) +} + + //鎷垮埌涓汉鑷紶 export function getCategory() { diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue index dee4067..e86cf8a 100644 --- a/ruoyi-ui/src/views/bignote/index.vue +++ b/ruoyi-ui/src/views/bignote/index.vue @@ -147,7 +147,7 @@ <el-table v-loading="loading" :data="familyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"> <el-table-column type="selection" :reserve-selection="true" width="55" align="center" /> - <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/> + <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/> <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="200px" align="center"> <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template> </el-table-column> diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue index e26abe7..0d57756 100644 --- a/ruoyi-ui/src/views/collection/collectionInfo.vue +++ b/ruoyi-ui/src/views/collection/collectionInfo.vue @@ -96,7 +96,7 @@ class="el-upload-list__item-thumbnail" :src="file.url" alt="" - style="width: 100%; height: 100%; object-fit: cover;" + style="width: 147px; height: 147px" fit="cover" :preview-src-list="[file.url]" > @@ -146,14 +146,23 @@ <div v-if="uploading1" class="upload-status">姝e湪涓婁紶...</div> <i v-if="!uploading1" slot="default" class="el-icon-plus"></i> <div slot="file" slot-scope="{file}"> - <img + <!-- 娣诲姞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="../../assets/401_images/401.gif" alt="" - style="width: 100%; height: 100%; object-fit: cover;" - fit="cover" - > + style="width: 100%; height: 100%" + fit="cover"> + <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)" @@ -174,8 +183,7 @@ > <i class="el-icon-delete"></i> </span> - </span> - + </span> </div> @@ -549,7 +557,21 @@ this.formData.url = ul+","+uls console.log(this.formData.url) updateCollection(this.formData).then(response => { - this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛"); + this.$modal.msgSuccess("涓婁紶鎴愬姛"); + + const videoElement = document.createElement('video'); // 鍒涘缓涓�涓柊鐨剉ideo鍏冪礌 + videoElement.src = response.data.url; // 璁剧疆video鍏冪礌鐨剆rc涓鸿棰慤RL + // 鐩戝惉loadedmetadata浜嬩欢浠ョ‘淇濊棰戝厓鏁版嵁鍔犺浇瀹屾垚 + videoElement.addEventListener('loadedmetadata', function() { + const canvas = document.createElement('canvas');// 鍒涘缓涓�涓猚anvas鍏冪礌 + const context = canvas.getContext('2d'); + context.drawImage(videoElement, 0, 0, canvas.width, canvas.height); // 灏嗚棰戠殑棣栧抚鐢婚潰缁樺埗鍒扮敾甯冧笂 + const imageURL = canvas.toDataURL();// 灏嗙敾甯冭浆鎹负鍥惧儚URL + videoElement.setAttribute('poster', imageURL);// 璁剧疆瑙嗛鐨勫皝闈㈠浘鍍� + + // 鍦ㄩ〉闈腑鏄剧ず瑙嗛鍏冪礌 + document.body.appendChild(videoElement); + }); // this.open = false; // this.btn=false }); @@ -592,4 +614,8 @@ font-weight: 400; color: #000000; } +.el-upload-list__item-name { + font-size: 14px; /* 璋冩暣鏂囦欢鍚嶅瓧鐨勫瓧浣撳ぇ灏� */ + +} </style> diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue index 59c0854..472a3b0 100644 --- a/ruoyi-ui/src/views/genealogy/index.vue +++ b/ruoyi-ui/src/views/genealogy/index.vue @@ -1,22 +1,6 @@ <template> <div class="app-container"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> - <el-form-item label="" prop="phone wx qq twitter isAlways remark" > - <el-input - v-model:phone="queryParams.phone" - v-model:wx="queryParams.wx" - v-model:qq="queryParams.qq" - v-model:twitter="queryParams.twitter" - v-model:isAlways="queryParams.isAlways" - v-model:remark="queryParams.remark" - placeholder="鍦ㄢ�滃紶姘忎竴瑙堣〃鈥濅腑鎼滅储" - clearable - style="width: 240px" - @keyup.enter.native="handleQuery"> - <i slot="prefix" class="el-input__icon el-icon-search"></i> - </el-input> - <!-- v-model="queryParams.id"--> - </el-form-item> <el-form-item label="韬唤" prop="identity" > <el-select @@ -73,6 +57,7 @@ ></el-date-picker> </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> @@ -85,58 +70,13 @@ <el-row :gutter="10" class="mb8"> <!-- <el-col :span="1.5">--> <!-- <el-button--> -<!-- type="primary"--> -<!-- plain--> -<!-- icon="el-icon-plus"--> -<!-- size="mini"--> -<!-- @click="handleAdd"--> -<!-- 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="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" - @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="handleExport"--> <!-- v-hasPermi="['family:note:export']"--> -<!-- >瀵煎叆妯℃澘涓嬭浇</el-button>--> -<!-- </el-col>--> -<!-- <el-col :span="1.2">--> - -<!-- <el-upload--> -<!-- action=""--> -<!-- class="upload-demo"--> -<!-- :show-file-list="false"--> -<!-- :http-request="handleEnport"--> -<!-- >--> -<!-- <el-button size="mini" type="primary"--> -<!-- plain--> -<!-- icon="el-icon-plus" >瀵煎叆</el-button>--> -<!-- </el-upload>--> +<!-- >瀵煎嚭</el-button>--> <!-- </el-col>--> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> @@ -146,7 +86,6 @@ <el-table v-loading="loading" :data="listRoot" :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" width="55" align="center" /> <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/> - <el-table-column label="韬唤" prop="identity" sortable width="100" > <template slot-scope="scope" > <span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span> @@ -180,21 +119,23 @@ <template slot-scope="scope">{{scope.row.spouseName? scope.row.spouseName: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> + <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope" v-if="scope.row.roleId !== 1"> -<el-button + <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)"> -鏌ョ湅璇︽儏</el-button> + 鏌ョ湅璇︽儏 + </el-button> </template> </el-table-column> </el-table> <pagination + v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @@ -202,49 +143,8 @@ @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="identity"> - <el-input v-model="formDat.identity" placeholder="璇疯緭鍏ヨ韩浠�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - <el-form-item label="濮撳悕" prop="nickName"> - <el-input v-model="formDat.nickName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" ></el-input> - </el-form-item> - <el-form-item label="鎬у埆" prop="sex"> - <el-input v-model="formDat.sex" placeholder="璇疯緭鍏ユ�у埆" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - <el-form-item label="鍑虹敓鏃堕棿" prop="birth"> - <el-input v-model="formDat.birth" placeholder="璇疯緭鍏ュ嚭鐢熸椂闂�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - <el-form-item label="鍏ㄧ敓鍛藉懆鏈�" prop="deadDay"> - <el-input v-model="formDat.deadDay" placeholder="璇疯緭鍏ュ叏鐢熷懡鍛ㄦ湡" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - <el-form-item label="鎵嬫満鍙风爜" prop="phoneNumber"> - <el-input v-model="formDat.phoneNumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unit"> - <el-input v-model="formDat.unit" placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - <el-form-item label="閰嶅伓" prop="spouseName"> - <el-input v-model="formDat.spouseName" placeholder="璇疯緭鍏witter" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - - </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> - </div> </el-dialog> <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body> @@ -263,6 +163,8 @@ //瀵煎叆鎺ュ彛鍑芥暟 import {enload, uploadPic} from "@/api/contacts/index"; import {getRoot,listUserAll} from "@/api/root/index"; + + export default { name: "index", dicts: ['sys_normal_disable'], @@ -281,7 +183,8 @@ multiple: true, // 鏄剧ず鎼滅储鏉′欢 showSearch: true, - // 鎬绘潯鏁� + pageSize: 10, // 姣忛〉鏄剧ず鏁版嵁鏉℃暟 + pageNum: 1, // 褰撳墠椤电爜 // 鎬绘潯鏁� total: 0, // 瀹惰氨琛ㄦ牸鏁版嵁 listRoot: [], @@ -416,10 +319,6 @@ }, created() { this.getList(); - // this.getCateInfor() - // for (let i = 0; i < this.contactList.length; i++) { - // this.formDat[i] = this.contactList[i]; - // } }, methods: { // 鍙栨秷鎸夐挳 @@ -460,45 +359,33 @@ return "statistics-warning-row"; } }, - /** 鏂板鎸夐挳鎿嶄綔 */ - handleAdd() { - this.reset(); - this.open = true; - this.title = "娣诲姞璇佷欢/鑽h獕/璧勮川淇℃伅"; - }, - /** 鏌ヨ閫氳褰曞垪琛� */ + /** 鏌ヨ瀹惰氨鍒楄〃 */ getList() { this.loading = true; // console.log(this.queryParams) //alert(23) this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0] this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1] + + // this.queryParams.pageSize = this.pageSize; // 娣诲姞 pageSize 鍙傛暟 + // this.queryParams.pageNum = this.pageNum; // 娣诲姞 pageNum 鍙傛暟 + // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listUserAll(this.queryParams).then(response => { - // alert(123) // console.log(response.data) - // alert(76) this.listRoot = response.data.data; - // alert(this.listRoot) - this.total = response.data.length; - this.pageNum=1; - this.pageSize=10; - // alert(this.total) + this.total = response.data.total; + // this.pageNum=1; + // this.pageSize=10; + // this.pageNum = response.data.pageNum; this.loading = false; } ); }, - /** 鏌ヨ绫诲埆淇℃伅 */ - // getCateInfor() - // { - // 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]}) - // }) - // }) - // }, + handlePageChange(currentPage) { + this.pageNum = currentPage; // 鏍规嵁 currentPage 璁$畻鍑� pageNum 鍊� + this.getList(); + }, //韬唤閫夋嫨 getSrc(identity) { if (identity === '1'){ @@ -518,9 +405,6 @@ return row.id }, - handleRemove(file) { - alert(323) - }, // 鍙栨秷鎸夐挳 cancel() { this.open = false; @@ -529,7 +413,6 @@ // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級 cancelDataScope() { this.openDataScope = false; - this.reset(); }, // 琛ㄥ崟閲嶇疆 reset() { @@ -589,65 +472,12 @@ this.$router.push("/familymodel/jiagenwang/personInfo/" + id); }, - 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) { - addContact(this.formDat).then(response => { - this.$modal.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - }); - } - }); - }, - 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}) - - } - }) - - }, - /** 鍒犻櫎鎸夐挳鎿嶄綔 */ - handleDelete(row) { - const Ids = row.id || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() { - return delContact(Ids); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(() => {}); - }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ // handleExport() { // this.download('/self/user/export/genealogy', { diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue index 11df3f8..23e768a 100644 --- a/ruoyi-ui/src/views/pet/index.vue +++ b/ruoyi-ui/src/views/pet/index.vue @@ -95,7 +95,7 @@ <el-table v-loading="loading" :data="petList,PetNoteList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"> <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"/> + <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/> <el-table-column label="绉嶇被" prop="animal" sortable :show-overflow-tooltip="true" width="150" /> <el-table-column label="鍝佺" prop="type" sortable :show-overflow-tooltip="true" width="150" /> diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue index 3775021..84a385b 100644 --- a/ruoyi-ui/src/views/secret/index.vue +++ b/ruoyi-ui/src/views/secret/index.vue @@ -129,7 +129,7 @@ <el-table v-loading="loading" :data="secretList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" @row-click="handleCheck" :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 label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/> + <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/> <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="150" align="center"> <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template> </el-table-column> diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue index 2259c78..dd9d44b 100644 --- a/ruoyi-ui/src/views/self/show.vue +++ b/ruoyi-ui/src/views/self/show.vue @@ -529,18 +529,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> @@ -740,12 +736,13 @@ 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' @@ -1695,6 +1692,16 @@ 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() { @@ -1752,7 +1759,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 +1775,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