From b580f0402ff66d0c5b74460edcb920a516b1ce6e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 九月 2023 18:00:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.218.113:9001/r/lims-before
---
src/views/CNAS/satisfactionSurveys/index.vue | 123 ++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 62 deletions(-)
diff --git a/src/views/CNAS/satisfactionSurveys/index.vue b/src/views/CNAS/satisfactionSurveys/index.vue
index f1e2efb..3b85a7b 100644
--- a/src/views/CNAS/satisfactionSurveys/index.vue
+++ b/src/views/CNAS/satisfactionSurveys/index.vue
@@ -1,14 +1,14 @@
<template>
<div class="content-main survey">
<div class="top-bar">
- <el-form ref="form" style="width: 1000px;" :inline="true">
+ <el-form ref="form" style="width: 1000px;margin-top: 10px;" :inline="true" >
<!-- <el-input v-model="input" class="input-form" placeholder="璇风洿鎺ヨ緭鍏ユ牱寮忕紪鍙�/鏍峰搧鍚嶇О/鍨嬪彿瑙勬牸/杩涜鎼滅储鎴栦笅鎷夐�夋嫨杩涜缁勫悎鏌ヨ"
@keyup.enter.native="getData" /> -->
<el-form-item style="width: 800px;">
<el-col style="display: flex; justify-content: space-around;" :span="12">
<el-row>璋冩煡鏃ユ湡:</el-row>
<el-row style="width: 300px;">
- <el-date-picker style="width: 270px;" class="newly-form" v-model="surveyDate" type="date"
+ <el-date-picker size="small" style="width: 270px;" class="newly-form" v-model="surveyDate" type="date"
placeholder="璇烽�夋嫨璋冩煡鏃ユ湡" autocomplete="off">
</el-date-picker>
</el-row>
@@ -16,7 +16,7 @@
<el-col style="display: flex; justify-content: space-around;" :span="12">
<el-row>褰曞叆鏃ユ湡:</el-row>
<el-row style="width: 300px;">
- <el-date-picker style="width: 270px;" class="newly-form" v-model="entryDate" type="date"
+ <el-date-picker size="small" style="width: 270px;" class="newly-form" v-model="entryDate" type="date"
placeholder="璇烽�夋嫨褰曞叆鏃ユ湡" autocomplete="off">
</el-date-picker>
</el-row>
@@ -27,14 +27,14 @@
<el-button type="primary" size="small" plain @click="resetData()">娓呯┖</el-button>
</el-form-item>
</el-form>
- <el-form>
- <el-button size="40" @click="getFillName()" icon="el-icon-document-add" type="primary">鏂板璁板綍</el-button>
+ <el-form style="margin-top: 10px;">
+ <el-button size="small" @click="getFillName()" icon="el-icon-plus" type="primary">鏂板璁板綍</el-button>
</el-form>
</div>
<div class="library-table">
<div class="table-box">
- <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'center' }"
- :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+ <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'left' }"
+ :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
:data="tableData" style="width: 100%">
<el-table-column prop="id" type="index" label="搴忓彿" min-width="20%"/>
<el-table-column prop="surveyDate" label="璋冩煡鏃ユ湡" min-width="10%" />
@@ -224,7 +224,7 @@
otherSupplements: "鏃�",
improvementRequirements: "鏃�",
dialogVisible2: false,
- path: 'http://192.168.110.254:1234/cnasSatisfactionSurvey/uploadFile',
+ path: 'http://localhost:1234/cnasSatisfactionSurvey/uploadFile',
ruleForm: {
surveyDate: '',
userUnit: '',
@@ -263,7 +263,7 @@
}
},
created() {
-
+ // this.path=process.env.VUE_APP_BASE_API+"cnasSatisfactionSurvey/uploadFile"
},
mounted() {
this.getData()
@@ -482,74 +482,73 @@
</script>
<style lang="scss" scoped>
-.top-bar {
- margin: -25px -15px;
- background: #fff;
- display: flex;
- justify-content: space-between;
- padding: 5px 24px 0px 24px;
+.content-main {
+ .el-form .el-form-item .el-form-item__content {
+ width: 100% !important;
+ }
- .input-form {
- width: 800px;
- }
-
- .el-dropdown-link {
- cursor: pointer;
- color: #409EFF !important;
- }
-
- .el-icon-arrow-down {
- font-size: 12px !important;
- }
-
-
-}
-
-.library-table {
- background-color: #fff;
- flex: 1;
- margin: 0px -15px;
- margin-top: 40px;
- display: flex;
- flex-direction: column;
-
- .table-header {
- padding: 20px;
+ .top-bar {
+ margin: -25px -15px;
+ background: #fff;
display: flex;
justify-content: space-between;
+ padding: 5px 24px 0px 24px;
- .el-form-item {
- margin-bottom: 30px !important;
+ .input-form {
+ width: 800px;
}
+
+ .el-dropdown-link {
+ cursor: pointer;
+ color: #409EFF !important;
+ }
+
+ .el-icon-arrow-down {
+ font-size: 12px !important;
+ }
+
+
}
- .table-box {
- padding: 0px 20px;
- margin-top: 20px;
+ .library-table {
+ background-color: #fff;
flex: 1;
- background: #fff;
+ margin: 0px -15px;
+ margin-top: 40px;
display: flex;
flex-direction: column;
- >div:nth-child(2) {
+ .table-header {
+ padding: 20px;
display: flex;
- justify-content: end;
- margin: 10px 0;
+ justify-content: space-between;
+
+ .el-form-item {
+ margin-bottom: 30px !important;
+ }
}
- }
-}
+ .table-box {
+ padding: 0px 20px;
+ margin-top: 20px;
+ flex: 1;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
-.table,
-tr,
-td {
- padding: 10px;
-}
-</style>
-<style >
-.content-main {
- .el-form .el-form-item .el-form-item__content {
- width: 100% !important;
+ >div:nth-child(2) {
+ display: flex;
+ justify-content: end;
+ margin: 10px 0;
+ }
+
+ }
+ }
+
+ .table,
+ tr,
+ td {
+ padding: 10px;
}
}
</style>
--
Gitblit v1.9.3