From 058c7c78326aaf9ff58e6bc63107dbfe50544e9e Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期六, 15 四月 2023 17:30:43 +0800
Subject: [PATCH] 主要新增了家庭小医生模块

---
 ruoyi-ui/src/views/contacts/index.vue        |  107 ++-
 ruoyi-ui/src/views/system/role/index.vue     |    2 
 ruoyi-ui/src/views/system/user/index.vue     |    2 
 ruoyi-ui/src/api/contacts/index.js           |    4 
 ruoyi-ui/src/views/doctor/doctorInfo.vue     |  395 +++++++++++++++
 ruoyi-ui/src/views/contacts/contactsInfo.vue |   15 
 ruoyi-ui/src/views/self/edit.vue             |    7 
 ruoyi-ui/src/views/doctor/index.vue          |  673 ++++++++++++++++++++++++++
 ruoyi-ui/src/views/login.vue                 |    3 
 ruoyi-ui/src/views/register.vue              |    7 
 ruoyi-ui/src/views/self/show.vue             |   62 +
 ruoyi-ui/src/api/bignote/index.js            |    2 
 ruoyi-ui/src/views/device/equipmentInfo.vue  |   67 +-
 ruoyi-ui/src/api/doctor/index.js             |   64 ++
 ruoyi-ui/src/api/login.js                    |   16 
 ruoyi-ui/src/api/self/index.js               |    6 
 ruoyi-ui/src/router/index.js                 |   17 
 17 files changed, 1,322 insertions(+), 127 deletions(-)

diff --git a/ruoyi-ui/src/api/bignote/index.js b/ruoyi-ui/src/api/bignote/index.js
index 7d9cdca..f179b18 100644
--- a/ruoyi-ui/src/api/bignote/index.js
+++ b/ruoyi-ui/src/api/bignote/index.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// Familyevent 
+// Familyevent
 
 // 鏌ヨ鎵�鏈夊搴ぇ浜嬶紝鍒嗛〉鏌ヨ
 export function listFamilyevent(query) {
diff --git a/ruoyi-ui/src/api/contacts/index.js b/ruoyi-ui/src/api/contacts/index.js
index 00bdf40..7d3c7fe 100644
--- a/ruoyi-ui/src/api/contacts/index.js
+++ b/ruoyi-ui/src/api/contacts/index.js
@@ -10,9 +10,9 @@
 }
 
 // 鏍规嵁id鏌ヨ閫氳褰曡缁嗕俊鎭�
-export function getContactIdList() {
+export function getContactIdList(id) {
   return request({
-    url: '/zfContact/2' ,
+    url: '/zfContact/' + id,
     method: 'get',
 
   })
diff --git a/ruoyi-ui/src/api/doctor/index.js b/ruoyi-ui/src/api/doctor/index.js
new file mode 100644
index 0000000..5ab4392
--- /dev/null
+++ b/ruoyi-ui/src/api/doctor/index.js
@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+// 鏌ヨ鎵�鏈夎褰�
+export function listDoctor(query) {
+  return request({
+    url: '/zfDoctor/all',
+    method: 'get',
+    params: query
+  })
+}
+
+// 鏍规嵁id鏌ヨ璁板綍
+export function getDoctor(id) {
+  return request({
+    url: '/zfDoctor/' + id,
+    method: 'get',
+
+  })
+}
+
+//鏂板璁板綍
+export function addDoctor(data)
+{
+  return request({
+    url: '/zfDoctor',
+    method: 'post',
+    data: data
+  })
+}
+
+// 鍒犻櫎璁板綍
+export function delDoctor(ids) {
+  return request({
+    url: '/zfDoctor/' + ids,
+    method: 'delete'
+  })
+}
+
+//淇敼璁板綍
+export function updateDoctor(data) {
+  return request({
+    url: '/zfDoctor',
+    method: 'put',
+    data: data
+  })
+}
+
+//涓婁紶鏂囦欢
+export function uploadPic(data) {
+  return request({
+    url: '/common/upload',
+    method: 'post',
+    data: data
+  })
+}
+//涓嬭浇鏂囦欢
+export function download(data) {
+  return request({
+    url: '/common/downLoadFile',
+    method: 'get',
+    params: data,
+    responseType: 'blob'
+  })
+}
diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index e9c7f4b..4086507 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -49,20 +49,8 @@
 }
 
 // 鑾峰彇楠岃瘉鐮�
-// export function getCodeImg() {
-//   console.log("-----")
-//   return request({
-//     url: '/captchaImage',
-//     headers: {
-//       isToken: false
-//     },
-//     method: 'get',
-//     timeout: 20000
-//   })
-// }
-
-// 鑾峰彇楠岃瘉鐮�
 export function getCodeImg() {
+  console.log("-----")
   return request({
     url: '/captchaImage',
     headers: {
@@ -71,4 +59,4 @@
     method: 'get',
     timeout: 20000
   })
-}
\ No newline at end of file
+}
diff --git a/ruoyi-ui/src/api/self/index.js b/ruoyi-ui/src/api/self/index.js
index 40242f8..f2f201b 100644
--- a/ruoyi-ui/src/api/self/index.js
+++ b/ruoyi-ui/src/api/self/index.js
@@ -21,7 +21,7 @@
 // 鍒犻櫎涓汉淇℃伅
 export function delIndividual(ids) {
   return request({
-    url: '/self/user' +ids,
+    url: '/self/user/' +ids,
     method: 'delete'
   })
 }
@@ -79,7 +79,7 @@
 export function delExperience(ids)
 {
   return request({
-    url: '/zExperience' +ids,
+    url: '/zExperience/' +ids,
     method: 'delete',
   })
 }
@@ -115,7 +115,7 @@
 export function delCertificate(ids)
 {
   return request({
-    url: '/zCertificate' +ids,
+    url: '/zCertificate/' +ids,
     method: 'delete',
   })
 }
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index c5e21f4..d9d4c3e 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -179,6 +179,23 @@
       }
     ]
   },
+  //瀹跺涵灏忓尰鐢�
+  {
+    path: '/familymodel/Doctor',
+    component: Layout,
+    // permissions: [],
+    hidden: true,
+    permissions: ['familymodel:doctor:info'],
+    children: [
+      {
+        path: 'doctorInfo/:id(\\d+)',
+        component: () => import('@/views/doctor/doctorInfo'),
+        name: 'doctorInfo',
+        meta: { title: '灏卞尰璁板綍鏌ヨ璇︽儏',activeMenu: '/familymodel/zfDoctor'}
+      }
+    ]
+  },
+
   //缂栬緫涓汉淇℃伅
   {
     path: '/self/self',
diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue
index d092eef..cff462e 100644
--- a/ruoyi-ui/src/views/contacts/contactsInfo.vue
+++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -3,16 +3,16 @@
     <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>
-      <!--      <br>-->
-      <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
-      <!--                 v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
+<!--      <br>-->
+<!--      <el-button type="primary" class="pt"   @click="handleExport"-->
+<!--                 v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
     </div>
 
     <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
-      <!--      <el-form-item label="id" prop="id">-->
-      <!--        <el-input v-model="formData.id" placeholder="璇疯緭鍏d" :maxlength="11" show-word-limit :disabled="true"-->
-      <!--                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
-      <!--      </el-form-item>-->
+<!--      <el-form-item label="id" prop="id">-->
+<!--        <el-input v-model="formData.id" placeholder="璇疯緭鍏d" :maxlength="11" show-word-limit :disabled="true"-->
+<!--                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
+<!--      </el-form-item>-->
       <el-form-item label="鎴愬憳濮撳悕" prop="myName">
         <el-input v-model="formData.myName" placeholder="璇疯緭鍏ユ垚鍛樺鍚�" clearable :style="{width: '100%'}" :disabled="dsb">
         </el-input>
@@ -393,4 +393,3 @@
   position: absolute;
 }
 </style>
-
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 81b8b04..46987c2 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -42,37 +42,41 @@
       </el-form-item>
       <el-cntainer>
         <el-col :span="9" >
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+         <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+                     style=" width: 65px; height: 32px;background: #FFDDE3;
+          border-radius: 6px 6px 6px 6px;opacity:1;">鎼滅储</el-button>
+          <el-button icon="el-icon-refresh" 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-item>
         </el-col>
       </el-cntainer>
-      <el-form-item label="濮撳悕" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="璇疯緭鍏ュ鍚�"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery">
-          <i slot="prefix" class="el-input__icon el-icon-search"></i>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="宸ヤ綔鍗曚綅" prop="work">
-        <el-input
-          v-model="queryParams.work"
-          placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        >
-          <i slot="prefix" class="el-input__icon el-icon-search"></i>
-        </el-input>
-      </el-form-item>
+        <el-form-item label="濮撳悕" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="璇疯緭鍏ュ鍚�"
+            clearable
+            style="width: 240px"
+            @keyup.enter.native="handleQuery">
+            <i slot="prefix" class="el-input__icon el-icon-search"></i>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="宸ヤ綔鍗曚綅" prop="work">
+          <el-input
+            v-model="queryParams.work"
+            placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
+            clearable
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          >
+            <i slot="prefix" class="el-input__icon el-icon-search"></i>
+          </el-input>
+        </el-form-item>
 
     </el-form>
-    <div style="width: 72px;
+    <div>
+      <div style="width: 72px;
       height: 24px;
       font-size: 18px;
       font-family: Microsoft YaHei-Regular, Microsoft YaHei;
@@ -80,6 +84,7 @@
       color: #000000;
       line-height: 21px;
       ">閫氳褰�</div>
+
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -115,8 +120,8 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
-    <el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange">
+  </div>
+    <el-table v-loading="loading" :data="contactList"  @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="25"  align="center" />
       <el-table-column label="鎴愬憳濮撳悕" prop="myName" sortable width="100" >
         <template slot-scope="scope">
@@ -128,19 +133,27 @@
       </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="phone" sortable width="110" />
+      <el-table-column label="宸ヤ綔鍗曚綅" prop="work" sortable width="100" >
+        <template slot-scope="scope">{{scope.row.work? scope.row.work: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="鎵嬫満" prop="phone" sortable width="110" >
+        <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" >
         <template slot-scope="scope">
-          {{scope.row.wx}}<br>
-          {{scope.row.qq}}<br>
-          {{scope.row.twitter}}
+          <span v-if="scope.row.wx || scope.row.qq || scope.row.twitter == true">
+            {{scope.row.wx}}<br>
+            {{scope.row.qq}}<br>
+            {{scope.row.twitter}}
+          </span>
+          <span v-else>鈥斺�斺�斺��</span>
         </template>
       </el-table-column>
       <el-table-column label="鏄惁甯歌仈绯�" prop="isAlways" sortable width="120" >
         <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-table-column>
       <el-table-column label="鐢靛瓙鍚嶇墖" prop="url" align="center" sortable  width="180">
@@ -148,7 +161,9 @@
           <el-image style="width: 100px; height: 100px" :src="'http://47.93.189.255:8080/'+ scope.row.url" fit="cover"></el-image>
         </template>
       </el-table-column>
-      <el-table-column label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark" sortable width="120" />
+      <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" class-name="small-padding fixed-width">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
@@ -186,6 +201,7 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      style="background: #FEF7FC;"
       @pagination="getList"
     />
 
@@ -195,7 +211,7 @@
 
         <el-form-item label="鎴愬憳濮撳悕" prop="myName">
           <el-input v-model="formDat.myName" placeholder="璇疯緭鍏ユ垚鍛樺鍚�" clearable :style="{width: '100%'}" >
-          </el-input>
+        </el-input>
         </el-form-item>
 
         <el-form-item label="绉板懠" prop="nickName">
@@ -405,6 +421,8 @@
         isAlways:undefined,
         remark:undefined,
       },
+      // searchVal:"",
+
       // 琛ㄥ崟鍙傛暟
       form: {},
       defaultProps: {
@@ -475,7 +493,9 @@
   created() {
     this.getList();
     // this.getCateInfor()
-
+    // for (let i = 0; i < this.contactList.length; i++) {
+    //   this.formDat[i] = this.contactList[i];
+    // }
   },
   methods: {
     // 鍙栨秷鎸夐挳
@@ -565,6 +585,14 @@
       this.single = selection.length!=1
       this.multiple = !selection.length
     },
+    // //姣忔鏀瑰彉input妗嗗�兼椂灏辨敼鍙榯his.myTableData鐨勫��
+    // inputChange() { //寰幆姣忎竴椤� 鍙content鐨勫�煎惈鏈夎緭鍏ョ殑searchVal鍊硷紝灏卞姞杩沶ewList锛涘弽涔嬶紝灏辨棤涓滆タ鍔犺繘newList
+    //   let newlist = this.formDat.filter(
+    //     (item) => item.content.indexOf(this.searchVal) > -1
+    //   );
+    //   this.contactList = newlist;
+    // },
+
 
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
@@ -642,7 +670,7 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const Ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎璧勪骇缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
         return delContact(Ids);
       }).then(() => {
         this.getList();
@@ -658,3 +686,8 @@
   }
 };
 </script>
+
+<style scoped>
+
+
+</style>
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index 6873343..6740171 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -44,8 +44,8 @@
         <el-form-item label="澶囨敞" prop="remark">
           <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
         </el-form-item>
-        
-  
+
+
         <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
         <el-upload
           action="#"
@@ -86,11 +86,11 @@
             <i class="el-icon-delete"></i>
           </span>
         </span>
-  
-  
+
+
           </div>
         </el-upload>
-  
+
         <h4 class="form-header">鍏朵粬闄勪欢 </h4>
         <el-upload
           action=""
@@ -98,7 +98,7 @@
           class="upload-demo"
           multiple
           :on-preview="handlePreview"
-  
+
           :on-remove="handleRemove"
           :http-request="requestUpload"
           :show-file-list="true"
@@ -108,15 +108,15 @@
             <div class="el-upload__tip">
             </div>
           </template>
-  
-  
+
+
         </el-upload>
-  
+
         <el-form-item size="large">
           <el-button 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>
@@ -128,7 +128,7 @@
   import {blobValidate} from "@/utils/ruoyi";
   import errorCode from "@/utils/errorCode";
   import {Message} from "element-ui";
-  
+
   export default {
     components: {},
     props: [],
@@ -140,7 +140,7 @@
         fileList:[
         ],
         fileListOther:[
-  
+
         ],
         dsb:true,
         btn:false,
@@ -204,7 +204,7 @@
             message: '璇疯緭鍏ュ娉�',
             trigger: 'blur'
           }],
-  
+
         },
         typeOptions: [],
       }
@@ -227,20 +227,20 @@
         document.title = "鏌ョ湅瀹跺涵璁惧璇︾粏淇℃伅";
         this.$route.meta.title = "鏌ョ湅瀹跺涵璁惧璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
       }
-  
+
       let _this = this
       if (id) {
         this.loading = true;
         getEquipmentInfo(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 {
@@ -254,7 +254,7 @@
           this.loading = false;
         });
         // this.getCateInfor()
-  
+
       }
     },
     mounted() {},
@@ -264,7 +264,7 @@
       // {
       //   let _this = this
       //   getCategory().then(response=>{
-  
+
       //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
       //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
       //     })
@@ -278,10 +278,10 @@
           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) {
               updateEquipment(this.formData).then(response => {
@@ -291,7 +291,7 @@
               });
             } else {
               this.$modal.msgSuccess("淇敼澶辫触");
-  
+
             }
           }
         })
@@ -325,7 +325,7 @@
       //鐐瑰嚮涓嬭浇鍑芥暟
       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) => {
@@ -347,27 +347,27 @@
         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})
-  
+
           }
         })
-  
+
       }
-  
+
     }
   }
-  
+
   </script>
   <style>
   .mt
@@ -376,7 +376,7 @@
   }
   .dt{
     display: block;
-  
+
   }
   .pt{
     right: 10px;
@@ -385,4 +385,3 @@
     position: absolute;
   }
   </style>
-  
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/doctor/doctorInfo.vue b/ruoyi-ui/src/views/doctor/doctorInfo.vue
new file mode 100644
index 0000000..0ec6975
--- /dev/null
+++ b/ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -0,0 +1,395 @@
+<template>
+  <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>
+      <!--      <br>-->
+      <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
+      <!--                 v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
+    </div>
+
+    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
+      <!--      <el-form-item label="id" prop="id">-->
+      <!--        <el-input v-model="formData.id" placeholder="璇疯緭鍏d" :maxlength="11" show-word-limit :disabled="true"-->
+      <!--                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
+      <!--      </el-form-item>-->
+      <el-form-item label="绫诲瀷" prop="type">
+        <el-input v-model="formData.type" placeholder="璇疯緭鍏ョ被鍨�" clearable :style="{width: '100%'}" :disabled="dsb">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="鐥囩姸" prop="symptom">
+        <el-input v-model="formData.symptom" placeholder="璇疯緭鍏ョ棁鐘�" clearable :style="{width: '100%'}" :disabled="dsb">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="鎸佺画鏃堕棿" prop="duration">
+        <el-input v-model="formData.duration" placeholder="璇疯緭鍏ユ寔缁椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="涓尰澶勬柟" prop="cmedical">
+        <el-input v-model="formData.cmedical" placeholder="璇疯緭鍏ヤ腑鍖诲鏂�" clearable :style="{width: '100%'}" :disabled="dsb">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="瑗垮尰澶勬柟" prop="wmedical">
+        <el-input v-model="formData.wmedical" placeholder="璇疯緭鍏ヨタ鍖诲鏂�" clearable :style="{width: '100%'}" :disabled="dsb">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="鍔熸晥" prop="effect">
+        <el-input v-model="formData.effect" placeholder="璇疯緭鍏ュ姛鏁�" clearable :style="{width: '100%'}" :disabled="dsb">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="閫傜敤浜�" prop="suitable">
+        <el-input v-model="formData.suitable" placeholder="璇疯緭鍏ラ�傜敤浜�" clearable :style="{width: '100%'}" :disabled="dsb">
+        </el-input>
+      </el-form-item>
+
+      <el-form-item label="澶囨敞" prop="remark">
+        <el-input v-model="formData.remark" 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"
+      >
+        <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: 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
+          v-if="!disabled"
+          class="el-upload-list__item-delete"
+          @click="handleDownload(file.url)"
+        >
+          <i class="el-icon-download"></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-preview="handlePreview"
+
+        :on-remove="handleRemove"
+        :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-item size="large">
+        <el-button 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 {addRole, updateRole} from "@/api/system/role";
+import {blobValidate} from "@/utils/ruoyi";
+import errorCode from "@/utils/errorCode";
+import {Message} from "element-ui";
+import { getDoctor, updateDoctor,download,uploadPic} from "@/api/doctor/index";
+
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      cdi:"灏卞尰璁板綍璇︾粏淇℃伅",
+      udi:"灏卞尰璁板綍淇℃伅璇︽儏",
+      fot:[".jpg",".jif"],
+      fileList:[
+      ],
+      fileListOther:[
+
+      ],
+      dsb:true,
+      btn:false,
+
+      // 灏卞尰璁板綍琛ㄦ牸鏁版嵁
+      doctorList: [],
+
+      formData: {
+        //灏卞尰璁板綍
+        id:undefined,
+        type:undefined,
+        symptom:undefined,
+        cmedical:undefined,
+        duration:undefined,
+        wmedical:undefined,
+        effect:undefined,
+        suitable:undefined,
+        remark:undefined,
+        url: undefined,
+      },
+      dialogImageUrl: '',
+      dialogVisible: false,
+      disabled: false,
+      rules: {
+        type: [{
+          required: true,
+          message: '璇疯緭鍏ョ被鍨�',
+          trigger: 'blur'
+        }],
+        symptom: [{
+          required: true,
+          message: '璇疯緭鍏ョ棁鐘�',
+          trigger: 'blur'
+        }],
+        duration: [{
+          // required: true,
+          message: '璇疯緭鍏ユ寔缁椂闂�',
+          trigger: 'blur'
+        }],
+        cmedical: [{
+          // required: true,
+          message: '璇疯緭鍏ヤ腑鍖诲鏂�',
+          trigger: 'blur'
+        }],
+        wmedical: [{
+          // required: true,
+          message: '璇疯緭鍏ヨタ鍖诲鏂�',
+          trigger: 'blur'
+        }],
+        effect: [{
+          required: true,
+          message: '璇疯緭鍏ュ姛鏁�',
+          trigger: 'blur'
+        }],
+        suitable: [{
+          required: true,
+          message: '璇疯緭鍏ラ�傜敤浜�',
+          trigger: 'blur'
+        }],
+
+        remark: [{
+          // required: true,
+          message: '璇疯緭鍏ュ娉�',
+          trigger: 'blur'
+        }],
+
+      },
+      typeOptions: [],
+    }
+  },
+  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
+      document.title = "淇敼灏卞尰璁板綍璇︾粏淇℃伅";
+      this.$route.meta.title = "淇敼灏卞尰璁板綍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+    }
+    else{
+      document.title = "鏌ョ湅灏卞尰璁板綍璇︾粏淇℃伅";
+      this.$route.meta.title = "鏌ョ湅灏卞尰璁板綍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+    }
+
+    let _this = this
+    if (id) {
+      this.loading = true;
+      getDoctor(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;
+      });
+      this.getCateInfor()
+
+    }
+  },
+  mounted() {},
+  methods: {
+    /** 鏌ヨ绫诲埆淇℃伅 */
+    // getCateInfor()
+    // {
+    //   let _this = this
+    //   getCategory().then(response=>{
+    //
+    //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+    //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+    //     })
+    //   })
+    // },
+    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) {
+            updateDoctor(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 = 'property_'+nt+'.'+suffix
+        const blob = new Blob([response])
+        saveAs(blob, filename)
+      })
+    },
+    handleRemoveFile(file) {
+      alert(23)
+    },
+    handleRemove(file) {
+      alert(323)
+    },
+    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 = 'property_'+nt+'.'+suffix
+        const blob = new Blob([response])
+        saveAs(blob, filename)
+      })
+    },
+    handleEdit()
+    {
+      this.dsb = false
+      this.btn = true
+    },
+    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})
+
+        }
+      })
+
+    },
+
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download('/zfDoctor/export', {
+        ...this.queryParams
+      }, `zfDoctor_${new Date().getTime()}.xlsx`)
+    }
+
+  }
+}
+
+</script>
+
+<style scoped>
+.mt
+{
+  position: relative;
+}
+.dt{
+  display: block;
+
+}
+.pt{
+  right: 10px;
+  top:-3px;
+  display: block;
+  position: absolute;
+}
+</style>
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
new file mode 100644
index 0000000..7fbb84a
--- /dev/null
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -0,0 +1,673 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+      <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
+        <el-input
+          v-model:phone="queryParams.phone"
+          v-model:wx="queryParams.wx"
+          v-model:qq="queryParams.qq"
+          v-model:twitter="queryParams.twitter"
+          v-model:isAlways="queryParams.isAlways"
+          v-model:remark="queryParams.remark"
+          placeholder="鍦ㄢ�滃搴皬鍖荤敓鈥濅腑鎼滅储"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery">
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+        <!--        <el-input
+                  v-model="searchVal"
+                  placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储"
+                  clearable
+                  style="width: 240px"
+                  @input="inputChange">
+                  <i slot="prefix" class="el-input__icon el-icon-search"></i>
+                </el-input>
+                <div class="outer-table">
+                   姝ょ埗缁勪欢寮曠敤瀛愮粍浠秚ablemax
+                  <tablemax label="myLabel" :tableData="contactList">
+                    <template v-slot:table>
+                      <el-table-column label="鎿嶄綔" width="180">
+                        <template slot-scope="scope">
+                          <el-button @click="handleCheck(scope.row)" type="text" size="small"
+                          >璋冪敤</el-button
+                          >
+                        </template>
+                      </el-table-column>
+                    </template>
+                  </tablemax>
+                </div>-->
+
+
+        <!--        v-model="queryParams.id"
+
+                  v-model:phone="queryParams.phone"
+                  v-model:wx="queryParams.wx"
+                  v-model:qq="queryParams.qq"
+                  v-model:twitter="queryParams.twitter"
+                  v-model:isAlways="queryParams.isAlways"
+                  v-model:remark="queryParams.remark"
+                  @keyup.enter.native="handleQuery"
+                  -->
+      </el-form-item>
+
+      <el-form-item label="绫诲瀷" prop="type" style="padding-left:180px">
+        <el-input
+          v-model="queryParams.type"
+          placeholder="璇疯緭鍏ョ被鍨�"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery">
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+
+      </el-form-item>
+
+      <el-form-item label="鐥囩姸" prop="symptom">
+        <el-input
+          v-model="queryParams.symptom"
+          placeholder="璇疯緭鍏ョ棁鐘�"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery">
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+      </el-form-item>
+      <el-cntainer>
+        <el-col :span="9" >
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" style=" width: 65px; height: 32px;background: #FFDDE3;
+          border-radius: 6px 6px 6px 6px;opacity:1; " @click="handleQuery">鎼滅储</el-button>
+            <el-button icon="el-icon-refresh" size="mini" style=" width: 65px; height: 32px;background: #FFDDE3;
+          border-radius: 6px 6px 6px 6px;opacity:1; " @click="resetQuery">閲嶇疆</el-button>
+
+          </el-form-item>
+        </el-col>
+      </el-cntainer>
+      <el-form-item label="澶勬柟" prop="cmedical">
+        <el-input
+          v-model="queryParams.cmedical"
+          placeholder="璇疯緭鍏ヤ腑鍖诲鏂�"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery">
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="閫傜敤浜�" prop="suitable">
+        <el-input
+          v-model="queryParams.suitable"
+          placeholder="璇疯緭鍏ラ�傜敤浜�"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        >
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+      </el-form-item>
+
+    </el-form>
+    <div>
+      <div style="width: 100px;
+      height: 24px;
+      font-size: 18px;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-weight: 400;
+      color: #000000;
+      line-height: 21px;
+      ">瀹跺涵灏忓尰鐢�</div>
+
+      <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>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+    </div>
+    <el-table v-loading="loading" :data="doctorList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="25"  align="center" />
+      <el-table-column label="搴忓彿" prop="id" sortable width="80" />
+      <el-table-column label="绫诲瀷" prop="type" sortable width="80">
+        <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="鐥囩姸" prop="symptom" sortable :show-overflow-tooltip="true" width="80" >
+        <template slot-scope="scope">{{scope.row.symptom? scope.row.symptom: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="鎸佺画鏃堕棿" prop="duration" sortable :show-overflow-tooltip="true" width="110" >
+        <template slot-scope="scope">{{scope.row.duration? scope.row.duration: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="涓尰澶勬柟" prop="cmedical" sortable width="110"  >
+        <template slot-scope="scope">{{scope.row.cmedical? scope.row.cmedical: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="瑗垮尰澶勬柟" prop="wmedical" sortable width="110">
+        <template slot-scope="scope">{{scope.row.wmedical? scope.row.wmedical: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="鍔熸晥" prop="effect" sortable width="80" >
+        <template slot-scope="scope">{{scope.row.effect? scope.row.effect: '鈥斺�斺�斺��'}}</template>
+      </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>
+      </template>
+    </el-table-column>
+      <el-table-column label="閫傜敤浜�" prop="suitable" sortable width="110" >
+        <template slot-scope="scope">{{scope.row.suitable? scope.row.suitable: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+
+      <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" 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="['system:role:edit']"
+          >淇敼</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="['system:role:edit']">
+            <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"
+    />
+
+    <!-- 娣诲姞灏卞尰璁板綍閰嶇疆瀵硅瘽妗� -->
+    <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="type">
+          <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍨�" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="鐥囩姸" prop="symptom">
+          <el-input v-model="formDat.symptom" placeholder="璇疯緭鍏ョ棁鐘�" clearable :style="{width: '100%'}" ></el-input>
+        </el-form-item>
+        <el-form-item label="鎸佺画鏃堕棿" prop="duration">
+          <el-input v-model="formDat.duration" placeholder="璇疯緭鍏ユ寔缁椂闂�" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="涓尰澶勬柟" prop="cmedical">
+          <el-input v-model="formDat.cmedical" placeholder="璇疯緭鍏ヤ腑鍖诲鏂�" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="瑗垮尰澶勬柟" prop="wmedical">
+          <el-input v-model="formDat.wmedical" placeholder="璇疯緭鍏ヨタ鍖诲鏂�" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="鍔熸晥" prop="effect">
+          <el-input v-model="formDat.effect" placeholder="璇疯緭鍏ュ姛鏁�" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="閫傜敤浜�" prop="suitable">
+          <el-input v-model="formDat.suitable" placeholder="璇疯緭鍏ラ�傜敤浜�" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="澶囨敞" prop="remark">
+          <el-input v-model="formDat.remark" 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="handleRemove"
+          :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";
+
+
+
+//瀵煎叆鎺ュ彛鍑芥暟
+import {listDoctor, getDoctor, addDoctor,updateDoctor, delDoctor,uploadPic} from "@/api/doctor/index";
+
+
+export default {
+  name: "index",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 閬僵灞�
+      disabled: false,
+
+      loading: true,
+      formData:[],
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 灏忓尰鐢熻〃鏍兼暟鎹�
+      doctorList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
+      openDataScope: false,
+      menuExpand: false,
+      menuNodeAll: false,
+      deptExpand: true,
+      deptNodeAll: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏁版嵁鑼冨洿閫夐」
+      fot:[".jpg",".jif"],
+      fileList:[
+      ],
+      fileListOther:[
+
+      ],
+      dsb:true,
+      btn:false,
+      fit:['fill'],
+
+      formDat: {
+        //灏卞尰璁板綍
+        id:undefined,
+        type:undefined,
+        symptom:undefined,
+        cmedical:undefined,
+        duration:undefined,
+        wmedical:undefined,
+        effect:undefined,
+        suitable:undefined,
+        remark:undefined,
+        url: undefined,
+
+      },
+      // 鑿滃崟鍒楄〃
+      menuOptions: [],
+      // 閮ㄩ棬鍒楄〃
+      deptOptions: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type:undefined,
+        symptom:undefined,
+        cmedical:undefined,
+        suitable:undefined,
+
+      },
+      // searchVal:"",
+
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+
+        type: [{
+          required: true,
+          message: '璇疯緭鍏ョ被鍨�',
+          trigger: 'blur'
+        }],
+        symptom: [{
+          required: true,
+          message: '璇疯緭鍏ョ棁鐘�',
+          trigger: 'blur'
+        }],
+        duration: [{
+          // required: true,
+          message: '璇疯緭鍏ユ寔缁椂闂�',
+          trigger: 'blur'
+        }],
+        cmedical: [{
+          // required: true,
+          message: '璇疯緭鍏ヤ腑鍖诲鏂�',
+          trigger: 'blur'
+        }],
+        wmedical: [{
+          // required: true,
+          message: '璇疯緭鍏ヨタ鍖诲鏂�',
+          trigger: 'blur'
+        }],
+        effect: [{
+          required: true,
+          message: '璇疯緭鍏ュ姛鏁�',
+          trigger: 'blur'
+        }],
+        suitable: [{
+          required: true,
+          message: '璇疯緭鍏ラ�傜敤浜�',
+          trigger: 'blur'
+        }],
+
+        remark: [{
+          // required: true,
+          message: '璇疯緭鍏ュ娉�',
+          trigger: 'blur'
+        }],
+      },
+      typeOptions: [],
+    };
+  },
+  created() {
+    this.getList();
+    // this.getCateInfor()
+    // for (let i = 0; i < this.contactList.length; i++) {
+    //   this.formDat[i] = this.contactList[i];
+    // }
+  },
+  methods: {
+    // 鍙栨秷鎸夐挳
+    cancelData() {
+      this.open = false;
+      this.reset();
+    },
+
+    /** 鏌ヨ璁板綍鍒楄〃 */
+    getList() {
+      this.loading = true;
+      // console.log(this.queryParams)
+      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listDoctor(this.queryParams).then(response => {
+          //  alert(123)
+          //   console.log(response.data)
+          this.doctorList = response.data.data;
+
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 鏌ヨ绫诲埆淇℃伅 */
+    // getCateInfor()
+    // {
+    //   let _this = this
+    //   getCategory().then(response=>{
+    //
+    //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+    //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+    //     })
+    //   })
+    // },
+
+    handleRemove(file) {
+      alert(323)
+    },
+    // 鍙栨秷鎸夐挳
+    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
+    },
+    // //姣忔鏀瑰彉input妗嗗�兼椂灏辨敼鍙榯his.myTableData鐨勫��
+    // inputChange() { //寰幆姣忎竴椤� 鍙content鐨勫�煎惈鏈夎緭鍏ョ殑searchVal鍊硷紝灏卞姞杩沶ewList锛涘弽涔嬶紝灏辨棤涓滆タ鍔犺繘newList
+    //   let newlist = this.formDat.filter(
+    //     (item) => item.content.indexOf(this.searchVal) > -1
+    //   );
+    //   this.contactList = newlist;
+    // },
+
+
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞灏卞尰璁板綍璇︾粏淇℃伅";
+    },
+    /** 鏌ョ湅璇︾粏淇℃伅 */
+    handleCheck(row){
+      const id = row.id;
+      this.$router.push("/familymodel/Doctor/doctorInfo/" + id);
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      const id = row.id;
+      let jd = true
+
+      this.$router.push({
+        path:"/familymodel/Doctor/doctorInfo/" + 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) {
+
+          addDoctor(this.formDat).then(response => {
+            this.$modal.msgSuccess("鏂板鎴愬姛");
+            this.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    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('鏄惁纭鍒犻櫎缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+        return delDoctor(Ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download('zfDoctor/export', {
+        ...this.queryParams
+      }, `zfDoctor_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index e841f52..b5027fe 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -160,7 +160,7 @@
       // 楠岃瘉鐮佸紑鍏�
       captchaEnabled: true,
       // 娉ㄥ唽寮�鍏�
-      register: false,
+      register: true,
       redirect: undefined
     };
   },
@@ -244,6 +244,7 @@
   width:  100%;
   background: no-repeat center/40% url("../assets/images/Group 132.png");
   background-color: #FEF7FC;
+
   // background-position: 81.7px 71.3px;
   background-position: 183px 145px;
   //background-image: url("../assets/images/login-background.jpg");
diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
index a0f83b9..35d3730 100644
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -151,8 +151,11 @@
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
-  background-size: cover;
+  //background-image: url("../assets/images/login-background.jpg");
+  background: no-repeat center/40% url("../assets/images/Group 132.png");
+  background-color: #FEF7FC;
+  background-position: 183px 145px;
+  //background-size: cover;
 }
 .title {
   margin: 0px auto 30px auto;
diff --git a/ruoyi-ui/src/views/self/edit.vue b/ruoyi-ui/src/views/self/edit.vue
index 65b2776..6f90fe8 100644
--- a/ruoyi-ui/src/views/self/edit.vue
+++ b/ruoyi-ui/src/views/self/edit.vue
@@ -1,11 +1,6 @@
 <template>
   <div class="app-container">
-    <el-col  :span="6">
-      <el-input size="medium" v-model="input" placeholder="鎼滅储" clearable>
-        <i slot="prefix" class="el-input__icon el-icon-search"></i>
-      </el-input>
-    </el-col>
-    <br>
+
     <h1 style="font-size:21px">涓汉绠�鍘�</h1>
     <el-divider />
     <h2 style="font-size:16px">鍩烘湰淇℃伅</h2>
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index cad6e43..b7d0dd9 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1,12 +1,4 @@
 <template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>
-<template>
   <div class="app-container">
     <!--    鍥炲埌椤堕儴-->
     <el-backtop :bottom="150" :right="30">
@@ -153,9 +145,10 @@
             <el-button
               type="primary"
               @click="handleUpdate(scope.row)"
+              :disabled="btn"
               v-hasPermi="['system:role:edit']"
             >缂栬緫</el-button>
-
+            <!--            @click="handleUpdate(scope.row)"-->
             <!--            <el-dropdown-->
             <!--              size="mini"-->
             <!--              @command="(command) => handleCommand(command, scope.row)"-->
@@ -172,13 +165,15 @@
             <el-button
               type="primary"
               @click="handleExport"
-              v-hasPermi="['self:user:export']"
+              v-hasPermi="['family:note:export']"
             >瀵煎嚭</el-button>
+            <br>
+            <el-button type="primary" @click="submitForm" :disabled="dsb">瀹屾垚</el-button>
           </el-row>
 
         </el-container>
       </div>
-      <!--      </el-dialog>-->
+      <!--      </el-dialog> self:user:export-->
     </el-container>
     <el-container>
       <div>
@@ -752,6 +747,33 @@
       this.openDataScope = false;
       this.reset();
     },
+
+    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) {
+            updateIndividual(this.formData).then(response => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              // this.open = false;
+              this.btn=false
+            });
+          } else {
+            this.$modal.msgSuccess("淇敼澶辫触");
+
+          }
+        }
+      })
+    },
     // 琛ㄥ崟閲嶇疆
     reset() {
       if (this.$refs.menu != undefined) {
@@ -795,11 +817,11 @@
     },
 
     /** 鏂板鎸夐挳鎿嶄綔 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "娣诲姞涓汉淇℃伅";
-    },
+    // handleAdd() {
+    //   this.reset();
+    //   this.open = true;
+    //   this.title = "娣诲姞涓汉淇℃伅";
+    // },
 
 
     /** 鏌ョ湅璇︾粏淇℃伅 */
@@ -843,6 +865,12 @@
         const blob = new Blob([response])
         saveAs(blob, filename)
       })
+    },
+    //缂栬緫鎸夐挳
+    handleEdit()
+    {
+      this.dsb = false
+      this.btn = true
     },
 
     /** 鏌ヨ鑷紶淇℃伅 */
@@ -941,7 +969,7 @@
 /*}*/
 
 .el-icon-top {
-  background: url("");
+  background: url("/src/assets/icons/top.png");
 }
 
 
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 3474fa6..fa5316e 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -951,4 +951,4 @@
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 1e11b24..e47f663 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -991,4 +991,4 @@
     }
   }
 };
-</script>
\ No newline at end of file
+</script>

--
Gitblit v1.9.1