From 31d4f1af2415091ce8171a48372795c0f1a16e14 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期六, 28 十月 2023 15:30:44 +0800
Subject: [PATCH] 1028 修改健康表
---
ruoyi-ui/src/views/healthy/Examination.vue | 637 ++++++++++++++++++++++++++++++
ruoyi-ui/src/api/healthy/index.js | 51 ++
ruoyi-ui/src/views/healthy/ExaminationInfo.vue | 425 ++++++++++++++++++++
ruoyi-ui/src/views/healthy/healthYear.vue | 19
ruoyi-ui/src/views/healthy/healthyInfo.vue | 22
ruoyi-ui/src/router/index.js | 30 +
ruoyi-ui/src/views/healthy/index.vue | 68 +-
7 files changed, 1,198 insertions(+), 54 deletions(-)
diff --git a/ruoyi-ui/src/api/healthy/index.js b/ruoyi-ui/src/api/healthy/index.js
index b61a782..fbbdec7 100644
--- a/ruoyi-ui/src/api/healthy/index.js
+++ b/ruoyi-ui/src/api/healthy/index.js
@@ -45,6 +45,56 @@
data: data
})
}
+
+// 鏌ヨ鍘嗗勾浣撴鎯呭喌
+export function listExamination(query) {
+ return request({
+ url: '/physcial/all',
+ method: 'get',
+ params: query
+ })
+}
+
+
+// // 鏍规嵁id鏌ヨ璇︾粏淇℃伅
+export function getExaminationInfo(queryParameters) {
+ return request({
+ url: '/physcial' ,
+ method: 'get',
+ params: queryParameters
+ })
+}
+
+//澧炲姞瀹跺涵璁惧
+export function addExamination(data)
+{
+ return request({
+ url: '/physcial',
+ method: 'post',
+ data: data
+ })
+}
+
+// 鍒犻櫎瀹跺涵璁惧
+export function delExamination(Ids) {
+ return request({
+ url: '/physcial/' + Ids,
+ method: 'delete'
+ })
+}
+//淇敼瀹跺涵璁惧
+export function updateExamination(data) {
+ return request({
+ url: '/physcial',
+ method: 'put',
+ data: data
+ })
+}
+
+
+
+
+
//涓婁紶鏂囦欢
export function uploadPic(data) {
return request({
@@ -62,6 +112,7 @@
responseType: 'blob'
})
}
+
//涓婁紶鏂囦欢
export function enload(data) {
return request({
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 6c799a7..76f3836 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -596,6 +596,36 @@
}
]
},
+ //浣撴
+ {
+ path: '/self/healthy',
+ component: Layout,
+ permissions: ['person:healthy:Examination'],
+ hidden: true,
+ children: [
+ {
+ path: 'Examination',
+ component: () => import('@/views/healthy/Examination'),
+ name: 'Examination',
+ meta: { title: '浣撴'}
+ }
+ ]
+ },
+ //浣撴璇︽儏
+ {
+ path: '/self/healthy',
+ component: Layout,
+ permissions: ['person:healthy:ExaminationInfo'],
+ hidden: true,
+ children: [
+ {
+ path: 'ExaminationInfo/:id(\\d+)',
+ component: () => import('@/views/healthy/ExaminationInfo'),
+ name: 'ExaminationInfo',
+ meta: { title: '浣撴璇︽儏'}
+ }
+ ]
+ },
//钘忓績瀵嗚
{
diff --git a/ruoyi-ui/src/views/healthy/Examination.vue b/ruoyi-ui/src/views/healthy/Examination.vue
new file mode 100644
index 0000000..ac4d569
--- /dev/null
+++ b/ruoyi-ui/src/views/healthy/Examination.vue
@@ -0,0 +1,637 @@
+<template>
+ <div class="app-container" style="opacity: 1;">
+
+ <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: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </el-form-item>
+
+
+ <el-form-item label="棰樺悕" prop="report">
+ <el-input
+ v-model="queryParams.report"
+ placeholder="璇疯緭鍏ラ鍚�"
+ clearable
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+
+ <el-button size="mini" type="text" @click="toYearhealthy" v-hasPermi="['person:healthy:healthYear']">
+ <div class="form1" ><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>
+ </el-button>
+
+ <el-form-item>
+ <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;border-radius:6px 6px 6px 6px;opacity:1;">鎼滅储</el-button>
+ <el-button size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3; border-radius:6px 6px 6px 6px;opacity: 1;">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+
+ <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="handleExportTemplate"-->
+<!-- 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-col>-->
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+ <div class="fixed-width1">
+ <el-table v-loading="loading" :data="ExamList" @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"/>
+
+ <el-table-column label="浣撴鏃堕棿" prop="happenTime" sortable width="200" align="center">
+ <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="棰樺悕" prop="report" sortable width="150" />
+
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable width="150" >
+ <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 label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['familymodel:economy:info']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:role:remove']"
+ >鍒犻櫎</el-button>
+ <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:bignote:list']">
+ <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
+
+ </el-dropdown>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ style="background: #FEF7FC;"
+ />
+ </div>
+ <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" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
+ </el-form-item>
+
+ <el-form-item label="棰樺悕" prop="report">
+ <el-input v-model="formDat.report" placeholder="璇疯緭鍏ラ鍚�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+
+ <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
+ <el-upload
+ action="#"
+ 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}">
+ <img
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+
+ alt=""
+ style="width: 126px; height: 126px"
+ fit="cover"
+ :preview-src-list="[file.url]"
+ >
+ <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="handleRemoveFile"
+ :http-request="requestUpload"
+ :show-file-list="true"
+ >
+ <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <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>
+ </div>
+ </el-dialog>
+
+ <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
+ <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+
+ </el-dialog>
+
+ </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";
+
+
+
+//鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁� --鎺ュソ浜�
+import {listExamination,enload,delExamination,uploadPic, addExamination} from "@/api/healthy/index";
+import {Message} from "element-ui";
+
+export default {
+ name: "Role",
+ dicts: ['sys_normal_disable'],
+ data() {
+ return {
+ // 閬僵灞�
+ disabled: false,
+ loading: true,
+ formData:[],
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
+ economyList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
+ openDataScope: false,
+ menuExpand: false,
+ menuNodeAll: false,
+ deptExpand: true,
+ deptNodeAll: false,
+ // 鏃ユ湡鑼冨洿
+ dateRange: [],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:[".jpg",".jif"],
+ fileList:[
+ ],
+ fileListOther:[ ],
+ dsb:true,
+ btn:false,
+ formDat: {
+
+ happenTime: undefined,
+ report: undefined,
+ url: undefined,
+ },
+ // 鑿滃崟鍒楄〃
+ menuOptions: [],
+ // 閮ㄩ棬鍒楄〃
+ deptOptions: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ checkTime:undefined,
+
+ },
+ ExamList:{
+ happenTime:undefined,
+
+ report:undefined,
+
+ url:undefined
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ defaultProps: {
+ children: "children",
+ label: "label"
+ },
+ // 琛ㄥ崟鏍¢獙
+ rules: {
+ report: [{
+ required: true,
+ message: '璇疯緭鍏ユ爣棰�',
+ trigger: 'blur'
+ }],
+
+ happenTime: [{
+ required: true,
+ message: '閫夋嫨浣撴鏃堕棿',
+ trigger: 'blur'
+ }],
+
+ },
+
+ };
+ },
+ created() {
+ this.getList();
+
+
+ },
+ 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 => {
+
+ listExamination(this.queryParams).then(response => {
+ // alert(123)
+ // console.log(response.data)
+ this.ExamList = response.data.data;
+
+ 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);
+ }
+ },
+ handleRemoveFile(file) {
+ for (let i = 0; i < this.fileListOther.length; i++) {
+ if (this.fileListOther[i].url == file.url)
+ this.$delete(this.fileListOther, i);
+ }
+ },
+
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
+ cancelDataScope() {
+ this.openDataScope = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ 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");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ 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
+ },
+
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "鏂板浣撴鎯呭喌";
+ },
+
+
+ /** 鏌ョ湅璇︾粏淇℃伅 */
+ handleCheck(row) {
+ const id = row.id;
+ this.$router.push("/self/healthy/ExaminationInfo/" + id);
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ const id = row.id;
+ let jd = true
+
+ this.$router.push({
+ path: "/self/healthy/ExaminationInfo/" + 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) {
+ addExamination(this.formDat).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+
+ this.getList();
+ // 娓呯┖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]);
+ }
+
+ });
+ }
+ });
+
+ },
+ 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('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function () {
+ return delExamination(Ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {
+ });
+ },
+ //骞村害鍋ュ悍鎶ュ憡
+ toYearhealthy(){
+ // console.log(this.HealthyBaseList.uid)
+ // this.$router.push("/self/healthy/healthYear/" + this.HealthyBaseList.uid);
+ // this.$router.push("/self/healthy/healthYear" );
+ this.$router.push("/self/healthy/healthYear" );
+ },
+
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+
+ handleExport() {
+ const Ids = this.ids;
+
+ if (Ids.length == 0) {
+ this.download('/zYearInfo/export', {
+ ...this.queryParams
+ }, `zYearInfo${new Date().getTime()}.xlsx`)
+ } else {
+ this.download('/zYearInfo/export1/' + Ids, {}, `zYearInfo${new Date().getTime()}.xlsx`)
+ }
+ },
+ /** 瀵煎叆妯℃澘涓嬭浇鎿嶄綔*/
+ handleExportTemplate()
+ {
+ this.download('/zYearInfo/model', {
+
+ }, `zYearInfo${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(err)
+ {
+ Message({ message: "瀵煎叆澶辫触", type: 'error' })
+ }
+
+
+
+ }
+ }
+
+};
+</script>
+
+<style>
+.el-table__row.statistics-warning-row {
+ background: #E0EEFE;
+
+}
+.el-table__row.statistics-warning-row1 {
+ background: #FFEFF2;
+
+}
+.fixed-width1{
+ width:75%;
+}
+.form1 {
+ position: absolute;
+ right: 60px;
+ top:20px;
+ background:center/11% no-repeat url('../../assets/icons/form.png') ;
+}
+.form2 {
+ position: absolute;
+ right: 200px;
+ top:20px;
+
+}
+</style>
diff --git a/ruoyi-ui/src/views/healthy/ExaminationInfo.vue b/ruoyi-ui/src/views/healthy/ExaminationInfo.vue
new file mode 100644
index 0000000..eb9190c
--- /dev/null
+++ b/ruoyi-ui/src/views/healthy/ExaminationInfo.vue
@@ -0,0 +1,425 @@
+<template>
+ <div class="app-container" id="printable-content">
+ <div class="form-header mt">
+ <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;" >
+ <span>浣撴璇︾粏淇℃伅</span>
+ <div style="display: flex; align-items: center;">
+ <el-button size="mini" type="text" v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
+ <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>
+ </el-button></div>
+ </h1>
+ </div>
+
+ <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
+ <el-form-item label="浣撴鏃堕棿" prop="happenTime">
+ <el-date-picker v-model="formData.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
+ ></el-date-picker> </el-form-item>
+
+ <el-form-item label="棰樺悕" prop="report">
+ <el-input v-model="formData.report" placeholder="璇疯緭鍏ラ鍚�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+
+
+ <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
+ <el-upload
+ action="#"
+ list-type="picture-card"
+ multiple
+ :http-request="requestUpload"
+ :file-list="fileList"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
+ >
+ <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <img
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ alt=""
+ style="width: 147px; height: 147px"
+ fit="cover"
+ :preview-src-list="[file.url]"
+ >
+ <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
+
+ class="el-upload-list__item-delete"
+ @click="handleDownload(file.url)"
+ >
+ <i class="el-icon-download"></i>
+ </span>
+ <span
+ v-if="isShow"
+ 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
+ list-type="picture-card"
+ :on-preview="handleFileCardPreview"
+ :on-remove="handleRemoveFile"
+ :http-request="requestUpload"
+ :show-file-list="true"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
+ >
+ <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
+ <i v-if="!uploading" 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="../../assets/401_images/401.gif"
+ alt=""
+ 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)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+
+ class="el-upload-list__item-delete"
+ @click="handleDownload(file.url)"
+ >
+ <i class="el-icon-download"></i>
+ </span>
+ <span
+ v-if="isShow"
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+ </div>
+
+
+ </el-upload>
+
+ <el-form-item size="large">
+ <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
+ </el-form-item>
+ </el-form>
+
+
+ <el-dialog :visible.sync="dialogVisible">
+ <img w-full :src="dialogImageUrl" alt="Preview Image" />
+ </el-dialog>
+ </div>
+</template>
+<script>
+import {getExaminationInfo, uploadPic, download, updateExamination} from "@/api/healthy/index";
+import {addRole, updateRole} from "@/api/system/role";
+import {blobValidate} from "@/utils/ruoyi";
+import errorCode from "@/utils/errorCode";
+import {Message} from "element-ui";
+
+export default {
+ components: {},
+ props: [],
+ data() {
+ return {
+ cdi:"鍋ュ悍璇︾粏淇℃伅",
+ udi:"鍋ュ悍淇℃伅淇敼",
+ fot:[".jpg",".jif"],
+ fileList:[
+ ],
+ fileListOther:[
+
+ ],
+ dsb:true,
+ btn:false,
+ isShow:true,
+ uploading: false,
+ formData: {
+ type: undefined,
+ happenTime: undefined,
+ accNo:undefined,
+ password:undefined,
+ validityDate:undefined,
+ isFinger:undefined,
+ isFace:undefined,
+ isPrivate:undefined,
+ location:undefined,
+ remark: undefined,
+ url: undefined,
+ },
+ dialogImageUrl: '',
+ dialogVisible: false,
+ disabled: false,
+ rules: {
+ happenTime: [{
+ required: true,
+ message: '璇烽�夋嫨浣撴鏃堕棿',
+ trigger: 'blur'
+ }],
+
+
+ report: [{
+ required: true,
+ message: '璇疯緭鍏ユ爣棰�',
+ trigger: 'blur'
+ }],
+
+
+ },
+ typeOptions: [{
+ value: '0',
+ label: '鍩洪噾',
+ },
+ {
+ value: '1',
+ label: '鍙拌处',
+ }],
+ }
+ },
+ computed: {},
+ watch: {},
+ created() {
+ const id = this.$route.params && this.$route.params.id;
+ let jd;
+ if(this.$route.query.detail!=undefined)
+ {
+ jd = this.$route.query.detail
+ this.btn= jd
+ this.dsb = !jd
+ this.isShow=true
+ document.title = "淇敼鍋ュ悍璇︾粏淇℃伅";
+ this.$route.meta.title = "淇敼鍋ュ悍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ }
+ else{
+ document.title = "鏌ョ湅鍋ュ悍璇︾粏淇℃伅";
+ this.$route.meta.title = "鏌ョ湅鍋ュ悍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ this.isShow=false
+ this.btn = false;
+ }
+
+ let _this = this
+ if (id) {
+ this.loading = true;
+
+ getExaminationInfo({id}).then((response) => {
+ this.formData = response.data;
+ let paths = response.data.url.split(",");
+ for(let i = 0; i < paths.length; i++)
+ {
+ if(paths[i]!="") {
+
+ let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+
+ if (_this.fot.includes(pth) === true)
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ else {
+ // alert(paths[i])
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ }
+ }
+ }
+ this.loading = false;
+ });
+
+
+ }
+ },
+ mounted() {},
+ methods: {
+ getSrc1(type) {
+ if (type === 0) {
+ return '鍩洪噾'
+ }else {
+ return '鍙拌处'
+ }
+ },
+
+ getSrc2(kind) {
+ if (kind == 0) {
+ return '鐜伴噾'
+ }else {
+ return '鑷姩鎵e垝'
+ }
+ },
+
+
+ submitForm() {
+ 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.formData.url = ul+","+uls
+
+ this.$refs['elForm'].validate(valid => {
+
+
+ if (valid) {
+ if (this.formData.id != undefined) {
+ updateExamination(this.formData).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ // this.open = false;
+ this.btn=false
+ });
+ } else {
+ this.$modal.msgSuccess("淇敼澶辫触");
+
+ }
+ }
+ })
+ },
+ resetForm() {
+ this.$refs['elForm'].resetFields()
+ },
+ handlePreview(file)
+ {
+ let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+ let lens = formData.path.split(".")
+ let suffix = lens[lens.length-1]
+ download(formData).then(async (response) => {
+ const isLogin = await blobValidate(response);
+ let nt = new Date().getTime()
+ let filename = 'familyevent_'+nt+'.'+suffix
+ const blob = new Blob([response])
+ saveAs(blob, filename)
+ })
+ },
+ handleRemoveFile(file) {
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ this.$delete(this.fileListOther,i);
+ }
+ },
+ handleRemove(file) {
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ this.$delete(this.fileList,i);
+ }
+ },
+ handleFileCardPreview(file){
+ this.dialogFileUrl = file.url;
+ // alert(file.url)
+ // this.dialogFileUrl = 'https://www.bendudu.com:8080/profile/upload/2023/10/18/20231018214647A011.doc'
+ // this.dialogFileUrl = 'https://47.93.189.255:8080/profile/upload/2023/03/19/test7_20230319222030A007.jpg'
+ if(this.dialogFileUrl.includes("47.93.189.255")==true)
+ this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
+ //alert(this.dialogFileUrl)
+ const Base64 = require('js-base64').Base64
+
+ this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+ let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+ },
+ handlePictureCardPreview(file) {
+ this.dialogImageUrl = file.url;
+ this.dialogVisible = true;
+ },
+ handleDownload(url) {
+ var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+
+ let lens = formData.path.split(".")
+ let suffix = lens[lens.length-1]
+ download(formData).then(async (response) => {
+ const isLogin = await blobValidate(response);
+ let nt = new Date().getTime()
+ let filename = 'healthyInfo'+nt+'.'+suffix
+ const blob = new Blob([response])
+ saveAs(blob, filename)
+ })
+ },
+ handleEdit()
+ {
+ this.dsb = false
+ this.btn = true
+ this.isShow=false
+ },
+ requestUpload(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})
+
+ }
+
+ else{
+ _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ }
+ })
+
+ },
+
+ }
+}
+
+</script>
+<style scoped lang="scss">
+.mt
+{
+ position: relative;
+}
+.dt{
+ display: block;
+
+}
+.pt{
+ right: 10px;
+ top:-3px;
+ display: block;
+ position: absolute;
+}
+.hide .el-upload--picture-card {
+ display: none;
+}
+.form{
+ background:center/11% no-repeat url('../../assets/icons/form.png') ;
+}
+</style>
diff --git a/ruoyi-ui/src/views/healthy/healthYear.vue b/ruoyi-ui/src/views/healthy/healthYear.vue
index 3cb4e24..801ab09 100644
--- a/ruoyi-ui/src/views/healthy/healthYear.vue
+++ b/ruoyi-ui/src/views/healthy/healthYear.vue
@@ -8,13 +8,13 @@
</el-backtop>
<h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
<span>鐜扮姸鍋ュ悍鎯呭喌</span>
- <div style="display: flex; align-items: center;">
- <el-button size="mini" type="text" @click="toYearhealthy" v-hasPermi="['person:healthy:healthYear']">
- <div class="form" ><el-icon style="padding-right:110px;"></el-icon>
- <span class="text" style="width: 69px;height: 26px;font-size: 16px; padding-left: 10px;
- font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">浣撴/鐪嬬梾</span></div>
- </el-button>
- </div>
+<!-- <div style="display: flex; align-items: center;">-->
+<!-- <el-button size="mini" type="text" @click="toYearhealthy" v-hasPermi="['person:healthy:healthYear']">-->
+<!-- <div class="form" ><el-icon style="padding-right:110px;"></el-icon>-->
+<!-- <span class="text" style="width: 69px;height: 26px;font-size: 16px; padding-left: 10px;-->
+<!-- font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">浣撴/鐪嬬梾</span></div>-->
+<!-- </el-button>-->
+<!-- </div>-->
</h1>
<el-divider />
@@ -2201,8 +2201,8 @@
},
//骞村害鍋ュ悍鎶ュ憡
toYearhealthy(){
- console.log(this.HealthyBaseList.uid)
- this.$router.push("/self/healthy/healthYear/" + this.HealthyBaseList.uid);
+ // console.log(this.HealthyBaseList.uid)
+ this.$router.push("/self/healthy/index");
},
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
@@ -2239,6 +2239,7 @@
.app-container {
background-color: #FEF7FC;
}
+
.btn_edit{
background:center no-repeat url('../../assets/icons/edit.png') ;
position: absolute;
diff --git a/ruoyi-ui/src/views/healthy/healthyInfo.vue b/ruoyi-ui/src/views/healthy/healthyInfo.vue
index 7317918..df162cd 100644
--- a/ruoyi-ui/src/views/healthy/healthyInfo.vue
+++ b/ruoyi-ui/src/views/healthy/healthyInfo.vue
@@ -13,7 +13,7 @@
</div>
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
- <el-form-item label="浣撴鏃堕棿" prop="checkTime">
+ <el-form-item label="灏卞尰鏃堕棿" prop="checkTime">
<el-date-picker v-model="formData.checkTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
:editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
></el-date-picker> </el-form-item>
@@ -21,13 +21,13 @@
<el-form-item label="灏辩梾鍖婚櫌" prop="hospital">
<el-input v-model="formData.hospital" placeholder="璇烽�夋嫨灏辩梾鍖婚櫌" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
- <el-form-item label="绫诲埆" prop="type">
- <el-select v-model="formData.type" placeholder="璇烽�夋嫨" clearable :style="{width: '100%'}" :disabled="dsb">
- <el-option label="浣撴" value="浣撴"></el-option>
- <el-option label="鐪嬬梾" value="鐪嬬梾"></el-option>
+<!-- <el-form-item label="绫诲埆" prop="type">-->
+<!-- <el-select v-model="formData.type" placeholder="璇烽�夋嫨" clearable :style="{width: '100%'}" :disabled="dsb">-->
+<!-- <el-option label="浣撴" value="浣撴"></el-option>-->
+<!-- <el-option label="鐪嬬梾" value="鐪嬬梾"></el-option>-->
- </el-select>
- </el-form-item>
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item label="棰樺悕" prop="title">
<el-input v-model="formData.title" placeholder="璇疯緭鍏ラ鍚�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
@@ -206,7 +206,7 @@
rules: {
checkTime: [{
required: true,
- message: '璇烽�夋嫨浣撴鏃堕棿',
+ message: '璇烽�夋嫨灏卞尰鏃堕棿',
trigger: 'blur'
}],
@@ -215,11 +215,7 @@
message: '璇疯緭鍏ュ尰闄�',
trigger: 'blur'
}],
- type: [{
- required: true,
- message: '璇烽�夋嫨浣撴/鐪嬬梾',
- trigger: 'change'
- }],
+
title: [{
required: true,
message: '璇疯緭鍏ユ爣棰�',
diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index cac3708..b41b7e8 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -3,7 +3,7 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="浣撴/鐪嬬梾鏃堕棿" prop="checkTime">
+ <el-form-item label="鐪嬬梾鏃堕棿" prop="checkTime">
<el-date-picker
v-model="dateRange"
style="width: 200px;
@@ -29,18 +29,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="绫诲埆" prop="type">
- <el-input
- v-model="queryParams.type"
- placeholder="璇疯緭鍏ョ被鍒�"
- clearable
- style="width: 200px;
- height: 35px;
- border-radius: 16px 16px 16px 16px;
- opacity: 0.5;"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
+
<el-form-item label="棰樺悕" prop="title">
<el-input
@@ -56,10 +45,16 @@
</el-form-item>
<el-button size="mini" type="text" @click="toYearhealthy" v-hasPermi="['person:healthy:healthYear']">
- <div class="form" ><el-icon style="padding-right:110px;"></el-icon>
- <span class="text" style="width: 69px;height: 26px;font-size: 16px;padding-left:50px;
- font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">骞村害鍋ュ悍鎯呭喌</span></div>
+ <div class="form1" ><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>
</el-button>
+
+ <el-button size="mini" type="text" @click="toExamination" v-hasPermi="['person:healthy:healthYear']">
+ <div class="form2" ><el-icon style="padding-right:50px;"></el-icon>
+ <span class="text" style="width: 69px;height: 26px;font-size: 16px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鍘嗗勾浣撴鎯呭喌</span></div>
+ </el-button>
<el-form-item>
<el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;border-radius:6px 6px 6px 6px;opacity:1;">鎼滅储</el-button>
@@ -130,10 +125,10 @@
<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="浣撴/鐪嬬梾鏃堕棿" prop="checkTime" sortable width="200" align="center">
+ <el-table-column label="鐪嬬梾鏃堕棿" prop="checkTime" sortable width="200" align="center">
<template slot-scope="scope">{{scope.row.checkTime? scope.row.checkTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="绫诲埆" prop="type" sortable width="120" />
+
<el-table-column label="灏辩梾鍖婚櫌" prop="hospital" sortable width="120" >
</el-table-column>
@@ -209,13 +204,7 @@
></el-date-picker>
</el-form-item>
- <el-form-item label="绫诲埆" prop="type">
- <el-select v-model="formDat.type" placeholder="璇烽�夋嫨">
- <el-option label="浣撴" value="浣撴"></el-option>
- <el-option label="鐪嬬梾" value="鐪嬬梾"></el-option>
- </el-select>
- </el-form-item>
<el-form-item label="灏辩梾鍖婚櫌" prop="hospital">
<el-input v-model="formDat.hospital" placeholder="璇疯緭鍏ュ氨鐥呭尰闄�" clearable :style="{width: '100%'}" >
</el-input>
@@ -316,6 +305,7 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁� --鎺ュソ浜�
import {listHealth,enload,delHealth,uploadPic, addHealth} from "@/api/healthy/index";
+import {Message} from "element-ui";
export default {
name: "Role",
@@ -633,13 +623,14 @@
},
//骞村害鍋ュ悍鎶ュ憡
toYearhealthy(){
- // console.log(this.HealthyBaseList.uid)
- // this.$router.push("/self/healthy/healthYear/" + this.HealthyBaseList.uid);
- // this.$router.push("/self/healthy/healthYear" );
this.$router.push("/self/healthy/healthYear" );
},
-
+ //浣撴琛�
+ toExamination(){
+ this.$router.push("/self/healthy/Examination" );
+ },
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
+
handleExport() {
const Ids = this.ids;
@@ -659,20 +650,21 @@
}, `zYearInfo${new Date().getTime()}.xlsx`)
},
/** 瀵煎叆鎿嶄綔*/
- handleEnport(params) {
+ handleEnport(params){
var file = params.file;
var formData = new FormData();
formData.append('excelImport', file);
let _this = this
- alert(file)
enload(formData).then(response => {
_this.getList();
- Message({message: "瀵煎叆鎴愬姛", type: 'warning'})
+ Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
}).catch(err)
{
- Message({message: "瀵煎叆澶辫触", type: 'error'})
+ Message({ message: "瀵煎叆澶辫触", type: 'error' })
}
+
+
}
}
@@ -689,4 +681,16 @@
background: #FFEFF2;
}
+.form1 {
+ position: absolute;
+ right: 60px;
+ top:20px;
+ background:center/11% no-repeat url('../../assets/icons/form.png') ;
+}
+.form2 {
+ position: absolute;
+ right: 200px;
+ top:20px;
+
+}
</style>
--
Gitblit v1.9.1