From c50a8b158e31b9157869d28fb90c6f5c840bb05d Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 08 十二月 2023 15:17:55 +0800
Subject: [PATCH] 提交信息

---
 src/views/repositoryai/verbaltrick/index.vue            |  247 ++
 vue.config.js                                           |    2 
 src/assets/images/导入.png                                |    0 
 src/views/knowledge/questionnaire/compilequer/index.vue | 1226 +++++++--------
 src/views/patient/patient/index.vue                     |  198 +
 src/views/patient/patient/profile/index.vue             | 1039 ++++++++++---
 src/views/knowledge/education/index.vue                 |  208 ++
 src/views/knowledge/questionnaire/index.vue             |  206 ++
 src/views/repositoryai/intention/index.vue              |  564 ++++++-
 src/views/knowledge/education/compilequer/index.vue     |  652 ++++----
 src/components/SFtable/index.vue                        |    5 
 src/views/patient/follow/index.vue                      |  136 
 12 files changed, 2,859 insertions(+), 1,624 deletions(-)

diff --git "a/src/assets/images/\345\257\274\345\205\245.png" "b/src/assets/images/\345\257\274\345\205\245.png"
new file mode 100644
index 0000000..86cba5f
--- /dev/null
+++ "b/src/assets/images/\345\257\274\345\205\245.png"
Binary files differ
diff --git a/src/components/SFtable/index.vue b/src/components/SFtable/index.vue
index 2fdf215..1e06198 100644
--- a/src/components/SFtable/index.vue
+++ b/src/components/SFtable/index.vue
@@ -24,6 +24,7 @@
     >
     </el-table-column>
     <el-table-column
+    v-if="center"
       label="鎿嶄綔"
       align="center"
       width="120"
@@ -74,6 +75,10 @@
       type: Boolean,
       default: true,
     },
+    center: {
+      type: Boolean,
+      default: true,
+    },
     controlxz: {
       type: Boolean,
       default: true,
diff --git a/src/views/knowledge/education/compilequer/index.vue b/src/views/knowledge/education/compilequer/index.vue
index 3df9ce1..c78fba9 100644
--- a/src/views/knowledge/education/compilequer/index.vue
+++ b/src/views/knowledge/education/compilequer/index.vue
@@ -23,20 +23,6 @@
           label-width="100px"
           class="demo-ruleForm"
         >
-          <el-form-item label="瀹f暀鍚嶇О" prop="name">
-            <el-input v-model="ruleForm.name"></el-input>
-          </el-form-item>
-          <el-form-item label="瀹f暀褰㈠紡" prop="name">
-            <el-select v-model="ruleForm.shape" placeholder="璇烽�夋嫨">
-              <el-option
-                v-for="item in xjxsoptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item label="瀹f暀鍒嗙被" prop="region">
             <el-select
               v-model="ruleForm.classify"
@@ -55,14 +41,123 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="閫傜敤鐤剧梾" prop="sickness">
+          <el-form-item label="瀹f暀鏍囬" prop="name">
+            <div style="width: 30%">
+              <el-input v-model="ruleForm.name"></el-input>
+            </div>
+          </el-form-item>
+          <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-form-item label="鏂囦欢" prop="sickness">
+            <div style="width: 40%">
+              <el-upload
+                class="upload-demo"
+                action="https://jsonplaceholder.typicode.com/posts/"
+                :on-change="handleChange"
+                :file-list="fileList"
+              >
+                <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+                <div slot="tip" class="el-upload__tip">
+                  鍙兘涓婁紶jpg/png/xsl鏂囦欢锛屼笖涓嶈秴杩�50mb
+                </div>
+              </el-upload>
+            </div>
+          </el-form-item>
+          <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
+                placeholder="璇烽�夋嫨"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.label"
+                  :label="item.label"
+                  :value="item.label"
+                >
+                </el-option>
+              </el-select>
+              <el-button
+                v-else
+                class="button-new-tag"
+                size="small"
+                @click="showInput"
+                >+ 鏂板鏍囩</el-button
+              >
+            </div>
+          </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="鐗堟湰鍙�" prop="name">
+                <el-input v-model="currentVersion"></el-input> </el-form-item
+            ></el-col>
+            <el-col :span="9">
+              <el-form-item label="鍙敤鐘舵��" prop="region">
+                <el-select
+                  v-model="ruleForm.classify"
+                  size="medium"
+                  multiple
+                  filterable
+                  placeholder="璇烽�夋嫨鍒嗙被"
+                >
+                  <el-option
+                    class="ruleFormaa"
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select> </el-form-item
+            ></el-col>
+          </el-row>
+          <el-form-item label="瀹f暀鏂瑰紡" prop="region">
             <el-select
-              v-model="ruleForm.sickness"
+              v-model="ruleForm.way"
+              size="medium"
+              multiple
               filterable
-              placeholder="璇烽�夋嫨"
+              placeholder="璇烽�夋嫨鍒嗙被"
             >
               <el-option
-                v-for="item in sicknessoptions"
+                class="ruleFormaa"
+                v-for="item in xjxsoptions"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -70,30 +165,112 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="娲诲姩褰㈠紡" prop="desc">
-            <el-input
-              :rows="4"
-              type="textarea"
-              v-model="ruleForm.desc"
-              maxlength="400"
-              show-word-limit
-            ></el-input>
+          <el-form-item label="閫傜敤鐤剧梾" prop="region">
+            <el-select
+              v-model="ruleForm.illness"
+              size="medium"
+              multiple
+              filterable
+              placeholder="璇烽�夋嫨鍒嗙被"
+            >
+              <el-option
+                class="ruleFormaa"
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="浣跨敤闄㈠尯" prop="region">
+            <el-select
+              v-model="ruleForm.courtyard"
+              size="medium"
+              filterable
+              placeholder="璇烽�夋嫨鍒嗙被"
+            >
+              <el-option
+                class="ruleFormaa"
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="閫傜敤绉戝" prop="region">
+            <el-select
+              v-model="ruleForm.administrative"
+              size="medium"
+              multiple
+              filterable
+              placeholder="璇烽�夋嫨鍒嗙被"
+            >
+              <el-option
+                class="ruleFormaa"
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="success" @click="submitForm('ruleForm')"
+            <el-button type="success" @click="nextstep('ruleForm')"
               >涓嬩竴姝�</el-button
             >
             <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
+            <el-button type="info" @click="closeFm('ruleForm')"
+                >鍏抽棴</el-button
+              >
           </el-form-item>
         </el-form>
       </div>
       <!-- 瀹f暀鍐呭 -->
       <div v-if="Editprogress == 2">
-        <div class="leftvlue-jbxx">瀹f暀鍐呭</div>
+        <el-row :gutter="20">
+          <el-col :span="4"><div class="leftvlue-jbxx">瀹f暀鍐呭</div></el-col>
+          <el-col :span="12">
+            <div>
+              <el-button @click="laststep('ruleForm')">涓婁竴姝�</el-button>
+              <el-button type="success" @click="submitForm('ruleForm')"
+                >淇濆瓨</el-button
+              >
+              <el-button type="warning" @click="submitForm('ruleForm')"
+                >鍙﹀瓨鏂扮増鏈�</el-button
+              >
+              <el-button type="info" @click="closeFm('ruleForm')"
+                >鍏抽棴</el-button
+              >
+            </div></el-col
+          >
+        </el-row>
+
         <div>
-          <div>
-            <el-button @click="openContent" type="primary">鏌ョ湅鍏冪礌</el-button>
-          </div>
+          <el-form
+            :model="ruleForm"
+            :rules="rules"
+            ref="ruleForm"
+            label-width="100px"
+            class="demo-ruleForm"
+          >
+            <el-form-item label="璧勬枡褰㈠紡" prop="region">
+              <el-select v-model="ruleForm.shape" placeholder="璇烽�夋嫨鍐呭褰㈠紡">
+                <el-option
+                  v-for="item in xjxsoptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div>
           <div id="quillEditorQiniu">
             <!-- 鍩轰簬elementUi鐨勪笂浼犵粍浠� el-upload begin-->
             <el-upload
@@ -162,7 +339,21 @@
       uploadImgUrl: "/v1/admin/common/upload",
       uploadUrlPath: "娌℃湁鏂囦欢涓婁紶",
       quillUpdateImg: false,
+      fileList: [
+        {
+          name: "food.jpeg",
+          url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+        },
+        {
+          name: "food2.jpeg",
+          url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+        },
+      ],
       content: "", //鏈�缁堜繚瀛樼殑鍐呭
+      dynamicTags: ["鏍囩涓�", "鏍囩浜�", "鏍囩涓�"],
+      inputVisible: false,
+      inputValue: "",
+      // 瀵屾枃鏈�
       editorOption: {
         placeholder: "浣犳兂璇翠粈涔堬紵",
         modules: {
@@ -294,292 +485,6 @@
           label: "闊抽",
         },
       ],
-      sicknessoptions: [
-        {
-          value: 1,
-          label: "楂樿鍘�",
-        },
-        {
-          value: 2,
-          label: "蹇冭剰鐥�",
-        },
-        {
-          value: 3,
-          label: "绯栧翱鐥�",
-        },
-        {
-          value: 4,
-          label: "鑴婃鐐�",
-        },
-      ],
-      asoptions: [
-        {
-          value: "zhinan",
-          label: "鎸囧崡",
-          children: [
-            {
-              value: "shejiyuanze",
-              label: "璁捐鍘熷垯",
-              children: [
-                {
-                  value: "yizhi",
-                  label: "涓�鑷�",
-                },
-                {
-                  value: "fankui",
-                  label: "鍙嶉",
-                },
-                {
-                  value: "xiaolv",
-                  label: "鏁堢巼",
-                },
-                {
-                  value: "kekong",
-                  label: "鍙帶",
-                },
-              ],
-            },
-            {
-              value: "daohang",
-              label: "瀵艰埅",
-              children: [
-                {
-                  value: "cexiangdaohang",
-                  label: "渚у悜瀵艰埅",
-                },
-                {
-                  value: "dingbudaohang",
-                  label: "椤堕儴瀵艰埅",
-                },
-              ],
-            },
-          ],
-        },
-        {
-          value: "zujian",
-          label: "缁勪欢",
-          children: [
-            {
-              value: "basic",
-              label: "Basic",
-              children: [
-                {
-                  value: "layout",
-                  label: "Layout 甯冨眬",
-                },
-                {
-                  value: "color",
-                  label: "Color 鑹插僵",
-                },
-                {
-                  value: "typography",
-                  label: "Typography 瀛椾綋",
-                },
-                {
-                  value: "icon",
-                  label: "Icon 鍥炬爣",
-                },
-                {
-                  value: "button",
-                  label: "Button 鎸夐挳",
-                },
-              ],
-            },
-            {
-              value: "form",
-              label: "Form",
-              children: [
-                {
-                  value: "radio",
-                  label: "Radio 鍗曢�夋",
-                },
-                {
-                  value: "checkbox",
-                  label: "Checkbox 澶氶�夋",
-                },
-                {
-                  value: "input",
-                  label: "Input 杈撳叆妗�",
-                },
-                {
-                  value: "input-number",
-                  label: "InputNumber 璁℃暟鍣�",
-                },
-                {
-                  value: "select",
-                  label: "Select 閫夋嫨鍣�",
-                },
-                {
-                  value: "cascader",
-                  label: "Cascader 绾ц仈閫夋嫨鍣�",
-                },
-                {
-                  value: "switch",
-                  label: "Switch 寮�鍏�",
-                },
-                {
-                  value: "slider",
-                  label: "Slider 婊戝潡",
-                },
-                {
-                  value: "time-picker",
-                  label: "TimePicker 鏃堕棿閫夋嫨鍣�",
-                },
-                {
-                  value: "date-picker",
-                  label: "DatePicker 鏃ユ湡閫夋嫨鍣�",
-                },
-                {
-                  value: "datetime-picker",
-                  label: "DateTimePicker 鏃ユ湡鏃堕棿閫夋嫨鍣�",
-                },
-                {
-                  value: "upload",
-                  label: "Upload 涓婁紶",
-                },
-                {
-                  value: "rate",
-                  label: "Rate 璇勫垎",
-                },
-                {
-                  value: "form",
-                  label: "Form 琛ㄥ崟",
-                },
-              ],
-            },
-            {
-              value: "data",
-              label: "Data",
-              children: [
-                {
-                  value: "table",
-                  label: "Table 琛ㄦ牸",
-                },
-                {
-                  value: "tag",
-                  label: "Tag 鏍囩",
-                },
-                {
-                  value: "progress",
-                  label: "Progress 杩涘害鏉�",
-                },
-                {
-                  value: "tree",
-                  label: "Tree 鏍戝舰鎺т欢",
-                },
-                {
-                  value: "pagination",
-                  label: "Pagination 鍒嗛〉",
-                },
-                {
-                  value: "badge",
-                  label: "Badge 鏍囪",
-                },
-              ],
-            },
-            {
-              value: "notice",
-              label: "Notice",
-              children: [
-                {
-                  value: "alert",
-                  label: "Alert 璀﹀憡",
-                },
-                {
-                  value: "loading",
-                  label: "Loading 鍔犺浇",
-                },
-                {
-                  value: "message",
-                  label: "Message 娑堟伅鎻愮ず",
-                },
-                {
-                  value: "message-box",
-                  label: "MessageBox 寮规",
-                },
-                {
-                  value: "notification",
-                  label: "Notification 閫氱煡",
-                },
-              ],
-            },
-            {
-              value: "navigation",
-              label: "Navigation",
-              children: [
-                {
-                  value: "menu",
-                  label: "NavMenu 瀵艰埅鑿滃崟",
-                },
-                {
-                  value: "tabs",
-                  label: "Tabs 鏍囩椤�",
-                },
-                {
-                  value: "breadcrumb",
-                  label: "Breadcrumb 闈㈠寘灞�",
-                },
-                {
-                  value: "dropdown",
-                  label: "Dropdown 涓嬫媺鑿滃崟",
-                },
-                {
-                  value: "steps",
-                  label: "Steps 姝ラ鏉�",
-                },
-              ],
-            },
-            {
-              value: "others",
-              label: "Others",
-              children: [
-                {
-                  value: "dialog",
-                  label: "Dialog 瀵硅瘽妗�",
-                },
-                {
-                  value: "tooltip",
-                  label: "Tooltip 鏂囧瓧鎻愮ず",
-                },
-                {
-                  value: "popover",
-                  label: "Popover 寮瑰嚭妗�",
-                },
-                {
-                  value: "card",
-                  label: "Card 鍗$墖",
-                },
-                {
-                  value: "carousel",
-                  label: "Carousel 璧伴┈鐏�",
-                },
-                {
-                  value: "collapse",
-                  label: "Collapse 鎶樺彔闈㈡澘",
-                },
-              ],
-            },
-          ],
-        },
-        {
-          value: "ziyuan",
-          label: "璧勬簮",
-          children: [
-            {
-              value: "axure",
-              label: "Axure Components",
-            },
-            {
-              value: "sketch",
-              label: "Sketch Templates",
-            },
-            {
-              value: "jiaohu",
-              label: "缁勪欢浜や簰鏂囨。",
-            },
-          ],
-        },
-      ],
       valssu: [
         {
           idd: 1,
@@ -607,6 +512,12 @@
           userName: "鍥涘彿瀹f暀",
         },
       ],
+      variablelist: [
+        {
+          variable: "paitent",
+          value: "琛ㄧず鎮h�呯殑鏍囪瘑",
+        },
+      ],
       // 鏌ヨ鍙傛暟
       queryParams: {
         pageNum: 1,
@@ -630,10 +541,8 @@
   },
 
   methods: {
+    // 瀹屾垚
     submitForm(formName) {
-      if (this.Editprogress <= 3) {
-        return this.Editprogress++;
-      }
       this.rules = this.rulesa;
       //   鎻愪氦
       this.$refs[formName].validate((valid) => {
@@ -645,6 +554,33 @@
         }
       });
     },
+    // 涓嬩竴姝�
+    nextstep() {
+      if (this.Editprogress <= 1) {
+        return this.Editprogress++;
+      }
+    },
+    // 涓婁竴姝�
+    laststep() {
+      this.Editprogress = this.Editprogress - 1;
+    },
+    // 鍏抽棴
+    closeFm(){
+      this.$confirm('閫�鍑轰笉浼氫繚鐣欓〉闈㈠唴瀹规洿鏀�, 鏄惁缁х画?', '鎻愮ず', {
+          confirmButtonText: '纭畾',
+          cancelButtonText: '鍙栨秷',
+          type: 'warning'
+        }).then(() => {
+          this.$router.go(-1)
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '宸插彇娑�'
+          });          
+        });
+    },
+    // 淇濆瓨棰樼洰淇℃伅
+    Saveproblem(){},
     /** 鏌ヨ棰樼洰鍒楄〃 */
     getList() {
       //   this.loading = true;
@@ -659,17 +595,50 @@
       //   console.log(rows);
       //   this.list = rows;
     },
-    changeaddtopic(val) {
-      console.log(11);
-      console.log(val);
-      this.addvalue = "娣诲姞棰樼洰";
+    // 鏂板鍙橀噺
+    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("鏈壘鍒拌瀵硅薄");
+      }
+    },
+    // 鎺у埗鏂囦欢
+    handleChange(file, fileList) {
+      this.fileList = fileList.slice(-3);
+    },
+    // 鏍囩-----------------
+    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();
+      // });
+    },
+    // --------------------------
+
     // 棰勮妯$増
     PreviewTemplate() {
       this.drawer = true;
-    },
-    laststep() {
-      this.Editprogress--;
     },
     resetForm(formName) {
       this.$refs[formName].resetFields();
@@ -723,9 +692,6 @@
     uploadResult: function (res) {
       this.uploadUrlPath = res;
     },
-    openContent: function () {
-      console.log(this.content);
-    },
   },
 };
 </script>
@@ -778,6 +744,30 @@
     cursor: pointer;
     font-size: 20px;
     margin: 0 20px;
+  }
+}
+.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;
   }
 }
 .preview-left {
@@ -842,7 +832,7 @@
   font-size: 25px;
 }
 ::v-deep.el-input--medium {
-  font-size: 24px !important;
+  font-size: 18px !important;
 }
 ::v-deep.ruleFormaa.el-select {
   display: inline-block;
diff --git a/src/views/knowledge/education/index.vue b/src/views/knowledge/education/index.vue
index e0b78d5..fab968a 100644
--- a/src/views/knowledge/education/index.vue
+++ b/src/views/knowledge/education/index.vue
@@ -21,7 +21,49 @@
         </el-input>
       </div>
       <div class="bottom-fl">
-        <el-tabs tab-position="right">
+        <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-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>
+        <!-- <el-tabs tab-position="right">
           <el-tab-pane :label="`鍏ㄩ儴 (${numberlb})`"></el-tab-pane>
           <el-tab-pane
             class="tab-paness"
@@ -48,21 +90,11 @@
                 <i slot="reference" class="el-icon-share"></i> </el-popover
             ></span>
           </el-tab-pane>
-        </el-tabs>
+        </el-tabs> -->
       </div>
     </div>
     <!-- 鍙充晶鏁版嵁 -->
     <div class="leftvlue">
-      <div class="leftvlue-top">
-        <el-tabs v-model="topactiveName" @tab-click="tophandleClick">
-          <el-tab-pane name="Local">
-            <span class="mulsz" slot="label">鏈湴瀹f暀搴� </span>
-          </el-tab-pane>
-          <el-tab-pane name="sharing">
-            <span class="mulsz" slot="label">鍏变韩瀹f暀搴� </span>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
       <div class="leftvlue-bg">
         <el-row :gutter="20">
           <!--鐢ㄦ埛鏁版嵁-->
@@ -75,7 +107,7 @@
               v-show="showSearch"
               label-width="98px"
             >
-              <el-form-item label="瀹f暀鍚嶇О" prop="userName">
+              <el-form-item label="瀹f暀鏍囬" prop="userName">
                 <el-input
                   v-model="queryParams.userName"
                   placeholder="璇疯緭鍏�"
@@ -84,7 +116,7 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="閫傜敤鐤剧梾" prop="sickness">
+              <el-form-item label="閫傜敤绉戝" prop="sickness">
                 <el-cascader
                   v-model="queryParams.sickness"
                   :options="optionss"
@@ -92,27 +124,44 @@
                   clearable
                 ></el-cascader>
               </el-form-item>
-              <el-form-item label="瀹f暀褰㈠紡" prop="shape">
-                <el-select
-                  v-model="queryParams.shapevalue"
-                  placeholder="璇烽�夋嫨"
-                >
-                  <el-option
-                    v-for="item in xjxsoptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
+              <el-form-item label="閫氱煡鍐呭" prop="userName">
+                <el-input
+                  v-model="queryParams.userNamevalue"
+                  placeholder="璇疯緭鍏�"
+                  clearable
+                  style="width: 200px"
+                  @keyup.enter.native="handleQuery"
+                />
               </el-form-item>
-              <el-form-item label="瀹f暀鍒嗙被" prop="classify">
+              <el-form-item label="閫傜敤鏂瑰紡" prop="shape">
+                <el-cascader
+                  v-model="queryParams.shapevalue"
+                  :options="optionss"
+                  :props="propss"
+                  clearable
+                ></el-cascader>
+              </el-form-item>
+              <el-form-item label="鍐呭褰㈠紡" prop="classify">
                 <el-select
                   v-model="queryParams.classifyvalue"
                   placeholder="璇烽�夋嫨"
                 >
                   <el-option
                     v-for="(item, index) in editableTabs"
+                    :key="index++"
+                    :label="item.title"
+                    :value="index++"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="鍙敤鐘舵��" prop="classify">
+                <el-select
+                  v-model="queryParams.classifyvalue"
+                  placeholder="璇烽�夋嫨"
+                >
+                  <el-option
+                    v-for="(item, index) in editableTabsky"
                     :key="index++"
                     :label="item.title"
                     :value="index++"
@@ -185,7 +234,7 @@
                 prop="userid"
               />
               <el-table-column
-                label="瀹f暀鍚嶇О"
+                label="鏍囬"
                 align="center"
                 key="userName"
                 prop="userName"
@@ -198,6 +247,13 @@
                 prop="nickName"
                 :show-overflow-tooltip="true"
               />
+              <el-table-column
+                label="涓昏鍐呭"
+                align="center"
+                key="userNamevalue"
+                prop="userNamevalue"
+                :show-overflow-tooltip="true"
+              />
 
               <el-table-column
                 label="閫傜敤鐤剧梾"
@@ -206,14 +262,42 @@
                 prop="aphonenumber"
                 width="120"
               /><el-table-column
-                label="瀹f暀鎻忚堪"
+                label="閫傜敤绉戝"
                 align="center"
                 key="bphonenumber"
                 prop="bphonenumber"
                 width="120"
               />
               <el-table-column
-                label="鏈�杩戠紪杈�"
+                label="鏍囩"
+                align="center"
+                key="cphonenumber"
+                prop="cphonenumber"
+                width="120"
+              />
+              <el-table-column
+                label="瀹f暀鏂瑰紡"
+                align="center"
+                key="cphonenumber"
+                prop="cphonenumber"
+                width="120"
+              />
+              <el-table-column
+                label="璧勬枡褰㈠紡"
+                align="center"
+                key="cphonenumber"
+                prop="cphonenumber"
+                width="120"
+              />
+              <el-table-column
+                label="鏈�杩戜慨鏀�"
+                align="center"
+                key="cphonenumber"
+                prop="cphonenumber"
+                width="120"
+              />
+              <el-table-column
+                label="鏄惁鍙敤"
                 align="center"
                 key="cphonenumber"
                 prop="cphonenumber"
@@ -389,6 +473,17 @@
       :visible.sync="dialogFormVisible"
     >
       <el-form :model="classifyform">
+        <el-form-item label="璇烽�夋嫨瀹f暀澶х被">
+          <el-select v-model="classifyform.broadheading" placeholder="璇烽�夋嫨">
+            <el-option
+              v-for="item in optionss"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item
           :label="amendtag ? '璇疯緭鍏ユ柊鐨勭被鍒悕绉�' : '璇疯緭鍏ョ被鍒悕绉�'"
         >
@@ -496,19 +591,19 @@
       optionss: [
         {
           value: 1,
-          label: "涓滃崡",
+          label: "绫诲瀷涓�",
         },
         {
           value: 2,
-          label: "瑗垮寳",
+          label: "绫诲瀷浜�",
         },
         {
           value: 3,
-          label: "浠ㄤ花浠�",
+          label: "绫诲瀷涓�",
         },
         {
           value: 4,
-          label: "鍏椋掗",
+          label: "绫诲瀷鍥�",
         },
       ],
       xjxsoptions: [
@@ -525,27 +620,41 @@
           label: "璇煶",
         },
       ],
-      //绫诲埆鍒楄〃
-      editableTabs: [
+      editableTabsky: [
         {
-          title: "瀹f暀鍒嗙被涓�",
+          title: "鍙敤",
           number: "1",
         },
         {
-          title: "瀹f暀鍒嗙被浜�",
+          title: "鍋滅敤",
+          number: "2",
+        },
+      ],
+      //绫诲埆鍒楄〃
+      editableTabs: [
+        {
+          title: "鐭俊",
+          number: "1",
+        },
+        {
+          title: "閽夐拤",
           number: "2",
         },
         {
-          title: "瀹f暀鍒嗙被涓�",
-          number: "2",
+          title: "寰俊",
+          number: "3",
         },
         {
-          title: "瀹f暀鍒嗙被鍥�",
-          number: "2",
+          title: "鐢佃瘽",
+          number: "4",
         },
         {
-          title: "瀹f暀鍒嗙被浜�",
-          number: "2",
+          title: "绾夸笅",
+          number: "5",
+        },
+        {
+          title: "鏅鸿兘璇煶",
+          number: "6",
         },
       ],
       // 鏌ヨ鍙傛暟
@@ -684,6 +793,15 @@
         this.deletefenl = row.title;
       }
     },
+    handleOpen(key, keyPath) {
+      console.log(key, keyPath);
+    },
+    handleClose(key, keyPath) {
+      console.log(key, keyPath);
+    },
+    handleSelect(key, keyPath) {
+      console.log(key, keyPath);
+    },
     //鎼滅储绫诲埆
     sidecolumnss() {},
     // 鍒囨崲鍏变韩/鏈湴
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 03e8202..4c2e5a9 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -4,15 +4,11 @@
     <div class="sidecolumn">
       <div style="height: 400px">
         <el-steps direction="vertical" :active="Editprogress">
-          <el-step title="鍩虹淇℃伅璁剧疆"></el-step>
-          <el-step title="闂嵎璁剧疆"></el-step>
+          <el-step title="鍩虹淇℃伅"></el-step>
+          <el-step title="闂嵎棰樼洰"></el-step>
           <el-step
             title="闂嵎棰勮"
-            description="杩欐槸涓�娈靛緢闀垮緢闀垮緢闀跨殑鎻忚堪鎬ф枃瀛�"
-          ></el-step>
-          <el-step
-            title="缁撴灉鍙嶉"
-            description="杩欐槸涓�娈靛緢闀垮緢闀垮緢闀跨殑鎻忚堪鎬ф枃瀛�"
+            description="鏌ョ湅闂嵎棰勮锛屽彲瀵煎嚭PDF"
           ></el-step>
         </el-steps>
       </div>
@@ -22,8 +18,9 @@
       <!-- 鍩烘湰淇℃伅 -->
       <div v-if="Editprogress == 1">
         <div class="leftvlue-jbxx">
-          鍩烘湰淇℃伅<span>褰撳墠鐗堟湰:{{ currentVersion }}</span>
+          鍩烘湰淇℃伅
         </div>
+        <el-divider></el-divider>
         <el-form
           :model="ruleForm"
           :rules="rules"
@@ -31,16 +28,13 @@
           label-width="100px"
           class="demo-ruleForm"
         >
-          <el-form-item label="娲诲姩鍚嶇О" prop="name">
-            <el-input v-model="ruleForm.name"></el-input>
-          </el-form-item>
-          <el-form-item label="娲诲姩鍖哄煙" prop="region">
+          <el-form-item label="闂嵎鍒嗙被" prop="region">
             <el-select
-              v-model="ruleForm.region"
+              v-model="ruleForm.classify"
               size="medium"
               multiple
               filterable
-              placeholder="璇烽�夋嫨娲诲姩鍖哄煙"
+              placeholder="璇烽�夋嫨鍒嗙被"
             >
               <el-option
                 class="ruleFormaa"
@@ -52,40 +46,140 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="娲诲姩褰㈠紡" prop="desc">
-            <el-input
-              :rows="4"
-              type="textarea"
-              v-model="ruleForm.desc"
-            ></el-input>
+          <el-form-item label="闂嵎鏍囬" prop="name">
+            <div style="width: 30%">
+              <el-input v-model="ruleForm.name"></el-input>
+            </div>
           </el-form-item>
-          <el-form-item>
-            <el-button type="success" @click="submitForm('ruleForm')"
-              >涓嬩竴姝�</el-button
+          <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-form-item label="鏂囦欢" prop="sickness">
+            <div style="width: 40%">
+              <el-upload
+                class="upload-demo"
+                action="https://jsonplaceholder.typicode.com/posts/"
+                :on-change="handleChange"
+                :file-list="fileList"
+              >
+                <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+                <div slot="tip" class="el-upload__tip">
+                  鍙兘涓婁紶jpg/png/xsl鏂囦欢锛屼笖涓嶈秴杩�50mb
+                </div>
+              </el-upload>
+            </div>
+          </el-form-item>
+          <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
+                placeholder="璇烽�夋嫨"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.label"
+                  :label="item.label"
+                  :value="item.label"
+                >
+                </el-option>
+              </el-select>
+              <el-button
+                v-else
+                class="button-new-tag"
+                size="small"
+                @click="showInput"
+                >+ 鏂板鏍囩</el-button
+              >
+            </div>
+          </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="鐗堟湰鍙�" prop="name">
+                <el-input v-model="currentVersion"></el-input> </el-form-item
+            ></el-col>
+            <el-col :span="9">
+              <el-form-item label="鍙敤鐘舵��" prop="region">
+                <el-select
+                  v-model="ruleForm.classify"
+                  size="medium"
+                  multiple
+                  filterable
+                  placeholder="璇烽�夋嫨鍒嗙被"
+                >
+                  <el-option
+                    class="ruleFormaa"
+                    v-for="item in options"
+                    :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="region">
+            <el-select
+              v-model="ruleForm.way"
+              size="medium"
+              multiple
+              filterable
+              placeholder="璇烽�夋嫨鍒嗙被"
             >
-            <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-      <!-- 闂嵎璁剧疆 -->
-      <div v-if="Editprogress == 2">
-        <div class="leftvlue-jbxx">闂嵎璁剧疆</div>
-        <el-form
-          :model="ruleForm"
-          :rules="rules"
-          ref="ruleForm"
-          label-width="100px"
-          class="demo-ruleForm"
-        >
-          <el-form-item label="闂嵎浠嬬粛" prop="desc">
-            <el-cascader
-              class="demo-cascader"
-              v-model="ruleForm.templatevalue"
-              :options="options"
-              :props="{ expandTrigger: 'hover' }"
-            ></el-cascader>
-            <el-select v-model="ruleForm.data2" placeholder="鎻愪氦鎻愮ず">
               <el-option
+                class="ruleFormaa"
+                v-for="item in xjxsoptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="閫傜敤鐤剧梾" prop="region">
+            <el-select
+              v-model="ruleForm.illness"
+              size="medium"
+              multiple
+              filterable
+              placeholder="璇烽�夋嫨鍒嗙被"
+            >
+              <el-option
+                class="ruleFormaa"
                 v-for="item in options"
                 :key="item.value"
                 :label="item.label"
@@ -93,135 +187,225 @@
               >
               </el-option>
             </el-select>
-            <div style="display: flex; margin-top: 20px">
-              <div class="PreviewTemplate" @click="PreviewTemplate()">
-                棰勮妯$増
-              </div>
-              <el-button type="primary">纭寮曠敤</el-button>
-            </div>
           </el-form-item>
-          <el-form-item label="娲诲姩褰㈠紡" prop="desc">
-            <el-input type="textarea" v-model="ruleForm.desc"></el-input>
-          </el-form-item>
-          <el-form-item label="娲诲姩褰㈠紡" prop="desc">
-            <el-input type="textarea" v-model="ruleForm.desc"></el-input>
-            <div class="addtopic">
-              <el-select
-                v-model="addvalue"
-                @change="changeaddtopic"
-                class="addtopic-input"
+          <el-form-item label="閫傜敤闄㈠尯" prop="region">
+            <el-select
+              v-model="ruleForm.courtyard"
+              size="medium"
+              filterable
+              placeholder="璇烽�夋嫨鍒嗙被"
+            >
+              <el-option
+                class="ruleFormaa"
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
               >
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </div>
-
-            <div class="presentation">
-              <div class="presentation-left">
-                <el-table v-loading="loading" :data="userList">
-                  <el-table-column
-                    label="搴忓彿"
-                    align="center"
-                    key="userid"
-                    prop="userid"
-                  />
-                  <el-table-column
-                    label="棰樼洰"
-                    align="center"
-                    key="userName"
-                    prop="userName"
-                    :show-overflow-tooltip="true"
-                  />
-
-                  <el-table-column
-                    label="鎿嶄綔"
-                    align="center"
-                    width="300"
-                    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"
-                        @click="ViewQuestionnaire(scope.row)"
-                        v-hasPermi="['system:user:edit']"
-                        ><span class="button-textck"
-                          ><i class="el-icon-edit"></i>鏌ョ湅</span
-                        ></el-button
-                      > -->
-                      <el-button
-                        size="medium"
-                        type="text"
-                        @click="handleUpdate(scope.row)"
-                        v-hasPermi="['system:user:edit']"
-                        ><span class="button-textxg"
-                          ><i class="el-icon-scissors"></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"></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"
-                />
-              </div>
-              <div class="presentation-right">
-                <div class="headline">棰樼洰璁剧疆璇︽儏</div>
-                <div>棰樼洰鏍囬锛�<span>杩欏鏈烘瀯鎬庝箞鏍�</span></div>
-                <div>鏄惁蹇呯瓟锛�<span>鏄�</span> 鏄惁闅愯棌锛�<span>鍚�</span></div>
-                <div class="headline">閫夐」璁剧疆</div>
-                <div>
-                  <p>閫夐」1:<span>鍖荤枟鏈烘瀯</span></p>
-                  <p>
-                    濉啓鏄庣粏锛�<span>鏃�</span> 寮傚父閫夐」锛�<span>鏃�</span>
-                    鍒嗗�硷細<span>3</span>
-                  </p>
-                  <p>閫変腑鎻愮ず锛�<span>杩欎釜棰樻湁鐐归毦璇锋敞鎰�</span></p>
-                  <p>閫変腑璺宠浆锛�<span>鏃�</span></p>
-                </div>
-              </div>
-            </div>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="閫傜敤绉戝" prop="region">
+            <el-select
+              v-model="ruleForm.administrative"
+              size="medium"
+              multiple
+              filterable
+              placeholder="璇烽�夋嫨鍒嗙被"
+            >
+              <el-option
+                class="ruleFormaa"
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="success" @click="submitForm('ruleForm')"
+            <el-button type="success" @click="nextstep('ruleForm')"
               >涓嬩竴姝�</el-button
             >
-            <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
-            <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
+            <el-button type="info" @click="closeFm('ruleForm')">鍏抽棴</el-button>
+            <el-button @click="submitForm('ruleForm')"
+              >淇濆瓨闂嵎鍩虹淇℃伅</el-button
+            >
           </el-form-item>
         </el-form>
       </div>
+      <!-- 闂嵎璁剧疆 -->
+      <div v-if="Editprogress == 2">
+        <div class="leftvlue-jbxx">闂嵎棰樼洰璁剧疆</div>
+        <el-divider></el-divider>
+        <div class="addtopic">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            round
+            @click="drawer = true"
+            >娣诲姞棰樼洰</el-button
+          >
+        </div>
+        <div class="presentation">
+          <div class="presentation-left">
+            <el-card class="box-card" style="min-height: 688px">
+              <el-table v-loading="loading" :data="userList">
+                <el-table-column
+                  label="搴忓彿"
+                  align="center"
+                  key="userid"
+                  prop="userid"
+                />
+                <el-table-column
+                  label="棰樼洰"
+                  align="center"
+                  key="userName"
+                  prop="userName"
+                  :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                  label="涓昏鍐呭"
+                  align="center"
+                  key="maincontent"
+                  prop="maincontent"
+                  :show-overflow-tooltip="true"
+                />
+
+                <el-table-column
+                  label="鎿嶄綔"
+                  align="center"
+                  width="200"
+                  class-name="small-padding fixed-width"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      icon="el-icon-edit"
+                      type="primary"
+                      round
+                      @click="handleUpdate(scope.row)"
+                      >淇敼</el-button
+                    >
+                    <el-button
+                      type="danger"
+                      icon="el-icon-delete"
+                      circle
+                      @click="handleDelete(scope.row)"
+                    ></el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-card>
+
+            <pagination
+              v-show="total > 0"
+              :total="total"
+              :page.sync="queryParams.pageNum"
+              :limit.sync="queryParams.pageSize"
+              @pagination="getList"
+            />
+          </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-form-item label="棰樼洰鏍囬">
+                  <el-input
+                    v-model="topicobj.title"
+                    placeholder="璇疯緭鍏ユ爣棰�"
+                  ></el-input>
+                </el-form-item>
+                <el-row :gutter="10">
+                  <el-col :span="12"
+                    ><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-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-row>
+                <div class="headline">閫夐」璁剧疆</div>
+                <div class="topicxq" v-for="item in 2">
+                  <el-row :gutter="10">
+                    <el-col :span="12"
+                      ><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="12"
+                      ><el-form-item label="鍒嗗��">
+                        <el-input
+                          type="text"
+                          placeholder="璇疯緭鍏ュ垎鍊�"
+                          v-model="text"
+                          show-word-limit
+                        >
+                        </el-input> </el-form-item
+                    ></el-col>
+                  </el-row>
+                  <el-row :gutter="10">
+                    <el-col :span="12"
+                      ><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="12"
+                      ><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>
+
+        <el-button type="success" @click="nextstep('ruleForm')"
+          >涓嬩竴姝�</el-button
+        >
+        <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
+        <el-button type="info" @click="closeFm('ruleForm')">鍏抽棴</el-button>
+        <el-button @click="Saveproblem('ruleForm')">淇濆瓨棰樼洰鏁版嵁</el-button>
+      </div>
       <!-- 闂嵎棰勮 -->
       <div v-if="Editprogress == 3">
+        <div class="leftvlue-jbxx">闂嵎棰勮</div>
+        <el-divider></el-divider>
         <div class="preview-left">
           <!-- 鍗曢�� -->
           <div class="topic-dev" v-for="item in valssu" :key="item.aaa">
@@ -267,133 +451,100 @@
             </div>
           </div>
         </div>
-        <el-button type="success" @click="submitForm('ruleForm')"
-          >涓嬩竴姝�</el-button
-        >
+        <el-button type="info" @click="closeFm('ruleForm')">鍏抽棴</el-button>
+        <el-button>瀵煎嚭涓簆df</el-button>
         <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
-        <!-- <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button> -->
-      </div>
-      <!-- 缁撴灉鍙嶉 -->
-      <div v-if="Editprogress == 4">
-        <el-form
-          :model="ruleForm"
-          :rules="rules"
-          ref="ruleForm"
-          label-width="100px"
-          class="demo-ruleForm"
-        >
-          <el-form-item label="娲诲姩鍚嶇О" prop="name">
-            <el-input v-model="ruleForm.name"></el-input>
-          </el-form-item>
-          <el-form-item label="娲诲姩鍖哄煙" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
-              <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
-              <el-option label="鍖哄煙浜�" value="beijing"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="娲诲姩鏃堕棿" required>
-            <el-col :span="11">
-              <el-form-item prop="date1">
-                <el-date-picker
-                  type="date"
-                  placeholder="閫夋嫨鏃ユ湡"
-                  v-model="ruleForm.date1"
-                  style="width: 100%"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="date2">
-                <el-time-picker
-                  placeholder="閫夋嫨鏃堕棿"
-                  v-model="ruleForm.date2"
-                  style="width: 100%"
-                ></el-time-picker>
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-          <el-form-item label="鍗虫椂閰嶉��" prop="delivery">
-            <el-switch v-model="ruleForm.delivery"></el-switch>
-          </el-form-item>
-          <el-form-item label="娲诲姩鎬ц川" prop="type">
-            <el-checkbox-group v-model="ruleForm.type">
-              <el-checkbox label="缇庨/椁愬巺绾夸笂娲诲姩" name="type"></el-checkbox>
-              <el-checkbox label="鍦版帹娲诲姩" name="type"></el-checkbox>
-              <el-checkbox label="绾夸笅涓婚娲诲姩" name="type"></el-checkbox>
-              <el-checkbox label="鍗曠函鍝佺墝鏇濆厜" name="type"></el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-          <el-form-item label="鐗规畩璧勬簮" prop="resource">
-            <el-radio-group v-model="ruleForm.resource">
-              <el-radio label="绾夸笂鍝佺墝鍟嗚禐鍔�"></el-radio>
-              <el-radio label="绾夸笅鍦哄湴鍏嶈垂"></el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="娲诲姩褰㈠紡" prop="desc">
-            <el-input type="textarea" v-model="ruleForm.desc"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="success" @click="submitForm('ruleForm')"
-              >绔嬪嵆鍒涘缓</el-button
-            >
-            <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
-            <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
-          </el-form-item>
-        </el-form>
       </div>
     </div>
     <!-- 棰勮妯$増寮圭獥 -->
     <el-drawer
-      title="闂嵎棰勮"
+      title="娣诲姞棰樼洰"
       :visible.sync="drawer"
       custom-class="demo-drawer"
       width="50%"
     >
       <div class="preview-left">
-        <!-- 鍗曢�� -->
-        <div class="topic-dev" v-for="item in valssu" :key="item.aaa">
-          <div class="dev-text">
-            {{ item.idd }}銆乕鍗曢�塢&nbsp&nbsp<span>{{ item.wssd }}</span>
-          </div>
-          <div class="dev-xx">
-            <el-radio-group v-model="radio">
-              <el-radio
-                v-for="(items, index) in item.sdadd"
-                :key="index"
-                :label="index"
-                >{{ items }}</el-radio
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          label-width="98px"
+        >
+          <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="sickness">
+            <el-select
+              v-model="ruleForm.classify"
+              size="medium"
+              multiple
+              filterable
+              placeholder="璇烽�夋嫨鍒嗙被"
+            >
+              <el-option
+                class="ruleFormaa"
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
               >
-            </el-radio-group>
-          </div>
-        </div>
-        <!-- 澶氶�� -->
-        <div class="topic-dev" v-for="item in valssu" :key="item.aaa">
-          <div class="dev-text">
-            {{ item.idd }}銆乕澶氶�塢&nbsp&nbsp<span>{{ item.wssd }}</span>
-          </div>
-          <div class="dev-xx">
-            <el-checkbox-group v-model="radios">
-              <el-checkbox
-                v-for="(items, index) in item.sdadd"
-                :key="index"
-                :label="index"
+              </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-button icon="el-icon-refresh" size="medium" @click="resetQuery"
+              >閲嶇疆</el-button
+            >
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="userList">
+          <el-table-column
+            label="鏍囬"
+            align="center"
+            key="userid"
+            prop="userid"
+            width="100"
+          />
+          <el-table-column
+            label="闂鍐呭"
+            align="center"
+            key="userName"
+            prop="userName"
+            width="200"
+            :show-overflow-tooltip="true"
+          />
+
+          <el-table-column
+            label="鎿嶄綔"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="medium"
+                type="text"
+                @click="handleUpdate(scope.row)"
+                ><span class="button-textxg"
+                  ><i class="el-icon-circle-plus-outline"></i>娣诲姞</span
+                ></el-button
               >
-                {{ items }}
-              </el-checkbox>
-            </el-checkbox-group>
-          </div>
-        </div>
-        <!-- 濉┖ -->
-        <div class="topic-dev" v-for="item in valssu" :key="item.aaa">
-          <div class="dev-text">
-            {{ item.idd }}銆乕濉┖]&nbsp&nbsp<span>{{ item.wssd }}</span>
-          </div>
-          <div class="dev-xx">
-            <el-input placeholder="璇疯緭鍏ョ瓟妗�" v-model="radioas" clearable>
-            </el-input>
-          </div>
-        </div>
+            </template>
+          </el-table-column>
+        </el-table>
       </div>
     </el-drawer>
   </div>
@@ -411,6 +562,10 @@
       radio: "false", //鍗曢�夐閫変腑
       radios: [], //澶氶�夐閫変腑
       radioas: "", //濉┖棰樼瓟妗�
+      dynamicTags: ["鏍囩涓�", "鏍囩浜�", "鏍囩涓�"],
+      inputVisible: false,
+      inputValue: "",
+      topicobj: {},
       // 鎬绘潯鏁�
       total: 1,
       ruleForm: {
@@ -426,333 +581,56 @@
         data2: "",
       },
       rules: {},
-      rulesa: {
-        name: [
-          { required: true, message: "璇疯緭鍏ユ椿鍔ㄥ悕绉�", trigger: "blur" },
-          { min: 3, max: 5, message: "闀垮害鍦� 3 鍒� 5 涓瓧绗�", trigger: "blur" },
-        ],
-        region: [
-          { required: true, message: "璇烽�夋嫨娲诲姩鍖哄煙", trigger: "change" },
-        ],
-        date1: [
-          {
-            type: "date",
-            required: true,
-            message: "璇烽�夋嫨鏃ユ湡",
-            trigger: "change",
-          },
-        ],
-        date2: [
-          {
-            type: "date",
-            required: true,
-            message: "璇烽�夋嫨鏃堕棿",
-            trigger: "change",
-          },
-        ],
-        type: [
-          {
-            type: "array",
-            required: true,
-            message: "璇疯嚦灏戦�夋嫨涓�涓椿鍔ㄦ�ц川",
-            trigger: "change",
-          },
-        ],
-        resource: [
-          { required: true, message: "璇烽�夋嫨娲诲姩璧勬簮", trigger: "change" },
-        ],
-        desc: [{ required: true, message: "璇峰~鍐欐椿鍔ㄥ舰寮�", trigger: "blur" }],
-      },
-      // options: [
-      //   {
-      //     value: "閫夐」1",
-      //     label: "榛勯噾绯�",
-      //   },
-      //   {
-      //     value: "閫夐」2",
-      //     label: "鍙岀毊濂�",
-      //   },
-      //   {
-      //     value: "閫夐」3",
-      //     label: "铓典粩鐓�",
-      //   },
-      //   {
-      //     value: "閫夐」4",
-      //     label: "榫欓』闈�",
-      //   },
-      //   {
-      //     value: "閫夐」5",
-      //     label: "鍖椾含鐑ら腑",
-      //   },
-      // ],
-      options: [
+      rulesa: {},
+      xjxsoptions: [
         {
-          value: "zhinan",
-          label: "鎸囧崡",
-          children: [
-            {
-              value: "shejiyuanze",
-              label: "璁捐鍘熷垯",
-              children: [
-                {
-                  value: "yizhi",
-                  label: "涓�鑷�",
-                },
-                {
-                  value: "fankui",
-                  label: "鍙嶉",
-                },
-                {
-                  value: "xiaolv",
-                  label: "鏁堢巼",
-                },
-                {
-                  value: "kekong",
-                  label: "鍙帶",
-                },
-              ],
-            },
-            {
-              value: "daohang",
-              label: "瀵艰埅",
-              children: [
-                {
-                  value: "cexiangdaohang",
-                  label: "渚у悜瀵艰埅",
-                },
-                {
-                  value: "dingbudaohang",
-                  label: "椤堕儴瀵艰埅",
-                },
-              ],
-            },
-          ],
+          value: "閫夐」1",
+          label: "鍥炬枃",
         },
         {
-          value: "zujian",
-          label: "缁勪欢",
-          children: [
-            {
-              value: "basic",
-              label: "Basic",
-              children: [
-                {
-                  value: "layout",
-                  label: "Layout 甯冨眬",
-                },
-                {
-                  value: "color",
-                  label: "Color 鑹插僵",
-                },
-                {
-                  value: "typography",
-                  label: "Typography 瀛椾綋",
-                },
-                {
-                  value: "icon",
-                  label: "Icon 鍥炬爣",
-                },
-                {
-                  value: "button",
-                  label: "Button 鎸夐挳",
-                },
-              ],
-            },
-            {
-              value: "form",
-              label: "Form",
-              children: [
-                {
-                  value: "radio",
-                  label: "Radio 鍗曢�夋",
-                },
-                {
-                  value: "checkbox",
-                  label: "Checkbox 澶氶�夋",
-                },
-                {
-                  value: "input",
-                  label: "Input 杈撳叆妗�",
-                },
-                {
-                  value: "input-number",
-                  label: "InputNumber 璁℃暟鍣�",
-                },
-                {
-                  value: "select",
-                  label: "Select 閫夋嫨鍣�",
-                },
-                {
-                  value: "cascader",
-                  label: "Cascader 绾ц仈閫夋嫨鍣�",
-                },
-                {
-                  value: "switch",
-                  label: "Switch 寮�鍏�",
-                },
-                {
-                  value: "slider",
-                  label: "Slider 婊戝潡",
-                },
-                {
-                  value: "time-picker",
-                  label: "TimePicker 鏃堕棿閫夋嫨鍣�",
-                },
-                {
-                  value: "date-picker",
-                  label: "DatePicker 鏃ユ湡閫夋嫨鍣�",
-                },
-                {
-                  value: "datetime-picker",
-                  label: "DateTimePicker 鏃ユ湡鏃堕棿閫夋嫨鍣�",
-                },
-                {
-                  value: "upload",
-                  label: "Upload 涓婁紶",
-                },
-                {
-                  value: "rate",
-                  label: "Rate 璇勫垎",
-                },
-                {
-                  value: "form",
-                  label: "Form 琛ㄥ崟",
-                },
-              ],
-            },
-            {
-              value: "data",
-              label: "Data",
-              children: [
-                {
-                  value: "table",
-                  label: "Table 琛ㄦ牸",
-                },
-                {
-                  value: "tag",
-                  label: "Tag 鏍囩",
-                },
-                {
-                  value: "progress",
-                  label: "Progress 杩涘害鏉�",
-                },
-                {
-                  value: "tree",
-                  label: "Tree 鏍戝舰鎺т欢",
-                },
-                {
-                  value: "pagination",
-                  label: "Pagination 鍒嗛〉",
-                },
-                {
-                  value: "badge",
-                  label: "Badge 鏍囪",
-                },
-              ],
-            },
-            {
-              value: "notice",
-              label: "Notice",
-              children: [
-                {
-                  value: "alert",
-                  label: "Alert 璀﹀憡",
-                },
-                {
-                  value: "loading",
-                  label: "Loading 鍔犺浇",
-                },
-                {
-                  value: "message",
-                  label: "Message 娑堟伅鎻愮ず",
-                },
-                {
-                  value: "message-box",
-                  label: "MessageBox 寮规",
-                },
-                {
-                  value: "notification",
-                  label: "Notification 閫氱煡",
-                },
-              ],
-            },
-            {
-              value: "navigation",
-              label: "Navigation",
-              children: [
-                {
-                  value: "menu",
-                  label: "NavMenu 瀵艰埅鑿滃崟",
-                },
-                {
-                  value: "tabs",
-                  label: "Tabs 鏍囩椤�",
-                },
-                {
-                  value: "breadcrumb",
-                  label: "Breadcrumb 闈㈠寘灞�",
-                },
-                {
-                  value: "dropdown",
-                  label: "Dropdown 涓嬫媺鑿滃崟",
-                },
-                {
-                  value: "steps",
-                  label: "Steps 姝ラ鏉�",
-                },
-              ],
-            },
-            {
-              value: "others",
-              label: "Others",
-              children: [
-                {
-                  value: "dialog",
-                  label: "Dialog 瀵硅瘽妗�",
-                },
-                {
-                  value: "tooltip",
-                  label: "Tooltip 鏂囧瓧鎻愮ず",
-                },
-                {
-                  value: "popover",
-                  label: "Popover 寮瑰嚭妗�",
-                },
-                {
-                  value: "card",
-                  label: "Card 鍗$墖",
-                },
-                {
-                  value: "carousel",
-                  label: "Carousel 璧伴┈鐏�",
-                },
-                {
-                  value: "collapse",
-                  label: "Collapse 鎶樺彔闈㈡澘",
-                },
-              ],
-            },
-          ],
+          value: "閫夐」2",
+          label: "瑙嗛",
         },
         {
-          value: "ziyuan",
-          label: "璧勬簮",
-          children: [
-            {
-              value: "axure",
-              label: "Axure Components",
-            },
-            {
-              value: "sketch",
-              label: "Sketch Templates",
-            },
-            {
-              value: "jiaohu",
-              label: "缁勪欢浜や簰鏂囨。",
-            },
-          ],
+          value: "閫夐」3",
+          label: "闊抽",
         },
       ],
+      fileList: [
+        {
+          name: "food.jpeg",
+          url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+        },
+        {
+          name: "food2.jpeg",
+          url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+        },
+      ],
+      options: [
+        {
+          value: "閫夐」1",
+          label: "鐤剧梾闂嵎",
+        },
+        {
+          value: "閫夐」2",
+          label: "鍏ラ櫌闂嵎",
+        },
+        {
+          value: "閫夐」3",
+          label: "鎵嬫湳闂嵎",
+        },
+        {
+          value: "閫夐」4",
+          label: "鎶ょ悊闂嵎",
+        },
+      ],
+      variablelist: [
+        {
+          variable: "paitent",
+          value: "琛ㄧず鎮h�呯殑鏍囪瘑",
+        },
+      ],
+
       valssu: [
         {
           idd: 1,
@@ -760,21 +638,6 @@
           sdadd: ["sss", "ssccss", "ssaas", "ss"],
         },
       ],
-      // options: [
-      //   {
-      //     value: "閫夐」1",
-      //     label: "鍗曢��",
-      //   },
-      //   {
-      //     value: "閫夐」2",
-      //     label: "澶氶��",
-      //     disabled: true,
-      //   },
-      //   {
-      //     value: "閫夐」3",
-      //     label: "濉┖",
-      //   },
-      // ],
       addvalue: "娣诲姞棰樼洰",
       // 棰樼洰琛ㄦ牸鏁版嵁
       userList: [
@@ -812,9 +675,6 @@
 
   methods: {
     submitForm(formName) {
-      if (this.Editprogress <= 3) {
-        return this.Editprogress++;
-      }
       this.rules = this.rulesa;
       //   鎻愪氦
       this.$refs[formName].validate((valid) => {
@@ -826,6 +686,33 @@
         }
       });
     },
+    // 涓嬩竴姝�
+    nextstep() {
+      if (this.Editprogress <= 2) {
+        return this.Editprogress++;
+      }
+    },
+    // 涓婁竴姝�
+    laststep() {
+      this.Editprogress = this.Editprogress - 1;
+    },
+    // 鍏抽棴
+    closeFm() {
+      this.$confirm('閫�鍑轰笉浼氫繚鐣欓〉闈㈠唴瀹规洿鏀�, 鏄惁缁х画?', '鎻愮ず', {
+          confirmButtonText: '纭畾',
+          cancelButtonText: '鍙栨秷',
+          type: 'warning'
+        }).then(() => {
+          this.$router.go(-1)
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '宸插彇娑�'
+          });          
+        });
+    },
+    // 淇濆瓨棰樼洰淇℃伅
+    Saveproblem() {},
     /** 鏌ヨ棰樼洰鍒楄〃 */
     getList() {
       //   this.loading = true;
@@ -840,18 +727,51 @@
       //   console.log(rows);
       //   this.list = rows;
     },
-    changeaddtopic(val) {
-      console.log(11);
-      console.log(val);
-      this.addvalue = "娣诲姞棰樼洰";
+    // 淇敼棰樼洰淇℃伅
+    Submittopicobj() {},
+    // 鏂板鍙橀噺
+    addvariable() {
+      this.variablelist.push({
+        variable: "",
+        value: "",
+      });
     },
-    // 棰勮妯$増
-    PreviewTemplate() {
-      this.drawer = true;
+    // 鍒犻櫎鍙橀噺
+    delvariable(item) {
+      const index = this.variablelist.indexOf(item);
+      if (index !== -1) {
+        this.variablelist.splice(index, 1); // 浠庣储寮曚綅缃垹闄や竴涓厓绱�
+      } else {
+        console.log("鏈壘鍒拌瀵硅薄");
+      }
     },
-    laststep() {
-      this.Editprogress--;
+    // 鎺у埗鏂囦欢
+    handleChange(file, fileList) {
+      this.fileList = fileList.slice(-3);
     },
+    // 鏍囩-----------------
+    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();
+      // });
+    },
+    // --------------------------
+    // 鏌ヨ棰樺簱
+    handleQuery() {},
+    resetQuery() {},
     resetForm(formName) {
       this.$refs[formName].resetFields();
     },
@@ -892,12 +812,10 @@
     font-size: 20px;
   }
   .leftvlue-jbxx {
-    margin-bottom: 50px;
-    font-size: 20px;
-    span {
-      position: absolute;
-      right: 80px;
-    }
+    font-size: 24px;
+      border-left: 5px solid #41a1be;
+      padding-left: 5px;
+      margin: 15px 0;
   }
   .demo-cascader {
     margin-right: 20px;
@@ -925,6 +843,30 @@
     }
   }
 }
+.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;
+  }
+}
 .addtopic {
   margin-top: 30px;
 }
@@ -933,7 +875,7 @@
   display: flex;
   .presentation-left {
     width: 50%;
-    height: 500px;
+    // height: 500px;
     .button-textxg {
       color: #024df0;
     }
@@ -943,20 +885,22 @@
   }
   .presentation-right {
     width: 50%;
-    height: 500px;
-    padding: 20px;
+    max-height: 688px;
+    padding: 0 20px;
     font-size: 18px;
-    border: 1px solid #909091;
-    span {
-      padding: 0 35px;
-      margin-right: 10px;
-      border-bottom: 1px solid #909091;
-    }
+    overflow: auto;
     .headline {
       font-size: 20px;
       border-left: 3px solid #41a1be;
       padding-left: 5px;
       margin: 15px 0;
+    }
+    .topicxq {
+      background-color: #e2f5fc;
+      border-radius: 4px;
+      margin-top: 10px;
+      padding-left: 10px;
+      padding-top: 15px;
     }
   }
 }
@@ -971,7 +915,7 @@
   font-size: 25px;
 }
 ::v-deep.el-input--medium {
-  font-size: 24px !important;
+  font-size: 18px !important;
 }
 ::v-deep.ruleFormaa.el-select {
   display: inline-block;
diff --git a/src/views/knowledge/questionnaire/index.vue b/src/views/knowledge/questionnaire/index.vue
index 6f34dca..118b7bb 100644
--- a/src/views/knowledge/questionnaire/index.vue
+++ b/src/views/knowledge/questionnaire/index.vue
@@ -21,7 +21,49 @@
         </el-input>
       </div>
       <div class="bottom-fl">
-        <el-tabs tab-position="right">
+        <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-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>
+        <!-- <el-tabs tab-position="right">
           <el-tab-pane :label="`鍏ㄩ儴 (${numberlb})`"></el-tab-pane>
           <el-tab-pane
             class="tab-paness"
@@ -48,21 +90,11 @@
                 <i slot="reference" class="el-icon-share"></i> </el-popover
             ></span>
           </el-tab-pane>
-        </el-tabs>
+        </el-tabs> -->
       </div>
     </div>
     <!-- 鍙充晶鏁版嵁 -->
     <div class="leftvlue">
-      <div class="leftvlue-top">
-        <el-tabs v-model="topactiveName" @tab-click="tophandleClick">
-          <el-tab-pane name="Local">
-            <span class="mulsz" slot="label">鏈湴闂嵎搴� </span>
-          </el-tab-pane>
-          <el-tab-pane name="sharing">
-            <span class="mulsz" slot="label">鍏变韩闂嵎搴� </span>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
       <div class="leftvlue-bg">
         <el-row :gutter="20">
           <!--鐢ㄦ埛鏁版嵁-->
@@ -84,13 +116,58 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="閫傜敤鐤剧梾" prop="status">
+              <el-form-item label="閫傜敤绉戝" prop="sickness">
                 <el-cascader
-                  v-model="queryParams.status"
+                  v-model="queryParams.sickness"
                   :options="optionss"
                   :props="propss"
                   clearable
                 ></el-cascader>
+              </el-form-item>
+              <el-form-item label="閫氱煡鍐呭" prop="userName">
+                <el-input
+                  v-model="queryParams.userNamevalue"
+                  placeholder="璇疯緭鍏�"
+                  clearable
+                  style="width: 200px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="閫傜敤鏂瑰紡" prop="shape">
+                <el-cascader
+                  v-model="queryParams.shapevalue"
+                  :options="optionss"
+                  :props="propss"
+                  clearable
+                ></el-cascader>
+              </el-form-item>
+              <el-form-item label="鍐呭褰㈠紡" prop="classify">
+                <el-select
+                  v-model="queryParams.classifyvalue"
+                  placeholder="璇烽�夋嫨"
+                >
+                  <el-option
+                    v-for="(item, index) in editableTabs"
+                    :key="index++"
+                    :label="item.title"
+                    :value="index++"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="鍙敤鐘舵��" prop="classify">
+                <el-select
+                  v-model="queryParams.classifyvalue"
+                  placeholder="璇烽�夋嫨"
+                >
+                  <el-option
+                    v-for="(item, index) in editableTabsky"
+                    :key="index++"
+                    :label="item.title"
+                    :value="index++"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
 
               <el-form-item>
@@ -135,18 +212,11 @@
                   >鍒犻櫎</el-button
                 >
               </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"
-              border="true"
+              :border="true"
               @selection-change="handleSelectionChange"
             >
               <el-table-column type="selection" width="50" align="center" />
@@ -155,14 +225,12 @@
                 align="center"
                 key="userId"
                 prop="userId"
-                v-if="columns[0].visible"
               />
               <el-table-column
-                label="闂嵎鍚嶇О"
+                label="闂嵎鏍囬"
                 align="center"
                 key="userName"
                 prop="userName"
-                v-if="columns[1].visible"
                 :show-overflow-tooltip="true"
               />
               <el-table-column
@@ -170,23 +238,65 @@
                 align="center"
                 key="nickName"
                 prop="nickName"
-                v-if="columns[2].visible"
                 :show-overflow-tooltip="true"
               />
 
               <el-table-column
+                label="涓昏鍐呭"
+                align="center"
+                key="bphonenumber"
+                prop="bphonenumber"
+                width="120"
+              /><el-table-column
                 label="閫傜敤鐤剧梾"
                 align="center"
                 key="aphonenumber"
                 prop="aphonenumber"
-                v-if="columns[4].visible"
                 width="120"
-              /><el-table-column
-                label="闂嵎鎻忚堪"
+              />
+              <el-table-column
+                label="閫傜敤绉戝"
                 align="center"
-                key="bphonenumber"
-                prop="bphonenumber"
-                v-if="columns[4].visible"
+                key="administrative"
+                prop="administrative"
+                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="瀹f暀鏂瑰紡"
+                align="center"
+                key="wayList"
+                prop="wayList"
+                width="160"
+                :show-overflow-tooltip="true"
+              >
+                <template slot-scope="scope">
+                  <span v-for="item in scope.row.wayList">{{ item }} </span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="璧勬枡褰㈠紡"
+                align="center"
+                key="cphonenumaber"
+                prop="cphonenumaber"
+                width="120"
+              />
+              <el-table-column
+                label="鍙敤"
+                align="center"
+                key="cphonenumbker"
+                prop="cphonenumbker"
                 width="120"
               />
               <el-table-column
@@ -194,7 +304,6 @@
                 align="center"
                 key="cphonenumber"
                 prop="cphonenumber"
-                v-if="columns[4].visible"
                 width="120"
               />
 
@@ -367,6 +476,17 @@
       :visible.sync="dialogFormVisible"
     >
       <el-form :model="classifyform">
+        <el-form-item label="璇烽�夋嫨闂嵎澶х被">
+          <el-select v-model="classifyform.broadheading" placeholder="璇烽�夋嫨">
+            <el-option
+              v-for="item in optionss"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item
           :label="amendtag ? '璇疯緭鍏ユ柊鐨勭被鍒悕绉�' : '璇疯緭鍏ョ被鍒悕绉�'"
         >
@@ -517,6 +637,16 @@
           number: "2",
         },
       ],
+      editableTabsky: [
+        {
+          title: "鍙敤",
+          number: "1",
+        },
+        {
+          title: "鍋滅敤",
+          number: "2",
+        },
+      ],
       // 鏌ヨ鍙傛暟
       queryParams: {
         pageNum: 1,
@@ -644,6 +774,16 @@
         this.deletefenl = row.title;
       }
     },
+    // 渚ц竟--------------
+    handleOpen(key, keyPath) {
+      console.log(key, keyPath);
+    },
+    handleClose(key, keyPath) {
+      console.log(key, keyPath);
+    },
+    handleSelect(key, keyPath) {
+      console.log(key, keyPath);
+    },
     //鎼滅储绫诲埆
     sidecolumnss() {},
     // 鍒囨崲鍏变韩/鏈湴
diff --git a/src/views/patient/follow/index.vue b/src/views/patient/follow/index.vue
index cadf3b5..9eede60 100644
--- a/src/views/patient/follow/index.vue
+++ b/src/views/patient/follow/index.vue
@@ -20,24 +20,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="鎮h�呯紪鍙�" prop="iccardno">
-            <el-input
-              v-model="queryParams.iccardno"
-              placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
-              clearable
-              style="width: 250px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="鎮h�呯紪鍙�" prop="telcode">
-            <el-input
-              v-model="queryParams.telcode"
-              placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
-              clearable
-              style="width: 280px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
+
           <el-form-item label="鎮h�呰寖鍥�" prop="tagId">
             <el-select
               v-model="queryParams.Patientid"
@@ -53,31 +36,36 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="鏄惁浼氬憳" prop="tagId">
+            <el-select
+              v-model="queryParams.whether"
+              multiple
+              placeholder="璇烽�夋嫨"
+            >
+              <el-option
+                v-for="item in whether"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-row>
-            <el-form-item label="鎮h�呮爣绛�" prop="tagId">
+            <el-form-item label="杩囨护绫诲瀷" prop="tagId">
               <el-select
                 v-model="queryParams.tagIds"
                 multiple
                 placeholder="璇烽�夋嫨"
               >
                 <el-option
-                  v-for="item in optionstag"
-                  :key="item.tagid"
-                  :label="item.tagname"
-                  :value="item.tagid"
+                  v-for="item in Filterreason"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
                 >
                 </el-option>
               </el-select>
-            </el-form-item>
-            <el-form-item label=" 灏辫瘖鏃ユ湡 " prop="admitdate">
-              <el-date-picker
-                clearable
-                v-model="queryParams.admitdate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="璇烽�夋嫨 灏辫瘖鏃ユ湡 "
-              >
-              </el-date-picker>
             </el-form-item>
             <el-form-item>
               <el-button
@@ -160,33 +148,23 @@
             prop="age"
             width="120"
           />
+       
           <el-table-column
-            label="鍑虹敓骞存湀"
-            align="center"
-            key="archivetime"
-            prop="archivetime"
-            width="160"
-          >
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="瀹跺涵浣忓潃"
+            label="璇佷欢缂栧彿"
             align="center"
             key="age"
             prop="age"
             width="120"
           />
           <el-table-column
-            label="榛戝悕鍗曞師鍥�"
+            label="杩囨护绫诲瀷"
             align="center"
             key="age"
             prop="age"
             width="120"
           />
           <el-table-column
-            label="鎮h�呮爣绛�"
+            label="杩囨护鍘熷洜"
             align="center"
             key="tagList"
             prop="tagList"
@@ -204,13 +182,12 @@
             prop="iccardtype"
             width="120"
           /><el-table-column
-            label="璇佷欢鍙风爜"
+            label="璇佷欢缂栧彿"
             align="center"
             key="iccardno"
             prop="iccardno"
             width="190"
           />
-
           <el-table-column
             label="鑱旂郴鏂瑰紡"
             align="center"
@@ -219,20 +196,17 @@
             width="120"
           />
           <el-table-column
-            label="寤烘。鏃ユ湡"
+            label="瀹跺涵浣忓潃"
+            align="center"
+            key="iccardno"
+            prop="iccardno"
+            width="190"
+          />
+          <el-table-column
+            label="鎿嶄綔鏃ユ湡"
             align="center"
             key="archivetime"
             prop="archivetime"
-            width="160"
-          >
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="鏇存柊鏃ユ湡"
-            align="center"
-            prop="updateTime"
             width="160"
           >
             <template slot-scope="scope">
@@ -266,7 +240,7 @@
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:user:edit']"
                 ><span class="button-textxga"
-                  ><i class="el-icon-edit"></i>鍙栨秷榛戝悕鍗�</span
+                  ><i class="el-icon-edit"></i>鍙栨秷杩囨护</span
                 ></el-button
               >
             </template>
@@ -488,13 +462,49 @@
       optionstag: [], //鏍囩鍒楄〃
       Patientrange: [
         {
-          name: "鍏ㄩ儴",
+          name: "闂ㄨ瘖",
           id: 1,
         },
         {
-          name: "褰撳墠绉戝",
+          name: "浣忛櫌",
+          id: 2,
+        },
+        {
+          name: "浣撴",
+          id: 3,
+        },
+      ],
+      whether: [
+        {
+          name: "鏄�",
           id: 1,
         },
+        {
+          name: "鍚�",
+          id: 2,
+        },
+      ],
+      Filterreason: [
+        {
+          name: "鎮h�呮浜�",
+          id: 1,
+        },
+        {
+          name: "棰戠箒灏辫瘖",
+          id: 2,
+        },
+        {
+          name: "鎮h�呮嫆缁濇湇鍔�",
+          id: 3,
+        },
+        {
+          name: "鑱旂郴鏂瑰紡鏃犳晥",
+          id: 4,
+        },
+        {
+          name: "榛戝悕鍗�",
+          id: 5,
+        },
       ],
       defaultProps: {
         children: "children",
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index 0f3e5ae..021b089 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -9,17 +9,12 @@
       <div class="bottom-fl">
         <el-tabs
           tab-position="right"
-          v-model="activeName"
+          v-model="queryParams.allhosp"
           @tab-click="handleClick"
         >
-          <!-- <el-tab-pane label="鍏ㄩ儴" name="first"></el-tab-pane>
-          <el-tab-pane label="鍦ㄩ櫌" name="Inhospital"></el-tab-pane>
-          <el-tab-pane label="绂婚櫌" name="Discharge"></el-tab-pane>
-          <el-tab-pane label="棰勭害" name="subscribe"></el-tab-pane>
-          <el-tab-pane label="宸叉" name="checked"></el-tab-pane> -->
-          <el-tab-pane label="浣忛櫌鎮h��" name="behospitalized"></el-tab-pane>
-          <el-tab-pane label="闂ㄨ瘖鎮h��" name="outpatient"></el-tab-pane>
-          <el-tab-pane label="浣撴鎮h��" name="physical"></el-tab-pane>
+          <el-tab-pane label="浣忛櫌鎮h��" name="1"></el-tab-pane>
+          <el-tab-pane label="闂ㄨ瘖鎮h��" name="2"></el-tab-pane>
+          <el-tab-pane label="浣撴鎮h��" name="3"></el-tab-pane>
         </el-tabs>
       </div>
     </div>
@@ -102,7 +97,6 @@
                   align="right"
                   type="date"
                   placeholder="閫夋嫨鏃ユ湡"
-                  :picker-options="pickerOptionsa"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -174,7 +168,7 @@
                   >鍒犻櫎</el-button
                 >
               </el-col>
-              <el-col :span="19">
+              <el-col :span="6">
                 <div class="documentf">
                   <div class="document">
                     <el-button
@@ -235,16 +229,13 @@
               <el-table-column
                 label="鍑虹敓骞存湀"
                 align="center"
-                key="archivetime"
-                prop="archivetime"
+                key="birthdate"
+                prop="birthdate"
                 width="160"
               >
-                <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
-                </template>
               </el-table-column>
               <el-table-column
-                label="瀹跺涵浣忓潃"
+                label="灞呬綇鍦�"
                 align="center"
                 key="age"
                 prop="age"
@@ -286,13 +277,10 @@
               <el-table-column
                 label="寤烘。鏃ユ湡"
                 align="center"
-                key="archivetime"
-                prop="archivetime"
+                key="uploadTime"
+                prop="uploadTime"
                 width="160"
               >
-                <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 label="鏇存柊鏃ユ湡"
@@ -367,7 +355,7 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="濮撳悕" prop="name">
               <el-input
                 v-model="form.name"
@@ -376,7 +364,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="鎬у埆" prop="sex">
               <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
                 <el-option
@@ -386,6 +374,44 @@
                   :value="dict.value"
                 ></el-option>
               </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="姘戞棌" prop="age">
+              <el-input
+                v-model="form.age"
+                placeholder="璇疯緭鍏ュ勾榫�"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="姘戞棌" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder="璇疯緭鍏ユ皯鏃�"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="绫嶈疮" prop="age">
+              <el-input
+                v-model="form.age"
+                placeholder="璇疯緭鍏ョ睄璐�"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="鑱旂郴鏂瑰紡" prop="telcode">
+              <el-input
+                v-model="form.telcode"
+                placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"
+                maxlength="30"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -414,49 +440,34 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="鏈汉鎵嬫満鍙�" prop="telcode">
+            <el-form-item label="鍑虹敓鍦�" prop="iccardno">
               <el-input
-                v-model="form.telcode"
-                placeholder="璇疯緭鍏ユ墜鏈哄彿"
-                maxlength="30"
+                v-model="form.iccardno"
+                placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑璇︾粏淇℃伅"
+                maxlength="50"
               />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="浜插睘鎵嬫満鍙�" prop="relativetelcode">
+            </el-form-item> </el-col
+          ><el-col :span="12">
+            <el-form-item label="灞呬綇鍦�" prop="iccardno">
               <el-input
-                v-model="form.relativetelcode"
-                placeholder="璇疯緭鍏ヤ翰灞炴墜鏈哄彿"
-                type="password"
-                maxlength="20"
-                show-password
+                v-model="form.iccardno"
+                placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑璇︾粏淇℃伅"
+                maxlength="50"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="骞撮緞" prop="age">
-              <el-input
-                v-model="form.age"
-                placeholder="璇疯緭鍏ュ勾榫�"
-                maxlength="30"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="鎮h�呮爣绛�">
-              <!-- <el-select v-model="form.sex" placeholder="璇烽�夋嫨"> -->
-              <el-select v-model="form.tagList" multiple placeholder="璇烽�夋嫨">
+          <el-col :span="24">
+            <el-form-item label="鎮h�呯被鍨�">
+              <el-select v-model="form.Patienttype" placeholder="璇烽�夋嫨绫诲瀷">
                 <el-option
-                  v-for="item in optionstag"
-                  :key="item.tagid"
-                  :label="item.tagname"
-                  :value="item.tagid"
-                >
-                </el-option>
+                  v-for="item in Patienttype"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
               </el-select>
-              <!-- </el-select> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -518,7 +529,16 @@
               :underline="false"
               style="font-size: 24px; vertical-align: baseline"
               @click="importTemplate"
-              >涓嬭浇妯℃澘</el-link
+              >涓嬭浇妯℃澘
+            </el-link>
+            <el-link
+              type="success"
+              :underline="false"
+              style="font-size: 24px; vertical-align: baseline"
+              href="http://m.qpic.cn/psc?/V50ZTolo1AIhq00dqrJP2169QM2VHGTU/ruAMsa53pVQWN7FLK88i5qfmCJclyMduqqL6kjE4h7TXDAjimVtmLmTyGVfF4qlkyOISsYQ4Mxx705X2tkXEIUPrfCS4L4yK.f11SmO8Tq0!/b&bo=twb0AgAAAAADB2U!&rf=viewer_4"
+              target="_blank"
+            >
+              鏌ョ湅妯$増</el-link
             >
           </div>
         </el-upload>
@@ -539,6 +559,7 @@
           </el-table-column>
           <el-table-column prop="tag" label="鎮h�呮爣绛�"> </el-table-column>
           <el-table-column prop="erry" label="閿欒鍘熷洜"> </el-table-column>
+          <el-table-column prop="opinion" label="澶勭悊鎰忚"> </el-table-column>
         </el-table>
         <pagination
           v-show="total > 0"
@@ -551,15 +572,46 @@
       <!-- 瀹屾垚 -->
       <div class="drexamine" v-else-if="dractive == 3">
         <img
-          src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
+          src="@/assets/images/瀵煎叆.png"
         />
         <p>瀵煎叆鎮h�呮垚鍔燂紒</p>
-        <p>鏈鍏辫瀵煎叆{{ ImportQuantity }}浣嶆偅鑰�</p>
+        <p>
+          鏈
+          <span style="color: #158bb8; font-size: 20px;">{{ ImportQuantity }}</span>
+          鏉℃暟鎹垚鍔熷鍏�<span style="color: #72d3a9; font-size: 20px;">{{ ImportQuantity }}</span
+          >浣嶆偅鑰�
+        </p>
+      </div>
+      <div v-if="dractive == 3">
+        <el-table :data="uploadingData" style="width: 100%" >
+            <el-table-column prop="serial" label="搴忓彿"> </el-table-column>
+            <el-table-column prop="name" label="濮撳悕"> </el-table-column>
+            <el-table-column prop="sex" label="鎬у埆"> </el-table-column>
+            <el-table-column prop="certificate" label="璇佷欢绫诲瀷">
+            </el-table-column>
+            <el-table-column prop="certificatenum" label="璇佷欢鍙风爜">
+            </el-table-column>
+            <el-table-column prop="goday" label="鍑虹敓鏃ユ湡"> </el-table-column>
+            <el-table-column prop="menum" label="鏈汉鑱旂郴鏂瑰紡"> </el-table-column>
+            <el-table-column prop="younum" label="浜插睘鑱旂郴鏂瑰紡">
+            </el-table-column>
+            <el-table-column prop="tag" label="鎮h�呮爣绛�"> </el-table-column>
+            <el-table-column prop="erry" label="閿欒鍘熷洜"> </el-table-column>
+          <el-table-column prop="opinion" label="澶勭悊鎰忚"> </el-table-column>
+          </el-table>
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="geterryList"
+          />
       </div>
 
       <div slot="footer" class="dialog-footer" v-if="dractive == 3">
         <!-- <el-button type="primary" @click="submitFileForm">涓嬩竴姝�</el-button> -->
         <el-button @click="submitclose">瀹屾垚</el-button>
+        <el-button type="warning" @click="submitclose">瀵煎嚭澶辫触鏁版嵁</el-button>
       </div>
       <div slot="footer" v-else>
         <el-button type="primary" @click="submitFileForm">涓嬩竴姝�</el-button>
@@ -631,6 +683,7 @@
       title: "",
       // 閮ㄩ棬鏍戦�夐」
       deptOptions: undefined,
+      options: [],
       // 鏄惁鏄剧ず寮瑰嚭灞�
       open: false,
       // 閮ㄩ棬鍚嶇О
@@ -648,6 +701,21 @@
         { papersname: "涓浗娓境灞呮皯韬唤璇�" },
         { papersname: "涓浗鍙版咕灞呮皯韬唤璇�" },
       ],
+      Patienttype: [
+        {
+          value: "1",
+          label: "浣忛櫌鎮h��",
+        },
+        {
+          value: "2",
+          label: "闂ㄨ瘖鎮h��",
+        },
+        {
+          value: "3",
+          label: "浣撴鎮h��",
+        },
+      ],
+
       cardlist: [
         {
           name: "鎮h�呮�绘暟",
@@ -713,6 +781,7 @@
       // 鏌ヨ鍙傛暟
       queryParams: {
         pageNum: 1,
+        allhosp: "1",
         pageSize: 10,
         iccardno: undefined,
         name: undefined,
@@ -788,6 +857,9 @@
         this.total = response.total;
         this.loading = false;
       });
+    },
+    handleClick() {
+      this.getList();
     },
     /** 鏌ヨ鏍囩鍒楄〃 */
     gettabList() {
@@ -1090,11 +1162,11 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  padding: 30px;
+  padding: 20px;
   background: #daeaf5;
   img {
-    width: 100px;
-    height: 100px;
+    width: 50px;
+    height: 50px;
   }
 }
 .button-textsc {
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index 3475bfd..cb19817 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -3,57 +3,27 @@
     <!-- 澶撮儴鐩掑瓙 -->
     <div class="personages">
       <el-row :gutter="20">
-        <el-col :span="4"
-          ><div class="headportrait">
+        <el-col :span="18">
+          <div class="headportrait">
             <div class="text-center">
               <img v-imgError="require('@/assets/common/head.jpg')" src="" />
             </div>
-            <div>鍚村ぇ榫�</div>
+            <div style="margin-left: 10px">鍚村ぇ榫�</div>
+            <div style="margin-left: 10px" class="text-title">鐢�</div>
+            <div style="margin-left: 10px" class="text-title">66宀�</div>
+            <div style="margin-left: 10px" class="text-title">1999.12.18</div>
+            <div style="margin-left: 10px" class="text-title">姹夋棌</div>
+            <div style="margin-left: 10px" class="text-title">娌冲崡淇¢槼</div>
           </div></el-col
         >
-        <el-col :span="8"
-          ><div class="xinz-inf">
-            <el-tag
-              :key="tag"
-              v-for="tag in dynamicTags"
-              closable
-              :disable-transitions="false"
-              @close="handleClose(tag)"
-            >
-              {{ 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
-            >
-          </div></el-col
-        >
-        <el-col :span="4"
-          ><div class="info-xx">鐢�<span>66宀�</span></div></el-col
-        >
-        <el-col :span="4"><div class="info-xx">13803963330</div></el-col>
       </el-row>
     </div>
 
     <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
       <el-tab-pane name="health">
         <span class="mulsz" slot="label"
-          ><i class="el-icon-date"></i> 鍋ュ悍妗f</span
+          ><i class="el-icon-date"></i> 鎮h�呮。妗�</span
         >
-        鍩烘湰淇℃伅
       </el-tab-pane>
       <el-tab-pane name="medical">
         <span class="mulsz" slot="label"
@@ -72,22 +42,7 @@
           >
           <el-tab-pane name="checkout"
             ><span class="mulsz" slot="label"
-              >妫�楠�({{ jynumber }})
-            </span></el-tab-pane
-          >
-          <el-tab-pane name="examine"
-            ><span class="mulsz" slot="label"
-              >妫�鏌�({{ jcnumber }})
-            </span></el-tab-pane
-          >
-          <el-tab-pane name="physical"
-            ><span class="mulsz" slot="label">
-              浣撴({{ tjnumber }})</span
-            ></el-tab-pane
-          >
-          <el-tab-pane name="pharmacy"
-            ><span class="mulsz" slot="label"
-              >鐢ㄨ嵂({{ yynumber }})
+              >浣撴({{ jynumber }})
             </span></el-tab-pane
           >
         </el-tabs>
@@ -113,6 +68,21 @@
               ><i class="el-icon-s-data"></i>浣撻噸
             </span></el-tab-pane
           >
+          <el-tab-pane name="heartrate"
+            ><span class="mulsz" slot="label"
+              ><i class="el-icon-s-operation"></i>蹇冪巼
+            </span></el-tab-pane
+          >
+          <el-tab-pane name="bloodoxygen"
+            ><span class="mulsz" slot="label"
+              ><i class="el-icon-s-data"></i>琛�姘�
+            </span></el-tab-pane
+          >
+          <el-tab-pane name="animalheat"
+            ><span class="mulsz" slot="label"
+              ><i class="el-icon-s-opportunity"></i>浣撴俯
+            </span></el-tab-pane
+          >
         </el-tabs></el-tab-pane
       >
       <el-tab-pane name="serve">
@@ -127,36 +97,204 @@
       <div class="top-message">
         <div class="headline">鍩虹淇℃伅</div>
         <div class="detailed">
-          <div class="one-column">
-            <div>鎮h�呭鍚嶏細<span class="spanvalue">鐜嬪ぇ缇�</span></div>
-            <div>鎬у埆锛�<span class="spanvalue">鐢�</span></div>
+          <el-row :gutter="20">
+            <el-col :span="12"
+              ><div class="grid-content bg-purple">
+                鎮h�呭鍚嶏細<span class="spanvalue">鐜嬪ぇ缇�</span>
+              </div></el-col
+            >
+            <el-col :span="12"
+              ><div class="grid-content bg-purple">
+                鑱旂郴鐢佃瘽锛�<span class="spanvalue">13803963330</span>
+              </div></el-col
+            >
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24"
+              ><div class="grid-content bg-purple">
+                鍑虹敓鍦帮細<span class="spanvalue"
+                  >娴欐睙鐪佹澀宸炲競浣欐澀鍖轰綑鏉閬�</span
+                >
+              </div></el-col
+            >
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24"
+              ><div class="grid-content bg-purple">
+                灞呬綇鍦帮細<span class="spanvalue"
+                  >娴欐睙鐪佹澀宸炲競浣欐澀鍖轰綑鏉閬�</span
+                >
+              </div></el-col
+            >
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24"
+              ><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
+                  placeholder="璇烽�夋嫨"
+                >
+                  <el-option
+                    v-for="item in options"
+                    :key="item.label"
+                    :label="item.label"
+                    :value="item.label"
+                  >
+                  </el-option>
+                </el-select>
 
-            <div>璇佷欢绫诲瀷锛�<span class="spanvalue">韬唤璇�</span></div>
-          </div>
-          <div class="one-column">
-            <div>鍑虹敓鏃ユ湡锛�<span class="spanvalue">1999-01-02</span></div>
 
-            <div>骞撮緞锛�<span class="spanvalue">121</span></div>
-
-            <div class="">
-              璇佷欢鍙风爜锛�<span class="spanvalue">312223222322232223</span>
-            </div>
-          </div>
+                <el-button
+                  v-else
+                  class="button-new-tag"
+                  size="small"
+                  @click="showInput"
+                  >+ 鏂板鏍囩</el-button
+                >
+              </div></el-col
+            >
+          </el-row>
         </div>
       </div>
+      <div class="top-message">
+        <div class="headline">鐥呭彶</div>
+        <div class="detailed">
+          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="杩囧線鐤剧梾" prop="name">
+                  <el-input
+                    v-model="form.name"
+                    placeholder="璇疯緭鍏�"
+                    maxlength="30"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="鑽墿杩囨晱" prop="sex">
+                  <el-input
+                    v-model="form.name"
+                    placeholder="璇疯緭鍏ュ叿浣撹嵂鐗�/鏃�"
+                    maxlength="30"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="瀹舵棌鐥呭彶" prop="age">
+                  <el-input
+                    v-model="form.age"
+                    placeholder="璇疯緭鍏ュ叿浣撶柧鐥�/鏃�"
+                    maxlength="30"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="鎵嬫湳鍙�" prop="name">
+                  <el-input
+                    v-model="form.name"
+                    placeholder="璇疯緭鍏ユ墜鏈�/鏃�"
+                    maxlength="30"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="鐢熻偛鍙�" prop="age">
+                  <el-input
+                    v-model="form.age"
+                    placeholder="璇疯緭鍏ヨ儙鏁�/鏃�"
+                    maxlength="30"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="鏈堢粡鍙�" prop="telcode">
+                  <el-radio-group v-model="form.radio">
+                    <el-radio :label="1">鏈�</el-radio>
+                    <el-radio :label="2">鏃�</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="鍚哥儫鎯呭喌" prop="iccardtype">
+                  <el-radio-group v-model="form.radio">
+                    <el-radio :label="1">鏈�</el-radio>
+                    <el-radio :label="2">鏃�</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="楗厭鎯呭喌" prop="iccardno">
+                  <el-radio-group v-model="form.radios">
+                    <el-radio :label="1">鏈�</el-radio>
+                    <el-radio :label="2">鏃�</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="杩愬姩鎯呭喌" prop="iccardno">
+                  <el-radio-group v-model="form.radiosa">
+                    <el-radio :label="1">鏈�</el-radio>
+                    <el-radio :label="2">鏃�</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="楗鎯呭喌" prop="iccardno">
+                  <el-radio-group v-model="form.radiosa">
+                    <el-radio :label="1">澶氬害楗</el-radio>
+                    <el-radio :label="2">姝e父楗</el-radio>
+                    <el-radio :label="2">椋熸涓嶆尟</el-radio>
+                  </el-radio-group>
+                </el-form-item> </el-col
+              ><el-col :span="12">
+                <el-form-item label="蹇冪悊鎯呭喌" prop="iccardno">
+                  <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-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <!-- 鑱旂郴鐢佃瘽 -->
       <div class="bottom-message">
-        <div class="headline">鍙风爜缁存姢</div>
+        <div class="headline">
+          鍙风爜缁存姢
+          <el-button type="primary" @click="AddanumberVisible = true"
+            >+鏂板</el-button
+          >
+        </div>
         <div class="Table-screen">
           <el-table :data="tableData" style="width: 100%">
+            <el-table-column prop="id" label="搴忓彿" width="180">
+            </el-table-column>
             <el-table-column prop="name" label="濮撳悕" width="180">
             </el-table-column>
             <el-table-column prop="phonenumber" label="鑱旂郴鏂瑰紡" width="180">
             </el-table-column>
             <el-table-column prop="concern" label="鍏崇郴"> </el-table-column>
-            <el-table-column prop="source" label="鑱旂郴浜烘潵婧�">
-            </el-table-column>
-            <el-table-column prop="default" label="榛樿鑱旂郴鏂瑰紡">
-            </el-table-column>
             <el-table-column
               label-class-name="columcz"
               fixed="right"
@@ -182,16 +320,19 @@
         <el-table :data="serviceData" style="width: 100%">
           <el-table-column prop="daya" label="灏辫瘖鏃ユ湡" width="180">
           </el-table-column>
-          <el-table-column prop="hospitalname" label="鍖婚櫌鍚嶇О" width="180">
-          </el-table-column>
-          <el-table-column prop="result" label="璇婃柇缁撴灉"> </el-table-column>
-          <el-table-column prop="administrative" label="灏辫瘖绉戝">
+          <el-table-column prop="administrative" label="灏辫瘖绉戝" width="180">
           </el-table-column>
           <el-table-column prop="doctor" label="鍖荤敓"> </el-table-column>
-          <el-table-column label-class-name="columcz" label="鎿嶄綔" width="300">
-            <template slot-scope="scope">
-              <el-button type="text" size="small">璇︽儏</el-button>
-            </template>
+          <el-table-column prop="result" label="鐤剧梾璇婃柇"> </el-table-column>
+          <el-table-column prop="administrative" label="妫�楠�">
+          </el-table-column>
+          <el-table-column prop="administrative" label="妫�鏌�">
+          </el-table-column>
+          <el-table-column prop="administrative" label="鎵嬫湳">
+          </el-table-column>
+          <el-table-column prop="administrative" label="鐢ㄨ嵂">
+          </el-table-column>
+          <el-table-column prop="columcz" label="鍖诲槺" width="200">
           </el-table-column>
         </el-table>
 
@@ -207,70 +348,39 @@
       <div v-if="sonactiveName == 'inhospital'">
         <el-table :data="serviceData" style="width: 100%">
           <el-table-column prop="godaya" label="鍏ラ櫌鏃ユ湡"> </el-table-column>
-          <el-table-column prop="hospitalname" label="鍖婚櫌鍚嶇О">
+          <el-table-column prop="hospitalname" label="鍑洪櫌鏃堕棿">
           </el-table-column>
-          <el-table-column prop="result" label="鍏ラ櫌绉戝埆"> </el-table-column>
           <el-table-column prop="administrative" label="鐥呭尯">
           </el-table-column>
-          <el-table-column prop="bed" label="搴婁綅鍙�"> </el-table-column>
-          <el-table-column prop="doctor" label="鍏ラ櫌璇婃柇"> </el-table-column>
-          <el-table-column prop="today" label="鍑洪櫌鏃堕棿"> </el-table-column>
-        </el-table>
-      </div>
-      <!-- 妫�楠� -->
-      <div v-if="sonactiveName == 'checkout'">
-        <el-table :data="serviceData" style="width: 100%">
-          <el-table-column prop="godaya" label="妫�楠屽崟鍙�"> </el-table-column>
-          <el-table-column prop="hospitalname" label="鎶ュ憡鏃ユ湡">
+          <el-table-column prop="result" label="涓绘不鍖诲笀"> </el-table-column>
+          <el-table-column prop="bed" label="绠″簥鎶ゅ+"> </el-table-column>
+          <el-table-column prop="doctor" label="鍑洪櫌鐤剧梾璇婃柇">
           </el-table-column>
-          <el-table-column prop="result" label="妫�楠岄」鐩�"> </el-table-column>
-          <el-table-column prop="administrative" label="鍖婚櫌鍚嶇О">
+          <el-table-column prop="today" label="妫�楠�"> </el-table-column>
+          <el-table-column prop="administrative" label="妫�鏌�">
           </el-table-column>
-        </el-table>
-      </div>
-      <!-- 妫�鏌� -->
-      <div v-if="sonactiveName == 'examine'">
-        <el-table :data="serviceData" style="width: 100%">
-          <el-table-column prop="godaya" label="鎶ュ憡鍗�"> </el-table-column>
-          <el-table-column prop="hospitalname" label="鎶ュ憡鏃堕棿">
+          <el-table-column prop="administrative" label="鎵嬫湳">
           </el-table-column>
-          <el-table-column prop="result" label="妫�鏌ラ」鐩�"> </el-table-column>
-          <el-table-column prop="administrative" label="鍖婚櫌鍚嶇О">
+          <el-table-column prop="administrative" label="鐢ㄨ嵂">
+          </el-table-column>
+          <el-table-column prop="columcz" label="鍑洪櫌灏忕粨" width="200">
           </el-table-column>
         </el-table>
       </div>
       <!-- 浣撴 -->
-      <div v-if="sonactiveName == 'physical'">
+      <div v-if="sonactiveName == 'checkout'">
         <el-table :data="serviceData" style="width: 100%">
-          <el-table-column prop="daya" label="灏辫瘖鏃ユ湡"> </el-table-column>
-          <el-table-column prop="hospitalname" label="鍖婚櫌鍚嶇О">
+          <el-table-column prop="godaya" label="浣撴绫诲瀷"> </el-table-column>
+          <el-table-column prop="hospitalname" label="浣撴濂楅鍚嶇О">
           </el-table-column>
-          <el-table-column prop="result" label="璇婃柇缁撴灉"> </el-table-column>
-          <el-table-column prop="administrative" label="灏辫瘖绉戝">
+          <el-table-column prop="result" label="浣撴棰勭害鏃ユ湡">
           </el-table-column>
-          <el-table-column prop="doctor" label="鍖荤敓"> </el-table-column>
-          <!-- <el-table-column
-            label-class-name="columcz"
-            fixed="right"
-            label="鎿嶄綔"
-            width="300"
-          >
-            <template slot-scope="scope">
-              <el-button type="text" size="small">璇︽儏</el-button>
-            </template>
-          </el-table-column> -->
-        </el-table>
-      </div>
-      <!-- 鐢ㄨ嵂 -->
-      <div v-if="sonactiveName == 'pharmacy'">
-        <el-table :data="serviceData" style="width: 100%">
-          <el-table-column prop="daya" label="灏辫瘖鏃ユ湡"> </el-table-column>
-          <el-table-column prop="hospitalname" label="鍖婚櫌鍚嶇О">
+          <el-table-column prop="administrative" label="浣撴椤圭洰">
           </el-table-column>
-          <el-table-column prop="result" label="璇婃柇缁撴灉"> </el-table-column>
-          <el-table-column prop="administrative" label="灏辫瘖绉戝">
+          <el-table-column prop="administrative" label="浣撴鎶ュ憡鏃�">
           </el-table-column>
-          <el-table-column prop="doctor" label="鍖荤敓"> </el-table-column>
+          <el-table-column prop="administrative" label="浣撴鎬绘鎶ュ憡">
+          </el-table-column>
         </el-table>
       </div>
     </div>
@@ -281,8 +391,19 @@
       style="margin-top: 20px; font-size: 20px !important"
       v-else-if="activeName == 'serve'"
     >
-      <el-tabs type="border-card">
-        <el-tab-pane label="棣栨闅忚">
+      <div style="margin-bottom: 15px" v-for="item in record">
+        <el-card class="box-card">
+          <div
+            style="
+              font-size: 22px;
+              padding-left: 5px;
+              margin: 15px 0;
+              border-left: 4px solid rgb(190, 65, 134);
+            "
+          >
+            {{ item.name }}
+          </div>
+          <el-divider></el-divider>
           <div style="margin-top: 10px">
             闅忚鐘舵�侊細宸茬粓姝�<span style="color: #2775b6"
               >锛堢粓姝㈠師鍥狅細鎮h�呯棅鎰堝洖璁跨粨鏉燂紝缁堟鏃堕棿锛�2023-12-18 12:00锛�</span
@@ -299,7 +420,7 @@
           </div>
           <div
             style="
-              font-size: 22px;
+              font-size: 20px;
               padding-left: 5px;
               margin: 15px 0;
               border-left: 4px solid rgb(65, 161, 190);
@@ -327,40 +448,138 @@
           <div style="margin-top: 10px">
             闅忚澶囨敞锛� <span style="color: #2775b6">鎻愰啋娉ㄦ剰楗鍋ュ悍</span>
           </div>
-        </el-tab-pane>
-        <el-tab-pane label="浜屾闅忚">浜屾闅忚</el-tab-pane>
-        <el-tab-pane label="涓夋闅忚">涓夋闅忚</el-tab-pane>
-      </el-tabs>
+        </el-card>
+      </div>
     </div>
     <!-- 鍋ュ悍鐩戞祴 -->
     <div class="medical-record" v-show="activeName == 'monitor'">
       <!-- 琛�鍘嬪浘鏍� -->
-      <div v-show="sontwoactiveName == 'blood'">
+      <div v-show="sontwoactiveName == 'blood'" style="display: flex">
         <div
           id="xyeCharts"
           class="sontwoactiveName"
-          style="width: 1300px; height: 800px"
+          style="width: 880px; height: 560px"
         ></div>
+        <div style="width: 400px">
+          <el-card class="box-card">
+            <SFtable
+              :currentList="tableDatalist"
+              :tableLabel="tableLabelxy"
+              :center="false"
+              :multiplechoice="false"
+            />
+          </el-card>
+        </div>
       </div>
       <!-- 琛�绯� -->
-      <div v-show="sontwoactiveName == 'glucose'">
+      <div v-show="sontwoactiveName == 'glucose'" style="display: flex">
         <div
           id="xteCharts"
           class="sontwoactiveName"
-          style="width: 1300px; height: 800px"
+          style="width: 880px; height: 560px"
         ></div>
+        <div style="width: 400px">
+          <el-card class="box-card">
+            <SFtable
+              :currentList="tableDatalist"
+              :tableLabel="tableLabelxt"
+              :center="false"
+              :multiplechoice="false"
+            />
+          </el-card>
+        </div>
       </div>
       <!-- 浣撻噸 -->
-      <div v-show="sontwoactiveName == 'weight'">
+      <div v-show="sontwoactiveName == 'weight'" style="display: flex">
         <div
           id="tzeCharts"
           class="sontwoactiveName"
-          style="width: 1300px; height: 800px"
+          style="width: 880px; height: 560px"
         ></div>
+        <div style="width: 400px">
+          <el-card class="box-card">
+            <SFtable
+              :currentList="tableDatalist"
+              :tableLabel="tableLabeltz"
+              :center="false"
+              :multiplechoice="false"
+            />
+          </el-card>
+        </div>
+      </div>
+      <!-- 蹇冪巼 -->
+      <div v-show="sontwoactiveName == 'heartrate'" style="display: flex">
+        <div
+          id="xleCharts"
+          class="sontwoactiveName"
+          style="width: 880px; height: 560px"
+        ></div>
+        <div style="width: 400px">
+          <el-card class="box-card">
+            <SFtable
+              :currentList="tableDatalist"
+              :tableLabel="tableLabelxl"
+              :center="false"
+              :multiplechoice="false"
+            />
+          </el-card>
+        </div>
+      </div>
+      <!-- 琛�姘� -->
+      <div v-show="sontwoactiveName == 'bloodoxygen'" style="display: flex">
+        <div
+          id="xueyangeCharts"
+          class="sontwoactiveName"
+          style="width: 880px; height: 560px"
+        ></div>
+        <div style="width: 400px">
+          <el-card class="box-card">
+            <SFtable
+              :currentList="tableDatalist"
+              :tableLabel="tableLabelxueyang"
+              :center="false"
+              :multiplechoice="false"
+            />
+          </el-card>
+        </div>
+      </div>
+      <!-- 浣撴俯 -->
+      <div v-show="sontwoactiveName == 'animalheat'" style="display: flex">
+        <div
+          id="tweCharts"
+          class="sontwoactiveName"
+          style="width: 880px; height: 560px"
+        ></div>
+        <div style="width: 400px">
+          <el-card class="box-card">
+            <SFtable
+              :currentList="tableDatalist"
+              :tableLabel="tableLabeltw"
+              :center="false"
+              :multiplechoice="false"
+            />
+          </el-card>
+        </div>
       </div>
     </div>
 
-    <!-- <div id="xyeCharts" style="width: 500px; height: 500px"></div> -->
+    <el-dialog title="鏂板鑱旂郴鏂瑰紡" :visible.sync="AddanumberVisible">
+      <el-form :model="numberform" label-width="100px">
+        <el-form-item label="濮撳悕">
+          <el-input v-model="numberform.name"></el-input>
+        </el-form-item>
+        <el-form-item label="鑱旂郴鐢佃瘽">
+          <el-input v-model="numberform.name"></el-input>
+        </el-form-item>
+        <el-form-item label="鍏崇郴">
+          <el-input v-model="numberform.name"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="AddanumberVisible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="Addanumber">纭� 瀹�</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -369,18 +588,20 @@
 import userInfo from "./userInfo";
 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"; //鑾峰彇鍒楄〃鎺ュ彛寰呭畾
 
 export default {
   name: "Profile",
-  components: { userAvatar, userInfo, resetPwd },
+  components: { userAvatar, userInfo, resetPwd, SFtable },
   data() {
     return {
       user: {},
       roleGroup: {},
       postGroup: {},
+      form: {},
       mznumber: 14,
       zynumber: 34,
       jynumber: 32,
@@ -393,7 +614,19 @@
       sonactiveName: "outpatient", //鍋ュ悍鐩戞祴瀵艰埅
       sontwoactiveName: "blood", //鍖荤枟妗f瀵艰埅
       dynamicTags: ["鏍囩涓�", "鏍囩浜�", "鏍囩涓�"],
+      record: [
+        {
+          name: "瀹f暀浠诲姟",
+        },
+        {
+          name: "閫氱煡浠诲姟",
+        },
+        {
+          name: "闂嵎璋冩煡",
+        },
+      ],
       inputVisible: false,
+      AddanumberVisible: false,
       inputValue: "",
       // 鏌ヨ鍙傛暟
       queryParams: {
@@ -403,6 +636,7 @@
         jobGroup: undefined,
         status: undefined,
       },
+      numberform: {},
       echartdom: {},
       xtechartdom: {},
       tzechartdom: {},
@@ -428,6 +662,26 @@
           address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�",
         },
       ],
+      tableDatalist: [
+        {
+          id: 12,
+          date: "2016-05-02",
+          name: "121",
+          address: "89",
+        },
+        {
+          id: 12,
+          date: "2016-05-02",
+          name: "121",
+          address: "89",
+        },
+        {
+          id: 12,
+          date: "2016-05-02",
+          name: "121",
+          address: "89",
+        },
+      ],
       serviceData: [
         {
           daya: "2023-12-12",
@@ -437,6 +691,52 @@
           doctor: "鍚村ぇ榫�",
         },
       ],
+      options: [
+        {
+          value: "1",
+          label: "浼氬憳",
+        },
+        {
+          value: "2",
+          label: "绯栧翱鐥�",
+        },
+        {
+          value: "3",
+          label: "楂樿鍘�",
+        },
+        {
+          value: "4",
+          label: "浣撴",
+        },
+      ],
+      tableLabelxy: [
+        { label: "娴嬮噺鏃堕棿", width: "", prop: "name" },
+        { label: "鏀剁缉鍘�", width: "", prop: "sex" },
+        { label: "鑸掑紶鍘�", width: "", prop: "age" },
+      ],
+      tableLabelxt: [
+        { label: "娴嬮噺鏃堕棿", width: "", prop: "name" },
+        { label: "鏀剁缉鍘�", width: "", prop: "sex" },
+        { label: "鑸掑紶鍘�", width: "", prop: "age" },
+      ],
+      tableLabeltz: [
+        { label: "娴嬮噺鏃堕棿", width: "", prop: "name" },
+        { label: "韬珮", width: "", prop: "sex" },
+        { label: "浣撻噸", width: "", prop: "age" },
+        { label: "BMI鎸囨暟", width: "", prop: "update_by" },
+      ],
+      tableLabelxl: [
+        { label: "娴嬮噺鏃堕棿", width: "", prop: "name" },
+        { label: "蹇冪巼", width: "", prop: "sex" },
+      ],
+      tableLabelxueyang: [
+        { label: "娴嬮噺鏃堕棿", width: "", prop: "name" },
+        { label: "琛�姘чケ鍜屽害", width: "", prop: "sex" },
+      ],
+      tableLabeltw: [
+        { label: "娴嬮噺鏃堕棿", width: "", prop: "name" },
+        { label: "浣撴俯", width: "", prop: "sex" },
+      ],
     };
   },
   created() {
@@ -444,12 +744,16 @@
       this.echartdom = document.getElementById("xyeCharts");
       this.xtechartdom = document.getElementById("xteCharts");
       this.tzechartdom = document.getElementById("tzeCharts");
-      console.log(this.echartdom);
-      console.log(this.xtechartdom);
-      console.log(this.tzechartdom);
+      this.xlechartdom = document.getElementById("xleCharts");
+      this.xueyangechartdom = document.getElementById("xueyangeCharts");
+      this.twechartdom = document.getElementById("tweCharts");
+
       this.echartsInit();
       this.xtechartsInit();
       this.tzechartsInit();
+      this.xlechartsInit();
+      this.xueyangechartsInit();
+      this.twechartsInit();
     });
     this.getList();
   },
@@ -468,6 +772,8 @@
     handleClick(tab, event) {
       console.log(tab, event);
     },
+    // 鑱旂郴鏂瑰紡鏂板
+    Addanumber() {},
     handleClose(tag) {
       this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
     },
@@ -491,13 +797,7 @@
     // 琛�鍘嬪浘琛ㄩ儴鍒�
     echartsInit() {
       // 鍩轰簬鍑嗗濂界殑dom锛屽垵濮嬪寲echarts瀹炰緥
-      console.log(echarts);
-      console.log(this.echartdom);
-      console.log(this.$refs.xyeCharts);
       var myxyChart = echarts.init(this.echartdom);
-      console.log(myxyChart);
-      // var myxyChart = this.$echarts.init(document.getElementById("xyeCharts"));
-      // var myxyChart = this.$echarts.init(this.$refs.xyeCharts);
       var option = {
         title: {
           text: "鍘嗗彶琛�鍘嬭褰�",
@@ -564,7 +864,6 @@
           },
         ],
       };
-      console.log("ss");
       // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃銆�
       myxyChart.setOption(option);
     },
@@ -606,80 +905,7 @@
         title: {
           text: "鍘嗗彶琛�绯栬褰�",
         },
-        visualMap: [
-          {
-            show: false,
-            type: "continuous",
-            seriesIndex: 0,
-            min: 0,
-            max: 400,
-          },
-        ],
-        title: [
-          {
-            left: "center",
-            text: "琛�绯栧巻鍙茬洃娴�",
-          },
-        ],
-        tooltip: {
-          trigger: "axis",
-        },
-        xAxis: [
-          {
-            data: dateList,
-          },
-        ],
-        yAxis: [{}],
-        series: [
-          {
-            type: "line",
-            showSymbol: false,
-            data: valueList,
-          },
-        ],
-      };
-      console.log("ss");
-      // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃銆�
-      myxyChart.setOption(option);
-    },
-    // 浣撻噸鍥捐〃
-    tzechartsInit() {
-      // 鍩轰簬鍑嗗濂界殑dom锛屽垵濮嬪寲echarts瀹炰緥
-      console.log(echarts);
-      console.log(this.tzechartdom);
-      var myxyChart = echarts.init(this.tzechartdom);
-      console.log(myxyChart);
-      const data = [
-        ["2000-06-05", 116],
-        ["2000-06-06", 99],
-        ["2000-06-07", 105],
-        ["2000-06-08", 126],
-        ["2000-06-09", 73],
-        ["2000-06-10", 85],
-        ["2000-06-11", 73],
-        ["2000-06-12", 68],
-        ["2000-06-13", 92],
-        ["2000-06-14", 130],
-        ["2000-06-15", 245],
-        ["2000-06-16", 119],
-        ["2000-06-17", 115],
-        ["2000-06-18", 201],
-        ["2000-06-19", 209],
-        ["2000-06-20", 106],
-        ["2000-06-21", 137],
-        ["2000-06-22", 128],
-        ["2000-06-23", 85],
-      ];
-      const dateList = data.map(function (item) {
-        return item[0];
-      });
-      const valueList = data.map(function (item) {
-        return item[1];
-      });
-      var option = {
-        title: {
-          text: "鍘嗗彶琛�绯栬褰�",
-        },
+        // 渚ц竟灏忓姛鑳�
         toolbox: {
           show: true,
           feature: {
@@ -742,6 +968,291 @@
       // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃銆�
       myxyChart.setOption(option);
     },
+    // 浣撻噸鍥捐〃
+    tzechartsInit() {
+      // 鍩轰簬鍑嗗濂界殑dom锛屽垵濮嬪寲echarts瀹炰緥
+      console.log(echarts);
+      console.log(this.tzechartdom);
+      var myxyChart = echarts.init(this.tzechartdom);
+      var option = {
+        title: {
+          text: "浣撻噸鎸囨爣鍥�",
+        },
+        tooltip: {
+          trigger: "axis",
+        },
+        legend: {
+          data: ["韬珮", "浣撻噸", "BMI鎸囨暟"],
+        },
+        grid: {
+          left: "3%",
+          right: "4%",
+          bottom: "3%",
+          containLabel: true,
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: {},
+          },
+        },
+        xAxis: {
+          type: "category",
+          boundaryGap: false,
+          data: ["涓�鏈�", "浜屾湀", "涓夋湀", "鍥涙湀", "浜旀湀", "鍏湀", "涓冩湀"],
+        },
+        yAxis: {
+          type: "value",
+        },
+        series: [
+          {
+            name: "韬珮",
+            type: "line",
+            stack: "Total",
+            data: [120, 132, 101, 134, 90, 230, 210],
+          },
+          {
+            name: "浣撻噸",
+            type: "line",
+            stack: "Total",
+            data: [220, 182, 191, 234, 290, 330, 310],
+          },
+
+          {
+            name: "BMI鎸囨暟",
+            type: "line",
+            stack: "Total",
+            data: [320, 332, 301, 334, 390, 330, 320],
+          },
+        ],
+      };
+      // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃銆�
+      myxyChart.setOption(option);
+    },
+    // 蹇冪巼
+    xlechartsInit() {
+      var myxyChart = echarts.init(this.xlechartdom);
+      console.log(myxyChart);
+      const data = [
+        ["2000-06-05", 116],
+        ["2000-06-06", 129],
+        ["2000-06-07", 135],
+        ["2000-06-08", 86],
+        ["2000-06-09", 73],
+        ["2000-06-10", 85],
+        ["2000-06-11", 73],
+        ["2000-06-12", 68],
+        ["2000-06-13", 92],
+        ["2000-06-14", 130],
+        ["2000-06-15", 245],
+        ["2000-06-16", 139],
+        ["2000-06-17", 115],
+        ["2000-06-18", 111],
+        ["2000-06-19", 309],
+        ["2000-06-20", 206],
+        ["2000-06-21", 137],
+        ["2000-06-22", 128],
+        ["2000-06-23", 85],
+      ];
+      const dateList = data.map(function (item) {
+        return item[0];
+      });
+      const valueList = data.map(function (item) {
+        return item[1];
+      });
+      var option = {
+        title: {
+          text: "鍘嗗彶蹇冪巼璁板綍",
+        },
+        visualMap: [
+          {
+            show: false,
+            type: "continuous",
+            seriesIndex: 0,
+            min: 0,
+            max: 400,
+          },
+        ],
+
+        tooltip: {
+          trigger: "axis",
+        },
+        xAxis: [
+          {
+            data: dateList,
+          },
+        ],
+        yAxis: [{}],
+        series: [
+          {
+            type: "line",
+            showSymbol: false,
+            data: valueList,
+            lineStyle: {
+              width: 3,
+              type: "solid",
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                {
+                  offset: 0,
+                  color: "#22a2c3",
+                },
+                {
+                  offset: 1,
+                  color: "#b0d5df",
+                },
+              ]),
+            },
+          },
+        ],
+      };
+      console.log("ss");
+      // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃銆�
+      myxyChart.setOption(option);
+    },
+    // 琛�姘�
+    xueyangechartsInit() {
+      var myxyChart = echarts.init(this.xueyangechartdom);
+      const data = [
+        ["2000-06-05", 116],
+        ["2000-06-06", 129],
+        ["2000-06-07", 135],
+        ["2000-06-08", 86],
+        ["2000-06-09", 73],
+        ["2000-06-10", 85],
+        ["2000-06-11", 73],
+        ["2000-06-12", 68],
+        ["2000-06-13", 92],
+        ["2000-06-14", 130],
+        ["2000-06-15", 245],
+        ["2000-06-16", 139],
+        ["2000-06-17", 115],
+        ["2000-06-18", 111],
+        ["2000-06-19", 309],
+        ["2000-06-20", 206],
+        ["2000-06-21", 137],
+        ["2000-06-22", 128],
+        ["2000-06-23", 85],
+      ];
+      const dateList = data.map(function (item) {
+        return item[0];
+      });
+      const valueList = data.map(function (item) {
+        return item[1];
+      });
+      var option = {
+        title: {
+          text: "鍘嗗彶琛�姘ц褰�",
+        },
+        visualMap: [
+          {
+            show: false,
+            type: "continuous",
+            seriesIndex: 0,
+            min: 0,
+            max: 400,
+          },
+        ],
+
+        tooltip: {
+          trigger: "axis",
+        },
+        xAxis: [
+          {
+            data: dateList,
+          },
+        ],
+        yAxis: [{}],
+        series: [
+          {
+            type: "line",
+            showSymbol: false,
+            data: valueList,
+            lineStyle: {
+              width: 3,
+              type: "solid",
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                {
+                  offset: 0,
+                  color: "#45b787",
+                },
+                {
+                  offset: 1,
+                  color: "#c4d7d6"
+                },
+              ]),
+            },
+          },
+        ],
+      };
+      console.log("ss");
+      // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃銆�
+      myxyChart.setOption(option);
+    },
+    // 浣撴俯
+    twechartsInit() {
+      var myxyChart = echarts.init(this.twechartdom);
+      console.log(myxyChart);
+      const data = [
+        ["2000-06-05", 36.8],
+        ["2000-06-06", 36.2],
+        ["2000-06-07", 37.8],
+        ["2000-06-08",37.8],
+        ["2000-06-09",37.2],
+        ["2000-06-10",36.2],
+        ["2000-06-11",37.8],
+        ["2000-06-12",36.9],
+        ["2000-06-13",36.8],
+        ["2000-06-14", 36.4],
+        ["2000-06-15", 37.1],
+        ["2000-06-16", 36.9],
+        ["2000-06-17", 36.4],
+        ["2000-06-18", 38.8],
+        ["2000-06-19", 37.5],
+        ["2000-06-20", 36.6],
+        ["2000-06-21", 36.8],
+        ["2000-06-22", 36.2],
+        ["2000-06-23",37.8],
+      ];
+      const dateList = data.map(function (item) {
+        return item[0];
+      });
+      const valueList = data.map(function (item) {
+        return item[1];
+      });
+      var option = {
+        title: {
+          text: "鍘嗗彶浣撴俯璁板綍",
+        },
+        visualMap: [
+          {
+            show: false,
+            type: "continuous",
+            seriesIndex: 0,
+            min: 0,
+            max: 400,
+          },
+        ],
+    
+        tooltip: {
+          trigger: "axis",
+        },
+        xAxis: [
+          {
+            data: dateList,
+          },
+        ],
+        yAxis: [{}],
+        series: [
+          {
+            type: "line",
+            showSymbol: false,
+            data: valueList,
+          },
+        ],
+      };
+      console.log("ss");
+      // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃銆�
+      myxyChart.setOption(option);
+    },
   },
 };
 </script>
@@ -770,30 +1281,35 @@
         border-radius: 50%;
       }
     }
+    .text-title {
+      font-size: 20px;
+      font-weight: 500;
+      color: #ecfcfc;
+    }
   }
-  .xinz-inf {
-    font-size: 18px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+}
+.xinz-inf {
+  font-size: 18px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 
-    line-height: 48px;
+  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;
-    }
+  .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;
   }
 }
 .el-tabs--border-card {
@@ -813,25 +1329,18 @@
     margin-top: 25px;
     margin-left: 100px;
     .detailed {
-      width: 70%;
+      width: 88%;
       border-radius: 8px;
       padding: 30px;
       margin-bottom: 30px;
       background-color: #ddf0f8;
-      .one-column {
-        display: flex;
-        font-size: 20px;
-        margin-bottom: 30px;
-        padding-bottom: 3px;
-        .spanvalue {
-          display: inline-block;
-          min-width: 200px;
-          border-bottom: 1px solid rgb(172, 172, 172);
-        }
-
-        div {
-          width: 330px;
-        }
+      .bg-purple {
+        margin-bottom: 20px;
+      }
+      .spanvalue {
+        display: inline-block;
+        min-width: 200px;
+        border-bottom: 1px solid rgb(172, 172, 172);
       }
     }
   }
diff --git a/src/views/repositoryai/intention/index.vue b/src/views/repositoryai/intention/index.vue
index ae0771e..b4d6ba3 100644
--- a/src/views/repositoryai/intention/index.vue
+++ b/src/views/repositoryai/intention/index.vue
@@ -21,48 +21,52 @@
         </el-input>
       </div>
       <div class="bottom-fl">
-        <el-tabs tab-position="right">
-          <el-tab-pane :label="`鍏ㄩ儴 (${numberlb})`"></el-tab-pane>
-          <el-tab-pane
-            class="tab-paness"
-            :key="item.title"
-            v-for="(item, index) in editableTabs"
-          >
-            <span slot="label">
-              {{
-                item.title + " (" + item.number + ")"
-              }}&nbsp&nbsp&nbsp<el-popover
-                placement="top-start"
-                width="100"
-                trigger="hover"
-              >
-                <div style="text-align: center">
-                  <el-button type="text" @click="popoveramend(item)"
-                    >淇敼</el-button
-                  ><el-button type="text" @click="deletefenlei(item)"
-                    ><span style="color: rgb(173, 55, 55)"
-                      >鍒犻櫎</span
-                    ></el-button
-                  >
-                </div>
-                <i slot="reference" class="el-icon-share"></i> </el-popover
-            ></span>
-          </el-tab-pane>
-        </el-tabs>
+        <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-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-top">
-        <el-tabs v-model="topactiveName" @tab-click="tophandleClick">
-          <el-tab-pane name="Local">
-            <span class="mulsz" slot="label">鏅�氭寚鏍囧簱 </span>
-          </el-tab-pane>
-          <el-tab-pane name="sharing">
-            <span class="mulsz" slot="label">鐗瑰畾鎸囨爣搴� </span>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
       <div class="leftvlue-bg">
         <el-row :gutter="20">
           <!--鐢ㄦ埛鏁版嵁-->
@@ -75,7 +79,7 @@
               v-show="showSearch"
               label-width="98px"
             >
-              <el-form-item label="鎸囨爣绉嶇被" prop="userName">
+              <el-form-item label="鎸囨爣鍚嶇О" prop="userName">
                 <el-input
                   v-model="queryParams.userName"
                   placeholder="璇疯緭鍏�"
@@ -84,19 +88,29 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="鎸囨爣鍊�" prop="userName">
-                <el-input
-                  v-model="queryParams.userName"
-                  placeholder="璇疯緭鍏�"
+              <el-form-item label="鏍囩" prop="sickness">
+                <el-cascader
+                  v-model="queryParams.sickness"
+                  :options="optionss"
+                  :props="propss"
                   clearable
-                  style="width: 200px"
-                  @keyup.enter.native="handleQuery"
-                />
+                ></el-cascader>
               </el-form-item>
-              <el-form-item label="璇█" prop="status">
-                <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨">
+              <el-form-item label="閫傜敤鏂瑰紡" prop="shape">
+                <el-cascader
+                  v-model="queryParams.shapevalue"
+                  :options="optionss"
+                  :props="propss"
+                  clearable
+                ></el-cascader>
+              </el-form-item>
+              <el-form-item label="鎸囨爣绫诲瀷" prop="classify">
+                <el-select
+                  v-model="queryParams.classifyvalue"
+                  placeholder="璇烽�夋嫨"
+                >
                   <el-option
-                    v-for="item in languagelist"
+                    v-for="(item, index) in qyoptions"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -104,10 +118,13 @@
                   </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="classify">
+                <el-select
+                  v-model="queryParams.classifyvalue"
+                  placeholder="璇烽�夋嫨"
+                >
                   <el-option
-                    v-for="item in qyoptions"
+                    v-for="(item, index) in qyoptions"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -178,38 +195,47 @@
                 align="center"
                 key="userId"
                 prop="userId"
-                v-if="columns[0].visible"
               />
               <el-table-column
-                label="鎸囨爣绉嶇被"
+                label="鍊肩被鍨�"
                 align="center"
                 key="userName"
                 prop="userName"
-                v-if="columns[1].visible"
                 :show-overflow-tooltip="true"
               />
               <el-table-column
-                label="鎸囨爣鍊�"
+                label="鎸囨爣鍚嶇О"
                 align="center"
                 key="nickName"
                 prop="nickName"
-                v-if="columns[2].visible"
                 :show-overflow-tooltip="true"
               />
 
               <el-table-column
-                label="鎸囨爣瑙勫垯"
+                label="姝e父鍊艰寖鍥�"
+                align="center"
+                key="scope"
+                prop="scope"
+                width="400"
+              />
+              <el-table-column
+                label="鎸囨爣鎻忚堪"
                 align="center"
                 key="aphonenumber"
                 prop="aphonenumber"
-                v-if="columns[4].visible"
                 width="400"
               /><el-table-column
-                label="鎸囨爣绫诲瀷"
+                label="閫傜敤鏂瑰紡"
+                align="center"
+                key="bphonenumbers"
+                prop="bphonenumbers"
+                width="120"
+              />
+              <el-table-column
+                label="閫傜敤鐤剧梾"
                 align="center"
                 key="bphonenumber"
                 prop="bphonenumber"
-                v-if="columns[4].visible"
                 width="120"
               />
               <el-table-column
@@ -217,7 +243,6 @@
                 align="center"
                 key="cphonenumber"
                 prop="cphonenumber"
-                v-if="columns[4].visible"
                 width="120"
               />
               <el-table-column label="鏄惁鍚敤" align="center" key="status">
@@ -250,10 +275,19 @@
                   <el-button
                     size="medium"
                     type="text"
+                    @click="handlemeasurement(scope.row)"
+                    v-hasPermi="['system:user:edit']"
+                    ><span class="button-textcs"
+                      ><i class="el-icon-help"></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-edit"></i>鍒犻櫎</span
+                      ><i class="el-icon-delete"></i>鍒犻櫎</span
                     ></el-button
                   >
                 </template>
@@ -283,8 +317,28 @@
             :rules="rules"
             label-width="100px"
           >
-            <el-row>
-              <el-col :span="24">
+            <el-row v-if="!measurement">
+              <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="12">
+                <el-form-item label="鐗堟湰鍙�" prop="deptId">
+                  <el-input
+                    v-model="indexform.versions"
+                    placeholder="璇疯緭鍏ユ寚鏍囩绫�"
+                    maxlength="40"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row v-if="!measurement">
+              <el-col :span="12">
                 <el-form-item label="璇█" prop="deptId">
                   <el-select
                     v-model="indexform.language"
@@ -299,20 +353,71 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="鏄惁鍙敤" prop="deptId">
+                  <el-select
+                    v-model="indexform.useofstate"
+                    placeholder="璇烽�夋嫨"
+                  >
+                    <el-option
+                      v-for="index in qyoptions"
+                      :key="index.value"
+                      :label="index.label"
+                      :value="index.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
-            <el-row>
+            <el-row v-if="!measurement">
               <el-col :span="24">
-                <el-form-item label="鎸囨爣绉嶇被" prop="nickName">
+                <el-form-item label="鎸囨爣鎻忚堪" prop="nickName">
                   <el-input
                     v-model="indexform.nickName"
-                    placeholder="璇疯緭鍏ユ寚鏍囩绫�"
+                    placeholder="璇疯緭鍏ユ寚鏍囨弿杩�"
                     maxlength="40"
                   />
                 </el-form-item> </el-col
             ></el-row>
-            <el-row>
+            <el-form-item label="鏍囩" prop="desc" v-if="!measurement">
+              <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
+                  placeholder="璇烽�夋嫨"
+                >
+                  <el-option
+                    v-for="item in optionss"
+                    :key="item.label"
+                    :label="item.label"
+                    :value="item.label"
+                  >
+                  </el-option>
+                </el-select>
+                <el-button
+                  v-else
+                  class="button-new-tag"
+                  size="small"
+                  @click="showInput"
+                  >+ 鏂板鏍囩</el-button
+                >
+              </div>
+            </el-form-item>
+            <el-row v-if="!measurement">
               <el-col :span="24">
-                <el-form-item label="鎷涙爣绫诲瀷">
+                <el-form-item label="鍊肩被鍨�">
                   <el-radio-group v-model="indexform.resource">
                     <el-radio label="閫夐」"></el-radio>
                     <el-radio label="鏂囨湰"></el-radio>
@@ -320,55 +425,138 @@
                   </el-radio-group>
                 </el-form-item> </el-col
             ></el-row>
-            <el-row>
+            <el-row v-if="!measurement">
               <el-col :span="24">
-                <el-form-item label="鎸囨爣鍊�" prop="userName">
-                  <el-input
-                    v-model="indexform.userName"
-                    placeholder="璇疯緭鍏ユ墜鏈哄彿"
-                    maxlength="30"
-                  />
+                <el-form-item label="閫傜敤鐤剧梾" prop="userName">
+                  <el-select
+                    v-model="indexform.useofstate"
+                    placeholder="璇烽�夋嫨"
+                  >
+                    <el-option
+                      v-for="index in qyoptions"
+                      :key="index.value"
+                      :label="index.label"
+                      :value="index.value"
+                    ></el-option>
+                  </el-select>
                 </el-form-item> </el-col
             ></el-row>
 
-            <el-row>
+            <el-row v-if="!measurement">
               <el-col :span="24">
-                <el-form-item label="鎸囨爣瑙勫垯" prop="email">
-                  <el-input
-                    v-model="indexform.remark"
-                    type="textarea"
-                    placeholder="璇疯緭鍏ュ唴瀹�"
-                  ></el-input>
+                <el-form-item label="閫傜敤鏂瑰紡" prop="email">
+                  <el-select
+                    v-model="indexform.useofstate"
+                    placeholder="璇烽�夋嫨"
+                  >
+                    <el-option
+                      v-for="index in qyoptions"
+                      :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="鏄惁鍚敤">
-                  <el-radio-group v-model="indexform.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-row>
+            <el-card class="box-card" style="margin-bottom: 20px">
+              <el-table v-loading="loading" :data="testuserList">
+                <el-table-column
+                  label="搴忓彿"
+                  align="center"
+                  key="userid"
+                  prop="userid"
+                  width="50"
+                />
+                <el-table-column
+                  label="鎸囨爣閫夐」"
+                  align="center"
+                  key="nickName"
+                  prop="nickName"
+                  :show-overflow-tooltip="true"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.nickName"
+                      placeholder="璇疯緭鍏ュ唴瀹�"
+                    ></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="瑙f瀽瑙勫垯"
+                  align="center"
+                  key="aphonenumber"
+                  prop="aphonenumber"
+                  width="460"
+                  :show-overflow-tooltip="true"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.aphonenumber"
+                      placeholder="璇疯緭鍏ュ唴瀹�"
+                    ></el-input>
+                  </template>
+                </el-table-column>
 
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="澶囨敞">
+                <el-table-column
+                  label="鎿嶄綔"
+                  align="center"
+                  width="200"
+                  class-name="small-padding fixed-width"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      @click="addoption(scope.row)"
+                      type="success"
+                      icon="el-icon-circle-plus-outline"
+                      circle
+                    ></el-button>
+                    <el-button
+                      type="danger"
+                      icon="el-icon-delete"
+                      circle
+                      @click="deloption(scope.row)"
+                    ></el-button>
+                    <el-button
+                      @click="syioption(scope.row)"
+                      type="primary"
+                      icon="el-icon-top"
+                      circle
+                    ></el-button>
+                    <el-button
+                      @click="xiayioption(scope.row)"
+                      type="primary"
+                      icon="el-icon-bottom"
+                      circle
+                    ></el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-card>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="娴嬭瘯杈撳叆" prop="nickName">
                   <el-input
-                    v-model="indexform.remark"
-                    type="textarea"
-                    placeholder="璇疯緭鍏ュ唴瀹�"
-                  ></el-input>
+                    v-model="testvalue"
+                    placeholder="璇疯緭鍏ユ祴璇曞唴瀹�"
+                    maxlength="40"
+                  />
                 </el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-button type="success">寮�濮嬫祴璇�</el-button>
               </el-col>
             </el-row>
           </el-form>
+          <div>
+            <el-input
+              type="textarea"
+              :rows="4"
+              placeholder="姝ゅ灞曠ず璇嗗埆缁撴灉"
+              v-model="testgovalue"
+            >
+            </el-input>
+          </div>
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
             <el-button @click="cancel">鍙� 娑�</el-button>
@@ -383,6 +571,17 @@
       :visible.sync="dialogFormVisible"
     >
       <el-form :model="classifyform">
+        <el-form-item label="璇烽�夋嫨鎸囨爣澶х被">
+          <el-select v-model="classifyform.broadheading" placeholder="璇烽�夋嫨">
+            <el-option
+              v-for="item in optionss"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item
           :label="amendtag ? '璇疯緭鍏ユ柊鐨勭被鍒悕绉�' : '璇疯緭鍏ョ被鍒悕绉�'"
         >
@@ -442,6 +641,7 @@
       multiple: true,
       // 鏄剧ず鎼滅储鏉′欢
       showSearch: true,
+      measurement: false,
       // 鎬绘潯鏁�
       total: 0,
       namequestionnaire: "",
@@ -451,6 +651,8 @@
       dialogFormVisible: false, //淇敼娣诲姞绫诲埆寮规
       deleteVisible: false, //鍒嗙被鍒犻櫎寮规
       deletefenl: "楂樿鍘�", //鍒犻櫎椤�
+      testvalue: "",
+      testgovalue: "",
       classifyform: {
         categoryname: "",
       }, //绫诲埆琛ㄥ崟
@@ -463,6 +665,28 @@
           aphonenumber: "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10",
           bphonenumber: "閫夋嫨",
           cphonenumber: "鏅�氳瘽",
+        },
+      ],
+      testuserList: [
+        {
+          userid: 1,
+          nickName: "璐",
+          aphonenumber: "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10",
+        },
+        {
+          userid: 2,
+          nickName: "姝e父",
+          aphonenumber: "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10",
+        },
+        {
+          userid: 55,
+          nickName: "闈炴甯�",
+          aphonenumber: "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10",
+        },
+        {
+          userid: 4,
+          nickName: "a姝e父",
+          aphonenumber: "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10",
           status: "0",
         },
       ],
@@ -484,7 +708,10 @@
       dialogFormVisible: false, //娣诲姞绫诲埆寮规
       sidecolumnval: "", //绫诲埆鎼滅储
       indexopen: false, //寮规灞曠ず鍚�
+      inputVisible: false,
+      inputValue: "",
       propss: { multiple: true },
+      dynamicTags: ["鏍囩涓�", "鏍囩浜�", "鏍囩涓�"],
       languagelist: [
         {
           value: 1,
@@ -502,11 +729,29 @@
       qyoptions: [
         {
           value: 1,
-          label: "鍚敤",
+          label: "鍙敤",
         },
         {
           value: 2,
-          label: "鍏抽棴",
+          label: "鍋滅敤",
+        },
+      ],
+      optionss: [
+        {
+          value: 1,
+          label: "绫诲瀷涓�",
+        },
+        {
+          value: 2,
+          label: "绫诲瀷浜�",
+        },
+        {
+          value: 3,
+          label: "绫诲瀷涓�",
+        },
+        {
+          value: 4,
+          label: "绫诲瀷鍥�",
         },
       ],
       //绫诲埆鍒楄〃
@@ -614,6 +859,9 @@
         console.log(this.userList);
       });
     },
+    getIndexInArray(arr, obj) {
+      return arr.indexOf(obj);
+    },
     // 娣诲姞銆佷慨鏀圭被鍒�
     submitsidecolumn() {
       if (this.amendtag) {
@@ -668,6 +916,72 @@
           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);
+    },
+    // 鏍囩-----------------
+    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;
+    },
+    //娴嬭瘯琛ㄥ崟 --------------------------
+    addoption() {
+      this.testuserList.push({
+        userid: 1,
+        nickName: "璐",
+        aphonenumber: "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10",
+      });
+      this.sortFn();
+    },
+    deloption() {
+      const index = this.testuserList.indexOf(item);
+      if (index !== -1) {
+        this.testuserList.splice(index, 1); // 浠庣储寮曚綅缃垹闄や竴涓厓绱�
+        this.sortFn();
+      } else {
+        console.log("鏈壘鍒拌瀵硅薄");
+      }
+    },
+    syioption(row) {
+      const index = this.getIndexInArray(this.testuserList, row);
+      const item = this.testuserList.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+      this.testuserList.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+      this.sortFn();
+    },
+    xiayioption(row) {
+      const index = this.getIndexInArray(this.testuserList, row);
+      const item = this.testuserList.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+      this.testuserList.splice(index + 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+      this.sortFn();
+    },
+    sortFn() {
+      this.testuserList = this.testuserList.map((item, index) => {
+        return {
+          userid: index + 1,
+          nickName: item.nickName,
+          aphonenumber: item.aphonenumber,
+        };
+      });
+      console.log(this.testuserList);
+    },
+// ---------------------
     //鎼滅储绫诲埆
     sidecolumnss() {},
     // 鍒囨崲鍏变韩/鏈湴
@@ -720,12 +1034,20 @@
       this.reset();
       this.title = "鏂板鎸囨爣";
       this.indexopen = true;
+      this.measurement=false;
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
       this.reset();
-      this.title = "淇敼鎸囨爣";
+      this.title = "鎸囨爣璇︽儏";
       this.indexopen = true;
+      this.measurement=false;
+    },
+    handlemeasurement(row) {
+      this.reset();
+      this.title = "鎸囨爣璇︽儏";
+      this.indexopen = true;
+      this.measurement=true;
     },
     // 淇敼鍒嗙被寮规
     popoveramend(tagcategoryid) {
@@ -775,6 +1097,30 @@
 <style lang="scss" scoped>
 .Questionnairemanagement {
   display: flex;
+}
+.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;
+  }
 }
 .sidecolumn {
   width: 300px;
@@ -868,7 +1214,7 @@
 .button-text {
   color: rgb(70, 204, 238);
 }
-.button-textck {
+.button-textcs {
   color: rgb(39, 167, 67);
 }
 .button-textxg {
diff --git a/src/views/repositoryai/verbaltrick/index.vue b/src/views/repositoryai/verbaltrick/index.vue
index 23f7838..e140120 100644
--- a/src/views/repositoryai/verbaltrick/index.vue
+++ b/src/views/repositoryai/verbaltrick/index.vue
@@ -3,7 +3,7 @@
     <!-- 宸︿晶鏍� -->
     <div class="sidecolumn">
       <div class="sidecolumn-top">
-        <div class="top-wj">璇濇湳绫诲瀷</div>
+        <div class="top-wj">闂绫诲瀷</div>
         <div class="top-tj" @click="dialogFormVisible = true">+娣诲姞</div>
       </div>
       <div class="center-ss">
@@ -21,48 +21,52 @@
         </el-input>
       </div>
       <div class="bottom-fl">
-        <el-tabs tab-position="right">
-          <el-tab-pane :label="`鍏ㄩ儴 (${numberlb})`"></el-tab-pane>
-          <el-tab-pane
-            class="tab-paness"
-            :key="item.title"
-            v-for="(item, index) in editableTabs"
-          >
-            <span slot="label">
-              {{
-                item.title + " (" + item.number + ")"
-              }}&nbsp&nbsp&nbsp<el-popover
-                placement="top-start"
-                width="100"
-                trigger="hover"
-              >
-                <div style="text-align: center">
-                  <el-button type="text" @click="popoveramend(item)"
-                    >淇敼</el-button
-                  ><el-button type="text" @click="deletefenlei(item)"
-                    ><span style="color: rgb(173, 55, 55)"
-                      >鍒犻櫎</span
-                    ></el-button
-                  >
-                </div>
-                <i slot="reference" class="el-icon-share"></i> </el-popover
-            ></span>
-          </el-tab-pane>
-        </el-tabs>
+        <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-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-top">
-        <el-tabs v-model="topactiveName" @tab-click="tophandleClick">
-          <el-tab-pane name="Local">
-            <span class="mulsz" slot="label">鏅�氳瘽鏈簱 </span>
-          </el-tab-pane>
-          <el-tab-pane name="sharing">
-            <span class="mulsz" slot="label">鐗瑰畾璇濇湳搴� </span>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
       <div class="leftvlue-bg">
         <el-row :gutter="20">
           <!--鐢ㄦ埛鏁版嵁-->
@@ -75,7 +79,18 @@
               v-show="showSearch"
               label-width="98px"
             >
-              <el-form-item label="璇濇湳涓绘棬" prop="userName">
+              <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="璇疯緭鍏�"
@@ -93,6 +108,17 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
+              <el-form-item label="閫傜敤鏂瑰紡" prop="status">
+                <el-select v-model="queryParams.applyway" 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
@@ -104,7 +130,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="鏄惁鍚敤" prop="status">
+              <el-form-item label="鏄惁鍙敤" prop="status">
                 <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨">
                   <el-option
                     v-for="item in qyoptions"
@@ -158,8 +184,6 @@
                   >鍒犻櫎</el-button
                 >
               </el-col>
-
-              <!-- <el-col :span="1.5"> </el-col> -->
             </el-row>
             <el-table
               v-loading="loading"
@@ -175,7 +199,7 @@
                 prop="userId"
               />
               <el-table-column
-                label="涓绘棬"
+                label="闂涓婚"
                 align="center"
                 key="userName"
                 prop="userName"
@@ -186,7 +210,7 @@
                 align="center"
                 key="nickName"
                 prop="nickName"
-                width="400"
+                width="200"
                 :show-overflow-tooltip="true"
               />
 
@@ -195,19 +219,47 @@
                 align="center"
                 key="aphonenumber"
                 prop="aphonenumber"
-                width="400"
+                width="200"
               /><el-table-column
                 label="鍏宠仈鎸囨爣"
                 align="center"
-                key="bphonenumber"
-                prop="bphonenumber"
+                key="bphonenumbers"
+                prop="bphonenumbers"
+                width="120"
+              />
+              /><el-table-column
+                label="姝e父鍊艰寖鍥�"
+                align="center"
+                key="scope"
+                prop="scope"
+                width="120"
+              />
+              /><el-table-column
+                label="闂鎻忚堪"
+                align="center"
+                key="describe"
+                prop="describe"
+                width="120"
+              />
+              /><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="鎸囨爣閫夐」"
+                label="鏍囩"
                 align="center"
-                key="bphonenumber"
-                prop="bphonenumber"
+                key="taglist"
+                prop="taglist"
                 width="120"
               />
               <el-table-column
@@ -217,7 +269,28 @@
                 prop="indicator"
                 width="120"
               />
-              <el-table-column label="鏄惁鍚敤" align="center" key="status">
+              <el-table-column
+                label="鐗堟湰"
+                align="center"
+                key="versions"
+                prop="versions"
+                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"
@@ -231,7 +304,7 @@
               <el-table-column
                 label="鎿嶄綔"
                 align="center"
-                width="200"
+                width="250"
                 class-name="small-padding fixed-width"
               >
                 <template slot-scope="scope">
@@ -250,7 +323,7 @@
                     @click="compileUpdate(scope.row)"
                     v-hasPermi="['system:user:edit']"
                     ><span class="button-bji"
-                      ><i class="el-icon-edit"></i>缂栬緫璇濇湳</span
+                      ><i class="el-icon-edit"></i>缂栬緫闂</span
                     ></el-button
                   >
                   <el-button
@@ -260,6 +333,15 @@
                     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>
@@ -276,7 +358,7 @@
           </el-col>
         </el-row>
 
-        <!-- 娣诲姞鎴栦慨鏀硅瘽鏈厤缃璇濇 -->
+        <!-- 娣诲姞鎴栦慨鏀归棶棰橀厤缃璇濇 -->
         <el-dialog
           :title="title"
           :visible.sync="indexopen"
@@ -308,10 +390,10 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="璇濇湳涓绘棬" prop="nickName">
+                <el-form-item label="闂涓绘棬" prop="nickName">
                   <el-input
                     v-model="indexform.nickName"
-                    placeholder="璇疯緭鍏ヨ瘽鏈富鏃�"
+                    placeholder="璇疯緭鍏ラ棶棰樹富鏃�"
                     maxlength="80"
                   />
                 </el-form-item> </el-col
@@ -334,13 +416,13 @@
             >
             <el-row>
               <el-col :span="24">
-                <el-form-item label="璇濇湳鏂囨湰" prop="verbaltricktext">
+                <el-form-item label="闂鏂囨湰" prop="verbaltricktext">
                   <el-input v-model="indexform.userName" maxlength="30" />
                 </el-form-item> </el-col
             ></el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="璇濇湳璇煶" prop="verbaltrickyy">
+                <el-form-item label="闂璇煶" prop="verbaltrickyy">
                   <el-input v-model="indexform.userName" maxlength="30" />
                 </el-form-item> </el-col
             ></el-row>
@@ -395,7 +477,7 @@
 
             <el-row>
               <el-col :span="24">
-                <el-form-item label="璇濇湳瑙勫垯" prop="email">
+                <el-form-item label="闂瑙勫垯" prop="email">
                   <el-input
                     v-model="indexform.remark"
                     type="textarea"
@@ -406,7 +488,7 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="鏄惁鍚敤">
+                <el-form-item label="鏄惁鍙敤">
                   <el-radio-group v-model="indexform.qystatus">
                     <el-radio
                       v-for="item in qyoptions"
@@ -445,6 +527,17 @@
       :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"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item
           :label="amendtag ? '璇疯緭鍏ユ柊鐨勭被鍒悕绉�' : '璇疯緭鍏ョ被鍒悕绉�'"
         >
@@ -564,33 +657,33 @@
       qyoptions: [
         {
           value: 1,
-          label: "鍚敤",
+          label: "鍙敤",
         },
         {
           value: 2,
-          label: "鍏抽棴",
+          label: "绂佺敤",
         },
       ],
       //绫诲埆鍒楄〃
       editableTabs: [
         {
-          title: "璇濇湳鍒嗙被涓�",
+          title: "闂鍒嗙被涓�",
           number: "1",
         },
         {
-          title: "璇濇湳鍒嗙被浜�",
+          title: "闂鍒嗙被浜�",
           number: "2",
         },
         {
-          title: "璇濇湳鍒嗙被涓�",
+          title: "闂鍒嗙被涓�",
           number: "2",
         },
         {
-          title: "璇濇湳鍒嗙被鍥�",
+          title: "闂鍒嗙被鍥�",
           number: "2",
         },
         {
-          title: "璇濇湳鍒嗙被浜�",
+          title: "闂鍒嗙被浜�",
           number: "2",
         },
       ],
@@ -713,7 +806,7 @@
     },
     // 棰樼洰鐘舵�佷慨鏀�
     handleStatusChange(row) {
-      let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
+      let text = row.status === "0" ? "鍙敤" : "鍋滅敤";
       this.$modal
         .confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚楋紵')
         .then(function () {
@@ -726,12 +819,20 @@
           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() {},
-    // 鍒囨崲鍏变韩/鏈湴
-    tophandleClick() {},
     // 鍙栨秷鎸夐挳
     cancel() {
       this.indexopen = false;
@@ -778,13 +879,13 @@
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
       this.reset();
-      this.title = "鏂板璇濇湳";
+      this.title = "鏂板闂";
       this.indexopen = true;
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
       this.reset();
-      this.title = "淇敼璇濇湳";
+      this.title = "淇敼闂";
       this.indexopen = true;
     },
     // 淇敼鍒嗙被寮规
diff --git a/vue.config.js b/vue.config.js
index fa7b806..82d5566 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -9,7 +9,7 @@
 
 const name = process.env.VUE_APP_TITLE || '鎮h�呮櫤鎱ф湇鍔$郴缁�' // 缃戦〉鏍囬
 
-const port = process.env.port || process.env.npm_config_port || 8091 // 绔彛
+const port = process.env.port || process.env.npm_config_port || 8099 // 绔彛
 
 // vue.config.js 閰嶇疆璇存槑
 //瀹樻柟vue.config.js 鍙傝�冩枃妗� https://cli.vuejs.org/zh/config/#css-loaderoptions

--
Gitblit v1.9.3