From a5a81efad512d32da6d1027fe8ab5cc29a3b6af4 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 01 三月 2024 20:46:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/healthy/index.vue | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index 42b2455..7d41766 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -6,7 +6,7 @@
<el-form-item label="鐪嬬梾鏃堕棿" prop="checkTime">
<el-date-picker
v-model="dateRange"
- style="width: 200px;
+ style="width: 240px;
height: 35px;
border-radius: 16px 16px 16px 16px;
opacity: 0.5;"
@@ -44,17 +44,7 @@
/>
</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-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>
@@ -117,11 +107,26 @@
icon="el-icon-top">瀵煎叆</el-button>
</el-upload>
+
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <el-col></el-col>
+ <el-col>
+<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-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;margin-right: 20px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鍘嗗勾浣撴鎯呭喌</span></div>
+ </el-button>
+ </el-col>
</el-row>
- <el-table v-loading="loading" :data="healthList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" :data="healthList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
@@ -136,7 +141,7 @@
<el-table-column label="娉ㄦ剰浜嬮」" prop="notice" sortable width="150" />
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable width="150" >
<template slot-scope="scope" >
- <div @click="handleCheck(scope.row)">
+ <div>
<img
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -343,7 +348,10 @@
// 鏃ユ湡鑼冨洿
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'],
+
fileList:[
],
fileListOther:[ ],
--
Gitblit v1.9.1