From 43e1199ca0c75787fb6b52bef7d595abd115ceab Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 02 一月 2025 21:44:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/healthy/index.vue | 86 +++++++++++++++++++++++++------------------
1 files changed, 50 insertions(+), 36 deletions(-)
diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index 331f8c1..6eca37c 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -20,7 +20,7 @@
<el-form-item label="鏁戠梾鍖婚櫌" prop="hospital" >
<el-input
v-model="queryParams.hospital"
- placeholder="璇疯緭鍏ュ氨鐥呭尰闄�"
+ placeholder="璇疯緭鍏ユ晳鐥呭尰闄�"
clearable
style="width: 200px;
height: 35px;
@@ -52,7 +52,7 @@
</el-form-item>
</el-form>
- <el-row :gutter="10" class="mb8">
+ <el-row :gutter="10" class="mb8" v-if="userId != 2">
<el-col :span="1.5">
<el-button
type="primary"
@@ -126,15 +126,15 @@
</el-col>
</el-row>
- <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 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"/>
+ <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">
<template slot-scope="scope">{{scope.row.checkTime? scope.row.checkTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="灏辩梾鍖婚櫌" prop="hospital" sortable width="120" >
+ <el-table-column label="鏁戠梾鍖婚櫌" prop="hospital" sortable width="120" >
</el-table-column>
<el-table-column label="棰樺悕" prop="title" sortable width="150" />
@@ -166,7 +166,7 @@
<el-table-column label="澶囨敞" prop="remark" sortable width="120" >
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<div class="button-container">
<el-button
@@ -201,19 +201,21 @@
style="background: #FEF7FC;"
/>
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+ <el-dialog :title="title" @click.native="handleDialogClick" :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="checkTime">
<el-date-picker v-model="formDat.checkTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ @click.native.stop
+ ref="datePicker"
:editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
- <el-form-item label="灏辩梾鍖婚櫌" prop="hospital">
- <el-input v-model="formDat.hospital" placeholder="璇疯緭鍏ュ氨鐥呭尰闄�" clearable :style="{width: '100%'}" >
+ <el-form-item label="鏁戠梾鍖婚櫌" prop="hospital">
+ <el-input v-model="formDat.hospital" placeholder="璇疯緭鍏ユ晳鐥呭尰闄�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="棰樺悕" prop="title">
@@ -234,7 +236,7 @@
<el-upload
action="#"
list-type="picture-card"
-
+
multiple
:http-request="requestUpload"
:file-list="fileList"
@@ -277,7 +279,7 @@
style="margin-left: 10px"
size="small"
type="success"
-
+
@click="picUpload"
>涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -297,7 +299,7 @@
>
-
+
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -310,11 +312,11 @@
></video>
<img v-else
class="el-upload-list__item-thumbnail"
- :src="file.url"
+ src="../../assets/images/deviceLis.png"
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
@@ -323,19 +325,19 @@
>
<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"
@@ -364,7 +366,7 @@
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
+import {getInfo} from "@/api/login";
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
@@ -372,10 +374,11 @@
import {Message} from "element-ui";
export default {
- name: "Role",
+ name: "ZYearInfo",
dicts: ['sys_normal_disable'],
data() {
return {
+ userId: undefined,
// 閬僵灞�
disabled: false,
loading: true,
@@ -407,7 +410,7 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[
],
@@ -465,7 +468,7 @@
hospital: [{
required: true,
- message: '璇疯緭鍏ュ氨鐥呭尰闄�',
+ message: '璇疯緭鍏ユ晳鐥呭尰闄�',
trigger: 'blur'
}],
type: [{
@@ -490,11 +493,22 @@
},
created() {
this.getList();
-
+ this.getInfo()
},
methods: {
-
+ handleDialogClick()
+ {
+ // 鍏抽棴鏃ユ湡閫夋嫨鍣�
+ this.$refs.datePicker.handleClose();
+ },
+ getInfo(){
+ console.log('-----------------')
+ getInfo().then(response=>{
+ console.log(response.user.roles[0].roleId,'roleID')
+ this.userId = response.user.roles[0].roleId
+ })
+ },
// 鍙栨秷鎸夐挳
cancelData() {
@@ -544,9 +558,9 @@
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);
+ this.$delete(this.uploadFileList1,i);
}
}
},
@@ -582,7 +596,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -669,7 +683,7 @@
},
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
console.log(file)
@@ -692,7 +706,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
this.$refs.upload1.submit();
// formData.append('uploadFile', file);
@@ -702,18 +716,18 @@
}
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()
{
@@ -728,7 +742,7 @@
//console.log(this.uploadFileList)
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
//alert(90)
let _this = this
@@ -738,7 +752,7 @@
_this.formDat.url = _this.formDat.url+","+response.fileNames
_this.uploadFileList = []
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-
+
});
},
requestUpload(params) {
--
Gitblit v1.9.1