From 4e32f1188e9d0cafd3511994d2d13617ca6e08f9 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 15 十二月 2023 11:15:00 +0800
Subject: [PATCH] 完成

---
 src/comp/smartor3/dwo/dw_list_pat_archive.vue             |    6 
 src/comp/smartor3/dwo/dw_list_pat_archivecontact.vue      |    2 
 src/views/patient/patient/physical.vue                    |   43 
 src/views/repositoryai/templateku/configurat/index.vue    |   31 
 src/comp/smartor3/dwo/dw_list_pat_med_weight.vue          |    2 
 src/comp/smartor3/dwo/dw_list_pat_med_operation.vue       |    2 
 src/views/patient/patient/outpatient.vue                  |   41 
 src/views/shortmessage/healthinformation/index.vue        |  429 ++++++---
 src/views/knowledge/questionnaire/compilequer/index.vue   |   30 
 src/views/patient/patient/index.vue                       |   62 
 src/api/smartorpor/pat_archive.js                         |    4 
 src/comp/smartor3/dwo/dw_list_pat_med_inhosp.vue          |    2 
 src/smartor/dataobject/dw_patarchive_list.vue             |    4 
 src/smartor/dataobject/dw_patarchive_base.vue             |    8 
 src/views/patient/viewvant/RightDrawer.vue                |    8 
 src/comp/smartor3/dwo/dw_list_pat_med_inspection.vue      |    2 
 src/comp/smartor3/dwo/dw_list_pat_med_inspection_item.vue |    2 
 src/views/repositoryai/verbaltrick/particulars/index.vue  |   28 
 src/views/knowledge/questionbank/particulars/index.vue    |  356 ++++++++
 src/views/system/label/index.vue                          |   58 
 src/views/patient/patient/behospitalized.vue              |   40 
 src/comp/smartor3/dwo/dw_list_pat_med_registration.vue    |    2 
 src/comp/smartor3/dwo/dw_list_pat_med_apointment.vue      |    2 
 src/comp/smartor3/dwo/dw_list_pat_med_drug.vue            |    2 
 src/views/knowledge/education/compilequer/index.vue       |   29 
 src/comp/smartor3/dwo/dw_query_pat_archive.vue            |    4 
 src/comp/smartor3/dwo/dw_list_pat_archivetag.vue          |    2 
 src/comp/smartor3/dwo/dw_list_pat_med_hypertension.vue    |    2 
 src/views/knowledge/questionbank/index.vue                | 1188 +++++++++++++-------------
 src/api/patient/homepage.js                               |   60 +
 src/comp/smartor3/dwo/dw_list_pat_med_physical.vue        |    2 
 src/comp/smartor3/dwo/dw_list_pat_med_bloodsugar.vue      |    2 
 src/comp/smartor3/dwo/dw_list_pat_med_outhosp.vue         |    2 
 src/views/patient/patient/profile/index.vue               |   94 +
 src/views/repositoryai/intention/index.vue                |   25 
 src/api/smartorpor/svr_prjtaskline.js                     |    2 
 src/comp/smartor3/dwo/dw_maint_pat_archive.vue            |    8 
 src/views/patient/follow/index.vue                        |   40 
 38 files changed, 1,652 insertions(+), 974 deletions(-)

diff --git a/src/api/patient/homepage.js b/src/api/patient/homepage.js
index 8ede6e1..0dfedce 100644
--- a/src/api/patient/homepage.js
+++ b/src/api/patient/homepage.js
@@ -36,14 +36,14 @@
 // 鎮h�呰鎯�
 export function particularpatient(userId) {
   return request({
-    url: '/smartor/patarchive/' + userId,
+    url: '/smartor/patarchive/getInfo/' + userId,
     method: 'get',
   })
 };
 // 鍒犻櫎鎮h�呭垪琛�
 export function deletepatient(userId) {
   return request({
-    url: '/smartor/patarchive/' + userId,
+    url: '/smartor/patarchive/remove/' + userId,
     method: 'delete',
   })
 };
@@ -62,3 +62,59 @@
     method: 'get',
   })
 };
+// 鏂板鎮h�呯梾鍙�
+
+export function addmedicalhistory(data) {
+  return request({
+    url: '/medicalhistory/add',
+    method: 'post',
+    data: data
+  })
+};
+// 鐥呭彶璇︽儏
+export function getmedicalhistory(userId) {
+  return request({
+    url: '/medicalhistory/'+userId,
+    method: 'get',
+  })
+};
+
+// 淇敼鐥呭彶
+export function editmedicalhistory(data) {
+  return request({
+    url: '/medicalhistory/edit',
+    method: 'post',
+    data: data
+  })
+};
+
+// 鏂板鎮h�呰仈绯绘柟寮�
+export function addcontactinformation(data) {
+  return request({
+    url: '/archivecontact/add',
+    method: 'post',
+    data: data
+  })
+};
+// 淇敼鎮h�呰仈绯绘柟寮�
+export function editcontactinformation(data) {
+  return request({
+    url: '/archivecontact/edit',
+    method: 'post',
+    data: data
+  })
+};
+// 鑱旂郴鏂瑰紡璇︽儏
+export function getcontactinformation(userId) {
+  return request({
+    url: '/medicalhistory/'+userId,
+    method: 'get',
+  })
+};
+// 鍒犻櫎璇︽儏
+export function delcontactinformation(userId) {
+  return request({
+    url: '/archivecontact/'+userId,
+    method: 'get',
+  })
+};
diff --git a/src/api/smartorpor/pat_archive.js b/src/api/smartorpor/pat_archive.js
index aaf4232..fdca65e 100644
--- a/src/api/smartorpor/pat_archive.js
+++ b/src/api/smartorpor/pat_archive.js
@@ -3,7 +3,7 @@
 	      patid// 鑷ID 
    name// 濮撳悕 
    sex// 鎬у埆   1:鐢�  2:濂�
-   idno// 璇佷欢鍙风爜 
+   idcardno// 璇佷欢鍙风爜 
    birthdate// 鐢熸棩 
    age// 骞撮緞 
    source// 鏉ユ簮 
@@ -11,7 +11,7 @@
    archiveby// 寤烘。浜� 
    telcode// 鎵嬫満鍙风爜 
    relativetelcode// 浜插睘鍙风爜 
-   idtype// 璇佷欢绫诲瀷 
+   idcardtype// 璇佷欢绫诲瀷 
    orgid// 鏈烘瀯ID 
    openid// 寰俊openid 
    del_flag// 鍒犻櫎鏍囪 
diff --git a/src/api/smartorpor/svr_prjtaskline.js b/src/api/smartorpor/svr_prjtaskline.js
index ef60f96..ab372a1 100644
--- a/src/api/smartorpor/svr_prjtaskline.js
+++ b/src/api/smartorpor/svr_prjtaskline.js
@@ -52,7 +52,7 @@
    pguid//瀛愪换鍔uid
    patname// 濮撳悕 
    patsex// 鎬у埆   1:鐢�  2:濂�
-   patidno// 璇佷欢鍙风爜 
+   patidcardno// 璇佷欢鍙风爜 
    patbirthdate// 鐢熸棩 
    patage// 骞撮緞 
    pattelcode// 鎵嬫満鍙风爜 
diff --git a/src/comp/smartor3/dwo/dw_list_pat_archive.vue b/src/comp/smartor3/dwo/dw_list_pat_archive.vue
index d94a109..3acf520 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_archive.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_archive.vue
@@ -59,7 +59,7 @@
       <el-table-column prop="patid" label="  鑷ID " align="center" />
       <el-table-column prop="name" label="  濮撳悕 " align="center" />
       <el-table-column prop="sex" label="  鎬у埆   1:鐢�  2:濂�" align="center" />
-      <el-table-column prop="idno" label="  璇佷欢鍙风爜 " align="center" />
+      <el-table-column prop="idcardno" label="  璇佷欢鍙风爜 " align="center" />
       <el-table-column prop="birthdate" label="  鐢熸棩 " align="center" />
       <el-table-column prop="age" label="  骞撮緞 " align="center" />
       <el-table-column prop="source" label="  鏉ユ簮 " align="center" />
@@ -71,7 +71,7 @@
         label="  浜插睘鍙风爜 "
         align="center"
       />
-      <el-table-column prop="idtype" label="  璇佷欢绫诲瀷 " align="center" />
+      <el-table-column prop="idcardtype" label="  璇佷欢绫诲瀷 " align="center" />
       <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
       <el-table-column prop="openid" label="  寰俊openid " align="center" />
       <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
@@ -130,7 +130,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_archivecontact.vue b/src/comp/smartor3/dwo/dw_list_pat_archivecontact.vue
index 64c9faa..a557bd4 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_archivecontact.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_archivecontact.vue
@@ -113,7 +113,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_archivetag.vue b/src/comp/smartor3/dwo/dw_list_pat_archivetag.vue
index cf19e2c..c35684f 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_archivetag.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_archivetag.vue
@@ -114,7 +114,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_apointment.vue b/src/comp/smartor3/dwo/dw_list_pat_med_apointment.vue
index 156867d..0aefd6b 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_apointment.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_apointment.vue
@@ -199,7 +199,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_bloodsugar.vue b/src/comp/smartor3/dwo/dw_list_pat_med_bloodsugar.vue
index a267b12..e39ac8c 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_bloodsugar.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_bloodsugar.vue
@@ -120,7 +120,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_drug.vue b/src/comp/smartor3/dwo/dw_list_pat_med_drug.vue
index 8e53486..6ab3424 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_drug.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_drug.vue
@@ -129,7 +129,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_hypertension.vue b/src/comp/smartor3/dwo/dw_list_pat_med_hypertension.vue
index 8ebd3f6..d7fd0cd 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_hypertension.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_hypertension.vue
@@ -125,7 +125,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_inhosp.vue b/src/comp/smartor3/dwo/dw_list_pat_med_inhosp.vue
index 1f633b9..a757dd9 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_inhosp.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_inhosp.vue
@@ -196,7 +196,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_inspection.vue b/src/comp/smartor3/dwo/dw_list_pat_med_inspection.vue
index 855c3f0..23fa04f 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_inspection.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_inspection.vue
@@ -142,7 +142,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_inspection_item.vue b/src/comp/smartor3/dwo/dw_list_pat_med_inspection_item.vue
index ede9b32..e4ece43 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_inspection_item.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_inspection_item.vue
@@ -119,7 +119,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_operation.vue b/src/comp/smartor3/dwo/dw_list_pat_med_operation.vue
index b0b5bb9..975ffdd 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_operation.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_operation.vue
@@ -138,7 +138,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_outhosp.vue b/src/comp/smartor3/dwo/dw_list_pat_med_outhosp.vue
index e445cf7..8e0fa61 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_outhosp.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_outhosp.vue
@@ -131,7 +131,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_physical.vue b/src/comp/smartor3/dwo/dw_list_pat_med_physical.vue
index a49880c..f04c3f2 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_physical.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_physical.vue
@@ -152,7 +152,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_registration.vue b/src/comp/smartor3/dwo/dw_list_pat_med_registration.vue
index 14ecefc..0783ea2 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_registration.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_registration.vue
@@ -140,7 +140,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_weight.vue b/src/comp/smartor3/dwo/dw_list_pat_med_weight.vue
index 3c66587..c578159 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_weight.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_weight.vue
@@ -115,7 +115,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/comp/smartor3/dwo/dw_maint_pat_archive.vue b/src/comp/smartor3/dwo/dw_maint_pat_archive.vue
index 43edab2..5e64558 100644
--- a/src/comp/smartor3/dwo/dw_maint_pat_archive.vue
+++ b/src/comp/smartor3/dwo/dw_maint_pat_archive.vue
@@ -16,8 +16,8 @@
         <el-form-item prop="sex" label=" 鎬у埆   1:鐢�  2:濂�">
           <el-input placeholder="璇疯緭鍏� 鎬у埆   1:鐢�  2:濂�" v-model="form.sex" />
         </el-form-item>
-        <el-form-item prop="idno" label=" 璇佷欢鍙风爜 ">
-          <el-input placeholder="璇疯緭鍏� 璇佷欢鍙风爜 " v-model="form.idno" />
+        <el-form-item prop="idcardno" label=" 璇佷欢鍙风爜 ">
+          <el-input placeholder="璇疯緭鍏� 璇佷欢鍙风爜 " v-model="form.idcardno" />
         </el-form-item>
         <el-form-item prop="birthdate" label=" 鐢熸棩 ">
           <el-input placeholder="璇疯緭鍏� 鐢熸棩 " v-model="form.birthdate" />
@@ -43,8 +43,8 @@
             v-model="form.relativetelcode"
           />
         </el-form-item>
-        <el-form-item prop="idtype" label=" 璇佷欢绫诲瀷 ">
-          <el-input placeholder="璇疯緭鍏� 璇佷欢绫诲瀷 " v-model="form.idtype" />
+        <el-form-item prop="idcardtype" label=" 璇佷欢绫诲瀷 ">
+          <el-input placeholder="璇疯緭鍏� 璇佷欢绫诲瀷 " v-model="form.idcardtype" />
         </el-form-item>
         <el-form-item prop="orgid" label=" 鏈烘瀯ID ">
           <el-input placeholder="璇疯緭鍏� 鏈烘瀯ID " v-model="form.orgid" />
diff --git a/src/comp/smartor3/dwo/dw_query_pat_archive.vue b/src/comp/smartor3/dwo/dw_query_pat_archive.vue
index bdaff72..e003ee3 100644
--- a/src/comp/smartor3/dwo/dw_query_pat_archive.vue
+++ b/src/comp/smartor3/dwo/dw_query_pat_archive.vue
@@ -2,7 +2,7 @@
       <field name="patid" label=" 鑷ID "/>
       <field name="name" label=" 濮撳悕 "/>
       <field name="sex" label=" 鎬у埆   1:鐢�  2:濂�"/>
-      <field name="idno" label=" 璇佷欢鍙风爜 "/>
+      <field name="idcardno" label=" 璇佷欢鍙风爜 "/>
       <field name="birthdate" label=" 鐢熸棩 "/>
 </dw>
 <script>
@@ -42,7 +42,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/smartor/dataobject/dw_patarchive_base.vue b/src/smartor/dataobject/dw_patarchive_base.vue
index cf6f084..89333f4 100644
--- a/src/smartor/dataobject/dw_patarchive_base.vue
+++ b/src/smartor/dataobject/dw_patarchive_base.vue
@@ -24,9 +24,9 @@
       </el-row>
       <el-row>
         <el-col :span="12"
-          ><el-form-item label=" 璇佷欢鍙风爜 " prop="idno">
+          ><el-form-item label=" 璇佷欢鍙风爜 " prop="idcardno">
             <el-input
-              v-model="form.idno"
+              v-model="form.idcardno"
               placeholder="璇疯緭鍏� 璇佷欢鍙风爜 "
             /> </el-form-item
         ></el-col>
@@ -207,7 +207,7 @@
         patid: null,
         name: null,
         sex: null,
-        idno: null,
+        idcardno: null,
         birthdate: null,
         age: null,
         source: null,
@@ -215,7 +215,7 @@
         archiveby: null,
         telcode: null,
         relativetelcode: null,
-        idtype: null,
+        idcardtype: null,
         orgid: null,
         openid: null,
         delFlag: null,
diff --git a/src/smartor/dataobject/dw_patarchive_list.vue b/src/smartor/dataobject/dw_patarchive_list.vue
index 1317680..0ebdef3 100644
--- a/src/smartor/dataobject/dw_patarchive_list.vue
+++ b/src/smartor/dataobject/dw_patarchive_list.vue
@@ -8,7 +8,7 @@
         <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
       </template>
     </el-table-column>
-    <el-table-column label=" 璇佷欢鍙风爜 " align="center" prop="idno" />
+    <el-table-column label=" 璇佷欢鍙风爜 " align="center" prop="idcardno" />
     <el-table-column label=" 鐢熸棩 " align="center" prop="birthdate" width="180">
       <template slot-scope="scope">
         <span>{{ parseTime(scope.row.birthdate, "{y}-{m}-{d}") }}</span>
@@ -79,7 +79,7 @@
         pageNum: 1,
         pageSize: 10,
         name: null,
-        idno: null,
+        idcardno: null,
         source: null,
         telcode: null,
         orgid: null,
diff --git a/src/views/knowledge/education/compilequer/index.vue b/src/views/knowledge/education/compilequer/index.vue
index c78fba9..b48ef43 100644
--- a/src/views/knowledge/education/compilequer/index.vue
+++ b/src/views/knowledge/education/compilequer/index.vue
@@ -103,13 +103,15 @@
                 v-if="inputVisible"
                 @change="handleInputConfirm"
                 filterable
+                  allow-create
+                  default-first-option
                 placeholder="璇烽�夋嫨"
               >
                 <el-option
-                  v-for="item in options"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.label"
+                  v-for="item in optionstag"
+                  :key="item.tagname"
+                    :label="item.tagname"
+                    :value="item.tagname"
                 >
                 </el-option>
               </el-select>
@@ -303,6 +305,8 @@
 import { quillEditor } from "vue-quill-editor";
 // import * as Quill from "quill";
 import Quill from "quill";
+import { listtag } from "@/api/system/label";
+
 
 // 杩欓噷寮曞叆淇敼杩囩殑video妯″潡骞舵敞鍐�
 import Video from "./video";
@@ -471,6 +475,7 @@
           label: "鎶ょ悊瀹f暀",
         },
       ],
+      optionstag:[],
       xjxsoptions: [
         {
           value: "閫夐」1",
@@ -531,7 +536,9 @@
     };
   },
 
-  created() {},
+  created() {
+    this.gettabList();
+  },
   watch: {
     content(newVal, oldVal) {
       //this.$emit('input', newVal);
@@ -595,6 +602,18 @@
       //   console.log(rows);
       //   this.list = rows;
     },
+    /** 鏌ヨ鏍囩鍒楄〃 */
+    gettabList() {
+      const tagqueryParams = {
+        pageNum: 1,
+        pageSize: 1000,
+        tagcategoryid: "0",
+      };
+      listtag(tagqueryParams).then((response) => {
+        console.log(response);
+        this.optionstag = response.rows;
+      });
+    },
     // 鏂板鍙橀噺
     addvariable() {
       this.variablelist.push({
diff --git a/src/views/knowledge/questionbank/index.vue b/src/views/knowledge/questionbank/index.vue
index c80f732..e3390af 100644
--- a/src/views/knowledge/questionbank/index.vue
+++ b/src/views/knowledge/questionbank/index.vue
@@ -1,395 +1,353 @@
 <template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--鐢ㄦ埛鏁版嵁-->
-      <el-col :span="24" :xs="24">
-        <el-form
-          :model="topqueryParams"
-          ref="queryForm"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="98px"
+  <div class="Questionnairemanagement">
+    <!-- 宸︿晶鏍� -->
+    <div class="sidecolumn">
+      <div class="sidecolumn-top">
+        <div class="top-wj">闂绫诲瀷</div>
+        <div class="top-tj" @click="dialogFormVisible = true">+娣诲姞</div>
+      </div>
+      <div class="center-ss">
+        <el-input
+          placeholder="璇疯緭鍏ュ唴瀹�"
+          v-model="sidecolumnval"
+          class="input-with-select"
+          size="medium "
         >
-          <el-form-item label="棰樼洰鍚嶇О" prop="userName">
-            <el-input
-              v-model="topqueryParams.userName"
-              placeholder="璇疯緭鍏�"
-              clearable
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
+          <el-button
+            @click="sidecolumnss"
+            slot="append"
+            icon="el-icon-search"
+          ></el-button>
+        </el-input>
+      </div>
+      <div class="bottom-fl">
+        <el-menu
+          default-active="3"
+          class="el-menu-vertical-demo"
+          @open="handleOpen"
+          @close="handleClose"
+          @select="handleSelect"
+        >
+          <el-submenu index="1">
+            <template slot="title">
+              <i class="el-icon-location"></i>
+              <span>鍒嗙被涓�</span>
+            </template>
 
-          <el-form-item label="棰樼洰鏍囩" prop="status">
-            <el-cascader
-              v-model="topqueryParams.tagid"
-              :options="optionss"
-              :props="propss"
-              clearable
-            ></el-cascader>
-          </el-form-item>
-          <el-form-item label="棰樼洰绫诲瀷" prop="status">
-            <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
-              <el-option
-                v-for="item in topicoptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="medium"
-              @click="handleQuery"
-              >鎼滅储</el-button
+            <el-menu-item index="1-1">閫夐」1</el-menu-item>
+            <el-menu-item index="1-2">閫夐」2</el-menu-item>
+            <el-menu-item index="1-3">閫夐」3</el-menu-item>
+            <el-menu-item index="1-4">閫夐」3</el-menu-item>
+          </el-submenu>
+          <el-submenu index="2">
+            <template slot="title">
+              <i class="el-icon-menu"></i>
+              <span>鍒嗙被浜�</span>
+            </template>
+            <el-menu-item index="2-1">閫夐」1</el-menu-item>
+            <el-menu-item index="2-2">閫夐」2</el-menu-item>
+            <el-menu-item index="2-3">閫夐」3</el-menu-item>
+          </el-submenu>
+          <el-submenu index="3">
+            <template slot="title">
+              <i class="el-icon-document"></i>
+              <span>鍒嗙被涓�</span>
+            </template>
+            <el-menu-item index="2-1">閫夐」1</el-menu-item>
+          </el-submenu>
+          <el-submenu index="4">
+            <template slot="title">
+              <i class="el-icon-setting"></i>
+              <span>鍒嗙被鍥�</span>
+            </template>
+            <el-menu-item index="2-1">閫夐」1</el-menu-item>
+          </el-submenu>
+        </el-menu>
+      </div>
+    </div>
+    <!-- 鍙充晶鏁版嵁 -->
+    <div class="leftvlue">
+      <div class="leftvlue-bg">
+        <el-row :gutter="20">
+          <!--鐢ㄦ埛鏁版嵁-->
+          <el-col :span="24" :xs="24">
+            <el-form
+              :model="queryParams"
+              ref="queryForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="98px"
             >
-            <el-button icon="el-icon-refresh" size="medium" @click="resetQuery"
-              >閲嶇疆</el-button
-            >
-          </el-form-item>
-        </el-form>
-        <el-divider></el-divider>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="medium"
-              @click="handleAdd"
-              v-hasPermi="['system:user:add']"
-              >鏂板</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="medium"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-              >淇敼</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="medium"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-              >鍒犻櫎</el-button
-            >
-          </el-col>
-          <el-col :span="19">
-            <div class="documentf">
-              <div class="document">
+              <el-form-item label="鍙敤闄㈠尯" prop="status">
+                <el-select v-model="queryParams.courtyard" placeholder="璇烽�夋嫨">
+                  <el-option
+                    v-for="item in languagelist"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="闂涓婚" prop="userName">
+                <el-input
+                  v-model="queryParams.userName"
+                  placeholder="璇疯緭鍏�"
+                  clearable
+                  style="width: 200px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="鏂囧瓧" prop="status">
+                <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨">
+                  <el-option
+                    v-for="item in languagelist"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="鏄惁鍙敤" prop="status">
+                <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨">
+                  <el-option
+                    v-for="item in qyoptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item>
                 <el-button
-                  type="warning"
-                  plain
-                  icon="el-icon-download"
+                  type="primary"
+                  icon="el-icon-search"
                   size="medium"
-                  @click="handleExport"
-                  v-hasPermi="['system:user:export']"
-                  >瀵煎嚭</el-button
+                  @click="handleQuery"
+                  >鎼滅储</el-button
                 >
-              </div>
-            </div>
-          </el-col>
-          <!-- <el-col :span="1.5"> </el-col> -->
-        </el-row>
-        <!-- <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar> -->
-        <el-table
-          v-loading="loading"
-          :data="userList"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column
-            label="搴忓彿"
-            align="center"
-            key="userId"
-            prop="userId"
-          />
+                <el-button
+                  icon="el-icon-refresh"
+                  size="medium"
+                  @click="resetQuery"
+                  >閲嶇疆</el-button
+                >
+              </el-form-item>
+            </el-form>
 
-          <el-table-column
-            label="棰樼洰"
-            align="center"
-            key="userName"
-            prop="userName"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="棰樼洰绫诲埆"
-            align="center"
-            key="types"
-            prop="types"
-          />
-          <el-table-column
-            label="鍒涘缓浜�"
-            align="center"
-            key="nickName"
-            prop="nickName"
-          />
-          <el-table-column
-            label="鏄惁蹇呭~"
-            align="center"
-            key="phonenumber"
-            prop="phonenumber"
-            width="120"
-          />
-          <el-table-column label="鏄惁鍚敤" align="center" key="status">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.status"
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
-            </template>
-          </el-table-column>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="medium"
+                  @click="compileUpdate"
+                  v-hasPermi="['system:user:add']"
+                  >鏂板</el-button
+                >
+              </el-col>
 
-          <el-table-column
-            label="棰樼洰鏍囩"
-            align="center"
-            key="topicnumber"
-            prop="topicnumber"
-            width="120"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="鍒涘缓鏃ユ湡"
-            align="center"
-            prop="createTime"
-            width="160"
-          >
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="鏈�杩戞洿鏂版棩鏈�"
-            align="center"
-            prop="createTime"
-            width="160"
-          >
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="鎿嶄綔"
-            align="center"
-            width="160"
-            class-name="small-padding fixed-width"
-          >
-            <template slot-scope="scope" v-if="scope.row.userId !== 1">
-              <el-button
-                size="medium"
-                type="text"
-                icon="el-icon-edit"
-                @click="Referencequestion(scope.row)"
-                v-hasPermi="['system:user:edit']"
-                >棰勮</el-button
-              >
-              <el-button
-                size="medium"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
-                >淇敼</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="topqueryParams.pageNum"
-          :limit.sync="topqueryParams.pageSize"
-          @pagination="getList"
-        />
-      </el-col>
-    </el-row>
-
-    <!-- 娣诲姞鎴栦慨鏀归鐩厤缃璇濇 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="addalteropen"
-      width="900px"
-      append-to-body
-    >
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="棰樼洰鍚嶇О" prop="nickName">
-              <el-input
-                v-model="form.nickName"
-                placeholder="璇疯緭鍏�"
-                maxlength="30"
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  icon="el-icon-delete"
+                  size="medium"
+                  :disabled="multiple"
+                  @click="handleDelete"
+                  v-hasPermi="['system:user:remove']"
+                  >鍒犻櫎</el-button
+                >
+              </el-col>
+            </el-row>
+            <el-table
+              v-loading="loading"
+              :data="userList"
+              :border="true"
+              @selection-change="handleSelectionChange"
+            >
+              <el-table-column type="selection" width="50" align="center" />
+              <el-table-column
+                label="搴忓彿"
+                align="center"
+                key="userId"
+                prop="userId"
               />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="棰樼洰绫诲瀷" prop="deptId">
-              <el-select v-model="form.types" placeholder="璇烽�夋嫨">
-                <el-option
-                  v-for="item in topicoptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+              <el-table-column
+                label="棰樼洰鏍囬"
+                align="center"
+                key="userName"
+                prop="userName"
+                :show-overflow-tooltip="true"
+              />
+              <el-table-column
+                label="棰樼洰鍐呭"
+                align="center"
+                key="nickName"
+                prop="nickName"
+                width="200"
+                :show-overflow-tooltip="true"
+              />
+
+
+              /><el-table-column
+                label="閫傜敤鏂瑰紡"
+                align="center"
+                key="application"
+                prop="application"
+                width="120"
+              />
+              /><el-table-column
+                label="閫傜敤鐤剧梾"
+                align="center"
+                key="Applicable"
+                prop="Applicable"
+                width="120"
+              />
+              <el-table-column
+                label="鏍囩"
+                align="center"
+                key="tagList"
+                prop="tagList"
+                width="160"
+                :show-overflow-tooltip="true"
+              >
+                <template slot-scope="scope">
+                  <span v-for="item in scope.row.tagList">{{ item }} </span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="璇█"
+                align="center"
+                key="indicator"
+                prop="indicator"
+                width="120"
+              />
+
+              <el-table-column
+                label="鍙敤"
+                align="center"
+                key="usable"
+                prop="usable"
+                width="120"
+              />
+              <el-table-column
+                label="鏈�杩戜慨鏀�"
+                align="center"
+                key="Recentrevision"
+                prop="Recentrevision"
+                width="120"
+              />
+              <el-table-column label="鏄惁鍙敤" align="center" key="status">
+                <template slot-scope="scope">
+                  <el-switch
+                    v-model="scope.row.status"
+                    active-value="0"
+                    inactive-value="1"
+                    @change="handleStatusChange(scope.row)"
+                  ></el-switch>
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                label="鎿嶄綔"
+                align="center"
+                width="250"
+                class-name="small-padding fixed-width"
+              >
+                <template slot-scope="scope">
+                  <el-button
+                    size="medium"
+                    type="text"
+                    @click="compileUpdate(scope.row)"
+                    v-hasPermi="['system:user:edit']"
+                    ><span class="button-bji"
+                      ><i class="el-icon-edit"></i>缂栬緫闂</span
+                    ></el-button
+                  >
+                  <el-button
+                    size="medium"
+                    type="text"
+                    @click="handleDelete(scope.row)"
+                    v-hasPermi="['system:user:remove']"
+                    ><span class="button-textsc"
+                      ><i class="el-icon-delete-solid"></i>鍒犻櫎</span
+                    ></el-button
+                  >
+                  <el-button
+                    size="medium"
+                    type="text"
+                    @click="handleDelete(scope.row)"
+                    v-hasPermi="['system:user:remove']"
+                    ><span class="button-text"
+                      ><i class="el-icon-view"></i>棰勮</span
+                    ></el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+
+            <pagination
+              v-show="total > 0"
+              :total="total"
+              :page.sync="queryParams.pageNum"
+              :limit.sync="queryParams.pageSize"
+              @pagination="getList"
+            />
           </el-col>
         </el-row>
-        <el-row>
-          <el-form-item label="绛旀閫夐」" prop="email">
-            <el-tag
-              :key="tag"
-              v-for="tag in dynamicTags"
-              closable
-              :disable-transitions="false"
-              @close="handleClose(tag)"
+      </div>
+    </div>
+    <!-- 娣诲姞绫诲埆寮规 -->
+    <el-dialog
+      :title="amendtag ? '淇敼绫诲埆' : '鏂板绫诲埆'"
+      width="30%"
+      :visible.sync="dialogFormVisible"
+    >
+      <el-form :model="classifyform">
+        <el-form-item label="璇烽�夋嫨闂嵎棰樼洰澶х被">
+          <el-select v-model="classifyform.broadheading" placeholder="璇烽�夋嫨">
+            <el-option
+              v-for="item in editableTabs"
+              :key="item.title"
+              :label="item.title"
+              :value="item.title"
             >
-              {{ tag }}
-            </el-tag>
-            <el-input
-              class="input-new-tag"
-              v-if="inputVisible"
-              v-model="inputValue"
-              ref="saveTagInput"
-              size="small"
-              @keyup.enter.native="handleInputConfirm"
-              @blur="handleInputConfirm"
-            >
-            </el-input>
-            <el-button
-              v-else
-              class="button-new-tag"
-              size="small"
-              @click="showInput"
-              >+ 鏂板閫夐」</el-button
-            >
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="棰樼洰鏍囩" prop="email">
-              <el-cascader
-                v-model="form.totagid"
-                :options="optionss"
-                :props="propss"
-                clearable
-              ></el-cascader>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="鏄惁鍚敤">
-              <el-radio-group v-model="form.qystatus">
-                <el-radio
-                  v-for="item in qyoptions"
-                  :key="item.value"
-                  :label="item.value"
-                  >{{ item.label }}</el-radio
-                >
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="鏄惁蹇呭~">
-              <el-radio-group v-model="form.btstatus">
-                <el-radio
-                  v-for="item in btoptions"
-                  :key="item.value"
-                  :label="item.value"
-                  >{{ item.label }}</el-radio
-                >
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="澶囨敞">
-              <el-input
-                v-model="form.remark"
-                type="textarea"
-                placeholder="璇疯緭鍏ュ唴瀹�"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          :label="amendtag ? '璇疯緭鍏ユ柊鐨勫瓙绫诲埆鍚嶇О' : '璇疯緭鍏ュ瓙绫诲埆鍚嶇О'"
+        >
+          <el-input
+            v-model="classifyform.categoryname"
+            autocomplete="off"
+          ></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
-        <el-button @click="cancel">鍙� 娑�</el-button>
+        <el-button @click="dialogFormVisible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="submitsidecolumn">纭� 瀹�</el-button>
       </div>
     </el-dialog>
-    <!-- 棰樼洰棰勮寮规 -->
-    <el-dialog width="30%" title="棰樼洰棰勮" :visible.sync="previewVisible">
-      <div class="qrcode-dialo">
-        <!-- 鍗曢�� -->
-        <div class="topic-dev" v-if="previewtype == 1">
-          <div class="dev-text">
-            [鍗曢�塢&nbsp&nbsp<span>{{ previewvalue.username }}</span>
-          </div>
-          <div class="dev-xx">
-            <el-radio-group v-model="radio">
-              <el-radio
-                v-for="(items, index) in dynamicTags"
-                :key="index"
-                :label="index"
-                >{{ items }}</el-radio
-              >
-            </el-radio-group>
-          </div>
-        </div>
-        <!-- 澶氶�� -->
-        <div class="topic-dev" v-else-if="previewtype == 2">
-          <div class="dev-text">
-            [澶氶�塢&nbsp&nbsp<span>{{ previewvalue.username }}</span>
-          </div>
-          <div class="dev-xx">
-            <el-checkbox-group v-model="radios">
-              <el-checkbox
-                v-for="(items, index) in dynamicTags"
-                :key="index"
-                :label="index"
-              >
-                {{ items }}
-              </el-checkbox>
-            </el-checkbox-group>
-          </div>
-        </div>
-        <!-- 濉┖ -->
-        <div class="topic-dev" v-if="previewtype == 3">
-          <div class="dev-text">
-            [濉┖]&nbsp&nbsp<span>{{ previewvalue.username }}</span>
-          </div>
-          <div class="dev-xx">
-            <el-input placeholder="璇疯緭鍏ョ瓟妗�" v-model="radioas" clearable>
-            </el-input>
-          </div>
-        </div>
+    <!-- 鍒犻櫎绫诲埆纭妗� -->
+    <el-dialog title="璀﹀憡" :visible.sync="deleteVisible" width="40%">
+      <div style="font-size: 20px; color: rgb(247, 76, 76)">
+        鏄惁纭鍒犻櫎鍒嗙被锛歔<span>{{ deletefenl }}</span
+        >]?
       </div>
+      <div style="font-size: 20px">
+        姝ゆ搷浣滀細灏嗚绫诲埆涓嬫墍鏈夋ā鍧楄浆绉昏嚦[鏈垎绫籡锛屾槸鍚︾户缁垹闄ゆ鍒嗙被锛�
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="deleteVisible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="deletefenlei">纭� 瀹�</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -401,20 +359,19 @@
   delUser,
   addUser,
   updateUser,
-  resetUserPwd,
-  changeUserStatus,
 } from "@/api/system/user";
+import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
 export default {
-  name: "User",
+  name: "questionnaire",
   dicts: ["sys_normal_disable", "sys_user_sex"],
   components: { Treeselect },
   data() {
     return {
+      topactiveName: "Local", //椤堕儴閫夋嫨
       // 閬僵灞�
-      loading: true,
+      loading: false,
       // 閫変腑鏁扮粍
       ids: [],
       // 闈炲崟涓鐢�
@@ -425,113 +382,104 @@
       showSearch: true,
       // 鎬绘潯鏁�
       total: 0,
-      // 鐢ㄦ埛琛ㄦ牸鏁版嵁
-      userList: null,
+      namequestionnaire: "",
+      haoquestionnaire: "",
+      idds: "",
+      amendtag: false, //鏄惁淇敼绫诲埆
+      dialogFormVisible: false, //淇敼娣诲姞绫诲埆寮规
+      deleteVisible: false, //鍒嗙被鍒犻櫎寮规
+      deletefenl: "楂樿鍘�", //鍒犻櫎椤�
+      classifyform: {
+        categoryname: "",
+      }, //绫诲埆琛ㄥ崟
+      // 琛ㄦ牸鏁版嵁
+      userList: [
+        {
+          userid: 1,
+          userName: "琛�甯歌銆佸翱甯歌",
+          nickName: "璐",
+          aphonenumber: "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10",
+          bphonenumber: "閫夋嫨",
+          cphonenumber: "鏅�氳瘽",
+          status: "0",
+        },
+      ],
       // 寮瑰嚭灞傛爣棰�
       title: "",
-      // 鏄惁鏄剧ず淇敼銆佹坊鍔犲脊鍑哄眰
-      addalteropen: false,
-      // 閮ㄩ棬鍚嶇О
-      deptName: undefined,
-      // 榛樿瀵嗙爜
-      initPassword: undefined,
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
       // 鏃ユ湡鑼冨洿
       dateRange: [],
       // 宀椾綅閫夐」
       postOptions: [],
       // 瑙掕壊閫夐」
       roleOptions: [],
-      dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
-      inputVisible: false,
-      inputValue: "",
-      previewVisible: false, //棰樼洰棰勮寮规
-      radio: "",
-      radios: [],
-      previewtype: 2, //棰勮棰樼洰绫诲瀷
-      total: 0, // 鎬绘潯鏁�
-      ImportQuantity: 999, //瀵奸鐩暟閲�
-      //棰勮棰樼洰淇℃伅
-      previewvalue: {
-        username: "杩欎釜鍖荤敓瀵逛綘鎬庝箞鏍�",
-      },
-      // 琛ㄥ崟鍙傛暟
-      form: {
-        phonenumber: "",
-        totagid: "",
-        types: "",
-        nickName: "",
-        qystatus: "",
-        btstatus: "",
-      },
-      //瀵煎叆杩涘害
-      dractive: 1,
-      // 瀵煎叆灞曠ず琛ㄥ崟
-      uploadingData: {},
-      // 鏌ヨ鍙傛暟
-      topqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        userName: undefined,
-        tagid: undefined,
-        topic: undefined,
-      },
+      // 娣诲姞銆佷慨鏀瑰弬鏁�
+      indexform: {},
+      numberlb: 22,
+      numberlbs: 2,
+      sidecolumnform: {}, //娣诲姞绫诲埆琛ㄥ崟
+      dialogFormVisible: false, //娣诲姞绫诲埆寮规
+      sidecolumnval: "", //绫诲埆鎼滅储
+      indexopen: false, //寮规灞曠ず鍚�
       propss: { multiple: true },
-      optionss: [
+      languagelist: [
         {
           value: 1,
-          label: "涓滃崡",
-        },
-        {
-          value: 2,
-          label: "瑗垮寳",
+          label: "姹夎",
         },
         {
           value: 3,
-          label: "浠ㄤ花浠�",
+          label: "鑻辫",
         },
-        {
-          value: 4,
-          label: "鍏椋掗",
-        },
-      ],
+      ], //璇█鍒楄〃
       qyoptions: [
         {
           value: 1,
-          label: "鍚敤",
+          label: "鍙敤",
         },
         {
           value: 2,
-          label: "鍏抽棴",
+          label: "绂佺敤",
         },
       ],
-      btoptions: [
+      //绫诲埆鍒楄〃
+      editableTabs: [
         {
-          value: 1,
-          label: "蹇呭~",
+          title: "闂鍒嗙被涓�",
+          number: "1",
         },
         {
-          value: 2,
-          label: "闈炲繀濉�",
+          title: "闂鍒嗙被浜�",
+          number: "2",
+        },
+        {
+          title: "闂鍒嗙被涓�",
+          number: "2",
+        },
+        {
+          title: "闂鍒嗙被鍥�",
+          number: "2",
+        },
+        {
+          title: "闂鍒嗙被浜�",
+          number: "2",
         },
       ],
-      topicoptions: [
-        {
-          value: 1,
-          label: "鍗曢��",
-        },
-        {
-          value: 2,
-          label: "澶氶��",
-        },
-        {
-          value: 3,
-          label: "濉┖",
-        },
-      ],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: undefined,
+        phonenumber: undefined,
+        status: undefined,
+        deptId: undefined,
+        IDnumber: undefined,
+      },
       // 琛ㄥ崟鏍¢獙
       rules: {
         userName: [
-          { required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
+          { required: true, message: "涓绘棬涓嶈兘涓虹┖", trigger: "blur" },
           {
             min: 2,
             max: 20,
@@ -579,30 +527,65 @@
   watch: {},
   created() {
     this.getList();
-    this.getConfigKey("sys.user.initPassword").then((response) => {
-      this.initPassword = response.msg;
-    });
   },
-  methods: {
-    /** 鏌ヨ棰樼洰鍒楄〃 */
-    getList() {
-      this.loading = true;
-      listUser(this.addDateRange(this.topqueryParams, this.dateRange)).then(
-        (response) => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-    // 鏌ョ湅棰樼洰璇︽儏
-    Referencequestion(row) {
-      this.previewVisible = true;
-    },
 
+  methods: {
+    /** 鏌ヨ鐢ㄦ埛鍒楄〃 */
+    getList() {
+      //   this.loading = true;
+      listUser().then((response) => {
+        console.log(response);
+        console.log(this.userList);
+      });
+    },
+    // 娣诲姞銆佷慨鏀圭被鍒�
+    submitsidecolumn() {
+      if (this.amendtag) {
+        this.classifyform.tagcategoryid = this.idds;
+        // toamendtagcategory(this.addDateRange(this.classifyform)).then(
+        //   (response) => {
+        //     console.log(response);
+        //     this.gitclasify();
+        //   }
+        // );
+      } else {
+        // addtagcategory(this.addDateRange(this.classifyform)).then(
+        //   (response) => {
+        //     console.log(response);
+        //     this.gitclasify();
+        //   }
+        // );
+      }
+      this.classifyform = {
+        categoryname: "",
+      };
+      this.idds = "";
+      this.dialogFormVisible = false;
+    },
+    //鍒犻櫎鍒嗙被
+    deletefenlei(row) {
+      if (this.deleteVisible) {
+        // deletetagcategory(this.idds).then((response) => {
+        //   console.log(response);
+        //   this.gitclasify();
+        // });
+        this.deleteVisible = false;
+        this.idds = "";
+      } else {
+        this.deleteVisible = true;
+        this.idds = row.tagcategoryid;
+        this.deletefenl = row.title;
+      }
+    },
+    compileUpdate(row) {
+      this.$router.push({
+        path: "/knowledge/questionbank/particulars/",
+        query: { id: "1" },
+      });
+    },
     // 棰樼洰鐘舵�佷慨鏀�
     handleStatusChange(row) {
-      let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
+      let text = row.status === "0" ? "鍙敤" : "鍋滅敤";
       this.$modal
         .confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚楋紵')
         .then(function () {
@@ -615,11 +598,26 @@
           row.status = row.status === "0" ? "1" : "0";
         });
     },
+    // 渚ц竟--------------
+    handleOpen(key, keyPath) {
+      console.log(key, keyPath);
+    },
+    handleClose(key, keyPath) {
+      console.log(key, keyPath);
+    },
+    handleSelect(key, keyPath) {
+      console.log(key, keyPath);
+    },
+    //鎼滅储绫诲埆
+    sidecolumnss() {},
+    // 渚挎嵎鏍囩
+    tsgnameto() {},
     // 鍙栨秷鎸夐挳
     cancel() {
-      this.addalteropen = false;
+      this.indexopen = false;
       this.reset();
     },
+
     // 琛ㄥ崟閲嶇疆
     reset() {
       this.form = {
@@ -640,14 +638,14 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
-      this.topqueryParams.pageNum = 1;
+      this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
       this.dateRange = [];
       this.resetForm("queryForm");
-      this.topqueryParams.deptId = undefined;
+      this.queryParams.deptId = undefined;
       this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
@@ -657,83 +655,34 @@
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
-    //鍒犻櫎閫夐」
-    handleClose(tag) {
-      this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
-    },
-    //瑙﹀彂鏂板杈撳叆
-    showInput() {
-      this.inputVisible = true;
-      this.$nextTick((_) => {
-        this.$refs.saveTagInput.$refs.input.focus();
-      });
-    },
-    //鑾峰彇澶卞幓鐒︾偣瑙﹀彂
-    handleInputConfirm() {
-      let inputValue = this.inputValue;
-      if (inputValue) {
-        this.dynamicTags.push(inputValue);
-      }
-      this.inputVisible = false;
-      this.inputValue = "";
-    },
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
-      this.reset();
-      getUser().then((response) => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.addalteropen = true;
-        this.title = "鏂板棰樼洰";
-        this.form.password = this.initPassword;
+      this.$router.push({
+        path: "/knowledge/verbaltrick/particulars/",
+        query: { id: "1" },
       });
     },
-    /** 淇敼鎸夐挳鎿嶄綔 */
-    handleUpdate(row) {
-      this.reset();
-      const userId = row.userId || this.ids;
-      getUser(userId).then((response) => {
-        this.form = response.data;
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.$set(this.form, "postIds", response.postIds);
-        this.$set(this.form, "roleIds", response.roleIds);
-        this.addalteropen = true;
-        this.title = "淇敼鐢ㄦ埛";
-        this.form.password = "";
-      });
-    },
-    /** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
-    handleResetPwd(row) {
-      this.$prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
-        confirmButtonText: "纭畾",
-        cancelButtonText: "鍙栨秷",
-        closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
-      })
-        .then(({ value }) => {
-          resetUserPwd(row.userId, value).then((response) => {
-            this.$modal.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + value);
-          });
-        })
-        .catch(() => {});
+    // 淇敼鍒嗙被寮规
+    popoveramend(tagcategoryid) {
+      this.idds = tagcategoryid;
+      this.amendtag = true;
+      this.dialogFormVisible = true;
     },
 
-    /** 鎻愪氦鎸夐挳 */
+    /** 鏇存柊/淇敼鎻愪氦鎸夐挳 */
     submitForm: function () {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.userId != undefined) {
             updateUser(this.form).then((response) => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
-              this.open = false;
+              this.indexopen = false;
               this.getList();
             });
           } else {
             addUser(this.form).then((response) => {
               this.$modal.msgSuccess("鏂板鎴愬姛");
-              this.open = false;
+              this.indexopen = false;
               this.getList();
             });
           }
@@ -754,80 +703,52 @@
         })
         .catch(() => {});
     },
-    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
-    handleExport() {
-      this.download(
-        "system/user/export",
-        {
-          ...this.topqueryParams,
-        },
-        `user_${new Date().getTime()}.xlsx`
-      );
-    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.el-button--primary.is-plain {
-  color: #ffffff;
-  background: #409eff;
-  border-color: #4fabe9;
-}
-.document {
-  width: 100px;
-  height: 50px;
-}
-.documentf {
+.Questionnairemanagement {
   display: flex;
-  justify-content: flex-end;
 }
-.download {
+.sidecolumn {
+  width: 300px;
+  min-height: 100vh;
   text-align: center;
-  .el-upload__tip {
-    font-size: 23px;
-  }
-  .el-upload__text {
-    font-size: 23px;
-  }
-}
-.uploading {
+  //   display: flex;
   margin-top: 20px;
   margin: 20px;
   padding: 30px;
-  background: #ffffff;
+  background: #edf1f7;
   border: 1px solid #dcdfe6;
   -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
     0 0 6px 0 rgba(0, 0, 0, 0.04);
-}
-.el-tag + .el-tag {
-  margin-left: 10px;
-}
-.button-new-tag {
-  margin-left: 10px;
-  height: 32px;
-  line-height: 30px;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-.input-new-tag {
-  width: 90px;
-  margin-left: 10px;
-  vertical-align: bottom;
-}
-.drexamine {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 30px;
-  background: #daeaf5;
-  img {
-    width: 100px;
-    height: 100px;
+  .sidecolumn-top {
+    display: flex;
+    justify-content: space-between;
+    .top-wj {
+      font-size: 20px;
+    }
+    .top-tj {
+      font-size: 18px;
+
+      color: rgb(0, 89, 255);
+      cursor: pointer;
+    }
+  }
+  .center-ss {
+    margin-top: 30px;
+    .input-with-select {
+      height: 40px !important;
+    }
+  }
+  .bottom-fl {
+    margin-top: 30px;
+    display: center !important;
   }
 }
 .qrcode-dialo {
-  // text-align: center;
+  text-align: center;
   //   display: flex;
   margin: 20px;
   padding: 30px;
@@ -835,22 +756,75 @@
   border: 1px solid #dcdfe6;
   -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
     0 0 6px 0 rgba(0, 0, 0, 0.04);
-  .topic-dev {
-    margin-bottom: 25px;
-    font-size: 20px !important;
-    .dev-text {
-      margin-bottom: 10px;
+  .qrcode-text {
+    font-size: 20px;
+    span {
+      margin-left: 20px;
     }
   }
-}
-::v-deep.el-radio-group {
-  span {
-    font-size: 24px;
+  .qrcode-img {
+    width: 300px;
+    height: 400px;
   }
 }
-::v-deep.el-checkbox-group {
-  span {
-    font-size: 24px;
+.tsgname {
+  width: 90px;
+  margin-right: 10px;
+  text-align: center;
+  cursor: pointer;
+  height: 40px;
+  line-height: 40px;
+  background: #7799fa;
+  color: #ffff;
+  font-size: 18px;
+  border-radius: 5px;
+}
+.tsgname:hover {
+  background: #3366f5;
+}
+::v-deep.el-tabs--left,
+.el-tabs--right {
+  overflow: hidden;
+  align-items: center;
+  display: flex;
+}
+::v-deep.el-input--medium .el-input__inner {
+  height: 40px !important;
+}
+::v-deep.el-tabs--right .el-tabs__active-bar.is-right {
+  height: 40px;
+  width: 5px;
+  left: 0;
+}
+::v-deep.el-tabs--right .el-tabs__item.is-right {
+  display: block;
+  font-size: 20px;
+}
+.leftvlue {
+  //   display: flex;
+  //   flex: 1;
+  width: 80%;
+  margin-top: 20px;
+  //   margin: 20px;
+  padding: 30px;
+  background: #ffff;
+  border: 1px solid #dcdfe6;
+  -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
+    0 0 6px 0 rgba(0, 0, 0, 0.04);
+  .mulsz {
+    font-size: 20px;
   }
 }
+.button-text {
+  color: rgb(70, 204, 238);
+}
+.button-bji {
+  color: rgb(39, 167, 67);
+}
+.button-textxg {
+  color: rgb(35, 81, 233);
+}
+.button-textsc {
+  color: rgb(235, 23, 23);
+}
 </style>
diff --git a/src/views/knowledge/questionbank/particulars/index.vue b/src/views/knowledge/questionbank/particulars/index.vue
new file mode 100644
index 0000000..841e5cb
--- /dev/null
+++ b/src/views/knowledge/questionbank/particulars/index.vue
@@ -0,0 +1,356 @@
+<template>
+  <div>
+    <div class="presentation-right">
+      <el-card class="box-card">
+        <el-form :inline="true" :model="topicobj" class="demo-form-inline">
+          <div class="headline">
+            棰樼洰璁剧疆璇︽儏
+            <span style="margin-left: 30px"
+              ><el-button type="primary" @click="Submittopicobj"
+                >淇濆瓨</el-button
+              ></span
+            >
+          </div>
+
+          <el-row :gutter="10">
+            <el-col :span="8"
+              ><el-form-item label="棰樼洰鏍囬">
+                <el-input
+                  v-model="topicobj.title"
+                  placeholder="璇疯緭鍏ユ爣棰�"
+                ></el-input> </el-form-item
+            ></el-col>
+            <el-col :span="6"
+              ><el-form-item label="鏄惁闅愯棌">
+                <el-radio-group v-model="topicobj.resourcea">
+                  <el-radio label="鏄�"></el-radio>
+                  <el-radio label="鍚�"></el-radio>
+                </el-radio-group> </el-form-item
+            ></el-col>
+            <el-col :span="6"
+              ><el-form-item label="璇█">
+                <el-select
+                  v-model="topicobj.languageh"
+                  size="medium"
+                  filterable
+                  placeholder="璇烽�夋嫨鍒嗙被"
+                >
+                  <el-option
+                    class="topicobjaa"
+                    v-for="item in xjxsoptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select> </el-form-item
+            ></el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="8"
+              ><el-form-item label="鏄惁蹇呯瓟">
+                <el-radio-group v-model="topicobj.resource">
+                  <el-radio label="鏄�"></el-radio>
+                  <el-radio label="鍚�"></el-radio>
+                </el-radio-group> </el-form-item
+            ></el-col>
+            <el-col :span="12"
+              ><el-form-item label="棰樼洰绫诲瀷">
+                <el-select
+                  v-model="topicobj.languageh"
+                  size="medium"
+                  filterable
+                  placeholder="璇烽�夋嫨鍒嗙被"
+                >
+                  <el-option
+                    class="topicobjaa"
+                    v-for="item in xjxsoptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select> </el-form-item
+            ></el-col>
+          </el-row>
+          <el-form-item label="棰樼洰鍐呭">
+            <el-input
+              style="width: 40vw"
+              type="textarea"
+              v-model="topicobj.title"
+              placeholder="璇疯緭鍏ユ爣棰�"
+            ></el-input>
+          </el-form-item>
+          <el-row :gutter="10">
+            <el-col :span="8"
+              ><el-form-item label="閫傜敤鏂瑰紡">
+                <el-select
+                  v-model="topicobj.languageh"
+                  size="medium"
+                  filterable
+                  placeholder="璇烽�夋嫨鍒嗙被"
+                >
+                  <el-option
+                    class="topicobjaa"
+                    v-for="item in xjxsoptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option> </el-select></el-form-item
+            ></el-col>
+            <el-col :span="12"
+              ><el-form-item label="閫傜敤鐤剧梾">
+                <el-select
+                  v-model="topicobj.languageh"
+                  size="medium"
+                  filterable
+                  placeholder="璇烽�夋嫨鍒嗙被"
+                >
+                  <el-option
+                    class="topicobjaa"
+                    v-for="item in xjxsoptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select> </el-form-item
+            ></el-col>
+          </el-row>
+          <el-form-item label="鏍囩" prop="desc">
+            <div class="xinz-inf">
+              <el-tag
+                :key="tag"
+                type="success"
+                v-for="tag in dynamicTags"
+                closable
+                :disable-transitions="false"
+                @close="handleClose(tag)"
+              >
+                {{ tag }}
+              </el-tag>
+              <el-select
+                v-model="inputValue"
+                v-if="inputVisible"
+                @change="handleInputConfirm"
+                filterable
+                  allow-create
+                  default-first-option
+                placeholder="璇烽�夋嫨"
+              >
+                <el-option
+                  v-for="item in optionstag"
+                  :key="item.tagname"
+                    :label="item.tagname"
+                    :value="item.tagname"
+                >
+                </el-option>
+              </el-select>
+              <el-button
+                v-else
+                class="button-new-tag"
+                size="small"
+                @click="showInput"
+                >+ 鏂板鏍囩</el-button
+              >
+            </div>
+          </el-form-item>
+          <div class="headline">
+            閫夐」璁剧疆<span style="margin-left: 30px"
+              ><el-button type="primary" @click="addoption"
+                >+鏂板</el-button
+              ></span
+            >
+          </div>
+          <div class="topicxq" v-for="item in optionlist">
+            <el-row :gutter="10">
+              <el-col :span="11"
+                ><el-form-item label="閫夐」">
+                  <el-input
+                    type="text"
+                    placeholder="璇疯緭鍏ラ�夐」"
+                    v-model="text"
+                    show-word-limit
+                  >
+                  </el-input> </el-form-item
+              ></el-col>
+              <el-col :span="11"
+                ><el-form-item label="鍒嗗��">
+                  <el-input
+                    type="text"
+                    placeholder="璇疯緭鍏ュ垎鍊�"
+                    v-model="text"
+                    show-word-limit
+                  >
+                  </el-input> </el-form-item
+              ></el-col>
+              <el-col :span="2">
+                <el-button
+                  type="danger"
+                  icon="el-icon-delete"
+                  circle
+                ></el-button>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10">
+              <el-col :span="11"
+                ><el-form-item label="閫変腑鎻愮ず">
+                  <el-input
+                    type="text"
+                    placeholder="璇疯緭鍏ュ唴瀹�"
+                    v-model="text"
+                    maxlength="10"
+                    show-word-limit
+                  >
+                  </el-input> </el-form-item
+              ></el-col>
+              <el-col :span="11"
+                ><el-form-item label="涓嬮璺宠浆">
+                  <el-input
+                    type="text"
+                    placeholder="璇疯緭鍏ラ鍙�"
+                    v-model="text"
+                    show-word-limit
+                  >
+                  </el-input> </el-form-item
+              ></el-col>
+            </el-row>
+          </div>
+        </el-form>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listtag } from "@/api/system/label";
+
+export default {
+  data() {
+    return {
+      topicobj: {},
+      inputVisible: false,
+      inputValue: "",
+      dynamicTags: ["鏍囩涓�", "鏍囩浜�", "鏍囩涓�"],
+      optionlist: [
+        { value: "topic", table: "topic" },
+        { value: "topic", table: "topic" },
+        { value: "topic", table: "topic" },
+      ],
+      options: [
+        {
+          value: "閫夐」1",
+          label: "蹇冭绠�",
+        },
+        {
+          value: "閫夐」2",
+          label: "楠ㄧ",
+        },
+        {
+          value: "閫夐」3",
+          label: "濡囩",
+        },
+      ],
+      optionstag:[],
+      xjxsoptions: [
+        {
+          value: "1",
+          label: "鍗曢��",
+        },
+        {
+          value: "2",
+          label: "澶氶��",
+        },
+      ],
+    };
+  },
+
+  created() {
+    this.gettabList();
+  },
+
+  methods: {
+    Submittopicobj() {},
+    // 鏂板閫夐」
+    addoption() {},
+    // 鏍囩-----------------
+    /** 鏌ヨ鏍囩鍒楄〃 */
+    gettabList() {
+      const tagqueryParams = {
+        pageNum: 1,
+        pageSize: 1000,
+        tagcategoryid: "0",
+      };
+      listtag(tagqueryParams).then((response) => {
+        console.log(response);
+        this.options = response.rows;
+      });
+    },
+    handleClose(tag) {
+      this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
+    },
+    handleInputConfirm() {
+      let inputValue = this.inputValue;
+      if (inputValue) {
+        this.dynamicTags.push(inputValue);
+      }
+      this.inputVisible = false;
+      this.inputValue = "";
+    },
+    showInput() {
+      this.inputVisible = true;
+      // 鑷姩鑾峰彇鐒︾偣
+      // this.$nextTick((_) => {
+      //   this.$refs.saveTagInput.$refs.input.focus();
+      // });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.presentation-right {
+  margin-top: 20px;
+  padding: 0 20px;
+  font-size: 18px;
+  overflow: auto;
+  .headline {
+    font-size: 20px;
+    border-left: 3px solid #41a1be;
+    padding-left: 5px;
+    margin: 15px 0;
+  }
+  .topicxq {
+    width: 50%;
+    background-color: #e2f5fc;
+    border-radius: 4px;
+    margin-top: 10px;
+    padding-left: 10px;
+    padding-top: 15px;
+  }
+  .xinz-inf {
+    font-size: 18px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    line-height: 48px;
+
+    .el-tag + .el-tag {
+      margin-left: 10px;
+    }
+    .button-new-tag {
+      margin-left: 10px;
+      height: 32px;
+      line-height: 30px;
+      padding-top: 0;
+      padding-bottom: 0;
+    }
+    .input-new-tag {
+      width: 90px;
+      margin-left: 10px;
+      vertical-align: bottom;
+    }
+  }
+}
+</style>
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 4c2e5a9..556466a 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -108,13 +108,15 @@
                 v-if="inputVisible"
                 @change="handleInputConfirm"
                 filterable
+                  allow-create
+                  default-first-option
                 placeholder="璇烽�夋嫨"
               >
                 <el-option
-                  v-for="item in options"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.label"
+                  v-for="item in optionstag"
+                  :key="item.tagname"
+                    :label="item.tagname"
+                    :value="item.tagname"
                 >
                 </el-option>
               </el-select>
@@ -551,6 +553,8 @@
 </template>
 
 <script>
+import { listtag } from "@/api/system/label";
+
 export default {
   data() {
     return {
@@ -582,6 +586,7 @@
       },
       rules: {},
       rulesa: {},
+      optionstag:[],
       xjxsoptions: [
         {
           value: "閫夐」1",
@@ -671,7 +676,10 @@
     };
   },
 
-  created() {},
+  created() {
+    this.gettabList();
+
+  },
 
   methods: {
     submitForm(formName) {
@@ -750,6 +758,18 @@
       this.fileList = fileList.slice(-3);
     },
     // 鏍囩-----------------
+     /** 鏌ヨ鏍囩鍒楄〃 */
+     gettabList() {
+      const tagqueryParams = {
+        pageNum: 1,
+        pageSize: 1000,
+        tagcategoryid: "0",
+      };
+      listtag(tagqueryParams).then((response) => {
+        console.log(response);
+        this.optionstag = response.rows;
+      });
+    },
     handleClose(tag) {
       this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
     },
diff --git a/src/views/patient/follow/index.vue b/src/views/patient/follow/index.vue
index a4abccf..c133603 100644
--- a/src/views/patient/follow/index.vue
+++ b/src/views/patient/follow/index.vue
@@ -188,14 +188,14 @@
           <el-table-column
             label="璇佷欢绫诲瀷"
             align="center"
-            key="idtype"
-            prop="idtype"
+            key="idcardtype"
+            prop="idcardtype"
             width="120"
           /><el-table-column
             label="璇佷欢缂栧彿"
             align="center"
-            key="idno"
-            prop="idno"
+            key="idcardno"
+            prop="idcardno"
             width="190"
           />
           <el-table-column
@@ -208,8 +208,8 @@
           <el-table-column
             label="瀹跺涵浣忓潃"
             align="center"
-            key="idno"
-            prop="idno"
+            key="idcardno"
+            prop="idcardno"
             width="190"
           />
           <el-table-column
@@ -299,8 +299,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="璇佷欢绫诲瀷" prop="idtype">
-              <el-select v-model="form.idtype" placeholder="璇烽�夋嫨鎬у埆">
+            <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
+              <el-select v-model="form.idcardtype" placeholder="璇烽�夋嫨鎬у埆">
                 <el-option
                   v-for="item in paperstypes"
                   :key="item.papersname"
@@ -311,9 +311,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="璇佷欢鍙�" prop="idno">
+            <el-form-item label="璇佷欢鍙�" prop="idcardno">
               <el-input
-                v-model="form.idno"
+                v-model="form.idcardno"
                 placeholder="璇疯緭鍏ヨ瘉浠跺彿"
                 maxlength="50"
               />
@@ -456,9 +456,9 @@
         age: "",
         sex: "",
         tagList: [],
-        idno: "",
+        idcardno: "",
         telcode: "",
-        idtype: "",
+        idcardtype: "",
         relativetelcode: "",
       },
       //瀵煎叆杩涘害
@@ -539,7 +539,7 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        idno: undefined,
+        idcardno: undefined,
         name: undefined,
         status: undefined,
         tagIds: undefined,
@@ -572,8 +572,14 @@
     },
     /** 鏌ヨ鏍囩鍒楄〃 */
     gettabList() {
-      const queryParams = {};
-      listtag().then((response) => {
+      const tagqueryParams = {
+        pageNum: 1,
+        pageSize: 1000,
+        tagname: undefined,
+        tagdescription: undefined,
+        tagcategoryid: "0",
+      };
+      listtag(tagqueryParams).then((response) => {
         console.log(response);
         this.optionstag = response.rows;
       });
@@ -611,9 +617,9 @@
         age: "",
         sex: "",
         tagList: [],
-        idno: "",
+        idcardno: "",
         telcode: "",
-        idtype: "",
+        idcardtype: "",
         relativetelcode: "",
       };
       // this.resetForm("form");
diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index de55f9c..158b5cf 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -20,9 +20,9 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="鎮h�呬綇闄㈠彿" prop="idno">
+          <el-form-item label="鎮h�呬綇闄㈠彿" prop="idcardno">
             <el-input
-              v-model="queryParams.idno"
+              v-model="queryParams.idcardno"
               placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
               clearable
               style="width: 250px"
@@ -234,15 +234,15 @@
           <el-table-column
             label="鎶ょ悊绛夌骇"
             align="center"
-            key="idtype"
-            prop="idtype"
+            key="idcardtype"
+            prop="idcardtype"
             width="120"
           />
           <el-table-column
             label="鐥呮儏鐘舵��"
             align="center"
-            key="idno"
-            prop="idno"
+            key="idcardno"
+            prop="idcardno"
             width="190"
           />
 
@@ -364,8 +364,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="璇佷欢绫诲瀷" prop="idtype">
-              <el-select v-model="form.idtype" placeholder="璇烽�夋嫨鎬у埆">
+            <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
+              <el-select v-model="form.idcardtype" placeholder="璇烽�夋嫨鎬у埆">
                 <el-option
                   v-for="item in paperstypes"
                   :key="item.papersname"
@@ -376,9 +376,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="璇佷欢鍙�" prop="idno">
+            <el-form-item label="璇佷欢鍙�" prop="idcardno">
               <el-input
-                v-model="form.idno"
+                v-model="form.idcardno"
                 placeholder="璇疯緭鍏ヨ瘉浠跺彿"
                 maxlength="50"
               />
@@ -610,9 +610,9 @@
         age: "",
         sex: "",
         tagList: [],
-        idno: "",
+        idcardno: "",
         telcode: "",
-        idtype: "",
+        idcardtype: "",
         relativetelcode: "",
       },
       //瀵煎叆杩涘害
@@ -657,7 +657,7 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        idno: undefined,
+        idcardno: undefined,
         name: undefined,
         status: undefined,
         tagIds: undefined,
@@ -734,8 +734,14 @@
     },
     /** 鏌ヨ鏍囩鍒楄〃 */
     gettabList() {
-      const queryParams = {};
-      listtag().then((response) => {
+      const tagqueryParams = {
+        pageNum: 1,
+        pageSize: 1000,
+        tagname: undefined,
+        tagdescription: undefined,
+        tagcategoryid: "0",
+      };
+      listtag(tagqueryParams).then((response) => {
         console.log(response);
         this.optionstag = response.rows;
       });
@@ -773,9 +779,9 @@
         age: "",
         sex: "",
         tagList: [],
-        idno: "",
+        idcardno: "",
         telcode: "",
-        idtype: "",
+        idcardtype: "",
         relativetelcode: "",
       };
       // this.resetForm("form");
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index cfccd0a..377f67e 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -246,8 +246,8 @@
               <el-table-column
                 label="灞呬綇鍦�"
                 align="center"
-                key="age"
-                prop="age"
+                key="placeOfResidence"
+                prop="placeOfResidence"
                 width="120"
               />
               <el-table-column
@@ -265,14 +265,14 @@
               <el-table-column
                 label="璇佷欢绫诲瀷"
                 align="center"
-                key="idtype"
-                prop="idtype"
+                key="idcardtype"
+                prop="idcardtype"
                 width="120"
               /><el-table-column
                 label="璇佷欢鍙风爜"
                 align="center"
-                key="idno"
-                prop="idno"
+                key="idcardno"
+                prop="idcardno"
                 width="190"
               />
 
@@ -286,15 +286,15 @@
               <el-table-column
                 label="寤烘。鏃ユ湡"
                 align="center"
-                key="uploadTime"
-                prop="uploadTime"
+                key="createTime"
+                prop="createTime"
                 width="160"
               >
               </el-table-column>
               <el-table-column
                 label="鏇存柊鏃ユ湡"
                 align="center"
-                prop="updateTime"
+                prop="archivetime"
                 width="160"
               >
                 <template slot-scope="scope">
@@ -386,7 +386,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="姘戞棌" prop="age">
+            <el-form-item label="骞撮緞" prop="age">
               <el-input
                 v-model="form.age"
                 placeholder="璇疯緭鍏ュ勾榫�"
@@ -399,7 +399,7 @@
           <el-col :span="8">
             <el-form-item label="姘戞棌" prop="name">
               <el-input
-                v-model="form.name"
+                v-model="form.nation"
                 placeholder="璇疯緭鍏ユ皯鏃�"
                 maxlength="30"
               />
@@ -408,7 +408,7 @@
           <el-col :span="8">
             <el-form-item label="绫嶈疮" prop="age">
               <el-input
-                v-model="form.age"
+                v-model="form.nativePlace"
                 placeholder="璇疯緭鍏ョ睄璐�"
                 maxlength="30"
               />
@@ -426,8 +426,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="璇佷欢绫诲瀷" prop="idtype">
-              <el-select v-model="form.idtype" placeholder="璇烽�夋嫨鎬у埆">
+            <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
+              <el-select v-model="form.idcardtype" placeholder="璇烽�夋嫨鎬у埆">
                 <el-option
                   v-for="item in paperstypes"
                   :key="item.papersname"
@@ -438,9 +438,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="璇佷欢鍙�" prop="idno">
+            <el-form-item label="璇佷欢鍙�" prop="idcardno">
               <el-input
-                v-model="form.idno"
+                v-model="form.idcardno"
                 placeholder="璇疯緭鍏ヨ瘉浠跺彿"
                 maxlength="50"
               />
@@ -449,17 +449,17 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="鍑虹敓鍦�" prop="idno">
+            <el-form-item label="鍑虹敓鍦�" prop="idcardno">
               <el-input
-                v-model="form.idno"
+                v-model="form.birthplace"
                 placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑璇︾粏淇℃伅"
                 maxlength="50"
               />
             </el-form-item> </el-col
           ><el-col :span="12">
-            <el-form-item label="灞呬綇鍦�" prop="idno">
+            <el-form-item label="灞呬綇鍦�" prop="idcardno">
               <el-input
-                v-model="form.idno"
+                v-model="form.placeOfResidence"
                 placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑璇︾粏淇℃伅"
                 maxlength="50"
               />
@@ -469,7 +469,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="鎮h�呯被鍨�">
-              <el-select v-model="form.Patienttype" placeholder="璇烽�夋嫨绫诲瀷">
+              <el-select v-model="form.pattype" placeholder="璇烽�夋嫨绫诲瀷">
                 <el-option
                   v-for="item in Patienttype"
                   :key="item.value"
@@ -755,9 +755,9 @@
         age: "",
         sex: "",
         tagList: [],
-        idno: "",
+        idcardno: "",
         telcode: "",
-        idtype: "",
+        idcardtype: "",
         relativetelcode: "",
       },
       activeName: "first", //渚ц竟閫夋嫨
@@ -794,7 +794,7 @@
         pageNum: 1,
         allhosp: "1",
         pageSize: 10,
-        idno: undefined,
+        idcardno: undefined,
         name: undefined,
         status: undefined,
         tagIds: undefined,
@@ -874,8 +874,14 @@
     },
     /** 鏌ヨ鏍囩鍒楄〃 */
     gettabList() {
-      const queryParams = {};
-      listtag().then((response) => {
+      const tagqueryParams = {
+        pageNum: 1,
+        pageSize: 1000,
+        tagname: undefined,
+        tagdescription: undefined,
+        tagcategoryid: "0",
+      };
+      listtag(tagqueryParams).then((response) => {
         console.log(response);
         this.optionstag = response.rows;
       });
@@ -905,9 +911,9 @@
         age: "",
         sex: "",
         tagList: [],
-        idno: "",
+        idcardno: "",
         telcode: "",
-        idtype: "",
+        idcardtype: "",
         relativetelcode: "",
       };
       // this.resetForm("form");
diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue
index 563d1c5..e5fdabd 100644
--- a/src/views/patient/patient/outpatient.vue
+++ b/src/views/patient/patient/outpatient.vue
@@ -20,9 +20,9 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="鎮h�呯紪鍙�" prop="idno">
+          <el-form-item label="鎮h�呯紪鍙�" prop="idcardno">
             <el-input
-              v-model="queryParams.idno"
+              v-model="queryParams.idcardno"
               placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
               clearable
               style="width: 250px"
@@ -58,6 +58,7 @@
               <el-select
                 v-model="queryParams.tagIds"
                 multiple
+                filterable 
                 placeholder="璇烽�夋嫨"
               >
                 <el-option
@@ -214,15 +215,15 @@
           <el-table-column
             label="灏辫瘖绫诲埆"
             align="center"
-            key="idtype"
-            prop="idtype"
+            key="idcardtype"
+            prop="idcardtype"
             width="120"
           />
           <el-table-column
             label="璇婃柇"
             align="center"
-            key="idno"
-            prop="idno"
+            key="idcardno"
+            prop="idcardno"
             width="190"
           />
 
@@ -344,8 +345,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="璇佷欢绫诲瀷" prop="idtype">
-              <el-select v-model="form.idtype" placeholder="璇烽�夋嫨鎬у埆">
+            <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
+              <el-select v-model="form.idcardtype" placeholder="璇烽�夋嫨鎬у埆">
                 <el-option
                   v-for="item in paperstypes"
                   :key="item.papersname"
@@ -356,9 +357,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="璇佷欢鍙�" prop="idno">
+            <el-form-item label="璇佷欢鍙�" prop="idcardno">
               <el-input
-                v-model="form.idno"
+                v-model="form.idcardno"
                 placeholder="璇疯緭鍏ヨ瘉浠跺彿"
                 maxlength="50"
               />
@@ -590,9 +591,9 @@
         age: "",
         sex: "",
         tagList: [],
-        idno: "",
+        idcardno: "",
         telcode: "",
-        idtype: "",
+        idcardtype: "",
         relativetelcode: "",
       },
       //瀵煎叆杩涘害
@@ -637,7 +638,7 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        idno: undefined,
+        idcardno: undefined,
         name: undefined,
         status: undefined,
         tagIds: undefined,
@@ -714,8 +715,14 @@
     },
     /** 鏌ヨ鏍囩鍒楄〃 */
     gettabList() {
-      const queryParams = {};
-      listtag().then((response) => {
+      const tagqueryParams = {
+        pageNum: 1,
+        pageSize: 1000,
+        tagname: undefined,
+        tagdescription: undefined,
+        tagcategoryid: "0",
+      };
+      listtag(tagqueryParams).then((response) => {
         console.log(response);
         this.optionstag = response.rows;
       });
@@ -753,9 +760,9 @@
         age: "",
         sex: "",
         tagList: [],
-        idno: "",
+        idcardno: "",
         telcode: "",
-        idtype: "",
+        idcardtype: "",
         relativetelcode: "",
       };
       // this.resetForm("form");
diff --git a/src/views/patient/patient/physical.vue b/src/views/patient/patient/physical.vue
index 296902a..39c8821 100644
--- a/src/views/patient/patient/physical.vue
+++ b/src/views/patient/patient/physical.vue
@@ -20,9 +20,9 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="浣撴缂栧彿" prop="idno">
+          <el-form-item label="浣撴缂栧彿" prop="idcardno">
             <el-input
-              v-model="queryParams.idno"
+              v-model="queryParams.idcardno"
               placeholder="璇疯緭鍏ヤ綋妫�缂栧彿"
               clearable
               style="width: 250px"
@@ -49,6 +49,7 @@
             <el-select
               v-model="queryParams.tagIds"
               multiple
+              filterable 
               placeholder="璇烽�夋嫨"
             >
               <el-option
@@ -213,8 +214,8 @@
           <el-table-column
             label="浣撴绫诲瀷"
             align="center"
-            key="idtype"
-            prop="idtype"
+            key="idcardtype"
+            prop="idcardtype"
             width="120"
           />
           <el-table-column
@@ -227,8 +228,8 @@
           <el-table-column
             label="浣撴鎶ュ憡"
             align="center"
-            key="idno"
-            prop="idno"
+            key="idcardno"
+            prop="idcardno"
             width="120"
           />
 
@@ -246,7 +247,7 @@
             prop="telcode"
             width="120"
           />
-          
+
           <el-table-column
             label="灏辫瘖鏃堕棿"
             align="center"
@@ -344,8 +345,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="璇佷欢绫诲瀷" prop="idtype">
-              <el-select v-model="form.idtype" placeholder="璇烽�夋嫨鎬у埆">
+            <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
+              <el-select v-model="form.idcardtype" placeholder="璇烽�夋嫨鎬у埆">
                 <el-option
                   v-for="item in paperstypes"
                   :key="item.papersname"
@@ -356,9 +357,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="璇佷欢鍙�" prop="idno">
+            <el-form-item label="璇佷欢鍙�" prop="idcardno">
               <el-input
-                v-model="form.idno"
+                v-model="form.idcardno"
                 placeholder="璇疯緭鍏ヨ瘉浠跺彿"
                 maxlength="50"
               />
@@ -590,9 +591,9 @@
         age: "",
         sex: "",
         tagList: [],
-        idno: "",
+        idcardno: "",
         telcode: "",
-        idtype: "",
+        idcardtype: "",
         relativetelcode: "",
       },
       //瀵煎叆杩涘害
@@ -637,7 +638,7 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        idno: undefined,
+        idcardno: undefined,
         name: undefined,
         status: undefined,
         tagIds: undefined,
@@ -714,8 +715,14 @@
     },
     /** 鏌ヨ鏍囩鍒楄〃 */
     gettabList() {
-      const queryParams = {};
-      listtag().then((response) => {
+      const tagqueryParams = {
+        pageNum: 1,
+        pageSize: 1000,
+        tagname: undefined,
+        tagdescription: undefined,
+        tagcategoryid: "0",
+      };
+      listtag(tagqueryParams).then((response) => {
         console.log(response);
         this.optionstag = response.rows;
       });
@@ -753,9 +760,9 @@
         age: "",
         sex: "",
         tagList: [],
-        idno: "",
+        idcardno: "",
         telcode: "",
-        idtype: "",
+        idcardtype: "",
         relativetelcode: "",
       };
       // this.resetForm("form");
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index 596664c..cba7f89 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -95,7 +95,10 @@
     <!-- 鍋ュ悍妗f妯″潡 -->
     <div class="information-content" v-if="activeName == 'health'">
       <div class="top-message">
-        <div class="headline">鍩虹淇℃伅</div>
+        <div class="headlines">
+          <div>鍩虹淇℃伅</div>
+          <el-button type="primary" @click="savefile">淇濆瓨鎮h�呮。妗�</el-button>
+        </div>
         <div class="detailed">
           <el-row :gutter="20">
             <el-col :span="12"
@@ -145,13 +148,15 @@
                   v-if="inputVisible"
                   @change="handleInputConfirm"
                   filterable
+                  allow-create
+                  default-first-option
                   placeholder="璇烽�夋嫨"
                 >
                   <el-option
                     v-for="item in options"
-                    :key="item.label"
-                    :label="item.label"
-                    :value="item.label"
+                    :key="item.tagname"
+                    :label="item.tagname"
+                    :value="item.tagname"
                   >
                   </el-option>
                 </el-select>
@@ -231,7 +236,7 @@
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="鍚哥儫鎯呭喌" prop="idtype">
+                <el-form-item label="鍚哥儫鎯呭喌" prop="idcardtype">
                   <el-radio-group v-model="form.radio">
                     <el-radio :label="1">鏈�</el-radio>
                     <el-radio :label="2">鏃�</el-radio>
@@ -239,7 +244,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="楗厭鎯呭喌" prop="idno">
+                <el-form-item label="楗厭鎯呭喌" prop="idcardno">
                   <el-radio-group v-model="form.radios">
                     <el-radio :label="1">鏈�</el-radio>
                     <el-radio :label="2">鏃�</el-radio>
@@ -247,7 +252,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="杩愬姩鎯呭喌" prop="idno">
+                <el-form-item label="杩愬姩鎯呭喌" prop="idcardno">
                   <el-radio-group v-model="form.radiosa">
                     <el-radio :label="1">鏈�</el-radio>
                     <el-radio :label="2">鏃�</el-radio>
@@ -257,19 +262,19 @@
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="楗鎯呭喌" prop="idno">
+                <el-form-item label="楗鎯呭喌" prop="idcardno">
                   <el-radio-group v-model="form.radiosa">
-                    <el-radio :label="1">澶氬害楗</el-radio>
+                    <el-radio :label="1">杩囧害楗</el-radio>
                     <el-radio :label="2">姝e父楗</el-radio>
-                    <el-radio :label="2">椋熸涓嶆尟</el-radio>
+                    <el-radio :label="3">椋熸涓嶆尟</el-radio>
                   </el-radio-group>
                 </el-form-item> </el-col
               ><el-col :span="12">
-                <el-form-item label="蹇冪悊鎯呭喌" prop="idno">
+                <el-form-item label="蹇冪悊鎯呭喌" prop="idcardno">
                   <el-radio-group v-model="form.radiosa">
                     <el-radio :label="1">蹇冩儏鎰夋偊</el-radio>
                     <el-radio :label="2">杞诲井鐒﹁檻</el-radio>
-                    <el-radio :label="2">鎶戦儊</el-radio>
+                    <el-radio :label="3">鎶戦儊</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
@@ -280,7 +285,7 @@
       <!-- 鑱旂郴鐢佃瘽 -->
       <div class="bottom-message">
         <div class="headline">
-          鍙风爜缁存姢
+          鍙风爜缁存姢<span style="margin-right: 60px">&nbsp;&nbsp;</span>
           <el-button type="primary" @click="AddanumberVisible = true"
             >+鏂板</el-button
           >
@@ -588,16 +593,23 @@
 import resetPwd from "./resetPwd";
 import * as echarts from "echarts";
 import SFtable from "@/components/SFtable"; //琛ㄦ牸缁勪欢
-
-import { getUserProfile } from "@/api/system/user";
-import { listJob } from "@/api/monitor/job"; //鑾峰彇鍒楄〃鎺ュ彛寰呭畾
+import { listtag } from "@/api/system/label";
+import {
+  messagelistpatient,
+  addmedicalhistory,
+  getmedicalhistory,
+  editmedicalhistory,
+  deletepatient,
+  Exporterrorpatient,
+  toleadpatient,
+} from "@/api/patient/homepage";
 
 export default {
   name: "Profile",
   components: { userAvatar, userInfo, resetPwd, SFtable },
   data() {
     return {
-      user: {},
+      userform: {},
       roleGroup: {},
       postGroup: {},
       form: {},
@@ -609,6 +621,7 @@
       yynumber: 12,
       total: 0, // 鎬绘潯鏁�
       activeTab: "userinfo",
+      id: "",
       activeName: "health", //涓�绫诲鑸�
       sonactiveName: "outpatient", //鍋ュ悍鐩戞祴瀵艰埅
       sontwoactiveName: "blood", //鍖荤枟妗f瀵艰埅
@@ -754,18 +767,42 @@
       this.xueyangechartsInit();
       this.twechartsInit();
     });
-    this.getList();
+    this.id = this.$route.query.id;
+    this.getuserinfo();
+    this.gettabList();
   },
   methods() {},
 
   methods: {
-    // 鏌ヨ鍒楄〃
+    // 鏌ヨ妗f鍒楄〃淇℃伅
     getList() {
       this.loading = true;
-      listJob(this.queryParams).then((response) => {
-        this.jobList = 1;
-        this.total = 1;
-        this.loading = false;
+    },
+    getuserinfo() {
+      console.log(this.id);
+      const queryParams = {
+        pid: Number(this.id),
+        allhosp: "0",
+        pageNum: 1,
+      };
+      messagelistpatient(queryParams).then((response) => {
+        console.log(response);
+        this.userform = response.rows[0];
+        console.log(this.userform);
+      });
+    },
+    // 淇濆瓨鎮h�呮。妗�
+    savefile() {},
+    /** 鏌ヨ鏍囩鍒楄〃 */
+    gettabList() {
+      const tagqueryParams = {
+        pageNum: 1,
+        pageSize: 1000,
+        tagcategoryid: "0",
+      };
+      listtag(tagqueryParams).then((response) => {
+        console.log(response);
+        this.options = response.rows;
       });
     },
     handleClick(tab, event) {
@@ -1260,7 +1297,7 @@
 .personages {
   height: 88px;
   width: 100%;
-  background-color: #2486b9;
+  background-color: #5e86f9;
   border-radius: 5px;
   padding: 20px;
   margin-bottom: 10px;
@@ -1350,6 +1387,15 @@
     margin-bottom: 10px;
     border-left: 8px solid rgb(65, 161, 190);
   }
+  .headlines {
+    font-size: 25px;
+    display: flex;
+    width: 88%;
+    justify-content: space-between;
+    padding-left: 5px;
+    margin-bottom: 10px;
+    border-left: 8px solid rgb(65, 161, 190);
+  }
   .bottom-message {
     margin-bottom: 25px;
     margin-left: 100px;
diff --git a/src/views/patient/viewvant/RightDrawer.vue b/src/views/patient/viewvant/RightDrawer.vue
index d9b5175..17b57f3 100644
--- a/src/views/patient/viewvant/RightDrawer.vue
+++ b/src/views/patient/viewvant/RightDrawer.vue
@@ -9,9 +9,9 @@
           </el-form-item>
           <div v-show="showGrid">
             <el-form-item label="缃戞牸绫诲瀷">
-              <el-radio-group v-model="grid.type" @change="changeGridType">
+              <el-radio-group v-model="grid.type" @change="changeGridcardtype">
                 <el-radio
-                  v-for="item in gridTypeList"
+                  v-for="item in gridcardtypeList"
                   :label="item.value"
                   :key="item.value"
                 >
@@ -165,7 +165,7 @@
   name: "RightDrawer",
   data() {
     return {
-      gridTypeList: [
+      gridcardtypeList: [
         {
           label: "鍥涜竟缃戞牸",
           value: "mesh",
@@ -245,7 +245,7 @@
     changeGrid() {
       this.showGrid ? this.graph.showGrid() : this.graph.hideGrid();
     },
-    changeGridType(e) {
+    changeGridcardtype(e) {
       this.grid.type = e;
       this.changeGrid();
     },
diff --git a/src/views/repositoryai/intention/index.vue b/src/views/repositoryai/intention/index.vue
index 8238d4c..3d03d41 100644
--- a/src/views/repositoryai/intention/index.vue
+++ b/src/views/repositoryai/intention/index.vue
@@ -396,13 +396,15 @@
                   v-if="inputVisible"
                   @change="handleInputConfirm"
                   filterable
+                  allow-create
+                  default-first-option
                   placeholder="璇烽�夋嫨"
                 >
                   <el-option
-                    v-for="item in optionss"
-                    :key="item.label"
-                    :label="item.label"
-                    :value="item.label"
+                    v-for="item in optionstag"
+                    :key="item.tagname"
+                    :label="item.tagname"
+                    :value="item.tagname"
                   >
                   </el-option>
                 </el-select>
@@ -624,6 +626,8 @@
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { listtag } from "@/api/system/label";
+
 export default {
   name: "questionnaire",
   dicts: ["sys_normal_disable", "sys_user_sex"],
@@ -754,6 +758,7 @@
           label: "绫诲瀷鍥�",
         },
       ],
+      optionstag:[],
       //绫诲埆鍒楄〃
       editableTabs: [
         {
@@ -848,6 +853,7 @@
   watch: {},
   created() {
     this.getList();
+    this.gettabList();
   },
 
   methods: {
@@ -927,6 +933,17 @@
       console.log(key, keyPath);
     },
     // 鏍囩-----------------
+    gettabList() {
+      const tagqueryParams = {
+        pageNum: 1,
+        pageSize: 1000,
+        tagcategoryid: "0",
+      };
+      listtag(tagqueryParams).then((response) => {
+        console.log(response);
+        this.optionstag = response.rows;
+      });
+    },
     handleClose(tag) {
       this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
     },
diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue
index bd95c12..97892d0 100644
--- a/src/views/repositoryai/templateku/configurat/index.vue
+++ b/src/views/repositoryai/templateku/configurat/index.vue
@@ -128,13 +128,15 @@
                 v-if="inputVisible"
                 @change="handleInputConfirm"
                 filterable
+                  allow-create
+                  default-first-option
                 placeholder="璇烽�夋嫨"
               >
                 <el-option
-                  v-for="item in options"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.label"
+                v-for="item in optionstag"
+                  :key="item.tagname"
+                    :label="item.tagname"
+                    :value="item.tagname"
                 >
                 </el-option>
               </el-select>
@@ -538,7 +540,7 @@
                       </el-form-item></el-col
                     >
                     <el-col :span="8">
-                      <div style="text-align: right; padding-right: 10px;" >
+                      <div style="text-align: right; padding-right: 10px">
                         <el-button type="danger" round>鍒犻櫎</el-button>
                       </div>
                     </el-col>
@@ -705,6 +707,8 @@
 </template>
 
 <script>
+import { listtag } from "@/api/system/label";
+
 export default {
   data() {
     return {
@@ -736,6 +740,7 @@
       },
       rules: {},
       rulesa: {},
+      optionstag:[],
       xjxsoptions: [
         {
           value: "閫夐」1",
@@ -839,7 +844,10 @@
     };
   },
 
-  created() {},
+  created() {
+    this.gettabList();
+
+  },
 
   methods: {
     getIndexInArray(arr, obj) {
@@ -931,6 +939,17 @@
       );
     },
     // 鏍囩-----------------
+    gettabList() {
+      const tagqueryParams = {
+        pageNum: 1,
+        pageSize: 1000,
+        tagcategoryid: "0",
+      };
+      listtag(tagqueryParams).then((response) => {
+        console.log(response);
+        this.optionstag = response.rows;
+      });
+    },
     handleClose(tag) {
       this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
     },
diff --git a/src/views/repositoryai/verbaltrick/particulars/index.vue b/src/views/repositoryai/verbaltrick/particulars/index.vue
index 6c50e91..eaff738 100644
--- a/src/views/repositoryai/verbaltrick/particulars/index.vue
+++ b/src/views/repositoryai/verbaltrick/particulars/index.vue
@@ -396,13 +396,15 @@
                 v-if="inputVisible"
                 @change="handleInputConfirm"
                 filterable
+                allow-create
+                default-first-option
                 placeholder="璇烽�夋嫨"
               >
                 <el-option
-                  v-for="item in optionss"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.label"
+                  v-for="item in optionstag"
+                  :key="item.tagname"
+                  :label="item.tagname"
+                  :value="item.tagname"
                 >
                 </el-option>
               </el-select>
@@ -560,6 +562,8 @@
 </template>
 
 <script>
+import { listtag } from "@/api/system/label";
+
 export default {
   data() {
     return {
@@ -591,6 +595,7 @@
       },
       rules: {},
       rulesa: {},
+      optionstag: [],
       xjxsoptions: [
         {
           value: "閫夐」1",
@@ -716,7 +721,9 @@
     };
   },
 
-  created() {},
+  created() {
+    this.gettabList();
+  },
 
   methods: {
     submitForm(formName) {
@@ -807,6 +814,17 @@
       );
     },
     // 鏍囩-----------------
+    gettabList() {
+      const tagqueryParams = {
+        pageNum: 1,
+        pageSize: 1000,
+        tagcategoryid: "0",
+      };
+      listtag(tagqueryParams).then((response) => {
+        console.log(response);
+        this.optionstag = response.rows;
+      });
+    },
     handleClose(tag) {
       this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
     },
diff --git a/src/views/shortmessage/healthinformation/index.vue b/src/views/shortmessage/healthinformation/index.vue
index 38815aa..1b19a82 100644
--- a/src/views/shortmessage/healthinformation/index.vue
+++ b/src/views/shortmessage/healthinformation/index.vue
@@ -65,11 +65,28 @@
               v-show="showSearch"
               label-width="98px"
             >
-              <el-form-item label="閫氱煡绫诲瀷" prop="userName">
+              <el-form-item label="閫傜敤绉戝" prop="userName">
                 <el-select
-                  v-model="queryParams.statustype"
+                  v-model="queryParams.administrative"
                   placeholder="璇烽�夋嫨"
                 >
+                  <el-option
+                    v-for="item in optionks"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="閫氱煡鏍囬" prop="userName">
+                <el-input
+                  v-model="queryParams.title"
+                  placeholder="璇疯緭鍏ュ唴瀹�"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="鍐呭褰㈠紡" prop="userName">
+                <el-select v-model="queryParams.shape" placeholder="璇烽�夋嫨">
                   <el-option
                     v-for="item in options"
                     :key="item.value"
@@ -79,8 +96,19 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="閫氱煡鏂瑰紡" prop="status">
-                <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨">
+              <el-form-item label="閫傜敤鏂瑰紡" prop="status">
+                <el-select v-model="queryParams.way" placeholder="璇烽�夋嫨">
+                  <el-option
+                    v-for="item in optionsfs"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="鍙敤鐘舵��" prop="status">
+                <el-select v-model="queryParams.usable" placeholder="璇烽�夋嫨">
                   <el-option
                     v-for="item in optionss"
                     :key="item.value"
@@ -156,11 +184,7 @@
 
               <!-- <el-col :span="1.5"> </el-col> -->
             </el-row>
-            <!-- <right-toolbar
-          :showSearch.sync="showSearch"
-          @queryTable="getList"
-          :columns="columns"
-        ></right-toolbar> -->
+
             <el-table
               v-loading="loading"
               :data="userList"
@@ -175,7 +199,7 @@
                 prop="userId"
               />
               <el-table-column
-                label="閫氱煡鏂瑰紡"
+                label="閫氱煡鏍囬"
                 align="center"
                 key="userName"
                 prop="userName"
@@ -184,8 +208,9 @@
               <el-table-column
                 label="閫氱煡鍐呭"
                 align="center"
-                key="nickName"
-                prop="nickName"
+                width="150"
+                key="informvalue"
+                prop="informvalue"
                 :show-overflow-tooltip="true"
               />
               <el-table-column
@@ -210,7 +235,28 @@
                 width="120"
               />
               <el-table-column
+                label="鍐呭褰㈠紡"
+                align="center"
+                key="shape"
+                prop="shape"
+                width="120"
+              />
+              <el-table-column
+                label="鍙戦�佹柟寮�"
+                align="center"
+                key="bphonenumber"
+                prop="bphonenumber"
+                width="120"
+              />
+              <el-table-column
                 label="鍙敤鐘舵��"
+                align="center"
+                key="usable"
+                prop="usable"
+                width="120"
+              />
+              <el-table-column
+                label="鏈�杩戜慨鏀�"
                 align="center"
                 key="cphonenumber"
                 prop="cphonenumber"
@@ -224,16 +270,6 @@
                 class-name="small-padding fixed-width"
               >
                 <template slot-scope="scope">
-                  <el-button
-                    size="medium"
-                    type="text"
-                    @click="goQRCode(scope.row)"
-                    v-hasPermi="['system:user:edit']"
-                  >
-                    <span class="button-text"
-                      ><i class="el-icon-edit"></i>浜岀淮鐮�</span
-                    ></el-button
-                  >
                   <el-button
                     size="medium"
                     type="text"
@@ -274,130 +310,172 @@
             />
           </el-col>
         </el-row>
-
-        <!-- 娣诲姞鎴栦慨鏀归�氱煡閰嶇疆瀵硅瘽妗� -->
-        <el-dialog
-          :title="title"
-          :visible.sync="open"
-          width="900px"
-          append-to-body
-        >
-          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="濮撳悕" prop="nickName">
-                  <el-input
-                    v-model="form.nickName"
-                    placeholder="璇疯緭鍏ュ鍚�"
-                    maxlength="30"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="鎬у埆" prop="deptId">
-                  <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
-                    <el-option
-                      v-for="dict in dict.type.sys_user_sex"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="璇佷欢绫诲瀷" prop="phonenumber">
-                  <el-input
-                    v-model="form.phonenumber"
-                    placeholder="璇烽�夋嫨璇佷欢绫诲瀷"
-                    maxlength="11"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="璇佷欢鍙�" prop="email">
-                  <el-input
-                    v-model="form.email"
-                    placeholder="璇疯緭鍏ヨ瘉浠跺彿"
-                    maxlength="50"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="鏈汉鎵嬫満鍙�" prop="userName">
-                  <el-input
-                    v-model="form.userName"
-                    placeholder="璇疯緭鍏ユ墜鏈哄彿"
-                    maxlength="30"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="浜插睘鎵嬫満鍙�" prop="password">
-                  <el-input
-                    v-model="form.password"
-                    placeholder="璇疯緭鍏ヤ翰灞炴墜鏈哄彿"
-                    type="password"
-                    maxlength="20"
-                    show-password
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="鎮h�呮爣绛�">
-                  <el-cascader
-                    :options="optionss"
-                    :props="propss"
-                    clearable
-                  ></el-cascader>
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="澶囨敞">
-                  <el-input
-                    v-model="form.remark"
-                    type="textarea"
-                    placeholder="璇疯緭鍏ュ唴瀹�"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
-            <el-button @click="cancel">鍙� 娑�</el-button>
-          </div>
-        </el-dialog>
       </div>
     </div>
-    <!-- 娣诲姞绫诲埆寮规 -->
+    <!-- 娣诲姞鎴栦慨鏀归�氱煡閰嶇疆瀵硅瘽妗� -->
     <el-dialog
-      :title="amendtag ? '淇敼绫诲埆' : '鏂板绫诲埆'"
-      width="30%"
-      :visible.sync="dialogFormVisible"
+      :title="title"
+      :visible.sync="indexopen"
+      width="900px"
+      append-to-body
     >
-      <el-form :model="classifyform">
-        <el-form-item
-          :label="amendtag ? '璇疯緭鍏ユ柊鐨勭被鍒悕绉�' : '璇疯緭鍏ョ被鍒悕绉�'"
-        >
-          <el-input
-            v-model="classifyform.categoryname"
-            autocomplete="off"
-          ></el-input>
+      <el-form ref="form" :model="indexform" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="閫氱煡鏍囬" prop="deptId">
+              <el-input
+                v-model="indexform.name"
+                placeholder="璇疯緭鍏�"
+                maxlength="40"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="鐗堟湰鍙�" prop="deptId">
+              <el-input
+                v-model="indexform.versions"
+                placeholder="璇疯緭鍏�"
+                maxlength="40"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="璇█" prop="deptId">
+              <el-select v-model="indexform.language" placeholder="璇烽�夋嫨璇█">
+                <el-option
+                  v-for="index in languagelist"
+                  :key="index.value"
+                  :label="index.label"
+                  :value="index.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="鏄惁鍙敤" prop="deptId">
+              <el-select v-model="indexform.useofstateky" placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="index in optionss"
+                  :key="index.value"
+                  :label="index.label"
+                  :value="index.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="閫氱煡鍐呭" prop="nickName">
+              <el-input
+                type="textarea"
+                v-model="indexform.nickName"
+                placeholder="璇疯緭鍏ラ�氱煡鍐呭"
+                maxlength="80"
+              />
+            </el-form-item> </el-col
+        ></el-row>
+        <el-form-item label="閫氱煡鍙橀噺" prop="name">
+          <el-row v-for="item in variablelist">
+            <el-col :span="4">
+              <el-input v-model="item.variable"></el-input>
+            </el-col>
+            <el-col :span="8" :offset="1">
+              <el-input v-model="item.value"></el-input>
+            </el-col>
+            <el-col :span="4" :offset="1">
+              <el-button
+                type="success"
+                icon="el-icon-plus"
+                circle
+                @click="addvariable(item)"
+              ></el-button>
+              <el-button
+                type="danger"
+                icon="el-icon-delete"
+                circle
+                @click="delvariable(item)"
+              ></el-button>
+            </el-col>
+          </el-row>
         </el-form-item>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="閫傜敤鐤剧梾" prop="userName">
+              <el-select
+                v-model="indexform.useofstate"
+                multiple
+                placeholder="璇烽�夋嫨(澶氶��)"
+              >
+                <el-option
+                  v-for="index in optionks"
+                  :key="index.value"
+                  :label="index.label"
+                  :value="index.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="閫傜敤绉戝" prop="userName">
+              <el-select
+                v-model="indexform.useofstateks"
+                multiple
+                placeholder="璇烽�夋嫨(澶氶��)"
+              >
+                <el-option
+                  v-for="index in optionks"
+                  :key="index.value"
+                  :label="index.label"
+                  :value="index.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="閫傜敤鏂瑰紡" prop="email">
+              <el-select
+                v-model="indexform.useofstatefs"
+                multiple
+                placeholder="璇烽�夋嫨(澶氶��)"
+              >
+                <el-option
+                  v-for="index in optionsfs"
+                  :key="index.value"
+                  :label="index.label"
+                  :value="index.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="鍐呭褰㈠紡" prop="email">
+              <el-select
+                v-model="indexform.useofstatexs"
+                multiple
+                placeholder="璇烽�夋嫨(澶氶��)"
+              >
+                <el-option
+                  v-for="index in options"
+                  :key="index.value"
+                  :label="index.label"
+                  :value="index.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
+
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">鍙� 娑�</el-button>
-        <el-button type="primary" @click="submitsidecolumn">纭� 瀹�</el-button>
+        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button @click="cancel">鍙� 娑�</el-button>
       </div>
     </el-dialog>
     <!-- 鍒犻櫎绫诲埆纭妗� -->
@@ -456,17 +534,30 @@
       showSearch: true,
       // 鎬绘潯鏁�
       total: 0,
+      indexopen: false, //寮规灞曠ず鍚�
+      // 娣诲姞銆佷慨鏀瑰弬鏁�
+      indexform: {},
       namequestionnaire: "",
       haoquestionnaire: "",
+      variablelist: [
+        {
+          variable: "paitent",
+          value: "琛ㄧず鎮h�呯殑鏍囪瘑",
+        },
+      ],
       // 鐢ㄦ埛琛ㄦ牸鏁版嵁
       userList: [
         {
           userid: 1,
           userName: "涓夊彿閫氱煡",
+          informvalue: "杩欎釜閫氱煡寰堥噸瑕佸晩寰堥噸瑕�",
           nickName: "1.2.4",
           aphonenumber: "鍏宠妭鐐庣棁",
-          bphonenumber: "寰堟",
+          bphonenumber: "楠ㄧ",
+          shape: "鏂囧瓧銆佸浘鐗�",
+          transmitmode: "閽夐拤銆佸井淇�",
           cphonenumber: "2022-12-12 ",
+          usable: "鍙敤",
         },
       ],
       // 寮瑰嚭灞傛爣棰�
@@ -498,11 +589,31 @@
       optionss: [
         {
           value: 1,
+          label: "鍙敤",
+        },
+        {
+          value: 2,
+          label: "绂佺敤",
+        },
+      ],
+      optionsfs: [
+        {
+          value: 1,
           label: "鐭俊",
         },
         {
           value: 2,
           label: "寰俊/閽夐拤",
+        },
+      ],
+      optionks: [
+        {
+          value: 1,
+          label: "蹇冨唴绉�",
+        },
+        {
+          value: 2,
+          label: "鑳稿绉�",
         },
       ],
       options: [
@@ -695,6 +806,22 @@
         this.optionsvalue = [];
       }
     },
+    // 鏂板鍙橀噺
+    addvariable() {
+      this.variablelist.push({
+        variable: "",
+        value: "",
+      });
+    },
+    // 鍒犻櫎鍙橀噺
+    delvariable(item) {
+      const index = this.variablelist.indexOf(item);
+      if (index !== -1) {
+        this.variablelist.splice(index, 1); // 浠庣储寮曚綅缃垹闄や竴涓厓绱�
+      } else {
+        console.log("鏈壘鍒拌瀵硅薄");
+      }
+    },
     //鍒犻櫎鍒嗙被
     deletefenlei(row) {
       if (this.deleteVisible) {
@@ -763,24 +890,18 @@
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
-      this.$router.push({
-        path: "/knowledge/questionnaire/compilequer/",
-      });
+      this.reset();
+      this.title = "鏂板閫氱煡";
+      this.indexopen = true;
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
-      this.$router.push({
-        path: "/knowledge/questionnaire/compilequer/",
-        query: { id: "1" },
-      });
+      this.reset();
+      this.title = "閫氱煡璇︽儏";
+      this.indexopen = true;
     },
-    // 鏌ョ湅閫氱煡
-    ViewQuestionnaire() {
-      this.$router.push({
-        path: "/knowledge/questionnaire/examine/",
-        query: { id: "1" },
-      });
-    },
+    // 鏌ョ湅
+    ViewQuestionnaire() {},
 
     /** 鏇存柊/淇敼鎻愪氦鎸夐挳 */
     submitForm: function () {
diff --git a/src/views/system/label/index.vue b/src/views/system/label/index.vue
index f910400..d83ddd4 100644
--- a/src/views/system/label/index.vue
+++ b/src/views/system/label/index.vue
@@ -6,7 +6,7 @@
         <div class="top-wj">鎮h�呮爣绛剧被鍨�</div>
         <div class="top-tj" @click="dialogFormVisible = true">+娣诲姞</div>
       </div>
-      <div class="center-ss">
+      <!-- <div class="center-ss">
         <el-input
           placeholder="璇疯緭鍏ュ唴瀹�"
           v-model="sidecolumnval"
@@ -19,14 +19,19 @@
             icon="el-icon-search"
           ></el-button>
         </el-input>
-      </div>
+      </div> -->
       <div class="bottom-fl">
-        <el-tabs tab-position="right">
-          <el-tab-pane :label="`鍏ㄩ儴 (${total})`"></el-tab-pane>
+        <el-tabs
+          tab-position="right"
+          v-model="queryParams.tagcategoryid"
+          @tab-click="handleClick"
+        >
+          <el-tab-pane :label="`鍏ㄩ儴 (${tagtotal})`" name="0"></el-tab-pane>
           <el-tab-pane
             class="tab-paness"
-            :key="item.name"
             v-for="(item, index) in editableTabs"
+            :key="item.categoryname"
+            :name="item.tagcategoryid.toString()"
           >
             <span slot="label">
               {{
@@ -168,6 +173,7 @@
                 align="center"
                 key="updateTime"
                 prop="updateTime"
+                width="200"
               >
                 <template slot-scope="scope">
                   <span
@@ -182,7 +188,7 @@
                 align="center"
                 key="tagdescription"
                 prop="tagdescription"
-                width="120"
+                width="200"
               >
               </el-table-column>
               <el-table-column
@@ -288,7 +294,7 @@
         <el-form-item label="鏍囩鍚嶇О">
           <el-input v-model="tagform.tagname"></el-input>
         </el-form-item>
-        <el-form-item label="鏍囩鎻忚堪">
+        <el-form-item label="鏍囩鍒嗙被">
           <el-select
             v-model="tagform.tagcategoryid"
             placeholder="璇烽�夋嫨鏍囩鍒嗙被"
@@ -375,6 +381,7 @@
       idds: "", //鍒嗙被id
       // 鎬绘潯鏁�
       total: 0,
+      tagtotal: 0,
       amendtag: false, //鏄惁淇敼绫诲埆
       lstamendtag: false, //鏄惁淇敼鏍囩
       scavisible: false, //鍒犻櫎寮规
@@ -433,30 +440,14 @@
         },
       ],
       //绫诲埆鍒楄〃
-      editableTabs: [
-        {
-          title: "楂樿鍘�",
-          number: "1",
-        },
-        {
-          title: "绯栧翱鐥�",
-          number: "2",
-        },
-        {
-          title: "楠ㄦ姌",
-          number: "2",
-        },
-        {
-          title: "蹇冭剰鐥�",
-          number: "2",
-        },
-      ],
+      editableTabs: [],
       // 鏌ヨ鏍囩鍒楄〃鍙傛暟
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         tagname: undefined,
         tagdescription: undefined,
+        tagcategoryid: "0",
       },
       // 鍒椾俊鎭�
       columns: [
@@ -525,12 +516,14 @@
   methods: {
     /** 鏌ヨ鏍囩鍒楄〃 */
     getList(row) {
-      console.log(row);
       console.log(this.queryParams);
       listtag(this.addDateRange(this.queryParams)).then((response) => {
         this.total = response.total;
         this.userList = response.rows;
       });
+    },
+    handleClick() {
+      this.getList();
     },
     /** 淇敼鏍囩 */
     handleUpdate(row) {
@@ -559,16 +552,17 @@
     // 娣诲姞/淇敼鏍囩
     Maintenancetag() {
       if (this.lstamendtag) {
-        toamendtag(this.addDateRange(this.tagform)).then((response) => {
+        toamendtag(this.tagform).then((response) => {
           console.log(response);
           this.lstamendtagVisible = false;
+          this.gitclasify();
           this.getList();
         });
       } else {
-        addapitag(this.addDateRange(this.tagform)).then((response) => {
+        addapitag(this.tagform).then((response) => {
           console.log(response);
           this.lstamendtagVisible = false;
-
+          this.gitclasify();
           this.getList();
         });
       }
@@ -587,6 +581,11 @@
         console.log(response);
         this.numberlb = response.total;
         this.editableTabs = response.rows;
+        const sum = this.editableTabs.reduce((accumulator, currentValue) => {
+          return accumulator + Number(currentValue.tagNum);
+        }, 0);
+        console.log(sum);
+        this.tagtotal = sum;
       });
     },
     // 娣诲姞/淇敼绫诲埆
@@ -706,6 +705,7 @@
         })
         .then(() => {
           this.getList();
+    this.gitclasify();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
         .catch(() => {});

--
Gitblit v1.9.3