From db0607d0522ad9fd51d344b6cb49ee66de24e889 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 25 四月 2023 00:13:04 +0800
Subject: [PATCH] 接入蓝湖样式和解决了一些bug: 1.在修改页面去掉了编辑按钮,点击编辑后跳转修改并且不会显示编辑按钮。 2.查看详情的方式从点击“查看详细”变成点击某行可以跳转详细信息 3.“电子文件”列换成文件图标

---
 ruoyi-ui/src/views/self/show.vue                 |    3 +
 ruoyi-ui/src/views/collection/collectionInfo.vue |   10 ++-
 ruoyi-ui/src/views/contacts/index.vue            |   29 +++++----
 ruoyi-ui/src/views/doctor/doctorInfo.vue         |   10 ++-
 ruoyi-ui/src/views/contacts/contactsInfo.vue     |   15 ++++-
 ruoyi-ui/src/views/self/edit.vue                 |    4 +
 ruoyi-ui/src/views/collection/index.vue          |   25 +++----
 ruoyi-ui/src/views/doctor/index.vue              |   26 ++++----
 8 files changed, 73 insertions(+), 49 deletions(-)

diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index 4757ded..e5b1c68 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="form-header mt">
       <h4 class="dt h4">鏀惰棌涓庤崳瑾夎缁嗕俊鎭� </h4>
-      <el-button type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" :disabled="btn">缂栬緫</el-button>
+      <el-button v-if="isShow" type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>
       <!--      <br>-->
       <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
       <!--                 v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
@@ -145,7 +145,7 @@
       ],
       dsb:true,
       btn:false,
-
+      isShow:true,
       // 鏀惰棌涓庤崳瑾夎〃鏍兼暟鎹�
      collectionList: [],
 
@@ -339,7 +339,8 @@
     handleEdit()
     {
       this.dsb = false
-      this.btn = true
+      // this.btn = true
+      this.isShow=false
     },
     requestUpload(params)
     {
@@ -378,6 +379,9 @@
 </script>
 
 <style scoped>
+.app-container{
+  background-color: #FEF7FC;
+}
 .mt
 {
   position: relative;
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index aa06d9f..4a1c8c7 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -154,7 +154,7 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
     </div>
-    <el-table v-loading="loading" :data="collectionList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+    <el-table v-loading="loading" :data="collectionList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
       <el-table-column type="selection" width="25"  align="center" />
 <!--      <el-table-column label="搴忓彿" prop="id" sortable width="80" />-->
       <el-table-column label="鑾峰緱鏃堕棿" prop="happenTime" sortable width="100" align="center">
@@ -180,14 +180,10 @@
       </el-table-column>
       <el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable  width="110" >
         <template slot-scope="scope">
-<!--          <el-image style="width: 100px; height: 100px" :src="'http://47.93.189.255:8080/'+ scope.row.url" fit="cover"></el-image>-->
-          <span v-if= "scope.row.url ==null" ><img src="../../assets/images/鏂囦欢澶�-0.png" /></span>
-
+          <span v-if= "scope.row.url == ','" ><img src="../../assets/images/鏂囦欢澶�-0.png" /></span>
           <span v-else><img src="../../assets/images/鏂囦欢澶�-1.png" /></span>
-
         </template>
       </el-table-column>
-
 
       <el-table-column label="澶囨敞" prop="remark" sortable width="140" align="center">
         <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
@@ -212,12 +208,12 @@
             size="mini"
             @command="(command) => handleCommand(command, scope.row)"
             v-hasPermi="['system:role:edit']">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-d-arrow-right"
-              @click="handleCheck(scope.row)"
-            >鏌ョ湅璇︽儏</el-button>
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              icon="el-icon-d-arrow-right"-->
+<!--              @click="handleCheck(scope.row)"-->
+<!--            >鏌ョ湅璇︽儏</el-button>-->
 
           </el-dropdown>
         </template>
@@ -242,8 +238,6 @@
           <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-
-
         <el-form-item label="鍚嶇О" prop="name">
           <el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ悕绉�" clearable :style="{width: '100%'}" >
           </el-input>
@@ -685,6 +679,9 @@
 };
 </script>
 <style>
+.app-container{
+  background-color: #FEF7FC;
+}
 
 .el-table__row.statistics-warning-row {
   background: #E0EEFE;
diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue
index cc14ea3..28d001c 100644
--- a/ruoyi-ui/src/views/contacts/contactsInfo.vue
+++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="form-header mt">
       <h4 class="dt h4">閫氳褰曡缁嗕俊鎭� </h4>
-      <el-button type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" :disabled="btn">缂栬緫</el-button>
+      <el-button v-if="isShow" type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>
 <!--      <br>-->
 <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
 <!--                 v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
@@ -47,6 +47,11 @@
       </el-form-item>
       <el-form-item label="鏄惁甯歌仈绯�" prop="isAlways">
         <el-input v-model="formData.isAlways" placeholder="鏄惁甯歌仈绯�" clearable :style="{width: '100%'}" :disabled="dsb">
+<!--          <template slot-scope="scope">-->
+<!--            <span v-if="scope.row.isAlways===1">鏄�</span>-->
+<!--            <span v-if="scope.row.isAlways===0">鍚�</span>-->
+<!--            <span v-if="scope.row.isAlways== null">鈥斺��</span>-->
+<!--          </template>-->
         </el-input>
       </el-form-item>
       <el-form-item label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark">
@@ -133,7 +138,7 @@
       ],
       dsb:true,
       btn:false,
-
+      isShow:true,
       // 閫氳褰曡〃鏍兼暟鎹�
       contactList: [],
 
@@ -320,7 +325,8 @@
     handleEdit()
     {
       this.dsb = false
-      this.btn = true
+      // this.btn = true
+      this.isShow=false
     },
     requestUpload(params)
     {
@@ -359,6 +365,9 @@
 </script>
 
 <style scoped>
+.app-container{
+  background-color: #FEF7FC;
+}
 .mt
 {
   position: relative;
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index a8462dd..2841519 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -144,7 +144,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
   </div>
-    <el-table v-loading="loading" :data="contactList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+    <el-table v-loading="loading" :data="contactList"  @selection-change="handleSelectionChange"  @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
       <el-table-column type="selection" width="25"  align="center" />
       <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
 
@@ -156,15 +156,15 @@
         </template>
 
       </el-table-column>
-      <el-table-column label="绉板懠" prop="nickName" sortable :show-overflow-tooltip="true" width="80" />
-      <el-table-column label="濮撳悕" prop="name" sortable :show-overflow-tooltip="true" width="80" />
-      <el-table-column label="宸ヤ綔鍗曚綅" prop="work" sortable width="100" >
+      <el-table-column label="绉板懠" prop="nickName" sortable :show-overflow-tooltip="true" width="80" align="center" />
+      <el-table-column label="濮撳悕" prop="name" sortable :show-overflow-tooltip="true" width="80" align="center"/>
+      <el-table-column label="宸ヤ綔鍗曚綅" prop="work" sortable width="100" align="center" >
         <template slot-scope="scope">{{scope.row.work? scope.row.work: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="鎵嬫満" prop="phone" sortable width="110" >
+      <el-table-column label="鎵嬫満" prop="phone" sortable width="110" align="center" >
         <template slot-scope="scope">{{scope.row.phone? scope.row.phone: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="鍏跺畠鑱旂郴鏂瑰紡" prop="wx qq twitter" sortable width="130" >
+      <el-table-column label="鍏跺畠鑱旂郴鏂瑰紡" prop="wx qq twitter" sortable width="130" align="center" >
         <template slot-scope="scope">
           <span v-if="scope.row.wx || scope.row.qq || scope.row.twitter == true">
             {{scope.row.wx}}<br>
@@ -174,7 +174,7 @@
           <span v-else>鈥斺�斺�斺��</span>
         </template>
       </el-table-column>
-      <el-table-column label="鏄惁甯歌仈绯�" prop="isAlways" sortable width="120" >
+      <el-table-column label="鏄惁甯歌仈绯�" prop="isAlways" sortable width="120" align="center" >
         <template slot-scope="scope">
           <span v-if="scope.row.isAlways===1">鏄�</span>
           <span v-if="scope.row.isAlways===0">鍚�</span>
@@ -232,12 +232,12 @@
             size="mini"
             @command="(command) => handleCommand(command, scope.row)"
             v-hasPermi="['system:role:edit']">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-d-arrow-right"
-              @click="handleCheck(scope.row)"
-            >鏌ョ湅璇︽儏</el-button>
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              icon="el-icon-d-arrow-right"-->
+<!--              @click="handleCheck(scope.row)"-->
+<!--            >鏌ョ湅璇︽儏</el-button>-->
 
           </el-dropdown>
         </template>
@@ -761,6 +761,9 @@
 </script>
 
 <style >
+.app-container{
+  background-color: #FEF7FC;
+}
 
 .el-table__row.statistics-warning-row {
   background: #E0EEFE;
diff --git a/ruoyi-ui/src/views/doctor/doctorInfo.vue b/ruoyi-ui/src/views/doctor/doctorInfo.vue
index f8f36b4..71c7098 100644
--- a/ruoyi-ui/src/views/doctor/doctorInfo.vue
+++ b/ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="form-header mt">
       <h4 class="dt h4">灏卞尰璁板綍璇︾粏淇℃伅 </h4>
-      <el-button type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" :disabled="btn">缂栬緫</el-button>
+      <el-button v-if="isShow" type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>
       <!--      <br>-->
       <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
       <!--                 v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
@@ -176,7 +176,7 @@
       ],
       dsb:true,
       btn:false,
-
+      isShow:true,
       // 灏卞尰璁板綍琛ㄦ牸鏁版嵁
       doctorList: [],
 
@@ -384,7 +384,8 @@
     handleEdit()
     {
       this.dsb = false
-      this.btn = true
+      // this.btn = true
+      this.isShow=false
     },
     requestUpload(params)
     {
@@ -423,6 +424,9 @@
 </script>
 
 <style scoped>
+.app-container{
+  background-color: #FEF7FC;
+}
 .mt
 {
   position: relative;
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 694b53c..94e0aed 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -51,7 +51,7 @@
                   -->
       </el-form-item>
 
-      <el-form-item label="绫诲瀷" prop="type" style="padding-left:180px">
+      <el-form-item label="绫诲瀷" prop="type" >
         <el-input
           v-model="queryParams.type"
           placeholder="璇疯緭鍏ョ被鍨�"
@@ -186,7 +186,7 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
     </div>
-    <el-table v-loading="loading" :data="doctorList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+    <el-table v-loading="loading" :data="doctorList" @selection-change="handleSelectionChange"  @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
       <el-table-column type="selection" width="25"  align="center" />
 <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>      <el-table-column label="绫诲瀷" prop="type" sortable width="80">
         <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
@@ -235,7 +235,7 @@
              </template>
           </el-table-column>
 
-      </el-table-column>
+<!--      </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
@@ -256,12 +256,12 @@
             size="mini"
             @command="(command) => handleCommand(command, scope.row)"
             v-hasPermi="['system:role:edit']">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-d-arrow-right"
-              @click="handleCheck(scope.row)"
-            >鏌ョ湅璇︽儏</el-button>
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              icon="el-icon-d-arrow-right"-->
+<!--              @click="handleCheck(scope.row)"-->
+<!--            >鏌ョ湅璇︽儏</el-button>-->
 
           </el-dropdown>
         </template>
@@ -733,19 +733,21 @@
     var formData = new FormData();
     formData.append('excelImport', file);
     let _this = this
-    
+
     enload(formData).then(response => {
        _this.getList();
       Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
 
     }).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })});
-   
+
     }
   }
 };
 </script>
 <style>
-
+.app-container{
+  background-color: #FEF7FC;
+}
 .el-table__row.statistics-warning-row {
   background: #E0EEFE;
 
diff --git a/ruoyi-ui/src/views/self/edit.vue b/ruoyi-ui/src/views/self/edit.vue
index 6f90fe8..a0eae15 100644
--- a/ruoyi-ui/src/views/self/edit.vue
+++ b/ruoyi-ui/src/views/self/edit.vue
@@ -495,5 +495,7 @@
 </script>
 
 <style scoped>
-
+.app-container{
+  background-color: #FEF7FC;
+}
 </style>
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index befcb05..8ef6d45 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -967,6 +967,9 @@
 /*.disUoloadSty {*/
 /*  display:none;   !* 涓婁紶鎸夐挳闅愯棌 *!*/
 /*}*/
+.app-container{
+  background-color: #FEF7FC;
+}
 
 .el-icon-top {
   background: url("../../assets/icons/top.png");

--
Gitblit v1.9.1