From acde167680dd6accc63fcafa2e9f27eab337cafb Mon Sep 17 00:00:00 2001
From: fy <773589090@qq.com>
Date: Sat, 17 Sep 2022 17:19:56 +0800
Subject: [PATCH 01/40] =?UTF-8?q?feat=EF=BC=9A=E5=AD=A6=E7=A7=91=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module-hmmm/components/tags-add.vue |   4 +-
 src/module-hmmm/pages/tags.vue          | 106 ++++++++++++++++++++----
 2 files changed, 95 insertions(+), 15 deletions(-)

diff --git a/src/module-hmmm/components/tags-add.vue b/src/module-hmmm/components/tags-add.vue
index 7dbeeb2..b274a20 100644
--- a/src/module-hmmm/components/tags-add.vue
+++ b/src/module-hmmm/components/tags-add.vue
@@ -32,6 +32,7 @@
 import { simple } from '@/api/hmmm/subjects'
 import { add, update } from '@/api/hmmm/tags'
 export default {
+  name: 'Tagsadd',
   props: {
     dialogFormVisible: {
       type: Boolean,
@@ -81,8 +82,9 @@ export default {
       this.$refs.newDirectory.resetFields()
     },
     async btnok() {
-      if (this.form.subjectID) {
+      if (this.form.id) {
         await update(this.form)
+        // console.log(this.form.subjectID)
       } else {
         try {
           await add(this.form)
diff --git a/src/module-hmmm/pages/tags.vue b/src/module-hmmm/pages/tags.vue
index aa5b4da..aa21011 100644
--- a/src/module-hmmm/pages/tags.vue
+++ b/src/module-hmmm/pages/tags.vue
@@ -1,5 +1,21 @@
 <template>
-  <div>
+  <div class="tags">
+    <ZyForm ref="zychild" :form-items="formItems">
+      <template #header>
+        <el-button size="small" @click="remove">
+          清除
+        </el-button>
+        <el-button size="small" type="primary" @click="searchbtn">
+          搜索
+        </el-button>
+      </template>
+      <template #footer>
+        <el-button type="success" icon="el-icon-edit" @click="addbtn">
+          新增标签
+        </el-button>
+      </template>
+    </ZyForm>
+    <AlertShow :alert-text="alertText" />
     <el-table
 
       :data="tableData"
@@ -66,6 +82,7 @@
     </el-table>
 
     <el-pagination
+
       background
       :current-page="page.page"
       :page-sizes="[5,10, 20]"
@@ -80,16 +97,29 @@
 </template>
 
 <script>
+import AlertShow from '@/base-ui/alert-show'
+import ZyForm from '@/base-ui/ZyForm'
 import tagsAdd from '../components/tags-add.vue'
 import { list, changeState, simple } from '@/api/hmmm/tags'
+
 // import test from 'node:test'
 export default {
   name: 'Tags',
   components: {
-    tagsAdd
+    tagsAdd, AlertShow, ZyForm
   },
   data() {
+    // const wineList = () => {
+    //   return this.search.state == null && this.search.tagName === ''
+    // }
     return {
+      search: {
+        tagName: '',
+        state: null,
+        page: 1,
+        pagesize: 5,
+        subjectID: 1
+      },
       dialogFormVisible: false,
       title: '新增学科',
       tableData: [{ }],
@@ -98,11 +128,28 @@ export default {
         page: 1,
         pagesize: 5,
         total: null
-      }
+      },
+      formItems: [{
+        field: 'tagName',
+        type: 'input',
+        label: '标签名称',
+        rules: []
 
+      }, {
+        field: 'state',
+        type: 'select',
+        label: '状态',
+        placeholder: '请选择',
+        options: [
+          { title: '启用', value: 1 },
+          { title: '禁用', value: 0 }
+        ]
+      }],
+      alertText: ''
     }
   },
   created () {
+    // console.log(this.wineList)
     this.list()
     this.simple()
   },
@@ -112,43 +159,74 @@ export default {
     },
     async simple() {
       const { data } = await simple()
-      // console.log(data, '++++++')
       this.page.total = data.length
+      this.alertText = `当前数据共${this.page.total}条`
     },
     async list () {
-      const { data: { items } } = await list(this.page)
-      this.tableData = items
+      if (this.search.state == null && this.search.tagName === '') {
+        const { data: { items } } = await list(this.page)
+        this.tableData = items
+        this.simple()
+      } else {
+        const { data } = await list(this.search)
+        this.page.total = data.counts
+        this.tableData = data.items
+        this.alertText = `当前数据共${data.counts}条`
+      }
     },
     async disable(id, state) { // 标签状态
-      // console.log()
       const data = { id: id, state: state }
       try {
         await changeState(data)
       } catch (error) {
         console.log(error)
       }
-
-      this.$message.success('操作成功')
       this.list()
+      this.$message.success('操作成功')
     },
     SizeChange(pagesize) {
-      this.page.pagesize = pagesize
-      this.list()
+      if (this.search.state == null && this.search.tagName === '') {
+        this.page.pagesize = pagesize
+      } else {
+        this.search.pagesize = pagesize
+      } this.list()
     },
     CurrentChange(page) {
-      this.page.page = page
-      this.list()
+      if (this.search.state == null && this.search.tagName === '') {
+        this.page.page = page
+      } else {
+        this.search.page = page
+      } this.list()
     },
     edit(row) {
       this.$refs.dialog.dialog(row)
       this.title = '编辑学科'
       this.dialogFormVisible = true
+    },
+    addbtn() {
+      this.title = '新增目录'
+      this.dialogFormVisible = true
+    },
+    remove() {
+      this.$refs.zychild.MyFormData = {}
+      this.search = {}
+      this.list()
+    },
+    searchbtn() {
+      this.search.state = this.$refs.zychild.MyFormData.state
+      this.search.tagName = this.$refs.zychild.MyFormData.tagName
+      this.list()
     }
-
   }
 }
 </script>
 <style>
+  .tags{
+    margin: 10px;
+    padding: 15px;
+    border: 1px solid #ebeef5;
+    background-color: #fff;
+  }
   .el-pagination {
     text-align: end
   }
-- 
Gitee


From df1cfc187c8ad9c4068f860fb3de6b8203bb0dff Mon Sep 17 00:00:00 2001
From: wzy <wzyzzqq@163.com>
Date: Sat, 17 Sep 2022 17:20:51 +0800
Subject: [PATCH 02/40] doc(wzy): add 2022/9/17 pm summary

---
 doc/wzy.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/wzy.md b/doc/wzy.md
index 13158a2..10d2aa5 100644
--- a/doc/wzy.md
+++ b/doc/wzy.md
@@ -71,6 +71,14 @@ propE: {
 },
 ```
 
+> time: 2022/9/17
 
+#### v-if引发的bug
 
-​		
\ No newline at end of file
+- vue2中 v-if 标签中无法识别 ?? 必须使用 ||
+
+```vue
+<template v-if="item.type === 'input' || item.type === 'password'">
+```
+
+​	
\ No newline at end of file
-- 
Gitee


From 7bd1aab04ac354c3d9f8ebef46932a93486f271a Mon Sep 17 00:00:00 2001
From: wzy <wzyzzqq@163.com>
Date: Sat, 17 Sep 2022 17:22:20 +0800
Subject: [PATCH 03/40] feat(wzy): the public component Zyform & QuestionsNew

---
 src/base-ui/ZyForm/src/zy-form.vue            |  66 +++++-
 .../questions-new/config/formConfig.config.js | 204 ++++++++++++++++--
 .../pages/questions-new/src/questions-new.vue |  46 +++-
 3 files changed, 279 insertions(+), 37 deletions(-)

diff --git a/src/base-ui/ZyForm/src/zy-form.vue b/src/base-ui/ZyForm/src/zy-form.vue
index 3282027..68de677 100644
--- a/src/base-ui/ZyForm/src/zy-form.vue
+++ b/src/base-ui/ZyForm/src/zy-form.vue
@@ -1,20 +1,35 @@
 <template>
   <div class="zy-form">
+    <!-- 头部内容插槽 -->
     <header class="header">
       <slot name="header" />
     </header>
-    <el-form :label-width="labelWidth">
-      <el-row>
+    <!-- form内容部分 -->
+    <el-form
+      ref="ruleForm"
+      :label-width="labelWidth"
+      :label-position="labelPosition"
+      :model="MyFormData"
+    >
+      <el-row class="zy-form-row">
         <el-col v-for="item of formItems" :key="item.label" v-bind="colLayout">
           <el-form-item
             :label="item.label"
             :rules="item.rules"
             :style="itemStyle"
+            :prop="item.field"
           >
             <!-- input -->
-            <template v-if="item.type === 'input' || item.type === 'password'">
+            <template
+              v-if="
+                item.type === 'input' ||
+                  item.type === 'password' ||
+                  item.type === 'textarea'
+              "
+            >
               <el-input
                 v-model="MyFormData[`${item.field}`]"
+                :type="item.type === 'textarea' ? 'textarea' : ''"
                 style="width: 100%"
                 v-bind="item.otherOptions"
                 :placeholder="item.placeholder"
@@ -22,12 +37,12 @@
               />
             </template>
             <!-- select -->
-            <template v-else-if="item.type === 'select'">
+            <template v-if="item.type === 'select' || item.type === 'tags'">
               <el-select
                 v-model="MyFormData[`${item.field}`]"
-                style="width: 100%"
                 v-bind="item.otherOptions"
                 :placeholder="item.placeholder"
+                :multiple="item.type === 'tags'"
               >
                 <el-option
                   v-for="option of item.options"
@@ -39,6 +54,23 @@
                 </el-option>
               </el-select>
             </template>
+            <!-- radio -->
+            <template v-else-if="item.type === 'radio'">
+              <el-radio-group v-model="MyFormData[`${item.field}`]">
+                <el-radio
+                  v-for="option of item.options"
+                  :key="option.title"
+                  v-bind="item.otherOptions"
+                  :label="option.label"
+                >
+                  {{ option.title }}
+                </el-radio>
+              </el-radio-group>
+            </template>
+            <!-- 提供自定义内容 定义内容 没有公用性 -->
+            <template v-else-if="item.type === 'more'">
+              <slot name="more" />
+            </template>
             <!-- datepicker -->
             <!-- <template v-else-if="item.type === 'datepicker'">
               <el-date-picker
@@ -51,6 +83,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <!-- 底部内容插槽 -->
     <footer class="footer">
       <slot name="footer" />
     </footer>
@@ -77,7 +110,11 @@ export default {
     },
     labelWidth: {
       type: String,
-      default: '100px'
+      default: '80px'
+    },
+    labelPosition: {
+      type: String,
+      default: 'right'
     },
     itemStyle: {
       type: Object,
@@ -87,7 +124,7 @@ export default {
       type: Object,
       default: () => ({
         xl: 6,
-        lg: 8,
+        lg: 6,
         md: 12,
         sm: 24,
         xs: 24
@@ -106,8 +143,19 @@ export default {
       },
       deep: true
     }
+  },
+  mounted() {
+    // console.log(this.$refs.ruleForm)
   }
 }
 </script>
-
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.zy-form {
+  // .zy-form-row {
+  //   // margin: ;
+  // }
+  ::v-deep(.el-form-item) {
+    padding: 0 !important;
+  }
+}
+</style>
diff --git a/src/module-hmmm/pages/questions-new/config/formConfig.config.js b/src/module-hmmm/pages/questions-new/config/formConfig.config.js
index 8bcab12..6a38b19 100644
--- a/src/module-hmmm/pages/questions-new/config/formConfig.config.js
+++ b/src/module-hmmm/pages/questions-new/config/formConfig.config.js
@@ -1,38 +1,202 @@
 export const formConfig = {
-  labelWidth: '90px',
-  itemLayout: {
-    padding: '10px 30px'
+  labelWidth: '85px',
+  labelPosition: 'left',
+  // itemLayout: {
+  //   padding: '10px 30px'
+  // },
+  colLayout: {
+    xl: 24,
+    lg: 24,
+    md: 24,
+    sm: 24,
+    xs: 24
   },
   formItems: [
+    // 学科
     {
-      field: 'id',
-      type: 'input',
-      label: 'id',
-      rules: [],
-      placeholder: '请输入id'
+      field: 'subjectID',
+      type: 'select',
+      label: '学科:',
+      rules: [
+        {
+          required: true,
+          message: '请输入学科',
+          trigger: 'blur'
+        }
+      ],
+      placeholder: '请选择',
+      otherOptions: {
+        style: 'max-width: 400px'
+      },
+      options: [
+        { title: '篮球', value: 'basketball' },
+        { title: '足球', value: 'football' }
+      ]
+    },
+    // 目录
+    {
+      field: 'catalogID',
+      type: 'select',
+      label: '目录:',
+      rules: [
+        {
+          required: true,
+          message: '请输入目录',
+          trigger: 'blur'
+        }
+      ],
+      placeholder: '请选择',
+      otherOptions: {
+        style: 'max-width: 400px'
+      }
+    },
+    // 企业
+    {
+      field: 'enterpriseID',
+      type: 'select',
+      label: '企业:',
+      rules: [
+        {
+          required: true,
+          message: '请输入企业',
+          trigger: 'blur'
+        }
+      ],
+      placeholder: '请选择',
+      otherOptions: {
+        style: 'max-width: 400px',
+        clearable: true
+      }
+    },
+    // 城市 ？？？
+    {
+      field: 'province,city',
+      type: 'select',
+      label: '城市:',
+      rules: [
+        {
+          required: true,
+          message: '请输入城市',
+          trigger: 'blur'
+        }
+      ],
+      placeholder: '请选择',
+      otherOptions: {
+        style: 'max-width: 400px',
+        clearable: true
+      }
     },
+    // 方向
     {
-      field: 'name',
+      field: 'direction',
+      type: 'select',
+      label: '方向:',
+      rules: [
+        {
+          required: true,
+          message: '请输入方向',
+          trigger: 'blur'
+        }
+      ],
+      placeholder: '请选择',
+      otherOptions: {
+        style: 'max-width: 400px'
+      }
+    },
+    // 题型
+    {
+      field: 'questionType',
+      type: 'radio',
+      label: '题型:',
+      rules: [
+        {
+          required: true,
+          message: '请输入题型',
+          trigger: 'blur'
+        }
+      ],
+      options: [
+        { title: '单选', label: '1' },
+        { title: '多选', label: '2' },
+        { title: '简答', label: '3' }
+      ]
+    },
+    // 难度
+    {
+      field: 'difficulty',
+      type: 'radio',
+      label: '难度:',
+      rules: [
+        {
+          required: true,
+          message: '请输入难度',
+          trigger: 'blur'
+        }
+      ],
+      options: [
+        { title: '简单', label: '1' },
+        { title: '一般', label: '2' },
+        { title: '困难', label: '3' }
+      ]
+    },
+    // 题干
+
+    // 选项
+    {},
+
+    // 解析视频
+    {
+      field: 'videoURL',
       type: 'input',
-      label: '用户名',
+      label: '解析视频:',
       rules: [],
-      placeholder: '请输入用户名'
+      placeholder: '请输入视频地址',
+      otherOptions: {
+        style: 'max-width: 400px'
+      }
     },
+    // 答案解析
+
+    // 题目备注
     {
-      field: 'password',
-      type: 'password',
-      label: '密码',
-      placeholder: '请输入密码'
+      field: 'remarks',
+      type: 'textarea',
+      label: '题目备注:',
+      rules: [],
+      placeholder: '请输入题目备注',
+      otherOptions: {
+        style: 'max-width: 400px',
+        maxlength: '100',
+        'show-word-limit': true
+      }
     },
+    // 试题标签
     {
-      field: 'sport',
-      type: 'select',
-      label: '喜欢的运动',
-      placeholder: '请输入喜欢的运动',
+      field: 'tags',
+      type: 'tags',
+      label: '试题标签:',
+      rules: [],
+      placeholder: '请选择试题标签',
+      otherOptions: {
+        style: 'max-width: 400px'
+      },
       options: [
         { title: '篮球', value: 'basketball' },
-        { title: '足球', value: 'football' }
+        { title: '足球', value: 'football' },
+        { title: '球', value: 'footbalafafasl' }
       ]
     }
+    //   field: 'sport',
+    //   type: 'select',
+    //   label: '喜欢的运动',
+    //   placeholder: '请输入喜欢的运动',
+    //   options: [
+    //     { title: '篮球', value: 'basketball' },
+    //     { title: '足球', value: 'football' }
+    //   ]
+    // },
+    // {
+    //   type: 'more'
+    // }
   ]
 }
diff --git a/src/module-hmmm/pages/questions-new/src/questions-new.vue b/src/module-hmmm/pages/questions-new/src/questions-new.vue
index bf4a459..7ab6a52 100644
--- a/src/module-hmmm/pages/questions-new/src/questions-new.vue
+++ b/src/module-hmmm/pages/questions-new/src/questions-new.vue
@@ -1,7 +1,20 @@
 <template>
-  <div>
-    <zy-form :form-data.sync="formData" v-bind="formConfig" />
-    <h1>adaf</h1>
+  <div class="questions-new">
+    <el-card>
+      <zy-form :form-data.sync="formData" v-bind="formConfig">
+        <template #header>
+          <span>试题录入</span>
+          <el-divider />
+        </template>
+        <template #footer>
+          <el-row type="flex" justify="center" align="middle">
+            <el-button type="primary" size="medium">
+              确认提交
+            </el-button>
+          </el-row>
+        </template>
+      </zy-form>
+    </el-card>
   </div>
 </template>
 
@@ -17,14 +30,31 @@ export default {
     return {
       formConfig,
       formData: {
-        id: '',
-        name: '',
-        password: '',
-        sport: ''
+        subjectID: '',
+        catalogID: '',
+        enterpriseID: '',
+        province: '',
+        city: '',
+        direction: '',
+        questionType: '',
+        difficulty: '',
+        question: '',
+        options: [],
+        videoURL: '',
+        answer: '',
+        remarks: '',
+        tags: []
       }
     }
+  },
+  mounted() {
+    // console.log(this.$refs.www)
   }
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.questions-new {
+  padding: 8px;
+}
+</style>
-- 
Gitee


From 8af8d86a44fafaba9006dbf6aee11dd56e558fd8 Mon Sep 17 00:00:00 2001
From: xx <zqx123@126.com>
Date: Sat, 17 Sep 2022 20:03:59 +0800
Subject: [PATCH 04/40] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/permissions.js                   |   6 +
 src/module-manage/components/page-tool.vue    |   4 +
 .../components/permissions-add.vue            |  62 ++++--
 src/module-manage/pages/permissions.vue       | 195 +++++++++++++++++-
 src/utils/request.js                          |   3 +-
 vue.config.js                                 |   1 +
 yarn.lock                                     |   2 +-
 7 files changed, 254 insertions(+), 19 deletions(-)

diff --git a/src/api/base/permissions.js b/src/api/base/permissions.js
index bddb153..ac95898 100644
--- a/src/api/base/permissions.js
+++ b/src/api/base/permissions.js
@@ -1,11 +1,17 @@
 import { createAPI } from '@/utils/request'
 
+// 权限列表
 export const list = (data) => createAPI('/permissions', 'get', data)
+// 权限组简单列表
 export const simple = (data) => createAPI('/permissions/simple', 'get', data)
+// 添加
 export const add = (data) => createAPI('/permissions', 'post', data)
+// 修改
 export const update = (data) =>
   createAPI(`/permissions/${data.id}`, 'put', data)
+// 删除
 export const remove = (data) =>
   createAPI(`/permissions/${data.id}`, 'delete', data)
+// 获取详情
 export const detail = (data) =>
   createAPI(`/permissions/${data.id}`, 'get', data)
diff --git a/src/module-manage/components/page-tool.vue b/src/module-manage/components/page-tool.vue
index c3ba2c8..73855fc 100644
--- a/src/module-manage/components/page-tool.vue
+++ b/src/module-manage/components/page-tool.vue
@@ -32,6 +32,10 @@ export default {
 }
 </script>
 <style>
+.pages{
+  margin-top: 10px;
+  text-align: end;
+}
 .blue {
   color: #409eff;
 }
diff --git a/src/module-manage/components/permissions-add.vue b/src/module-manage/components/permissions-add.vue
index 1d4cae5..bd9d870 100644
--- a/src/module-manage/components/permissions-add.vue
+++ b/src/module-manage/components/permissions-add.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="add-form">
-    <el-dialog :title="text + pageTitle" :visible.sync="dialogFormVisible">
+    <el-dialog :title="text + pageTitle" :visible="dialogFormVisible" @close="handleClose">
       <el-form
         ref="dataForm"
         :rules="ruleInline"
@@ -29,7 +29,7 @@
         <el-button @click="handleClose">
           {{ $t('table.cancel') }}
         </el-button>
-        <el-button type="primary" @click="handleAdd('formBase')">
+        <el-button type="primary" @click="handleAdd(formBase)">
           {{ $t('table.confirm') }}
         </el-button>
       </div>
@@ -42,10 +42,32 @@ import { list } from '@/api/base/menus.js'
 let _this = []
 export default {
   name: 'UsersAdd',
-  props: ['text', 'pageTitle', 'ruleInline'],
+  props: {
+
+    obj: {
+      type: Object,
+      default: null
+    },
+    text: {
+      type: String,
+      default: null
+    },
+    pageTitle: {
+      type: String,
+      default: null
+    },
+    ruleInline: {
+      type: Object,
+      default: null
+    },
+    dialogFormVisible: {
+      type: Boolean,
+      default: false
+    }
+  },
   data() {
     return {
-      dialogFormVisible: false,
+      // dialogFormVisible: true,
       PermissionGroupsmenu: [],
       defaultProps: {
         label: 'title'
@@ -130,15 +152,16 @@ export default {
   methods: {
     // 弹层显示
     dialogFormV() {
-      this.dialogFormVisible = true
+      this.$emit('update:dialogFormVisible', false)
     },
     // 弹层隐藏
     dialogFormH() {
-      this.dialogFormVisible = false
+      this.$emit('update:dialogFormVisible', false)
     },
     // 退出
     handleClose() {
-      this.$emit('handleCloseModal')
+      this.$emit('update:dialogFormVisible')
+      this.handleResetForm()
     },
     // 表单重置
     handleResetForm() {
@@ -147,17 +170,20 @@ export default {
         title: '',
         permissions: []
       }
+      this.curPermissions = []
+      this.treeCheckedNodes = []
     },
     // 编辑详情数据加载
-    hanldeEditForm(objeditId) {
-      this.formBase.id = objeditId
+    hanldeEditForm(id) {
+      this.formBase.id = id
       var data = {
-        id: objeditId
+        id: id
       }
       detail(data).then((ret, err) => {
         if (err) {
           return err
         }
+        console.log(data)
         this.formBase.id = ret.data.id
         this.formBase.title = ret.data.title
         this.formBase.permissions = ret.data.permissions
@@ -173,6 +199,7 @@ export default {
     handleCheckChange(data, checked, indeterminate) {
       this.treeCheckedNodes = checked.checkedNodes
     },
+
     // 表单提交
     handleAdd(object) {
       // 读取完整节点
@@ -197,6 +224,7 @@ export default {
       //   return false
       // }
       // 已选中的控件节点
+      console.log(curPermissions)
       if (this.treeCheckedNodes.length === 0) {
         this.treeCheckedNodes = this.$refs.treeMenu.getCheckedNodes()
         if (this.treeCheckedNodes.length === 0) {
@@ -209,16 +237,16 @@ export default {
         curPermissions.add(it.id)
       }
       this.curPermissions = Array.from(curPermissions)
+      console.log(this.curPermissions)
       // 保存
       if (this.curPermissions.length === 0) {
-        this.$message({
-          showClose: true,
-          message: '请选择需要的权限及页面权限点',
-          type: 'error'
-        })
+        alert(11)
+        this.$message.success('请输入需要的权限点')
       } else {
         this.dataFormSub(this.curPermissions)
       }
+      this.$emit('update:dialogFormVisible', false)
+      this.$parent.getlist()
     },
     nodeDate(nodesPath, curPermissions, findId) {
       nodesPath.map(function (item, index) {
@@ -241,6 +269,8 @@ export default {
             }
             update(data).then(() => {
               this.$emit('newDataes', this.formBase)
+              this.$parent.getlist()
+              this.handleResetForm()
             })
           } else {
             add({
@@ -248,6 +278,8 @@ export default {
               permissions: curPermis
             }).then(() => {
               this.$emit('newDataes', this.formBase)
+              this.handleResetForm()
+              this.$parent.getlist()
             })
           }
         } else {
diff --git a/src/module-manage/pages/permissions.vue b/src/module-manage/pages/permissions.vue
index 682baf7..98cd732 100644
--- a/src/module-manage/pages/permissions.vue
+++ b/src/module-manage/pages/permissions.vue
@@ -2,14 +2,205 @@
   <div class="dashboard-container">
     <div class="app-container">
       <el-card shadow="never">
-        权限
+        <el-form :inline="true" :model="requestParameters" class="demo-form-inline">
+          <el-form-item size="small">
+            <el-input v-model="requestParameters.title" placeholder="根据用户名搜索" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              size="small"
+              @click="eliminate"
+            >
+              清除
+            </el-button>
+            <el-button
+              type="primary"
+              size="small"
+              @click="search"
+            >
+              搜索
+            </el-button>
+          </el-form-item>
+          <el-button
+            type="success"
+            size="small"
+            class="btn"
+            @click="add"
+          >
+            <i class="el-icon-edit" />新增权限组
+          </el-button>
+        </el-form>
+        <el-alert
+          class="alert"
+          :title="title"
+          type="info"
+          show-icon
+          :closable="false"
+        />
+        <el-table
+          ref="multipleTable"
+          :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+          highlight-current-row
+          tooltip-effect="dark"
+          :data="list"
+          fit
+          style="width: 100%"
+          :default-sort="{prop: 'date', order: 'descending'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+          />
+          <el-table-column
+            label="用户名"
+            width="“380"
+            align="center"
+            prop="title"
+          />
+          <el-table-column
+            sortable
+            width="350"
+            label="日期"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.create_date | parseTimeByString("{y}-{m}-{d}") }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            width="120"
+            align="center"
+            label="操作"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-button type="primary" icon="el-icon-edit" circle plain @click="amend(scope.row)" />
+              <el-button type="danger" icon="el-icon-delete" circle plain @click="detel(scope.row)" />
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- 分页插件 -->
+        <page-tool
+          :pagination-page="currentPage"
+          :pagination-pagesize="pageSize"
+          :total="total"
+
+          @pageChange="handleCurrentChange"
+          @pageSizeChange="handleSizeChange"
+        />
       </el-card>
+      <!-- 弹窗组件 -->
+      <permissionsAdd
+        ref="myamend"
+        :text="text"
+        :page-title="pageTitle"
+        :rule-inline="ruleInline"
+        :dialog-form-visible.sync="dialogFormVisible"
+      />
     </div>
   </div>
 </template>
 <style rel="stylesheet/scss" lang="scss" scoped></style>
 <script>
+import pageTool from '../components/page-tool.vue'
+import { list, remove } from '@/api/base/permissions'
+import permissionsAdd from '../components/permissions-add.vue'
 export default {
-  name: 'BasePermissions'
+  name: 'BasePermissions',
+  components: {
+    pageTool,
+    permissionsAdd
+  },
+  data() {
+    return {
+      list: [], // 列表
+      currentPage: '',
+      pageSize: 10,
+      total: '',
+      title: '',
+      text: '',
+      pageTitle: '权限组',
+      dialogFormVisible: false,
+      id: null,
+      requestParameters: {
+        page: 1,
+        pagesize: 10,
+        title: this.title
+      },
+      ruleInline: {
+        // 表单验证
+        title: [{ required: true, message: '用户名不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  created () {
+    this.getlist()
+  },
+  methods: {
+    async getlist() {
+      const res = await list(this.requestParameters)
+      console.log(res)
+      this.list = res.data.list
+      this.currentPage = res.data.page
+      this.total = res.data.counts
+      this.title = `共 ${this.total} 条记录`
+    },
+    onSubmit() {
+
+    },
+    add() {
+      console.log(this.dialogFormVisible)
+      this.dialogFormVisible = true
+      this.text = '添加'
+    },
+    amend(row) {
+      this.text = '修改'
+      this.$refs.myamend.hanldeEditForm(row.id)
+      this.dialogFormVisible = true
+    },
+    async detel(row) {
+      console.log(row)
+      try {
+        await this.$confirm('你确定删除该员工')
+        await remove(row)
+        this.getlist()
+        this.$message.success('操作成功')
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    handleSizeChange (val) {
+      this.requestParameters.pagesize = val
+      if (this.requestParameters.page === 1) {
+        this.getlist(this.requestParameters)
+      }
+    },
+    // 进入某一页
+    handleCurrentChange (val) {
+      this.requestParameters.page = val
+      this.getlist()
+    },
+    // 搜索
+    search() {
+      this.requestParameters.page = 1
+      this.getlist(this.requestParameters)
+    },
+    // 清除
+    eliminate() {
+      this.requestParameters.title = ''
+      this.getlist(this.requestParameters)
+    }
+
+  }
+
 }
 </script>
+<style scoped>
+.btn{
+  position: absolute;
+  right: 50px;
+}
+.alert{
+  margin-bottom: 20px;
+}
+
+</style>
diff --git a/src/utils/request.js b/src/utils/request.js
index abc7d4a..5b9f76c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -5,7 +5,8 @@ import { getToken } from '@/utils/auth'
 
 // create an axios instance
 const instance = axios.create({
-  baseURL: 'http://127.0.0.1:7001/', // http://39.105.1.33:7001/ api的base_url
+  // baseURL: '192.168.34.80:7001/', // http://39.105.1.33:7001/ api的base_url
+  baseURL: 'http://hmmm-api.itheima.net/', // http://39.105.1.33:7001/ api的base_url
   timeout: 5000 // request timeout
 })
 
diff --git a/vue.config.js b/vue.config.js
index 8466fd6..ca60cbe 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -13,6 +13,7 @@ module.exports = {
       }
     }
   },
+
   chainWebpack: (config) => {
     const svgRule = config.module.rule('svg')
     svgRule.uses.clear()
diff --git a/yarn.lock b/yarn.lock
index 726e0f4..974c5e9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5109,7 +5109,7 @@ human-signals@^1.1.1:
   resolved "https://registry.npmmirror.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-husky@^8.0.1:
+husky@^8.0.0:
   version "8.0.1"
   resolved "https://registry.npmmirror.com/husky/-/husky-8.0.1.tgz#511cb3e57de3e3190514ae49ed50f6bc3f50b3e9"
   integrity sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==
-- 
Gitee


From a5d4b34decf405a66af0444de90f40322b5be678 Mon Sep 17 00:00:00 2001
From: zwc <434657279@qq.com>
Date: Sat, 17 Sep 2022 20:06:41 +0800
Subject: [PATCH 05/40] =?UTF-8?q?=E9=BB=91=E9=A9=AC=E9=9D=A2=E9=9D=A2?=
 =?UTF-8?q?=E7=B2=BE=E9=80=89=E8=AF=95=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/QuestionChoiceSelect.vue       |  50 ++
 .../QuestionsChoiceNavbar/index.vue           | 148 ++++++
 src/components/index.js                       |   8 +
 src/main.js                                   |   2 +
 src/module-hmmm/pages/questions-choice.vue    | 450 +++++++++++++++++-
 yarn.lock                                     |   2 +-
 6 files changed, 655 insertions(+), 5 deletions(-)
 create mode 100644 src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
 create mode 100644 src/components/QuestionsChoiceNavbar/index.vue
 create mode 100644 src/components/index.js

diff --git a/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue b/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
new file mode 100644
index 0000000..68bd06e
--- /dev/null
+++ b/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
@@ -0,0 +1,50 @@
+<template>
+  <div class="container">
+    <template>
+      <span class="project">{{ name }}</span>
+      <el-select v-model="value" placeholder="请选择" size="small" style="width:240px">
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+    </template>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ['name'],
+  data() {
+    return {
+      options: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }, {
+        value: '选项3',
+        label: '蚵仔煎'
+      }, {
+        value: '选项4',
+        label: '龙须面'
+      }, {
+        value: '选项5',
+        label: '北京烤鸭'
+      }],
+      value: ''
+    }
+  }
+}
+</script>
+
+<style scoped >
+.project{
+  margin-right: 10px;
+  color: #606266;
+  font-weight: 700;
+}
+</style>
diff --git a/src/components/QuestionsChoiceNavbar/index.vue b/src/components/QuestionsChoiceNavbar/index.vue
new file mode 100644
index 0000000..47a30f0
--- /dev/null
+++ b/src/components/QuestionsChoiceNavbar/index.vue
@@ -0,0 +1,148 @@
+<template>
+  <div>
+    <div class="head">
+      <div class="subject">
+        <QuestionChoiceSelect :name="subject" />
+      </div>
+      <div class="subject">
+        <QuestionChoiceSelect :name="directory" />
+      </div>
+      <div class="subject">
+        <QuestionChoiceSelect :name="label" />
+      </div>
+      <div class="subject">
+        <span class="keyword">关键字</span>
+        <el-input v-model="input" placeholder="根据题干搜索" size="small" style="width:240px" />
+      </div>
+    </div>
+    <div class="second">
+      <div class="subject">
+        <QuestionChoiceSelect :name="type" />
+      </div>
+      <div class="subject">
+        <QuestionChoiceSelect :name="difficulty" />
+      </div>
+      <div class="subject">
+        <QuestionChoiceSelect :name="direction" />
+      </div>
+      <div class="subject">
+        <QuestionChoiceSelect :name="Entered" />
+      </div>
+    </div>
+    <div class="second">
+      <div class="subject">
+        <span class="keyword">题目备注</span>
+        <el-input v-model="input" size="small" style="width:240px" />
+      </div>
+      <div class="subject">
+        <span class="keyword">企业简称</span>
+        <el-input v-model="input" size="small" style="width:240px" />
+      </div>
+      <div class="city" style="width:320px">
+        <span class="keyword">城市</span>
+        <template>
+          <el-select v-model="value1" placeholder="请选择" size="small" style="width:116px;height: 32px;">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+          <el-select
+            v-model="value2"
+            collapse-tags
+            size="small"
+            style="margin-left: 10px;width:116px;height: 32px;"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+      </div>
+      <div style="width:320px" class="button">
+        <el-button style="height:32px">
+          清除
+        </el-button>
+        <el-button type="primary" style="height:32px">
+          搜索
+        </el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      subject: '学科',
+      directory: '二级目录',
+      label: '标签',
+      type: '试题类型',
+      difficulty: '难度',
+      direction: '方向',
+      Entered: '录入人',
+      input: '',
+      options: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }, {
+        value: '选项3',
+        label: '蚵仔煎'
+      }, {
+        value: '选项4',
+        label: '龙须面'
+      }, {
+        value: '选项5',
+        label: '北京烤鸭'
+      }],
+      value1: [],
+      value2: [],
+      activeName: 'first'
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+.head{
+  margin-top: 10px;
+  display: flex;
+  justify-content:space-between;
+}
+.subject{
+  display: flex;
+  justify-content: end;
+  width: 320px;
+}
+.second{
+  margin-top: 20px;
+  display: flex;
+  justify-content:space-between;
+}
+.keyword{
+  margin-right: 10px;
+  color: #606266;
+  font-weight: 700;
+  line-height: 32px;
+}
+.city{
+  display: flex;
+  justify-content: end;
+}
+.button{
+  display: flex;
+  justify-content: end;
+}
+
+</style>
diff --git a/src/components/index.js b/src/components/index.js
new file mode 100644
index 0000000..0ad5d11
--- /dev/null
+++ b/src/components/index.js
@@ -0,0 +1,8 @@
+import questionsChoice from '@/components/QuestionsChoiceNavbar'
+import QuestionChoiceSelect from '@/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect'
+export default {
+  install(Vue) {
+    Vue.component('questionsChoice', questionsChoice)
+    Vue.component('QuestionChoiceSelect', QuestionChoiceSelect)
+  }
+}
diff --git a/src/main.js b/src/main.js
index 644fb37..c70a480 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,6 +13,7 @@ import * as filters from './filters' // global filters
 import './mock' // simulation data
 // font-awesome
 import 'font-awesome/css/font-awesome.css'
+import components from '@/components'
 /*
  * 注册 - 业务模块
  */
@@ -26,6 +27,7 @@ Vue.use(base, store)
 // Vue.use(form, store)
 // Vue.use(details, store)
 Vue.use(hmmm, store)
+Vue.use(components)
 
 /*
  * 注册 - 组件
diff --git a/src/module-hmmm/pages/questions-choice.vue b/src/module-hmmm/pages/questions-choice.vue
index 4863277..36c5dc5 100644
--- a/src/module-hmmm/pages/questions-choice.vue
+++ b/src/module-hmmm/pages/questions-choice.vue
@@ -1,11 +1,453 @@
 <template>
   <div class="container">
-    精选题库
+    <div id="content">
+      <div id="head">
+        <p>说明：目前支持学科和关键字条件筛选</p>
+        <el-button size="small" type="success" icon="el-icon-edit">
+          新增试题
+        </el-button>
+      </div>
+      <questionsChoice />
+      <div class="table">
+        <template>
+          <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+            <el-tab-pane label="全部" name="first" />
+            <el-tab-pane label="待审核" name="second" />
+            <el-tab-pane label="已审核" name="third" />
+            <el-tab-pane label="已拒绝" name="fourth" />
+          </el-tabs>
+        </template>
+        <div>
+          <el-alert
+            type="info"
+            show-icon
+            :closable="false"
+          >
+            <template slot="title">
+              <span>数据一共{{ counts }}条</span>
+            </template>
+          </el-alert>
+        </div>
+        <template>
+          <el-table
+            :data="tableData"
+            style="width: 100%"
+          >
+            <el-table-column
+              prop="number"
+              label="试题编号"
+              width="150"
+            />
+            <el-table-column
+              prop="subject"
+              label="学科"
+              width="120"
+            />
+            <el-table-column
+              prop="catalog"
+              label="目录"
+              width="120"
+            />
+            <el-table-column
+              prop="questionType"
+              label="题型"
+              width="120"
+              :formatter="questionType"
+            />
+            <el-table-column
+              prop="question"
+              label="题干"
+              width="300"
+            >
+              <template v-slot="{row}">
+                <div v-html="row.question" />
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="addDate"
+              label="录入时间"
+              width="250"
+            >
+              <template v-slot="{row}">
+                {{ formatDate(row.addDate) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="difficulty"
+              label="难度"
+              width="120"
+              :formatter="difficulty"
+            />
+            <el-table-column
+              prop="creator"
+              label="录入人"
+              width="120"
+            />
+            <el-table-column
+              prop="chkState"
+              label="审核状态"
+              width="120"
+              :formatter="chkState"
+            />
+            <el-table-column
+              prop="chkRemarks"
+              label="审核意见"
+              width="120"
+            />
+            <el-table-column
+              prop="chkUser"
+              label="审核人"
+              width="120"
+            />
+            <el-table-column
+              prop="publishState"
+              label="发布状态"
+              width="120"
+              :formatter="publishState"
+            />
+            <el-table-column align="center"
+                             fixed="right"
+                             label="操作"
+                             width="230"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click.native.prevent="preview(scope.$index, tableData)"
+                >
+                  预览
+                </el-button>
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click.native.prevent="examine(scope.$index, tableData)"
+                >
+                  审核
+                </el-button>
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click.native.prevent="revise(scope.$index, tableData)"
+                >
+                  修改
+                </el-button>
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click.native.prevent="grounding(scope.$index, tableData)"
+                >
+                  上架
+                </el-button>
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click.native.prevent="delete(scope.$index, tableData)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+        <div class="foot">
+          <div class="block">
+            <el-pagination
+              :page-sizes="[5, 10, 20, 50]"
+              :page-size="100"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="counts"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+            />
+          </div>
+        </div>
+        <el-dialog
+          title="题目审核"
+          :visible.sync="dialogVisible"
+          width="30%"
+        >
+          <el-radio v-model="radio" label="1">
+            通过
+          </el-radio>
+          <el-radio v-model="radio" label="2">
+            拒绝
+          </el-radio>
+          <div class="textarea">
+            <el-input
+              v-model="textarea"
+              type="textarea"
+              :rows="2"
+              placeholder="请输入审核意见"
+            />
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+          </span>
+        </el-dialog>
+        <el-dialog
+          title="题目预览"
+          :visible.sync="dialogVisible1"
+          width="60%"
+        >
+          <div class="preview1">
+            <el-row>
+              <el-col :span="6">
+                <div class="grid-content bg-purple">
+                  【题型】:{{ questionType(previewList) }}
+                </div>
+              </el-col>
+              <el-col :span="6">
+                <div class="grid-content bg-purple-light">
+                  【编号】:{{ previewList.id }}
+                </div>
+              </el-col>
+              <el-col :span="6">
+                <div class="grid-content bg-purple">
+                  【难度】:{{ difficulty(previewList) }}
+                </div>
+              </el-col>
+              <el-col :span="6">
+                <div class="grid-content bg-purple-light">
+                  【标签】:{{ previewList.tags }}
+                </div>
+              </el-col>
+            </el-row>
+          </div>
+          <div class="preview2">
+            <el-row>
+              <el-col :span="6">
+                <div class="grid-content bg-purple">
+                  【学科】:{{ previewList.subject }}
+                </div>
+              </el-col>
+              <el-col :span="6">
+                <div class="grid-content bg-purple-light">
+                  【目录】:{{ previewList.catalog }}
+                </div>
+              </el-col>
+              <el-col :span="6">
+                <div class="grid-content bg-purple">
+                  【方向】:{{ previewList.direction }}
+                </div>
+              </el-col>
+              <el-col :span="6">
+                <div class="grid-content bg-purple-light" />
+              </el-col>
+            </el-row>
+          </div>
+          <hr>
+          <span>【题干】:</span>
+          <p class="stem" v-html="previewList.question" />
+          <hr>
+          <div class="videoTab">
+            <p><span>【参考答案】：</span> <span><el-button type="danger" @click="isVideoShow=true">视频答案预览</el-button></span></p>
+            <video v-if="isVideoShow" controls width="300" height="300" class="video">
+              <source :src="previewList.videoURL"
+                      type="video/webm"
+              >
+            </video>
+          </div>
+
+          <hr>
+          <div class="answer">
+            <span>【答案解析】:</span><span v-html="previewList.answer" />
+          </div>
+          <hr>
+          <div class="remarks">
+            <span>【题目备注】:</span><span>{{ previewList.remarks }}</span>
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="dialogVisible1 = false">关 闭</el-button>
+          </span>
+        </el-dialog>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
-export default {}
-</script>
+import { choice } from '@/api/hmmm/questions'
+export default {
+  data() {
+    return {
+      activeName: 'first',
+      tableData: [],
+      counts: 3,
+      dialogVisible: false,
+      radio: '1',
+      textarea: '',
+      dialogVisible1: false,
+      isVideoShow: false,
+      previewList: {}
+    }
+  },
+  created() {
+    this.choiceAll()
+  },
+  methods: {
+    handleClick(val) {
+      if (val.index === '0') {
+        // console.log(0)
+        this.choiceAll()
+      } else if (val.index === '1') {
+        console.log(1)
+      } else if (val.index === '2') {
+        console.log(2)
+      } else {
+        console.log(3)
+      }
+    },
+    examineList() {
 
-<style scoped lang="less"></style>
+    },
+    preview(tab, event) {
+      this.previewList = event[tab]
+      this.dialogVisible1 = true
+      // console.log(event[tab])
+    },
+    examine(tab, event) {
+      // console.log(tab, event)
+      this.dialogVisible = true
+    },
+    revise(tab, event) {
+      // console.log(tab, event)
+    },
+    grounding(tab, event) {
+      // console.log(tab, event)
+    },
+    delete(tab, event) {
+      // console.log(tab, event)
+    },
+    async choiceAll() {
+      const { data } = await choice()
+      this.tableData = data.items
+      // console.log(data)
+      this.counts = data.counts
+    },
+    questionType(row) {
+      if (row.questionType === '1') {
+        return '单选'
+      }
+      if (row.questionType === '2') {
+        return '多选'
+      }
+      if (row.questionType === '3') {
+        return '简答'
+      }
+    },
+    difficulty(row) {
+      if (row.difficulty === '1') {
+        return '简单'
+      } else if (row.difficulty === '2') {
+        return '一般'
+      } else if (row.difficulty === '3') {
+        return '困难'
+      }
+    },
+    chkState(row) {
+      if (row.chkState === 0) {
+        return '待审核'
+      }
+      if (row.chkState === 1) {
+        return '通过'
+      }
+      if (row.chkState === 2) {
+        return '拒绝'
+      }
+    },
+    formatDate(res) {
+      const date = new Date(res)
+      const formatObj = {
+        y: date.getFullYear(),
+        m: date.getMonth() + 1,
+        d: date.getDate(),
+        h: date.getHours(),
+        i: date.getMinutes(),
+        s: date.getSeconds(),
+        a: date.getDay()
+      }
+      if (formatObj.m < 10) {
+        formatObj.m = '0' + formatObj.m
+      }
+      if (formatObj.d < 10) {
+        formatObj.d = '0' + formatObj.d
+      }
+      if (formatObj.h < 10) {
+        formatObj.h = '0' + formatObj.h
+      }
+      if (formatObj.i < 10) {
+        formatObj.i = '0' + formatObj.i
+      }
+      if (formatObj.s < 10) {
+        formatObj.s = '0' + formatObj.s
+      }
+      return formatObj.y + '-' + formatObj.m + '-' + formatObj.d + '  ' + formatObj.h + ':' + formatObj.i + ':' + formatObj.s
+    },
+    publishState(row) {
+      if (row.publishState === 0) {
+        return '下架'
+      } else if (row.publishState === 1) {
+        return '上架'
+      }
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+    }
+  }
+}
+
+</script>
+<style scoped>
+  .container{
+    padding: 8px 16px;
+  }
+  #content {
+    background-color: #fff;
+    padding: 20px 20px;
+  }
+  #head{
+    font-size: 12px;
+    display: flex;
+    justify-content:space-between;
+  }
+  #head p {
+    color: pink;
+  }
+  .el-button--small{
+    width: 97px;
+    height: 32px;
+  }
+  .table{
+  margin-top: 20px;
+}
+.textarea{
+  margin-top: 20px;
+}
+.preview2{
+  margin-top: 30px;
+  margin-bottom: 20px;
+}
+.preview1{
+  margin-top: 20px;
+}
+.answer{
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+.remarks{
+  margin-top: 20px;
+}
+.stem{
+  color: blue;
+}
+.foot{
+  margin-top: 20px;
+  display: flex;
+  justify-content: end;
+}
+</style>
diff --git a/yarn.lock b/yarn.lock
index 726e0f4..974c5e9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5109,7 +5109,7 @@ human-signals@^1.1.1:
   resolved "https://registry.npmmirror.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-husky@^8.0.1:
+husky@^8.0.0:
   version "8.0.1"
   resolved "https://registry.npmmirror.com/husky/-/husky-8.0.1.tgz#511cb3e57de3e3190514ae49ed50f6bc3f50b3e9"
   integrity sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==
-- 
Gitee


From da38b6d6633cd5684c4d798386149504d3ec0a9f Mon Sep 17 00:00:00 2001
From: xx <2355@qq.com>
Date: Sat, 17 Sep 2022 20:11:22 +0800
Subject: [PATCH 06/40] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/hmmm/companys.js                    |  15 +-
 src/module-hmmm/components/companys-add.vue | 111 ++++++++++++-
 src/module-hmmm/pages/companys.vue          | 173 +++++++++++++++++++-
 yarn.lock                                   |   2 +-
 4 files changed, 286 insertions(+), 15 deletions(-)

diff --git a/src/api/hmmm/companys.js b/src/api/hmmm/companys.js
index ed3850f..581e2f4 100644
--- a/src/api/hmmm/companys.js
+++ b/src/api/hmmm/companys.js
@@ -9,11 +9,12 @@
 
 import { createAPI } from '@/utils/request'
 
-export const list = (data) => createAPI('/companys', 'get', data)
-export const add = (data) => createAPI('/companys', 'post', data)
-export const update = (data) => createAPI(`/companys/${data.id}`, 'put', data)
-export const remove = (data) =>
-  createAPI(`/companys/${data.id}`, 'delete', data)
-export const detail = (data) => createAPI(`/companys/${data.id}`, 'get', data)
+export const list = (data) => createAPI('/companys', 'get', data)  //获取管理列表
+export const add = (data) => createAPI('/companys', 'post', data) //企业管理添加
+export const update = (data) => createAPI(`/companys/${data.id}`, 'put', data) //企业管理修改
+export const remove = (id) =>
+  createAPI(`/companys/${id}`, 'delete') //企业管理删除
+
+export const detail = (data) => createAPI(`/companys/${data.id}`, 'get', data) //企业管理详情
 export const disabled = (data) =>
-  createAPI(`/companys/${data.id}/state`, 'post', data)
+  createAPI(`/companys/${data.id}/state`, 'post', data) //企业管理设置状态
diff --git a/src/module-hmmm/components/companys-add.vue b/src/module-hmmm/components/companys-add.vue
index 3e52083..3be22bb 100644
--- a/src/module-hmmm/components/companys-add.vue
+++ b/src/module-hmmm/components/companys-add.vue
@@ -1,11 +1,114 @@
 <template>
-  <div class="container">
-    新增企业对话框
+  <div class="headcontainer">
+    <el-form ref="form" :model="form" label-width="70px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="标签名称">
+            <el-input
+              v-model="form.name"
+              style="width: 85%"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="城市">
+            <el-select v-model="value" placeholder="请选择" style="width: 85%">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="地区">
+            <el-select v-model="value" placeholder="请选择" style="width: 85%">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="企业简称">
+            <el-input v-model="form.name" style="width: 85%"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="space-between">
+        <el-col :span="6">
+          <el-form-item label="状态">
+            <el-select v-model="value" placeholder="请选择" style="width: 85%">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="14" class="btn">
+          <el-button>清除</el-button>
+          <el-button type="primary">搜索</el-button>
+        </el-col>
+        <el-col :span="3" class="success">
+          <el-button type="success">新增用户</el-button>
+        </el-col>
+      </el-row>
+    </el-form>
   </div>
 </template>
 
 <script>
-export default {}
+export default {
+  data() {
+    return {
+      form: {
+        name: ''
+      },
+      options: [
+        {
+          value: '选项1',
+          label: '黄金糕'
+        },
+        {
+          value: '选项2',
+          label: '双皮奶'
+        },
+        {
+          value: '选项3',
+          label: '蚵仔煎'
+        },
+        {
+          value: '选项4',
+          label: '龙须面'
+        },
+        {
+          value: '选项5',
+          label: '北京烤鸭'
+        }
+      ],
+      value: ''
+    }
+  }
+}
 </script>
 
-<style lang="less" scoped></style>
+<style  scoped>
+.btn {
+  margin-left: 20px;
+}
+.headcontainer{
+  padding: 0;
+}
+</style>
diff --git a/src/module-hmmm/pages/companys.vue b/src/module-hmmm/pages/companys.vue
index b7e3955..ef4f16d 100644
--- a/src/module-hmmm/pages/companys.vue
+++ b/src/module-hmmm/pages/companys.vue
@@ -1,11 +1,178 @@
 <template>
   <div class="container">
-    企业管理
+    <el-card>
+      <companysadd />
+      <el-alert :title="textnum" type="info" show-icon :closable="false">
+      </el-alert>
+      <el-table
+        :loading="loading"
+        :data="list"
+        fit
+        highlight-current-row
+        style="width: 100%"
+        :header-cell-style="{ background: '#fafafa', border: '3px' }"
+      >
+        <el-table-column align="center" prop="id" label="序号" width="120">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="number"
+          label="企业编号"
+          width="115"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="shortName"
+          label="企业简称"
+          width="115"
+        >
+        </el-table-column>
+        <el-table-column align="center" prop="tags" label="标签" width="115">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="creatorID"
+          label="创建者"
+          width="115"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="addDate"
+          label="创建日期"
+          width="115"
+        >
+        </el-table-column>
+        <el-table-column align="center" prop="remarks" label="备注" width="115">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="state"
+          label="状态"
+          width="115"
+        >
+        </el-table-column>
+        <el-table-column align="center" prop="address" label="操作" type="flex">
+          <template v-slot="{ row }">
+            <el-button
+              type="primary"
+              icon="el-icon-edit"
+              plain
+              circle
+            ></el-button>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="禁用"
+              placement="top"
+            >
+              <el-button
+                type="warning"
+                icon="el-icon-close"
+                plain
+                circle
+              ></el-button>
+            </el-tooltip>
+            <el-button
+              type="danger"
+              icon="el-icon-delete"
+              plain
+              circle
+              @click="del(row.id)"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination
+          background
+          @current-change="currentchange"
+          :current-page.sync="page.page"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="page.size"
+          :total="page.total"
+          layout=" sizes, prev, pager, next, jumper"
+        >
+        </el-pagination>
+      </div>
+    </el-card>
   </div>
 </template>
 
 <script>
-export default {}
+import PageTool from '@/module-dashboard/components/pageTool'
+import companysadd from '../components/companys-add.vue'
+import { list, remove } from '@/api/hmmm/companys.js'
+export default {
+  components: {
+    PageTool,
+    companysadd
+  },
+  methods: {
+    currentchange() {
+      this.getlist()
+    },
+    formatEmployment(row) {
+      // let obj = this.list.find((item) => {item.state == row.formOfEmployment}
+      // )
+      // console.log(row.formOfEmployment);
+      // return obj ?  :
+    },
+    async getlist() {
+      this.loading = true
+      let { data } = await list(this.page)
+      this.textnum = `共 ${data.counts} 条记录`
+      this.page.total = data.counts
+      this.list = data.items
+      console.log(this.list);
+      this.loading = false
+    },
+    async del(id) {
+      const confirmResult = await this.$confirm(
+        '此操作将永久删除用户 , 是否继续?',
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).catch((error) => error)
+      if (confirmResult === 'confirm') {
+        await remove(id)
+        this.$message.success('删除分类成功')
+        console.log(this.page.total)
+        this.getlist()
+      } else {
+        return this.$message.info('已取消删除')
+      }
+    }
+  },
+  created() {
+    this.getlist()
+  },
+  data() {
+    return {
+      textnum: '',
+      currentPage4: 1,
+      list: [],
+      page: {
+        page: 1, // 当前页码
+        size: 10,
+        total: 0 // 总数
+      },
+      loading: false
+    }
+  }
+}
 </script>
 
-<style lang="less" scoped></style>
+<style scoped>
+.container {
+  padding: 20px;
+}
+.pagination {
+  margin: 10px;
+  float: right;
+}
+</style>
diff --git a/yarn.lock b/yarn.lock
index 726e0f4..974c5e9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5109,7 +5109,7 @@ human-signals@^1.1.1:
   resolved "https://registry.npmmirror.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-husky@^8.0.1:
+husky@^8.0.0:
   version "8.0.1"
   resolved "https://registry.npmmirror.com/husky/-/husky-8.0.1.tgz#511cb3e57de3e3190514ae49ed50f6bc3f50b3e9"
   integrity sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==
-- 
Gitee


From 6ad1868ba7d965dfa0e1748964752c9f08706f3f Mon Sep 17 00:00:00 2001
From: xx <2355@qq.com>
Date: Sat, 17 Sep 2022 20:14:45 +0800
Subject: [PATCH 07/40] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E5=A4=A9init?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/hmmm/companys.js                    | 12 ++--
 src/module-hmmm/components/companys-add.vue | 21 +++---
 src/module-hmmm/pages/companys.vue          | 76 +++++++++------------
 3 files changed, 49 insertions(+), 60 deletions(-)

diff --git a/src/api/hmmm/companys.js b/src/api/hmmm/companys.js
index 581e2f4..4ee92f7 100644
--- a/src/api/hmmm/companys.js
+++ b/src/api/hmmm/companys.js
@@ -9,12 +9,12 @@
 
 import { createAPI } from '@/utils/request'
 
-export const list = (data) => createAPI('/companys', 'get', data)  //获取管理列表
-export const add = (data) => createAPI('/companys', 'post', data) //企业管理添加
-export const update = (data) => createAPI(`/companys/${data.id}`, 'put', data) //企业管理修改
+export const list = (data) => createAPI('/companys', 'get', data) // 获取管理列表
+export const add = (data) => createAPI('/companys', 'post', data) // 企业管理添加
+export const update = (data) => createAPI(`/companys/${data.id}`, 'put', data) // 企业管理修改
 export const remove = (id) =>
-  createAPI(`/companys/${id}`, 'delete') //企业管理删除
+  createAPI(`/companys/${id}`, 'delete') // 企业管理删除
 
-export const detail = (data) => createAPI(`/companys/${data.id}`, 'get', data) //企业管理详情
+export const detail = (data) => createAPI(`/companys/${data.id}`, 'get', data) // 企业管理详情
 export const disabled = (data) =>
-  createAPI(`/companys/${data.id}/state`, 'post', data) //企业管理设置状态
+  createAPI(`/companys/${data.id}/state`, 'post', data) // 企业管理设置状态
diff --git a/src/module-hmmm/components/companys-add.vue b/src/module-hmmm/components/companys-add.vue
index 3be22bb..4c14b10 100644
--- a/src/module-hmmm/components/companys-add.vue
+++ b/src/module-hmmm/components/companys-add.vue
@@ -8,7 +8,7 @@
               v-model="form.name"
               style="width: 85%"
               placeholder="请输入"
-            ></el-input>
+            />
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -19,8 +19,7 @@
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
-              >
-              </el-option>
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -32,14 +31,13 @@
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
-              >
-              </el-option>
+              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="企业简称">
-            <el-input v-model="form.name" style="width: 85%"></el-input>
+            <el-input v-model="form.name" style="width: 85%" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -52,17 +50,20 @@
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
-              >
-              </el-option>
+              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="14" class="btn">
           <el-button>清除</el-button>
-          <el-button type="primary">搜索</el-button>
+          <el-button type="primary">
+            搜索
+          </el-button>
         </el-col>
         <el-col :span="3" class="success">
-          <el-button type="success">新增用户</el-button>
+          <el-button type="success">
+            新增用户
+          </el-button>
         </el-col>
       </el-row>
     </el-form>
diff --git a/src/module-hmmm/pages/companys.vue b/src/module-hmmm/pages/companys.vue
index ef4f16d..2e7009b 100644
--- a/src/module-hmmm/pages/companys.vue
+++ b/src/module-hmmm/pages/companys.vue
@@ -2,8 +2,7 @@
   <div class="container">
     <el-card>
       <companysadd />
-      <el-alert :title="textnum" type="info" show-icon :closable="false">
-      </el-alert>
+      <el-alert :title="textnum" type="info" show-icon :closable="false" />
       <el-table
         :loading="loading"
         :data="list"
@@ -12,47 +11,39 @@
         style="width: 100%"
         :header-cell-style="{ background: '#fafafa', border: '3px' }"
       >
-        <el-table-column align="center" prop="id" label="序号" width="120">
-        </el-table-column>
+        <el-table-column align="center" prop="id" label="序号" width="120" />
         <el-table-column
           align="center"
           prop="number"
           label="企业编号"
           width="115"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="shortName"
           label="企业简称"
           width="115"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="tags" label="标签" width="115">
-        </el-table-column>
+        />
+        <el-table-column align="center" prop="tags" label="标签" width="115" />
         <el-table-column
           align="center"
           prop="creatorID"
           label="创建者"
           width="115"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="addDate"
           label="创建日期"
           width="115"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="remarks" label="备注" width="115">
-        </el-table-column>
+        />
+        <el-table-column align="center" prop="remarks" label="备注" width="115" />
         <el-table-column
           align="center"
           prop="state"
           label="状态"
           width="115"
-        >
-        </el-table-column>
+        />
         <el-table-column align="center" prop="address" label="操作" type="flex">
           <template v-slot="{ row }">
             <el-button
@@ -60,7 +51,7 @@
               icon="el-icon-edit"
               plain
               circle
-            ></el-button>
+            />
             <el-tooltip
               class="item"
               effect="dark"
@@ -72,7 +63,7 @@
                 icon="el-icon-close"
                 plain
                 circle
-              ></el-button>
+              />
             </el-tooltip>
             <el-button
               type="danger"
@@ -80,35 +71,48 @@
               plain
               circle
               @click="del(row.id)"
-            ></el-button>
+            />
           </template>
         </el-table-column>
       </el-table>
       <div class="pagination">
         <el-pagination
           background
-          @current-change="currentchange"
           :current-page.sync="page.page"
           :page-sizes="[10, 20, 30, 40]"
           :page-size="page.size"
           :total="page.total"
           layout=" sizes, prev, pager, next, jumper"
-        >
-        </el-pagination>
+          @current-change="currentchange"
+        />
       </div>
     </el-card>
   </div>
 </template>
 
 <script>
-import PageTool from '@/module-dashboard/components/pageTool'
 import companysadd from '../components/companys-add.vue'
 import { list, remove } from '@/api/hmmm/companys.js'
 export default {
   components: {
-    PageTool,
     companysadd
   },
+  data() {
+    return {
+      textnum: '',
+      currentPage4: 1,
+      list: [],
+      page: {
+        page: 1, // 当前页码
+        size: 10,
+        total: 0 // 总数
+      },
+      loading: false
+    }
+  },
+  created() {
+    this.getlist()
+  },
   methods: {
     currentchange() {
       this.getlist()
@@ -121,11 +125,11 @@ export default {
     },
     async getlist() {
       this.loading = true
-      let { data } = await list(this.page)
+      const { data } = await list(this.page)
       this.textnum = `共 ${data.counts} 条记录`
       this.page.total = data.counts
       this.list = data.items
-      console.log(this.list);
+      console.log(this.list)
       this.loading = false
     },
     async del(id) {
@@ -147,22 +151,6 @@ export default {
         return this.$message.info('已取消删除')
       }
     }
-  },
-  created() {
-    this.getlist()
-  },
-  data() {
-    return {
-      textnum: '',
-      currentPage4: 1,
-      list: [],
-      page: {
-        page: 1, // 当前页码
-        size: 10,
-        total: 0 // 总数
-      },
-      loading: false
-    }
   }
 }
 </script>
-- 
Gitee


From b61a21cd9b2918f1a1169631dc69dcf3944e2bee Mon Sep 17 00:00:00 2001
From: xiaoli <24567@qq.com>
Date: Sat, 17 Sep 2022 20:20:37 +0800
Subject: [PATCH 08/40] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base-ui/ZyForm/src/zy-form.vue            |   9 +-
 src/module-hmmm/components/directorys-add.vue | 114 +++++++-
 src/module-hmmm/pages/directorys.vue          | 249 +++++++++++++++++-
 src/module-manage/components/menu-add.vue     |   3 -
 src/utils/request.js                          |   3 +-
 5 files changed, 362 insertions(+), 16 deletions(-)

diff --git a/src/base-ui/ZyForm/src/zy-form.vue b/src/base-ui/ZyForm/src/zy-form.vue
index 3282027..ddb445a 100644
--- a/src/base-ui/ZyForm/src/zy-form.vue
+++ b/src/base-ui/ZyForm/src/zy-form.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/no-parsing-error -->
 <template>
   <div class="zy-form">
     <header class="header">
@@ -49,11 +50,13 @@
             </template> -->
           </el-form-item>
         </el-col>
+        </el-form-item>
+        </el-col>
       </el-row>
+      <footer class="footer">
+        <slot name="footer" />
+      </footer>
     </el-form>
-    <footer class="footer">
-      <slot name="footer" />
-    </footer>
   </div>
 </template>
 
diff --git a/src/module-hmmm/components/directorys-add.vue b/src/module-hmmm/components/directorys-add.vue
index 8654c8b..835a4a9 100644
--- a/src/module-hmmm/components/directorys-add.vue
+++ b/src/module-hmmm/components/directorys-add.vue
@@ -1,11 +1,115 @@
 <template>
-  <div class="container">
-    添加目录对话框
-  </div>
+  <el-dialog :title="title" :visible="dialogshow" width="40%" @close="btncanel">
+    <el-form ref="form" :model="form" :rules="rules">
+      <el-form-item
+        v-if="subject"
+        prop="subjectID"
+        label="所属学科"
+        label-width="80px"
+      >
+        <el-select v-model="form.subjectID" placeholder="请选择所属科目">
+          <el-option
+            v-for="item in subjectlist"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="目录名称" prop="directoryName" label-width="80px">
+        <el-input v-model="form.directoryName" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="btncanel">
+        取消
+      </el-button>
+      <el-button type="primary" @click="btnok">
+        确定
+      </el-button>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
-export default {}
+// update
+import { add, update } from '@/api/hmmm/directorys'
+import { simple } from '@/api/hmmm/subjects'
+export default {
+  props: {
+    dialogshow: {
+      type: Boolean,
+      default: false
+    },
+    // 是否显示所属学科
+    subject: {
+      type: Boolean,
+      default: true
+    },
+    title: {
+      default: '新增目录',
+      type: String
+    }
+  },
+  data() {
+    return {
+      // 双向绑定表单
+      form: {
+        id: this.id,
+        // 所属学科
+        subjectID: '',
+        directoryName: ''
+      },
+      // 校验规则
+      rules: {
+        subjectID: [
+          { required: true, message: '请选择所属学科', trigger: 'change' }
+        ],
+        directoryName: [
+          { required: true, message: '目录名称不能为空', tigger: 'blur' }
+        ]
+      },
+      // 学科列表
+      subjectlist: []
+    }
+  },
+  async created() {
+    const res = await simple()
+    this.subjectlist = res.data
+  },
+  methods: {
+    btncanel() {
+      // console.log(1)
+      this.$emit('update:dialogshow', false)
+      // 数据重置，表单验证信息取消
+    },
+    async btnok() {
+      try {
+        // 点击确认的时候先判断下是否校验成功
+        await this.$refs.form.validate()
+        if (this.form.subjectID) {
+          console.log(this.form.subjectID)
+          await add(this.form)
+        } else {
+          console.log(111)
+          await update(this.form)
+        }
+        this.$message.success('操作成功')
+      } catch (error) {
+        console.log(error)
+        this.$message('新增失败')
+      }
+    }
+  }
+}
 </script>
 
-<style scoped lang="less"></style>
+<style scoped>
+.bgc {
+  background: blue;
+}
+.dialog-footer {
+  text-align: center;
+}
+</style>
diff --git a/src/module-hmmm/pages/directorys.vue b/src/module-hmmm/pages/directorys.vue
index 0340d3b..ab9e60e 100644
--- a/src/module-hmmm/pages/directorys.vue
+++ b/src/module-hmmm/pages/directorys.vue
@@ -1,11 +1,252 @@
 <template>
-  <div class="container">
-    目录管理
+  <div class="container" style="margin: 10px">
+    <el-card shadow="never">
+      <!-- 表格 -->
+      <ZyForm :form-data.sync="formData" v-bind="formConfig">
+        <template #footer>
+          <el-button
+            style="margin-left: 10px"
+            class="filter-item"
+            size="small"
+            type="primary"
+          >
+            清除
+          </el-button>
+
+          <el-button class="filter-item" size="small" type="primary">
+            搜索
+          </el-button>
+          <el-button plain>
+            <i class="el-icon-back" /> <span>返回学科 </span>
+          </el-button>
+
+          <el-button
+            class="filter-item fr"
+            size="small"
+            style="margin-left: 10px"
+            type="success"
+            icon="el-icon-edit"
+          >
+            {{ title }}
+          </el-button>
+        </template>
+      </ZyForm>
+      <!-- 显示一共少条数据 -->
+      <el-alert
+        style="margin: 15px"
+        :title="alertText"
+        type="info"
+        class="alert"
+        :closable="false"
+        show-icon
+      />
+      <div>
+        <el-table :data="tableData" style="width: 100%">
+          <el-table-column type="index" label="序号" width="100" />
+          <el-table-column prop="subjectName" label="所属学科" />
+          <el-table-column prop="directoryName" label="目录名称" />
+          <el-table-column prop="username" label="创建者" />
+          <el-table-column prop="addDate" label="创建日期">
+            <template slot-scope="{ row }">
+              {{ row.addDate | formatDate }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="totals" label="面试题总数" />
+          <el-table-column prop="state" label="状态">
+            <template slot-scope="{ row }">
+              <span v-if="row.state === 0" type="text" size="small">
+                已禁用
+              </span>
+              <span v-else type="text" size="small"> 已启用 </span>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="address" label="操作">
+            <template slot-scope="{ row }">
+              <el-button
+                v-if="row.state === 1"
+                type="text"
+                size="medium "
+                @click="changestate({ id: row.id, state: 0 })"
+              >
+                禁用
+              </el-button>
+              <el-button
+                v-else
+                type="text"
+                size="medium"
+                @click="changestate({ id: row.id, state: 1 })"
+              >
+                启用
+              </el-button>
+              <el-button
+                type="text"
+                size="medium "
+                :disabled="row.state === 1"
+                @click="edit(row.id)"
+              >
+                修改
+              </el-button>
+              <el-button
+                type="text"
+                size="medium "
+                :disabled="row.state === 1"
+                @click="del(row.id)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 下拉框 -->
+      <el-pagination
+        background
+        style="margin-top: 20px"
+        :current-page="info.page"
+        :page-sizes="[5, 10, 15]"
+        :page-size="info.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="info.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </el-card>
+    <!-- 点击新增 -->
+    <directorysadd :id="id" :dialogshow.sync="dialogshow" @close="close" />
   </div>
 </template>
 
 <script>
-export default {}
+// 导入组件
+import ZyForm from '@/base-ui/ZyForm'
+import { list, remove, changeState } from '@/api/hmmm/directorys'
+// 导入新增
+import directorysadd from '../components/directorys-add.vue'
+
+export default {
+  components: {
+    ZyForm,
+    directorysadd
+  },
+  data() {
+    return {
+      // 显示弹窗
+      dialogshow: false,
+      // id
+      id: '',
+      // 页码
+      formData: {
+        name: '',
+        select: '',
+        password: '',
+        sport: ''
+      },
+      formConfig: {
+        labelWidth: '90px',
+        itemLayout: {
+          padding: '10px 30px'
+        },
+        formItems: [
+          {
+            field: '目录名称',
+            type: 'input',
+            label: '目录名称',
+            rules: [],
+            placeholder: ''
+          },
+          {
+            field: '状态',
+            type: 'select',
+            label: '状态',
+            placeholder: '请选择',
+            options: [
+              { title: '启用', value: '0' },
+              { title: '禁用', value: '1' }
+            ]
+          }
+        ]
+      },
+      value: '',
+      // requestParameters: {
+      //   username: ''
+      // },
+      title: '新增目录',
+      alertText: '',
+      options: [
+        {
+          value: '1',
+          label: '启用'
+        },
+        {
+          value: '2',
+          label: '禁用'
+        }
+      ],
+      // 信息
+      tableData: [], // 渲染表格数据
+      /// 页码
+      info: {
+        page: 1,
+        pagesize: 10,
+        total: 0
+      }
+    }
+  },
+  created() {
+    this.list()
+  },
+  methods: {
+    // 点击编辑的时候显示弹框
+    edit(id) {
+      this.id = id
+      this.dialogshow = true
+    },
+    async list() {
+      const { data } = await list(this.info)
+      console.log(data)
+      this.info.total = data.counts
+      this.tableData = data.items
+      this.alertText = `共${this.info.total}条目录`
+    },
+    // 页码大小发生改变的时候
+    handleSizeChange(val) {
+      this.info.page = 1
+      console.log(val)
+      this.info.pagesize = val
+      this.list()
+    },
+    // 当前页发生改变的时候
+    handleCurrentChange(val) {
+      console.log(val)
+      this.info.page = val
+      this.list()
+    },
+    // 删除
+    async del(id) {
+      try {
+        await this.$confirm('您确定删除吗')
+        await remove(id)
+        this.$message.success('删除成功')
+        // 调用下接口
+        this.list()
+      } catch (error) {
+        this.$message('操作失败')
+      }
+    },
+    // 修改状态
+    async changestate(state) {
+      console.log(state)
+      await changeState(state)
+      this.$message.success('修改状态成功')
+      this.list()
+    },
+    // 关闭弹窗
+    close() {
+      this.dialogshow = false
+    }
+  }
+}
 </script>
 
-<style scoped lang="less"></style>
+<style></style>
diff --git a/src/module-manage/components/menu-add.vue b/src/module-manage/components/menu-add.vue
index c5217a6..11b58b7 100644
--- a/src/module-manage/components/menu-add.vue
+++ b/src/module-manage/components/menu-add.vue
@@ -465,6 +465,3 @@ export default {
   }
 }
 </style>
-
-作者：CRPER 链接：https://juejin.im/post/5972ea2f6fb9a06bc569204f 来源：掘金
-著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。
diff --git a/src/utils/request.js b/src/utils/request.js
index abc7d4a..7b1cf8f 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -5,7 +5,8 @@ import { getToken } from '@/utils/auth'
 
 // create an axios instance
 const instance = axios.create({
-  baseURL: 'http://127.0.0.1:7001/', // http://39.105.1.33:7001/ api的base_url
+  baseURL: 'http://192.168.34.80:7001/', // http://39.105.1.33:7001/ api的base_url
+  // baseURL: 'http://127.0.0.1:7001/', // http://39.105.1.33:7001/ api的base_url
   timeout: 5000 // request timeout
 })
 
-- 
Gitee


From 07d90cf6dcd64dece5fef5c365a37afdb120b6c4 Mon Sep 17 00:00:00 2001
From: zhangwei <1369734433@qq.com>
Date: Sat, 17 Sep 2022 20:21:20 +0800
Subject: [PATCH 09/40] =?UTF-8?q?=E7=BB=84=E9=A2=98=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E5=BC=B9=E5=87=BA=E5=B1=82=E9=83=A8?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/hmmm/questions.js                    |   3 +-
 src/module-dashboard/components/pageTool.vue |   2 +-
 src/module-hmmm/pages/questions-randoms.vue  | 256 ++++++++++++++++++-
 yarn.lock                                    |   2 +-
 4 files changed, 255 insertions(+), 8 deletions(-)

diff --git a/src/api/hmmm/questions.js b/src/api/hmmm/questions.js
index 296bf01..abe157b 100644
--- a/src/api/hmmm/questions.js
+++ b/src/api/hmmm/questions.js
@@ -55,5 +55,4 @@ export const setRecords = (data) =>
 export const randoms = (data) => createAPI('/questions/randoms', 'get', data)
 
 // 组题列表删除
-export const removeRandoms = (data) =>
-  createAPI(`/questions/randoms/${data.id}`, 'delete', data)
+export const removeRandoms = (data) => createAPI(`/questions/randoms/${data.id}`, 'delete', data)
diff --git a/src/module-dashboard/components/pageTool.vue b/src/module-dashboard/components/pageTool.vue
index c3ba2c8..af6f754 100644
--- a/src/module-dashboard/components/pageTool.vue
+++ b/src/module-dashboard/components/pageTool.vue
@@ -6,7 +6,7 @@
       :total="Number(total)"
       :page-size="Number(paginationPagesize)"
       :page-sizes="[10, 20, 30, 50]"
-      layout="sizes, prev, pager, next, jumper"
+      layout=" prev, pager, next , sizes, jumper"
       @size-change="onPageSizeChange"
       @current-change="onPageChange"
     />
diff --git a/src/module-hmmm/pages/questions-randoms.vue b/src/module-hmmm/pages/questions-randoms.vue
index 4863277..0e52b60 100644
--- a/src/module-hmmm/pages/questions-randoms.vue
+++ b/src/module-hmmm/pages/questions-randoms.vue
@@ -1,11 +1,259 @@
 <template>
-  <div class="container">
-    精选题库
+  <div
+    class="dashboard-container"
+  >
+    <div class="app-container">
+      <el-card shadow="never">
+        <el-row type="flex" class="row-bg" justify="space-between">
+          <el-col :span="6">
+            <el-input type="search" v-model="keyword" placeholder="根据编号搜索" ></el-input>
+          </el-col>
+          <el-col :span="6" class="el-col-offset-12">
+            <el-button @click="btnClane()">清除</el-button>
+            <el-button type="primary" @click="btnSearch(keyword)">搜索</el-button>
+          </el-col>
+        </el-row>
+
+        <el-alert
+          :title="alertText"
+          :closable="false"
+          class="alert"
+          show-icon
+        />
+
+        <el-table
+          :key="tableKey"
+          :data="tableData"
+          fit
+          highlight-current-row
+          style="width: 100%">
+          <el-table-column
+             prop="id"
+             align="center"
+             label="编号"
+             width="180">
+          </el-table-column>
+          <el-table-column
+             prop="questionType"
+             align="center"
+             label="题型"
+             width="100">
+          </el-table-column>
+          <el-table-column
+              align="center"
+             prop="questionIDs"
+             label="题目编号"
+             width="200"
+             >
+             <template v-slot="{row}">
+              <span  v-for="(item,index) in row.questionIDs" :key="index" @click="getdetail(item)">
+                <a href="#"  >{{item.number}}</a>
+                <br>
+              </span>
+             </template>
+          </el-table-column>
+          <el-table-column
+             prop="addTime"
+             align="center"
+             label="录入时间">
+          </el-table-column>
+          <el-table-column
+             prop="totalSeconds"
+             align="center"
+             label="答题时间(s)">
+
+          </el-table-column>
+          <el-table-column
+             prop="accuracyRate"
+             align="center"
+             label="真确率(%)">
+          </el-table-column>
+          <el-table-column
+             prop="userName"
+             align="center"
+             label="录入人">
+          </el-table-column>
+          <el-table-column
+             label="操作"
+             align="center">
+             <template v-slot="{row}">
+              <el-button type="danger" icon="el-icon-delete" circle @click="delList(row)"></el-button>
+             </template>
+          </el-table-column>
+        </el-table>
+
+        <!-- 分页 -->
+        <div class="pagination-container">
+          <PageTool
+            :pagination-page="pagination.page"
+            :pagination-pagesize="pagination.pageSize"
+            :total="pagination.total"
+            @pageChange="handleCurrentChange"
+            @pageSizeChange="handleSizeChange"
+          />
+        </div>
+
+        <!-- 弹出层 -->
+        <el-dialog
+          title="题目预览"
+          :visible.sync="dialogVisible"
+          width="50%"
+          :before-close="handleClose">
+          <el-row style="border-bottom:1px solid #000;">
+            <el-col :span="6"><div class="grid-content bg-purple">【题型】：{{detailData.questionType}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple-light">【编号】：{{detailData.id}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">【难度】：{{detailData.difficulty}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple-light">【标签】：{{detailData.tags}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple-light">【学科】：{{detailData.subjectID}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple-light">【目录】：{{detailData.catalogID}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple-light">【方向】：{{detailData.direction}}</div></el-col>
+          </el-row >
+          <el-row style="border-bottom:1px solid #000;">
+            <el-col :span="24"><div class="grid-content bg-purple-light">
+              【题干】：
+              <div v-html="detailData.question" style="color:blue">
+              </div>
+            </div>
+          </el-col>
+          </el-row>
+          <el-row style="border-bottom:1px solid #000;">
+            <el-col :span="24">
+              <div class="grid-content bg-purple-light">【参考答案】
+                <el-button type="danger">视频答案预览</el-button>
+                <div>
+                  <video :src="detailData.videoURL" controls="controls">1</video>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row style="border-bottom:1px solid #000;">
+            <el-col :span="24"><div class="grid-content bg-purple-light">
+              【答案解析】：
+              <div v-html="detailData.answer">
+              </div>
+            </div>
+          </el-col>
+          </el-row>
+          <el-row >
+            <el-col :span="24"><div class="grid-content bg-purple-light">【题目备注】：{{detailData.remarks}}</div></el-col>
+            <div></div>
+          </el-row>
+          <span slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="dialogVisible = false">关闭</el-button>
+          </span>
+        </el-dialog>
+
+      </el-card>
+    </div>
   </div>
 </template>
 
 <script>
-export default {}
+import PageTool from '@/module-dashboard/components/pageTool.vue'
+import { randoms , removeRandoms ,detail } from '@/api/hmmm/questions'
+export default {
+  created(){
+    this.getList()
+  },
+  data() {
+        return {
+          tableKey:0,
+          keyword:'',
+          alertText:'',
+          questionType:'',
+          dialogVisible:false,
+          tableData: [],
+          detailData:{},
+          pagination: {
+            page: 1,
+            // pagesize: 10
+            total: 0,
+            pageSize: 20,
+            pageSizes: [10,20,30,50],
+            currentPage: 1
+          }
+        }
+      },
+  components:{
+        PageTool
+  },
+  methods:{
+    async getList (page = 1, limit = 20){
+      this.pagination.currentPage = page
+      this.pagination.pageSize = limit
+      this.tableData = []
+      const { data } = await randoms()
+      this.pagination.total = data.counts
+      this.tableData = data.items
+      // console.log(this.tableData);
+      this.alertText = `共 ${data.counts} 条记录`
+      // console.log(data);
+    },
+    async delList(row){
+      try {
+        await this.$confirm('您确定删除吗')
+        await removeRandoms(row)
+        // alert(2)
+        this.getList()
+        this.$message.success('删除成功')
+      } catch (error){
+        console.log(error)
+      }
+    },
+    async getdetail(row){
+      // console.log(row);
+      this.dialogVisible = true
+      const { data } = await detail(row)
+      // console.log(data);
+      this.detailData = data
+      console.log(this.detailData.videoURL);
+    },
+    btnClane(){
+      this.input = ''
+    },
+    btnSearch(keyword){
+      // console.log(keyword);
+      console.log(this.tableData);
+      // this.getList(keyword)
+
+    },
+    // 每页显示信息条数
+    handleSizeChange(val) {
+      // console.log(val);
+      this.pagination.pagesize = val
+      if (this.pagination.page === 1) {
+        this.getList(this.pagination)
+      }
+      // alert(1)
+    },
+    // 进入某一页
+    handleCurrentChange(val) {
+      this.pagination.page = val
+      this.getList()
+    },
+    handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      }
+  }
+}
 </script>
 
-<style scoped lang="less"></style>
+<style rel="stylesheet/scss" scoped lang="scss">
+  .alert {
+  margin: 10px 0px;
+}
+.el-input{
+  width: 20vw;
+}
+.el-col-offset-12{
+  margin-left: 50%;
+}
+.dialog-footer{
+  display: flex;
+  justify-content: end !important;
+}
+</style>
diff --git a/yarn.lock b/yarn.lock
index 726e0f4..974c5e9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5109,7 +5109,7 @@ human-signals@^1.1.1:
   resolved "https://registry.npmmirror.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-husky@^8.0.1:
+husky@^8.0.0:
   version "8.0.1"
   resolved "https://registry.npmmirror.com/husky/-/husky-8.0.1.tgz#511cb3e57de3e3190514ae49ed50f6bc3f50b3e9"
   integrity sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==
-- 
Gitee


From bfc9332e4e240e34bd1e4b16612d86d0f2012b90 Mon Sep 17 00:00:00 2001
From: zhangwei <1369734433@qq.com>
Date: Sat, 17 Sep 2022 20:25:53 +0800
Subject: [PATCH 10/40] =?UTF-8?q?=E6=88=91=E6=9C=8D=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                                |   3 +-
 src/module-hmmm/pages/questions-randoms.vue | 257 +++++++++++---------
 2 files changed, 150 insertions(+), 110 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 1f95510..b36f904 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -19,6 +19,7 @@ module.exports = {
     'space-before-function-paren': 'off',
     'vue/max-attributes-per-line': 'off',
     'vue/require-prop-types': 'off',
-    'vue/no-use-v-if-with-v-for': 'off'
+    'vue/no-use-v-if-with-v-for': 'off',
+    'vue/no-v-html': 'off'
   }
 }
diff --git a/src/module-hmmm/pages/questions-randoms.vue b/src/module-hmmm/pages/questions-randoms.vue
index 0e52b60..ce6ab7f 100644
--- a/src/module-hmmm/pages/questions-randoms.vue
+++ b/src/module-hmmm/pages/questions-randoms.vue
@@ -6,11 +6,15 @@
       <el-card shadow="never">
         <el-row type="flex" class="row-bg" justify="space-between">
           <el-col :span="6">
-            <el-input type="search" v-model="keyword" placeholder="根据编号搜索" ></el-input>
+            <el-input v-model="keyword" type="search" placeholder="根据编号搜索" />
           </el-col>
           <el-col :span="6" class="el-col-offset-12">
-            <el-button @click="btnClane()">清除</el-button>
-            <el-button type="primary" @click="btnSearch(keyword)">搜索</el-button>
+            <el-button @click="btnClane()">
+              清除
+            </el-button>
+            <el-button type="primary" @click="btnSearch(keyword)">
+              搜索
+            </el-button>
           </el-col>
         </el-row>
 
@@ -26,59 +30,60 @@
           :data="tableData"
           fit
           highlight-current-row
-          style="width: 100%">
+          style="width: 100%"
+        >
           <el-table-column
-             prop="id"
-             align="center"
-             label="编号"
-             width="180">
-          </el-table-column>
+            prop="id"
+            align="center"
+            label="编号"
+            width="180"
+          />
           <el-table-column
-             prop="questionType"
-             align="center"
-             label="题型"
-             width="100">
-          </el-table-column>
+            prop="questionType"
+            align="center"
+            label="题型"
+            width="100"
+          />
           <el-table-column
-              align="center"
-             prop="questionIDs"
-             label="题目编号"
-             width="200"
-             >
-             <template v-slot="{row}">
-              <span  v-for="(item,index) in row.questionIDs" :key="index" @click="getdetail(item)">
-                <a href="#"  >{{item.number}}</a>
+            align="center"
+            prop="questionIDs"
+            label="题目编号"
+            width="200"
+          >
+            <template v-slot="{row}">
+              <span v-for="(item,index) in row.questionIDs" :key="index" @click="getdetail(item)">
+                <a href="#">{{ item.number }}</a>
                 <br>
               </span>
-             </template>
+            </template>
           </el-table-column>
           <el-table-column
-             prop="addTime"
-             align="center"
-             label="录入时间">
-          </el-table-column>
+            prop="addTime"
+            align="center"
+            label="录入时间"
+          />
           <el-table-column
-             prop="totalSeconds"
-             align="center"
-             label="答题时间(s)">
-
-          </el-table-column>
+            prop="totalSeconds"
+            align="center"
+            label="答题时间(s)"
+          />
           <el-table-column
-             prop="accuracyRate"
-             align="center"
-             label="真确率(%)">
-          </el-table-column>
+            prop="accuracyRate"
+            align="center"
+            label="真确率(%)"
+          />
           <el-table-column
-             prop="userName"
-             align="center"
-             label="录入人">
-          </el-table-column>
+            prop="userName"
+            align="center"
+            label="录入人"
+          />
           <el-table-column
-             label="操作"
-             align="center">
-             <template v-slot="{row}">
-              <el-button type="danger" icon="el-icon-delete" circle @click="delList(row)"></el-button>
-             </template>
+            label="操作"
+            align="center"
+          >
+            <template v-slot="{row}">
+              <el-button type="danger" icon="el-icon-delete" circle @click="delList(row)" />
+            </template>
           </el-table-column>
         </el-table>
 
@@ -98,28 +103,60 @@
           title="题目预览"
           :visible.sync="dialogVisible"
           width="50%"
-          :before-close="handleClose">
+          :before-close="handleClose"
+        >
           <el-row style="border-bottom:1px solid #000;">
-            <el-col :span="6"><div class="grid-content bg-purple">【题型】：{{detailData.questionType}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple-light">【编号】：{{detailData.id}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple">【难度】：{{detailData.difficulty}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple-light">【标签】：{{detailData.tags}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple-light">【学科】：{{detailData.subjectID}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple-light">【目录】：{{detailData.catalogID}}</div></el-col>
-            <el-col :span="6"><div class="grid-content bg-purple-light">【方向】：{{detailData.direction}}</div></el-col>
-          </el-row >
+            <el-col :span="6">
+              <div class="grid-content bg-purple">
+                【题型】：{{ detailData.questionType }}
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="grid-content bg-purple-light">
+                【编号】：{{ detailData.id }}
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="grid-content bg-purple">
+                【难度】：{{ detailData.difficulty }}
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="grid-content bg-purple-light">
+                【标签】：{{ detailData.tags }}
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="grid-content bg-purple-light">
+                【学科】：{{ detailData.subjectID }}
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="grid-content bg-purple-light">
+                【目录】：{{ detailData.catalogID }}
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="grid-content bg-purple-light">
+                【方向】：{{ detailData.direction }}
+              </div>
+            </el-col>
+          </el-row>
           <el-row style="border-bottom:1px solid #000;">
-            <el-col :span="24"><div class="grid-content bg-purple-light">
-              【题干】：
-              <div v-html="detailData.question" style="color:blue">
+            <el-col :span="24">
+              <div class="grid-content bg-purple-light">
+                【题干】：
+                <div style="color:blue" v-html="detailData.question" />
               </div>
-            </div>
-          </el-col>
+            </el-col>
           </el-row>
           <el-row style="border-bottom:1px solid #000;">
             <el-col :span="24">
-              <div class="grid-content bg-purple-light">【参考答案】
-                <el-button type="danger">视频答案预览</el-button>
+              <div class="grid-content bg-purple-light">
+                【参考答案】
+                <el-button type="danger">
+                  视频答案预览
+                </el-button>
                 <div>
                   <video :src="detailData.videoURL" controls="controls">1</video>
                 </div>
@@ -127,22 +164,25 @@
             </el-col>
           </el-row>
           <el-row style="border-bottom:1px solid #000;">
-            <el-col :span="24"><div class="grid-content bg-purple-light">
-              【答案解析】：
-              <div v-html="detailData.answer">
+            <el-col :span="24">
+              <div class="grid-content bg-purple-light">
+                【答案解析】：
+                <div v-html="detailData.answer" />
               </div>
-            </div>
-          </el-col>
+            </el-col>
           </el-row>
-          <el-row >
-            <el-col :span="24"><div class="grid-content bg-purple-light">【题目备注】：{{detailData.remarks}}</div></el-col>
-            <div></div>
+          <el-row>
+            <el-col :span="24">
+              <div class="grid-content bg-purple-light">
+                【题目备注】：{{ detailData.remarks }}
+              </div>
+            </el-col>
+            <div />
           </el-row>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="dialogVisible = false">关闭</el-button>
           </span>
         </el-dialog>
-
       </el-card>
     </div>
   </div>
@@ -150,35 +190,35 @@
 
 <script>
 import PageTool from '@/module-dashboard/components/pageTool.vue'
-import { randoms , removeRandoms ,detail } from '@/api/hmmm/questions'
+import { randoms, removeRandoms, detail } from '@/api/hmmm/questions'
 export default {
-  created(){
-    this.getList()
+  components: {
+    PageTool
   },
   data() {
-        return {
-          tableKey:0,
-          keyword:'',
-          alertText:'',
-          questionType:'',
-          dialogVisible:false,
-          tableData: [],
-          detailData:{},
-          pagination: {
-            page: 1,
-            // pagesize: 10
-            total: 0,
-            pageSize: 20,
-            pageSizes: [10,20,30,50],
-            currentPage: 1
-          }
-        }
-      },
-  components:{
-        PageTool
+    return {
+      tableKey: 0,
+      keyword: '',
+      alertText: '',
+      questionType: '',
+      dialogVisible: false,
+      tableData: [],
+      detailData: {},
+      pagination: {
+        page: 1,
+        // pagesize: 10
+        total: 0,
+        pageSize: 20,
+        pageSizes: [10, 20, 30, 50],
+        currentPage: 1
+      }
+    }
+  },
+  created() {
+    this.getList()
   },
-  methods:{
-    async getList (page = 1, limit = 20){
+  methods: {
+    async getList (page = 1, limit = 20) {
       this.pagination.currentPage = page
       this.pagination.pageSize = limit
       this.tableData = []
@@ -189,33 +229,32 @@ export default {
       this.alertText = `共 ${data.counts} 条记录`
       // console.log(data);
     },
-    async delList(row){
+    async delList(row) {
       try {
         await this.$confirm('您确定删除吗')
         await removeRandoms(row)
         // alert(2)
         this.getList()
         this.$message.success('删除成功')
-      } catch (error){
+      } catch (error) {
         console.log(error)
       }
     },
-    async getdetail(row){
+    async getdetail(row) {
       // console.log(row);
       this.dialogVisible = true
       const { data } = await detail(row)
       // console.log(data);
       this.detailData = data
-      console.log(this.detailData.videoURL);
+      console.log(this.detailData.videoURL)
     },
-    btnClane(){
+    btnClane() {
       this.input = ''
     },
-    btnSearch(keyword){
+    btnSearch(keyword) {
       // console.log(keyword);
-      console.log(this.tableData);
+      console.log(this.tableData)
       // this.getList(keyword)
-
     },
     // 每页显示信息条数
     handleSizeChange(val) {
@@ -232,12 +271,12 @@ export default {
       this.getList()
     },
     handleClose(done) {
-        this.$confirm('确认关闭？')
-          .then(_ => {
-            done();
-          })
-          .catch(_ => {});
-      }
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {})
+    }
   }
 }
 </script>
-- 
Gitee


From 2178c67e90ac2d509b19bbf1931c09fa8b1c4ff9 Mon Sep 17 00:00:00 2001
From: jiangxiuguo <2872456851@qq.com>
Date: Sat, 17 Sep 2022 20:44:02 +0800
Subject: [PATCH 11/40] =?UTF-8?q?=E6=88=91=E5=A4=AA=E9=9A=BE=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module-hmmm/components/tags-add.vue | 117 ++++--------------------
 src/module-hmmm/pages/questions-new.vue |  11 +++
 2 files changed, 30 insertions(+), 98 deletions(-)
 create mode 100644 src/module-hmmm/pages/questions-new.vue

diff --git a/src/module-hmmm/components/tags-add.vue b/src/module-hmmm/components/tags-add.vue
index b274a20..fbd1996 100644
--- a/src/module-hmmm/components/tags-add.vue
+++ b/src/module-hmmm/components/tags-add.vue
@@ -1,116 +1,37 @@
 <template>
   <div class="container">
-    <el-dialog :title="title" :visible="dialogFormVisible" width="380px" @close="cancel">
-      <el-form ref="newDirectory" :model="form" :rules="rules">
-        <el-form-item label="所属学科" prop="subjectID" :label-width="formLabelWidth">
-          <el-select v-model="form.subjectID" placeholder="请选择活动区域">
-            <el-option
-              v-for="item,index in simplelist"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="目录名称" prop="tagName" :label-width="formLabelWidth">
-          <el-input v-model="form.tagName" autocomplete="off" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="cancel">
-          取 消
-        </el-button>
-        <el-button type="primary" @click="btnok">
-          确 定
-        </el-button>
-      </div>
+    添加标签对话框
+    <el-dialog :title="text + pageTitle" :visible.sync="dialogFormVisible">
+      <el-form
+        ref="dataForm"
+        :rules="ruleInline"
+        :model="formBase"
+        label-position="left"
+        label-width="120px"
+        style="width: 400px; margin-left: 120px"
+      />
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { simple } from '@/api/hmmm/subjects'
-import { add, update } from '@/api/hmmm/tags'
 export default {
-  name: 'Tagsadd',
-  props: {
-    dialogFormVisible: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      required: true,
-      default: '新增学科'
-    }
-  },
-  data () {
+  data() {
     return {
-      rules: {
-        subjectID: [
-          { required: true, message: '请选择活动学科', trigger: 'change' }
-        ],
-        tagName: [
-          { required: true, message: '请填写标签名称', trigger: 'blur' }
-        ]
-      },
-
-      form: {
-        id: null,
-        subjectID: '',
-        tagName: ''
-      },
-
-      simplelist: {},
-      formLabelWidth: '80px'
+      dialogFormVisible: false
     }
   },
-  created() {
-    this.simple()
-  },
   methods: {
-    fn() {
-      alert(1)
-    },
-    async simple() {
-      const { data } = await simple()
-      // console.log(obj)
-      this.simplelist = data
-    },
-    cancel() {
-      this.$emit('update:dialogFormVisible', false)
-      this.$refs.newDirectory.resetFields()
+    // 弹层显示
+    dialogFormV() {
+      this.dialogFormVisible = true
     },
-    async btnok() {
-      if (this.form.id) {
-        await update(this.form)
-        // console.log(this.form.subjectID)
-      } else {
-        try {
-          await add(this.form)
-        } catch (error) {
-          console.log(error)
-        }
-      }
-      this.$message.success('操作成功')
-      this.$emit('update:dialogFormVisible', false)
-      this.$parent.list()
-    },
-    dialog(row) {
-      this.form.id = row.id
-      this.form.subjectID = row.subjectID
-      this.form.tagName = row.tagName
+    // 弹层隐藏
+    dialogFormH() {
+      this.dialogFormVisible = false
     }
   }
 }
 </script>
 
-<style>
- .el-dialog__footer {
-    text-align: end;
-}
-.el-select {
-    width: 100%;}
-    .el-dialog__body {
-    padding: 30px 20px 0;}
-</style>
+<style scoped lang="less"></style>
diff --git a/src/module-hmmm/pages/questions-new.vue b/src/module-hmmm/pages/questions-new.vue
new file mode 100644
index 0000000..3d6e66f
--- /dev/null
+++ b/src/module-hmmm/pages/questions-new.vue
@@ -0,0 +1,11 @@
+<template>
+  <div class="container">
+    试题录入
+  </div>
+</template>
+
+<script>
+export default {}
+</script>
+
+<style scoped lang="less"></style>
-- 
Gitee


From 23d2f448ca15f62d57b40a8dffe84ea49a6b268f Mon Sep 17 00:00:00 2001
From: wzy <wzyzzqq@163.com>
Date: Sat, 17 Sep 2022 20:50:33 +0800
Subject: [PATCH 12/40] feat(wzy):add wangEditor

---
 src/base-ui/ZyEditor/index.js          |  3 ++
 src/base-ui/ZyEditor/src/zy-editor.vue | 69 ++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 src/base-ui/ZyEditor/index.js
 create mode 100644 src/base-ui/ZyEditor/src/zy-editor.vue

diff --git a/src/base-ui/ZyEditor/index.js b/src/base-ui/ZyEditor/index.js
new file mode 100644
index 0000000..b16c501
--- /dev/null
+++ b/src/base-ui/ZyEditor/index.js
@@ -0,0 +1,3 @@
+import ZyEditor from './src/zy-editor.vue'
+
+export default ZyEditor
diff --git a/src/base-ui/ZyEditor/src/zy-editor.vue b/src/base-ui/ZyEditor/src/zy-editor.vue
new file mode 100644
index 0000000..b35a70c
--- /dev/null
+++ b/src/base-ui/ZyEditor/src/zy-editor.vue
@@ -0,0 +1,69 @@
+<template>
+  <div style="border: 1px solid #ccc">
+    <Toolbar
+      style="border-bottom: 1px solid #ccc"
+      :editor="editor"
+      :default-config="toolbarConfig"
+      :mode="mode"
+    />
+    <!-- v-model="html"  -->
+    <Editor
+      :mode="mode"
+      :style="itemStyle"
+      :default-config="editorConfig"
+      @onCreated="onCreated"
+    />
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
+
+export default Vue.extend({
+  name: 'ZyEditor',
+  components: { Editor, Toolbar },
+  props: {
+    mode: {
+      type: String,
+      default: 'simple',
+      validator: (value) => {
+        return ['default', 'simple'].includes(value)
+      }
+    },
+    itemStyle: {
+      type: String,
+      default: () => {}
+    },
+    editorConfig: {
+      type: Object,
+      default: () => {}
+    },
+    toolbarConfig: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      editor: null
+      // html: "<p>hello</p>",
+      // toolbarConfig: {}
+      // editorConfig: { autoFocus: false }
+      // mode: 'simple' // default or 'simple'
+    }
+  },
+  beforeDestroy() {
+    const editor = this.editor
+    if (editor == null) return
+    editor.destroy() // 组件销毁时，及时销毁编辑器
+  },
+  methods: {
+    onCreated(editor) {
+      this.editor = Object.seal(editor)
+    }
+  }
+})
+</script>
+
+<style lang="scss" scoped></style>
-- 
Gitee


From 8b453a7c67d86a1c071f747e1cbd7d9602059f10 Mon Sep 17 00:00:00 2001
From: wzy <wzyzzqq@163.com>
Date: Sat, 17 Sep 2022 20:53:37 +0800
Subject: [PATCH 13/40] feat(wzy):add wangEditor

---
 .eslintrc.js                                  |   3 +-
 doc/wzy.md                                    |   6 +-
 package.json                                  |   2 +
 src/base-ui/ZyForm/src/zy-form.vue            |   8 +-
 src/main.js                                   |   2 +
 src/module-dashboard/components/pageTool.vue  |   1 +
 .../questions-new/config/formConfig.config.js |  13 +-
 .../pages/questions-new/src/questions-new.vue |   7 +-
 src/module-manage/components/page-tool.vue    |   1 +
 .../components/permissions-add.vue            |   1 +
 .../components/permissionsApi-add.vue         |   1 +
 src/module-manage/components/user-add.vue     |   4 +-
 yarn.lock                                     | 338 +++++++++++++++++-
 13 files changed, 378 insertions(+), 9 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index e90b8ad..230453f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -18,8 +18,9 @@ module.exports = {
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'space-before-function-paren': 'off',
     'vue/max-attributes-per-line': 'off',
-    'vue/require-prop-types': 'off',
+    // 'vue/require-prop-types': 'off',
     'vue/no-use-v-if-with-v-for': 'off',
     'vue/no-template-key': 'off'
+    // 'vue/require-default-prop': 'off'
   }
 }
diff --git a/doc/wzy.md b/doc/wzy.md
index 10d2aa5..4696456 100644
--- a/doc/wzy.md
+++ b/doc/wzy.md
@@ -81,4 +81,8 @@ propE: {
 <template v-if="item.type === 'input' || item.type === 'password'">
 ```
 
-​	
\ No newline at end of file
+#### 使用富文本插件
+
+> WangEditor
+>
+> https://www.wangeditor.com/v5/for-frame.html#%E4%BD%BF%E7%94%A8
\ No newline at end of file
diff --git a/package.json b/package.json
index 5733683..aa8ded4 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,8 @@
     "prepare": "husky install"
   },
   "dependencies": {
+    "@wangeditor/editor": "^5.1.18",
+    "@wangeditor/editor-for-vue": "^1.0.2",
     "axios": "^0.19.2",
     "core-js": "^3.6.4",
     "echarts": "^4.6.0",
diff --git a/src/base-ui/ZyForm/src/zy-form.vue b/src/base-ui/ZyForm/src/zy-form.vue
index 68de677..e0eeda9 100644
--- a/src/base-ui/ZyForm/src/zy-form.vue
+++ b/src/base-ui/ZyForm/src/zy-form.vue
@@ -37,7 +37,9 @@
               />
             </template>
             <!-- select -->
-            <template v-if="item.type === 'select' || item.type === 'tags'">
+            <template
+              v-else-if="item.type === 'select' || item.type === 'tags'"
+            >
               <el-select
                 v-model="MyFormData[`${item.field}`]"
                 v-bind="item.otherOptions"
@@ -71,6 +73,10 @@
             <template v-else-if="item.type === 'more'">
               <slot name="more" />
             </template>
+            <!-- my-editor -->
+            <template v-else-if="item.type === 'myEditor'">
+              <slot name="myEditor" :editor="item" />
+            </template>
             <!-- datepicker -->
             <!-- <template v-else-if="item.type === 'datepicker'">
               <el-date-picker
diff --git a/src/main.js b/src/main.js
index 644fb37..ff4b897 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,6 +13,8 @@ import * as filters from './filters' // global filters
 import './mock' // simulation data
 // font-awesome
 import 'font-awesome/css/font-awesome.css'
+// 富文本样式
+import '@wangeditor/editor/dist/css/style.css'
 /*
  * 注册 - 业务模块
  */
diff --git a/src/module-dashboard/components/pageTool.vue b/src/module-dashboard/components/pageTool.vue
index c3ba2c8..00fd2ae 100644
--- a/src/module-dashboard/components/pageTool.vue
+++ b/src/module-dashboard/components/pageTool.vue
@@ -15,6 +15,7 @@
 <script>
 export default {
   name: 'PageTool',
+  // eslint-disable-next-line
   props: ['total', 'paginationPage', 'paginationPagesize'],
   data() {
     return {}
diff --git a/src/module-hmmm/pages/questions-new/config/formConfig.config.js b/src/module-hmmm/pages/questions-new/config/formConfig.config.js
index 6a38b19..94817b0 100644
--- a/src/module-hmmm/pages/questions-new/config/formConfig.config.js
+++ b/src/module-hmmm/pages/questions-new/config/formConfig.config.js
@@ -140,7 +140,18 @@ export const formConfig = {
       ]
     },
     // 题干
-
+    {
+      field: 'question',
+      type: 'myEditor',
+      label: '题干',
+      otherOptions: {
+        itemStyle: 'height: 300px; overflow-y: hidden; text-align: left',
+        mode: 'simple'
+      },
+      editorConfig: {
+        placeholder: '<p>请输入题干</p>'
+      }
+    },
     // 选项
     {},
 
diff --git a/src/module-hmmm/pages/questions-new/src/questions-new.vue b/src/module-hmmm/pages/questions-new/src/questions-new.vue
index 7ab6a52..a367447 100644
--- a/src/module-hmmm/pages/questions-new/src/questions-new.vue
+++ b/src/module-hmmm/pages/questions-new/src/questions-new.vue
@@ -13,6 +13,9 @@
             </el-button>
           </el-row>
         </template>
+        <template #myEditor="{ otherOptions, editorConfig }">
+          <ZyEditor v-bind="otherOptions" :editor-config="editorConfig" />
+        </template>
       </zy-form>
     </el-card>
   </div>
@@ -20,11 +23,13 @@
 
 <script>
 import ZyForm from '@/base-ui/ZyForm'
+import ZyEditor from '@/base-ui/ZyEditor'
 import { formConfig } from '../config/formConfig.config.js'
 export default {
   name: 'QuestionsNew',
   components: {
-    ZyForm
+    ZyForm,
+    ZyEditor
   },
   data() {
     return {
diff --git a/src/module-manage/components/page-tool.vue b/src/module-manage/components/page-tool.vue
index c3ba2c8..00fd2ae 100644
--- a/src/module-manage/components/page-tool.vue
+++ b/src/module-manage/components/page-tool.vue
@@ -15,6 +15,7 @@
 <script>
 export default {
   name: 'PageTool',
+  // eslint-disable-next-line
   props: ['total', 'paginationPage', 'paginationPagesize'],
   data() {
     return {}
diff --git a/src/module-manage/components/permissions-add.vue b/src/module-manage/components/permissions-add.vue
index 1d4cae5..c5dad10 100644
--- a/src/module-manage/components/permissions-add.vue
+++ b/src/module-manage/components/permissions-add.vue
@@ -42,6 +42,7 @@ import { list } from '@/api/base/menus.js'
 let _this = []
 export default {
   name: 'UsersAdd',
+  // eslint-disable-next-line
   props: ['text', 'pageTitle', 'ruleInline'],
   data() {
     return {
diff --git a/src/module-manage/components/permissionsApi-add.vue b/src/module-manage/components/permissionsApi-add.vue
index 49392c8..3519a07 100644
--- a/src/module-manage/components/permissionsApi-add.vue
+++ b/src/module-manage/components/permissionsApi-add.vue
@@ -42,6 +42,7 @@ import { list } from '@/api/base/menus.js'
 let _this = []
 export default {
   name: 'PermissionGroupsApiAdd',
+  // eslint-disable-next-line
   props: ['apiTitle', 'ruleInline'],
   data() {
     return {
diff --git a/src/module-manage/components/user-add.vue b/src/module-manage/components/user-add.vue
index 3c5637e..78cf640 100644
--- a/src/module-manage/components/user-add.vue
+++ b/src/module-manage/components/user-add.vue
@@ -80,14 +80,14 @@
 </template>
 
 <script>
-// eslint-disable-next-line
+/* eslint-disable */
 import { detail, update, add } from '@/api/base/users'
 export default {
   name: 'UsersAdd',
+
   props: [
     'text',
     'pageTitle',
-    // eslint-disable-next-line
     'PermissionGroupsList',
     'formBase',
     'ruleInline'
diff --git a/yarn.lock b/yarn.lock
index 974c5e9..9ddcac7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -908,7 +908,7 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/runtime@^7.11.0", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.11.0", "@babel/runtime@^7.12.0", "@babel/runtime@^7.8.4":
   version "7.19.0"
   resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259"
   integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==
@@ -1093,6 +1093,11 @@
   resolved "https://registry.npmmirror.com/@soda/get-current-script/-/get-current-script-1.0.2.tgz#a53515db25d8038374381b73af20bb4f2e508d87"
   integrity sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w==
 
+"@transloadit/prettier-bytes@0.0.7":
+  version "0.0.7"
+  resolved "https://registry.npmmirror.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz#cdb5399f445fdd606ed833872fa0cabdbc51686b"
+  integrity sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==
+
 "@types/body-parser@*":
   version "1.19.2"
   resolved "https://registry.npmmirror.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
@@ -1116,6 +1121,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/event-emitter@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.3.tgz#727032a9fc67565f96bbd78b2e2809275c97d7e7"
+  integrity sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==
+
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
   version "4.17.30"
   resolved "https://registry.npmmirror.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz#0f2f99617fa8f9696170c46152ccf7500b34ac04"
@@ -1257,6 +1267,49 @@
     anymatch "^3.0.0"
     source-map "^0.6.0"
 
+"@uppy/companion-client@^2.2.2":
+  version "2.2.2"
+  resolved "https://registry.npmmirror.com/@uppy/companion-client/-/companion-client-2.2.2.tgz#c70b42fdcca728ef88b3eebf7ee3e2fa04b4923b"
+  integrity sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==
+  dependencies:
+    "@uppy/utils" "^4.1.2"
+    namespace-emitter "^2.0.1"
+
+"@uppy/core@^2.1.1":
+  version "2.3.3"
+  resolved "https://registry.npmmirror.com/@uppy/core/-/core-2.3.3.tgz#c2dc50a9a3dce6d565490780b2fc35b32367e047"
+  integrity sha512-oTFYZT02dIoUGm8Ar6+Tg/xbL8MliwiPQdiuoCimPBmY19ZhuJm/K4wEYZ6nOFeYsgBWYi1yWfsmdx8LvFVx4g==
+  dependencies:
+    "@transloadit/prettier-bytes" "0.0.7"
+    "@uppy/store-default" "^2.1.1"
+    "@uppy/utils" "^4.1.2"
+    lodash.throttle "^4.1.1"
+    mime-match "^1.0.2"
+    namespace-emitter "^2.0.1"
+    nanoid "^3.1.25"
+    preact "^10.5.13"
+
+"@uppy/store-default@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.npmmirror.com/@uppy/store-default/-/store-default-2.1.1.tgz#62a656a099bdaa012306e054d093754cb2d36e3e"
+  integrity sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==
+
+"@uppy/utils@^4.1.2":
+  version "4.1.3"
+  resolved "https://registry.npmmirror.com/@uppy/utils/-/utils-4.1.3.tgz#9d0be6ece4df25f228d30ef40be0f14208258ce3"
+  integrity sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==
+  dependencies:
+    lodash.throttle "^4.1.1"
+
+"@uppy/xhr-upload@^2.0.3":
+  version "2.1.3"
+  resolved "https://registry.npmmirror.com/@uppy/xhr-upload/-/xhr-upload-2.1.3.tgz#0d4e355332fe0c6eb372d7731315e04d02aeeb18"
+  integrity sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==
+  dependencies:
+    "@uppy/companion-client" "^2.2.2"
+    "@uppy/utils" "^4.1.2"
+    nanoid "^3.1.25"
+
 "@vue/babel-helper-vue-jsx-merge-props@^1.4.0":
   version "1.4.0"
   resolved "https://registry.npmmirror.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz#8d53a1e21347db8edbe54d339902583176de09f2"
@@ -1546,6 +1599,84 @@
   resolved "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a"
   integrity sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA==
 
+"@wangeditor/basic-modules@^1.1.5":
+  version "1.1.5"
+  resolved "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.5.tgz#098c05d934e7dbdca33af7c221a29cbe62b67cb9"
+  integrity sha512-rq69or2qs400RhzqpRczYAJQN+RzWOElhmCYuDOgMGvL7OAZUMNHcuihzVmP4sj0EGVIsjnTq1bWaRF654ladw==
+  dependencies:
+    is-url "^1.2.4"
+
+"@wangeditor/code-highlight@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/@wangeditor/code-highlight/-/code-highlight-1.0.3.tgz#90256857714d5c0cf83ac475aea64db7bf29a7cd"
+  integrity sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==
+  dependencies:
+    prismjs "^1.23.0"
+
+"@wangeditor/core@^1.1.14":
+  version "1.1.14"
+  resolved "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.14.tgz#5de86b8828b2d7d07a0603123f151554e19c810f"
+  integrity sha512-pq33BxvDUUGL08+YJiWyG7RCI6xKCInxuzMDwPSJ+0h1oLQMcT2I37MXnghDPAl2+rpKFJBbS6AwRsysp0K4vw==
+  dependencies:
+    "@types/event-emitter" "^0.3.3"
+    event-emitter "^0.3.5"
+    html-void-elements "^2.0.0"
+    i18next "^20.4.0"
+    scroll-into-view-if-needed "^2.2.28"
+    slate-history "^0.66.0"
+
+"@wangeditor/editor-for-vue@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-1.0.2.tgz#62674d56354319ff8dcc83db5c62cec4437ee906"
+  integrity sha512-BOENvAXJVtVXlE2X50AAvjV82YlCUeu5cbeR0cvEQHQjYtiVnJtq7HSoj85r2kTgGouI5OrpJG9BBEjSjUSPyA==
+
+"@wangeditor/editor@^5.1.18":
+  version "5.1.18"
+  resolved "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.18.tgz#58bb7f398e6f99d8c4901137e69814c3b6a757be"
+  integrity sha512-mt5IeNjVQgCPmUeHygcEoz/1lhujx7GjeAERaAt+RaeB2+TZCzOBqqx+0nVIdmVBDDwyu1OabWyS4Pc7tEvzVA==
+  dependencies:
+    "@uppy/core" "^2.1.1"
+    "@uppy/xhr-upload" "^2.0.3"
+    "@wangeditor/basic-modules" "^1.1.5"
+    "@wangeditor/code-highlight" "^1.0.3"
+    "@wangeditor/core" "^1.1.14"
+    "@wangeditor/list-module" "^1.0.3"
+    "@wangeditor/table-module" "^1.1.3"
+    "@wangeditor/upload-image-module" "^1.0.2"
+    "@wangeditor/video-module" "^1.1.3"
+    dom7 "^3.0.0"
+    is-hotkey "^0.2.0"
+    lodash.camelcase "^4.3.0"
+    lodash.clonedeep "^4.5.0"
+    lodash.debounce "^4.0.8"
+    lodash.foreach "^4.5.0"
+    lodash.isequal "^4.5.0"
+    lodash.throttle "^4.1.1"
+    lodash.toarray "^4.4.0"
+    nanoid "^3.2.0"
+    slate "^0.72.0"
+    snabbdom "^3.1.0"
+
+"@wangeditor/list-module@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.3.tgz#52b12ed61b5cd48a591e835b4d2cb41feec0b5ac"
+  integrity sha512-hH1OZGT0pBPSywFyGELkPHh9bGJQk5fcGgP9S3cXcQYxrPPhnAKjCCr5YzFzZhaSI6Epj83HfOHaAelEjkibNg==
+
+"@wangeditor/table-module@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.3.tgz#bfd2a8eaa6df9dc32d61f4114bebf7a364cb41f5"
+  integrity sha512-rV+7k1z1cL/z0txK3W2/iqjwglEi+hgwhq626dJHH7ryrh/Ale0O+Tte548FG+bAwVIWjtZDHpJQl84P4Xy8Pw==
+
+"@wangeditor/upload-image-module@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.2.tgz#89e9b9467e10cbc6b11dc5748e08dd23aaebee30"
+  integrity sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==
+
+"@wangeditor/video-module@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.3.tgz#64bb4392b064261517f8c8bbccf39434d4596a73"
+  integrity sha512-3FYDGJ/FN1A/4k247UOOEsJJ9I7wcnw1QdEcpPr4ybKrdSn6F80/YzpC1xUltADmhrD/J/bOCyuZ41kN0JIg6Q==
+
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -2869,6 +3000,11 @@ compression@^1.7.4:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
+compute-scroll-into-view@^1.0.17:
+  version "1.0.17"
+  resolved "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz#6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab"
+  integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -3258,6 +3394,14 @@ cyclist@^1.0.1:
   resolved "https://registry.npmmirror.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==
 
+d@1, d@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
+  dependencies:
+    es5-ext "^0.10.50"
+    type "^1.0.1"
+
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.npmmirror.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -3538,6 +3682,13 @@ dom-serializer@^1.0.1:
     domhandler "^4.2.0"
     entities "^2.0.0"
 
+dom7@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/dom7/-/dom7-3.0.0.tgz#b861ce5d67a6becd7aaa3ad02942ff14b1240331"
+  integrity sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==
+  dependencies:
+    ssr-window "^3.0.0-alpha.1"
+
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.npmmirror.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
@@ -3817,6 +3968,32 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+es5-ext@^0.10.35, es5-ext@^0.10.50, es5-ext@~0.10.14:
+  version "0.10.62"
+  resolved "https://registry.npmmirror.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"
+  integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==
+  dependencies:
+    es6-iterator "^2.0.3"
+    es6-symbol "^3.1.3"
+    next-tick "^1.1.0"
+
+es6-iterator@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npmmirror.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
+es6-symbol@^3.1.1, es6-symbol@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
+  dependencies:
+    d "^1.0.1"
+    ext "^1.1.2"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -4075,6 +4252,14 @@ etag@~1.8.1:
   resolved "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
+event-emitter@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.npmmirror.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
 event-pubsub@4.3.0:
   version "4.3.0"
   resolved "https://registry.npmmirror.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e"
@@ -4215,6 +4400,13 @@ express@^4.16.3, express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+ext@^1.1.2:
+  version "1.7.0"
+  resolved "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
+  integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
+  dependencies:
+    type "^2.7.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -4994,6 +5186,11 @@ html-tags@^3.1.0:
   resolved "https://registry.npmmirror.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961"
   integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==
 
+html-void-elements@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/html-void-elements/-/html-void-elements-2.0.1.tgz#29459b8b05c200b6c5ee98743c41b979d577549f"
+  integrity sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==
+
 html-webpack-plugin@^3.2.0:
   version "3.2.0"
   resolved "https://registry.npmmirror.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
@@ -5114,6 +5311,13 @@ husky@^8.0.0:
   resolved "https://registry.npmmirror.com/husky/-/husky-8.0.1.tgz#511cb3e57de3e3190514ae49ed50f6bc3f50b3e9"
   integrity sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==
 
+i18next@^20.4.0:
+  version "20.6.1"
+  resolved "https://registry.npmmirror.com/i18next/-/i18next-20.6.1.tgz#535e5f6e5baeb685c7d25df70db63bf3cc0aa345"
+  integrity sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==
+  dependencies:
+    "@babel/runtime" "^7.12.0"
+
 iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -5158,6 +5362,11 @@ image-size@^0.5.1:
   resolved "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
   integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==
 
+immer@^9.0.6:
+  version "9.0.15"
+  resolved "https://registry.npmmirror.com/immer/-/immer-9.0.15.tgz#0b9169e5b1d22137aba7d43f8a81a495dd1b62dc"
+  integrity sha512-2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ==
+
 immutable@^4.0.0:
   version "4.1.0"
   resolved "https://registry.npmmirror.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
@@ -5509,6 +5718,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-hotkey@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmmirror.com/is-hotkey/-/is-hotkey-0.2.0.tgz#1835a68171a91e5c9460869d96336947c8340cef"
+  integrity sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==
+
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.npmmirror.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -5591,6 +5805,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-promise@^2.1.0:
   version "2.2.2"
   resolved "https://registry.npmmirror.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
@@ -5650,6 +5869,11 @@ is-typedarray@~1.0.0:
   resolved "https://registry.npmmirror.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
+is-url@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.npmmirror.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
+  integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
+
 is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmmirror.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
@@ -5990,6 +6214,16 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
+
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==
+
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -6000,6 +6234,16 @@ lodash.defaultsdeep@^4.6.1:
   resolved "https://registry.npmmirror.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6"
   integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==
 
+lodash.foreach@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npmmirror.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
+  integrity sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==
+
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
+
 lodash.kebabcase@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmmirror.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
@@ -6015,6 +6259,16 @@ lodash.memoize@^4.1.2:
   resolved "https://registry.npmmirror.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
+lodash.throttle@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
+  integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==
+
+lodash.toarray@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.npmmirror.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
+  integrity sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==
+
 lodash.transform@^4.6.0:
   version "4.6.0"
   resolved "https://registry.npmmirror.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0"
@@ -6250,6 +6504,13 @@ mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   resolved "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
+mime-match@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/mime-match/-/mime-match-1.0.2.tgz#3f87c31e9af1a5fd485fb9db134428b23bbb7ba8"
+  integrity sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==
+  dependencies:
+    wildcard "^1.1.0"
+
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
@@ -6413,12 +6674,17 @@ mz@^2.4.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
+namespace-emitter@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/namespace-emitter/-/namespace-emitter-2.0.1.tgz#978d51361c61313b4e6b8cf6f3853d08dfa2b17c"
+  integrity sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==
+
 nan@^2.12.1:
   version "2.16.0"
   resolved "https://registry.npmmirror.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916"
   integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==
 
-nanoid@^3.3.4:
+nanoid@^3.1.25, nanoid@^3.2.0, nanoid@^3.3.4:
   version "3.3.4"
   resolved "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
   integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
@@ -6455,6 +6721,11 @@ neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
   resolved "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
+next-tick@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
+  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
+
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.npmmirror.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -7503,6 +7774,11 @@ posthtml@^0.9.2:
     posthtml-parser "^0.2.0"
     posthtml-render "^1.0.5"
 
+preact@^10.5.13:
+  version "10.11.0"
+  resolved "https://registry.npmmirror.com/preact/-/preact-10.11.0.tgz#26af45a0613f4e17a197cc39d7a1ea23e09b2532"
+  integrity sha512-Fk6+vB2kb6mSJfDgODq0YDhMfl0HNtK5+Uc9QqECO4nlyPAQwCI+BKyWO//idA7ikV7o+0Fm6LQmNuQi1wXI1w==
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -7533,6 +7809,11 @@ pretty-error@^2.0.2:
     lodash "^4.17.20"
     renderkid "^2.0.4"
 
+prismjs@^1.23.0:
+  version "1.29.0"
+  resolved "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12"
+  integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==
+
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -8126,6 +8407,13 @@ screenfull@^5.0.2:
   resolved "https://registry.npmmirror.com/screenfull/-/screenfull-5.2.0.tgz#6533d524d30621fc1283b9692146f3f13a93d1ba"
   integrity sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==
 
+scroll-into-view-if-needed@^2.2.28:
+  version "2.2.29"
+  resolved "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.29.tgz#551791a84b7e2287706511f8c68161e4990ab885"
+  integrity sha512-hxpAR6AN+Gh53AdAimHM6C8oTN1ppwVZITihix+WqalywBeFcQ6LdQP5ABNl26nX8GTEL7VT+b8lKpdqq65wXg==
+  dependencies:
+    compute-scroll-into-view "^1.0.17"
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -8312,6 +8600,22 @@ slash@^3.0.0:
   resolved "https://registry.npmmirror.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
+slate-history@^0.66.0:
+  version "0.66.0"
+  resolved "https://registry.npmmirror.com/slate-history/-/slate-history-0.66.0.tgz#ac63fddb903098ceb4c944433e3f75fe63acf940"
+  integrity sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==
+  dependencies:
+    is-plain-object "^5.0.0"
+
+slate@^0.72.0:
+  version "0.72.8"
+  resolved "https://registry.npmmirror.com/slate/-/slate-0.72.8.tgz#5a018edf24e45448655293a68bfbcf563aa5ba81"
+  integrity sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==
+  dependencies:
+    immer "^9.0.6"
+    is-plain-object "^5.0.0"
+    tiny-warning "^1.0.3"
+
 slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.npmmirror.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
@@ -8326,6 +8630,11 @@ slice-ansi@^2.1.0:
     astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
+snabbdom@^3.1.0:
+  version "3.5.1"
+  resolved "https://registry.npmmirror.com/snabbdom/-/snabbdom-3.5.1.tgz#25f80ef15b194baea703d9d5441892e369de18e1"
+  integrity sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.npmmirror.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -8508,6 +8817,11 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
+ssr-window@^3.0.0-alpha.1:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/ssr-window/-/ssr-window-3.0.0.tgz#fd5b82801638943e0cc704c4691801435af7ac37"
+  integrity sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==
+
 ssri@^6.0.1:
   version "6.0.2"
   resolved "https://registry.npmmirror.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
@@ -8947,6 +9261,11 @@ timsort@^0.3.0:
   resolved "https://registry.npmmirror.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==
 
+tiny-warning@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
+  integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.npmmirror.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -9091,6 +9410,16 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+type@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
+
+type@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.npmmirror.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
+  integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.npmmirror.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -9655,6 +9984,11 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
+wildcard@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/wildcard/-/wildcard-1.1.2.tgz#a7020453084d8cd2efe70ba9d3696263de1710a5"
+  integrity sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==
+
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-- 
Gitee


From 5b4f5d2037503ae7d5c22d9bf5dcaf7da08cc1fa Mon Sep 17 00:00:00 2001
From: jiangxiuguo <2872456851@qq.com>
Date: Sat, 17 Sep 2022 20:57:19 +0800
Subject: [PATCH 14/40] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AF=95=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module-hmmm/pages/questions.vue | 257 +++++++++++++++++++++++++++-
 1 file changed, 255 insertions(+), 2 deletions(-)

diff --git a/src/module-hmmm/pages/questions.vue b/src/module-hmmm/pages/questions.vue
index d903714..aae2a67 100644
--- a/src/module-hmmm/pages/questions.vue
+++ b/src/module-hmmm/pages/questions.vue
@@ -1,11 +1,264 @@
 <template>
   <div class="container">
     题组管理
+    <el-card shadow="never">
+      <el-form ref="requestParameters" :model="requestParameters">
+        <div class="filter-container">
+          <span style="font-size: 0.75rem; color: pink">说明：目前支持学科和关键字条件筛选</span>
+          <el-button
+            class="filter-item fr"
+            type="success"
+            icon="el-icon-edit"
+            size="small"
+            @click="$router.push('/questions/new')"
+          >
+            添加试题
+          </el-button>
+        </div>
+      </el-form>
+
+      <el-alert
+        v-if="alertText !== ''"
+        :title="alertText"
+        type="info"
+        class="alert"
+        :closable="false"
+        show-icon
+      />
+      <!-- end -->
+      <!-- 数据 -->
+      <el-table
+        :data="tableData"
+        element-loading-text="给我一点时间"
+        highlight-current-row
+        style="width: 100%"
+      >
+        <el-table-column prop="number" label="试题编号" />
+
+        <el-table-column width="50px" prop="subject" label="学科" />
+        <el-table-column width="100px" prop="catalog" label="目录" />
+        <el-table-column width="50px" label="题型">
+          <template v-slot="{ row }">
+            {{ getquestype(row.questionType) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="question" label="题干" />
+        <el-table-column label="录入时间">
+          <template v-slot="{ row }">
+            {{ formatDate(row.addDate) }}
+          </template>
+        </el-table-column>
+        <el-table-column width="100px" label="难度">
+          <template v-slot="{ row }">
+            {{ getdifftype(row.difficulty) }}
+          </template>
+        </el-table-column>
+        <el-table-column width="100px" prop="creator" label="录入人" />
+        <el-table-column label="操作">
+          <template slot-scope="{ row }">
+            <el-button
+              type="primary"
+              icon="el-icon-view"
+              circle
+              plain
+              @click="handleCreate"
+            />
+            <el-button
+              type="success"
+              icon="el-icon-edit"
+              circle
+              plain
+              @click="$router.push('/questions/new')"
+            />
+            <el-button
+              type="danger"
+              icon="el-icon-delete"
+              circle
+              plain
+              @click="delques(row)"
+            />
+            <el-button type="warning" icon="el-icon-check" circle plain />
+          </template>
+        </el-table-column>
+
+        <!-- 头像 -->
+        <!-- <el-table-column align="center" :label="$t('table.avatar')">
+            <template slot-scope="scope">
+              <img :src="scope.row.avatar" style="width:50px;height:50px;">
+            </template>
+          </el-table-column> -
+          <el-table-column align="center" width="350px" :label="$t('table.introduction')">
+            <template slot-scope="scope">
+              <span>{{scope.row.introduction}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" :label="$t('table.actions')" class-name="small-padding fixed-width">
+            <template slot-scope="scope" v-show="deletedDate">
+              <el-button type="primary" size="mini" @click="handleUpdate(scope.row.id)">{{$t('table.edit')}}</el-button>
+              <el-button v-if="scope.row.status!='deleted'" size="mini" type="danger" @click="removeUser(scope.row.id)">{{$t('table.delete')}}
+              </el-button>
+            </template>
+            <template slot-scope="scope" v-show="showDate">
+              <el-button type="primary" size="mini">{{$t('table.edit')}}</el-button>
+              <el-button v-if="scope.row.status!='deleted'" size="mini" type="danger">{{$t('table.delete')}}
+              </el-button>
+            </template>
+          </el-table-column>
+          -->
+      </el-table>
+      <!-- end -->
+      <!-- 分页 -->
+      <div class="pagination-container">
+        <PageTool
+          :pagination-page="pagination.page"
+          :pagination-pagesize="pagination.pageSize"
+          :total="pagination.total"
+        />
+      </div>
+      <!-- end -->
+    </el-card>
+    <!-- 新增标签弹层 -->
+    <tagsAdd />
   </div>
 </template>
 
 <script>
-export default {}
+// import PageTool from '@/module-dashboard/components/pageTool.vue'
+import PageTool from '@/module-manage/components/page-tool.vue'
+import { list, remove } from '@/api/hmmm/questions.js'
+
+import tagsAdd from '@/module-hmmm/components/tags-add.vue'
+export default {
+  components: {
+    PageTool,
+    tagsAdd
+  },
+  data() {
+    return {
+      pagination: {
+        page: 1,
+        // pagesize: 10
+        total: 0,
+        pageSize: 20,
+        pageSizes: [20, 50, 80, 120],
+        currentPage: 1
+      },
+      list: [],
+      total: null,
+      tableData: [],
+      alertText: ''
+    }
+  },
+  created() {
+    this.list = list()
+    console.log(this.list)
+    this.getList()
+  },
+  methods: {
+    // 删除基础题库方法
+    async delques(id) {
+      try {
+        await this.$confirm('您确认删除该试题吗')
+        await remove(id)
+        this.getList()
+        this.$message.success('删除成功')
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    // 显示弹层
+    handleCreate() {
+      alert(123)
+      this.$refs.editUser.dialogFormV()
+    },
+    getquestype(str) {
+      if (str === 1) {
+        str = '单选'
+      } else if (str === 2) {
+        str = '多选'
+      } else if (str === 3) {
+        str = '简答'
+      }
+      console.log(str)
+      return str
+    },
+    getdifftype(str) {
+      if (str === 1) {
+        str = '简单'
+      } else if (str === 2) {
+        str = '一般'
+      } else if (str === 3) {
+        str = '困难'
+      }
+      return str
+    },
+    async getList() {
+      const { data } = await list()
+      console.log(data)
+      this.tableData = data.items
+    },
+    formatDate(res) {
+      const date = new Date(res)
+      const formatObj = {
+        y: date.getFullYear(),
+        m: date.getMonth() + 1,
+        d: date.getDate(),
+        h: date.getHours(),
+        i: date.getMinutes(),
+        s: date.getSeconds(),
+        a: date.getDay()
+      }
+      if (formatObj.m < 10) {
+        formatObj.m = '0' + formatObj.m
+      }
+      if (formatObj.d < 10) {
+        formatObj.d = '0' + formatObj.d
+      }
+      if (formatObj.h < 10) {
+        formatObj.h = '0' + formatObj.h
+      }
+      if (formatObj.i < 10) {
+        formatObj.i = '0' + formatObj.i
+      }
+      if (formatObj.s < 10) {
+        formatObj.s = '0' + formatObj.s
+      }
+      return (
+        formatObj.y +
+        '-' +
+        formatObj.m +
+        '-' +
+        formatObj.d +
+        ' ' +
+        formatObj.h +
+        ':' +
+        formatObj.i +
+        ':' +
+        formatObj.s
+      )
+    }
+    // // 每页显示信息条数
+    // handleSizeChange(val) {
+    //   this.requestParameters.pagesize = val
+    //   if (this.requestParameters.page ==== 1) {
+    //     this.getList(this.requestParameters)
+    //   }
+    // },
+    // // 进入某一页
+    // handleCurrentChange(val) {
+    //   this.requestParameters.page = val
+    //   this.getList()
+    // },
+  }
+}
 </script>
 
-<style scoped lang="less"></style>
+<style scoped>
+.alert {
+  margin: 10px 0px;
+}
+.pagination-container {
+  margin-top: 10px;
+  text-align: right;
+}
+</style>
-- 
Gitee


From cd61730a355ef84b8a21f2a03e4c72e301336a49 Mon Sep 17 00:00:00 2001
From: wzy <wzyzzqq@163.com>
Date: Sat, 17 Sep 2022 21:02:22 +0800
Subject: [PATCH 15/40] go to the moon

---
 src/base-ui/ZyForm/src/zy-form.vue            |  4 +-
 .../components/QuestionChoiceSelect.vue       | 50 ++++++++++++-------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/base-ui/ZyForm/src/zy-form.vue b/src/base-ui/ZyForm/src/zy-form.vue
index ae63043..22bc730 100644
--- a/src/base-ui/ZyForm/src/zy-form.vue
+++ b/src/base-ui/ZyForm/src/zy-form.vue
@@ -24,8 +24,8 @@
             <template
               v-if="
                 item.type === 'input' ||
-                item.type === 'password' ||
-                item.type === 'textarea'
+                  item.type === 'password' ||
+                  item.type === 'textarea'
               "
             >
               <el-input
diff --git a/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue b/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
index 68bd06e..1d85bf2 100644
--- a/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
+++ b/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
@@ -2,7 +2,12 @@
   <div class="container">
     <template>
       <span class="project">{{ name }}</span>
-      <el-select v-model="value" placeholder="请选择" size="small" style="width:240px">
+      <el-select
+        v-model="value"
+        placeholder="请选择"
+        size="small"
+        style="width: 240px"
+      >
         <el-option
           v-for="item in options"
           :key="item.value"
@@ -16,33 +21,40 @@
 
 <script>
 export default {
+  // eslint-disable-next-line
   props: ['name'],
   data() {
     return {
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
+      options: [
+        {
+          value: '选项1',
+          label: '黄金糕'
+        },
+        {
+          value: '选项2',
+          label: '双皮奶'
+        },
+        {
+          value: '选项3',
+          label: '蚵仔煎'
+        },
+        {
+          value: '选项4',
+          label: '龙须面'
+        },
+        {
+          value: '选项5',
+          label: '北京烤鸭'
+        }
+      ],
       value: ''
     }
   }
 }
 </script>
 
-<style scoped >
-.project{
+<style scoped>
+.project {
   margin-right: 10px;
   color: #606266;
   font-weight: 700;
-- 
Gitee


From 94bac7376c7242734a1966f6cd7cc325280f9d67 Mon Sep 17 00:00:00 2001
From: fy <773589090@qq.com>
Date: Sat, 17 Sep 2022 21:15:17 +0800
Subject: [PATCH 16/40] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=AD=A6=E7=A7=91?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module-hmmm/pages/subjects.vue | 127 ++++++++++++++++++++++++++++-
 src/module-hmmm/pages/tags.vue     |  66 +++++++++------
 src/utils/request.js               |  12 +--
 3 files changed, 173 insertions(+), 32 deletions(-)

diff --git a/src/module-hmmm/pages/subjects.vue b/src/module-hmmm/pages/subjects.vue
index 546e24c..67be980 100644
--- a/src/module-hmmm/pages/subjects.vue
+++ b/src/module-hmmm/pages/subjects.vue
@@ -1,11 +1,134 @@
 <template>
   <div class="container">
     学科管理
+    <button @click="fn">
+      跳转标签
+    </button>
+    <hr>
+    <el-table
+      :data="tableData"
+      border
+      style="width: 100%"
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        width="180"
+      />
+      <el-table-column
+        prop="subjectName"
+        label="学科名称"
+        width="180"
+      />
+      <el-table-column
+        prop="tagName"
+        label="创建者"
+      />
+      <el-table-column
+        prop="addDate"
+        label="创建日期"
+      >
+        <template slot-scope="{row}">
+          {{ row.addDate | formatDate }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="state"
+        label="前台是否提示"
+      >
+        <!-- <template slot-scope="{row}">
+          <span>{{ row.state===0?'是':'否' }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column
+        prop="twoLeveIDirectory"
+        label="二级目录"
+      /> <el-table-column
+        prop="username"
+        label="标签"
+      /><el-table-column
+        prop="totals"
+        label="题目数量"
+      />
+      <el-table-column
+        prop="address"
+        label="操作"
+      >
+        <template slot-scope="{row}">
+          <el-button type="text" size="medium " @click="disable(row.id,0)">
+            学科分类
+          </el-button>
+          <el-button type="text" size="medium " @click="disable(row.id,1)">
+            学科标签
+          </el-button>
+          <el-button type="text" size="medium " @click="edit(row)">
+            修改
+          </el-button> <el-button type="text" size="medium " @click="remove(row)">
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-pagination
+
+      background
+      :current-page="page.page"
+      :page-sizes="[5,10, 20]"
+      :page-size="page.pagesize"
+      layout="  prev, pager, next,sizes, jumper"
+      :total="page.total"
+      @size-change="SizeChange"
+      @current-change="CurrentChange"
+    />
   </div>
 </template>
 
 <script>
-export default {}
+import { list } from '@/api/hmmm/subjects'
+export default {
+  data () {
+    return {
+      id: 1,
+      tableData: [{ }],
+      page: {
+        page: 1,
+        pagesize: 5,
+        total: null
+      }
+    }
+  },
+  created() {
+    this.list()
+  },
+  methods: {
+    fn() {
+      this.$router.push({
+        path: '/subjects/tags',
+        query: {
+          id: this.id
+        }
+      })
+    },
+    async list() {
+      const { data } = await list(this.page)
+      this.tableData = data.items
+      this.page.total = data.counts
+      console.log(data)
+    },
+    SizeChange(pagesize) {
+      console.log(pagesize)
+      this.page.pagesize = pagesize
+      this.list()
+    },
+    CurrentChange(page) {
+      console.log(page)
+      this.page.page = page
+      this.list()
+    }
+  }
+
+}
 </script>
 
-<style scoped lang="less"></style>
+<style ></style>
diff --git a/src/module-hmmm/pages/tags.vue b/src/module-hmmm/pages/tags.vue
index aa21011..6c6d209 100644
--- a/src/module-hmmm/pages/tags.vue
+++ b/src/module-hmmm/pages/tags.vue
@@ -2,7 +2,7 @@
   <div class="tags">
     <ZyForm ref="zychild" :form-items="formItems">
       <template #header>
-        <el-button size="small" @click="remove">
+        <el-button size="small" @click="removebtn">
           清除
         </el-button>
         <el-button size="small" type="primary" @click="searchbtn">
@@ -10,6 +10,9 @@
         </el-button>
       </template>
       <template #footer>
+        <el-button v-if="labelshow" type="text" icon="el-icon-back" @click="$router.back()">
+          返回学科
+        </el-button>
         <el-button type="success" icon="el-icon-edit" @click="addbtn">
           新增标签
         </el-button>
@@ -29,7 +32,7 @@
       />
       <el-table-column
         prop="subjectName"
-        label="姓名"
+        label="所属学科"
         width="180"
       />
       <el-table-column
@@ -52,12 +55,7 @@
         label="状态"
       >
         <template slot-scope="{row}">
-          <span v-if="row.state===0" type="text" size="small">
-            已禁用
-          </span>
-          <span v-else type="text" size="small">
-            已启用
-          </span>
+          <span>{{ row.state===0?'已禁用':'已启用' }}</span>
         </template>
       </el-table-column>
 
@@ -74,7 +72,7 @@
           </el-button>
           <el-button :disabled="state(row.state)" type="text" size="medium " @click="edit(row)">
             修改
-          </el-button> <el-button :disabled="state(row.state)" type="text" size="medium ">
+          </el-button> <el-button :disabled="state(row.state)" type="text" size="medium " @click="remove(row)">
             删除
           </el-button>
         </template>
@@ -100,27 +98,23 @@
 import AlertShow from '@/base-ui/alert-show'
 import ZyForm from '@/base-ui/ZyForm'
 import tagsAdd from '../components/tags-add.vue'
-import { list, changeState, simple } from '@/api/hmmm/tags'
-
-// import test from 'node:test'
+import { list, remove, changeState, simple } from '@/api/hmmm/tags'
 export default {
   name: 'Tags',
   components: {
     tagsAdd, AlertShow, ZyForm
   },
   data() {
-    // const wineList = () => {
-    //   return this.search.state == null && this.search.tagName === ''
-    // }
     return {
       search: {
         tagName: '',
         state: null,
         page: 1,
-        pagesize: 5,
-        subjectID: 1
+        pagesize: 5
+        // subjectID: 1
       },
       dialogFormVisible: false,
+      tagid: this.$route.query.id,
       title: '新增学科',
       tableData: [{ }],
       showdisable: null,
@@ -145,25 +139,49 @@ export default {
           { title: '禁用', value: 0 }
         ]
       }],
-      alertText: ''
+      alertText: '',
+      labelshow: false
     }
   },
   created () {
-    // console.log(this.wineList)
     this.list()
     this.simple()
   },
   methods: {
+    async remove(row) {
+      try {
+        await this.$confirm('确定要删除该数据吗')
+        await remove(row)
+        this.list()
+        this.$message.success('删除成功')
+      } catch (error) {
+        console.log(error)
+      }
+    },
     state(flag) {
       return Boolean(flag)
     },
     async simple() {
-      const { data } = await simple()
-      this.page.total = data.length
-      this.alertText = `当前数据共${this.page.total}条`
+      if (!this.tagid) {
+        const { data } = await simple()
+        this.page.total = data.length
+        this.alertText = `当前数据共${this.page.total}条`
+      }
     },
     async list () {
-      if (this.search.state == null && this.search.tagName === '') {
+      if (this.tagid) {
+        this.labelshow = true
+        const data1 = {
+          page: this.page.page,
+          pagesize: this.page.pagesize,
+          subjectID: this.tagid
+        }
+        const { data } = await list(data1)
+        this.page.total = null
+        this.page.total = data.counts
+        this.tableData = data.items
+        this.alertText = `当前数据共${data.counts}条`
+      } else if (this.search.state == null && this.search.tagName === '') {
         const { data: { items } } = await list(this.page)
         this.tableData = items
         this.simple()
@@ -207,7 +225,7 @@ export default {
       this.title = '新增目录'
       this.dialogFormVisible = true
     },
-    remove() {
+    removebtn() {
       this.$refs.zychild.MyFormData = {}
       this.search = {}
       this.list()
diff --git a/src/utils/request.js b/src/utils/request.js
index 129d48c..a0fa234 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -5,13 +5,13 @@ import { getToken } from '@/utils/auth'
 
 // create an axios instance
 const instance = axios.create({
-<<<<<<< HEAD
-  baseURL: 'http://192.168.34.80:7001/', // http://39.105.1.33:7001/ api的base_url
-  // baseURL: 'http://127.0.0.1:7001/', // http://39.105.1.33:7001/ api的base_url
-=======
+
+  // baseURL: 'http://192.168.34.80:7001/', // http://39.105.1.33:7001/ api的base_url
+  baseURL: 'http://127.0.0.1:7001/', // http://39.105.1.33:7001/ api的base_url
+
   // baseURL: '192.168.34.80:7001/', // http://39.105.1.33:7001/ api的base_url
-  baseURL: 'http://hmmm-api.itheima.net/', // http://39.105.1.33:7001/ api的base_url
->>>>>>> 6ad1868ba7d965dfa0e1748964752c9f08706f3f
+  // baseURL: 'http://hmmm-api.itheima.net/', // http://39.105.1.33:7001/ api的base_url
+
   timeout: 5000 // request timeout
 })
 
-- 
Gitee


From 83ae2a2891090c5d980c10dab4ee36c6fae453dd Mon Sep 17 00:00:00 2001
From: xx <2355@qq.com>
Date: Sat, 17 Sep 2022 21:21:22 +0800
Subject: [PATCH 17/40] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=861?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/hmmm/companys.js           |  4 +--
 src/module-hmmm/pages/companys.vue | 50 +++++++++++++++++-------------
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/api/hmmm/companys.js b/src/api/hmmm/companys.js
index 4ee92f7..1ae67d0 100644
--- a/src/api/hmmm/companys.js
+++ b/src/api/hmmm/companys.js
@@ -16,5 +16,5 @@ export const remove = (id) =>
   createAPI(`/companys/${id}`, 'delete') // 企业管理删除
 
 export const detail = (data) => createAPI(`/companys/${data.id}`, 'get', data) // 企业管理详情
-export const disabled = (data) =>
-  createAPI(`/companys/${data.id}/state`, 'post', data) // 企业管理设置状态
+export const disabled = (id) =>
+  createAPI(`/companys/${id}/state`, 'post') // 企业管理设置状态
diff --git a/src/module-hmmm/pages/companys.vue b/src/module-hmmm/pages/companys.vue
index 2e7009b..ad93c11 100644
--- a/src/module-hmmm/pages/companys.vue
+++ b/src/module-hmmm/pages/companys.vue
@@ -43,7 +43,11 @@
           prop="state"
           label="状态"
           width="115"
-        />
+        >
+        <template slot-scope="{row}">
+          {{row.state==1?'启用':'禁用'}}
+        </template>
+        </el-table-column>
         <el-table-column align="center" prop="address" label="操作" type="flex">
           <template v-slot="{ row }">
             <el-button
@@ -52,18 +56,9 @@
               plain
               circle
             />
-            <el-tooltip
-              class="item"
-              effect="dark"
-              content="禁用"
-              placement="top"
-            >
-              <el-button
-                type="warning"
-                icon="el-icon-close"
-                plain
-                circle
-              />
+            <el-tooltip class="item" effect="dark" content="禁用" placement="top">
+              <el-button @click="changestate(row.id,row.state)" v-if="row.state==1" type="warning" icon="el-icon-close" plain circle/>
+              <el-button @click="changestate(row.id,row.state)" v-else type="success" icon="el-icon-check" plain circle/>
             </el-tooltip>
             <el-button
               type="danger"
@@ -92,7 +87,7 @@
 
 <script>
 import companysadd from '../components/companys-add.vue'
-import { list, remove } from '@/api/hmmm/companys.js'
+import { list, remove , disabled } from '@/api/hmmm/companys.js'
 export default {
   components: {
     companysadd
@@ -114,22 +109,35 @@ export default {
     this.getlist()
   },
   methods: {
+    async changestate(id,state){
+      const confirmResult = await this.$confirm(
+        '已成功禁用, 是否继续?',
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).catch((error) => error)
+      if (confirmResult === 'confirm') {
+        await disabled(id,state);
+        this.$message.success('已成功禁用')
+        
+        console.log(this.page.total)
+        this.getlist()
+      } else {
+        return this.$message.info('已取消删除')
+      }
+    },
     currentchange() {
       this.getlist()
     },
-    formatEmployment(row) {
-      // let obj = this.list.find((item) => {item.state == row.formOfEmployment}
-      // )
-      // console.log(row.formOfEmployment);
-      // return obj ?  :
-    },
     async getlist() {
       this.loading = true
       const { data } = await list(this.page)
       this.textnum = `共 ${data.counts} 条记录`
       this.page.total = data.counts
       this.list = data.items
-      console.log(this.list)
       this.loading = false
     },
     async del(id) {
-- 
Gitee


From 189a47d58496b9fa8a40b288aa22a9e9b1d2c325 Mon Sep 17 00:00:00 2001
From: wzy <wzyzzqq@163.com>
Date: Sat, 17 Sep 2022 21:34:50 +0800
Subject: [PATCH 18/40] =?UTF-8?q?fix(all):=20=E4=BF=AE=E5=A4=8D=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=BC=95=E5=8F=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                            |  2 ++
 src/base-ui/ZyForm/src/zy-form.vue                    |  7 ++-----
 src/module-hmmm/pages/questions-new.vue               | 11 -----------
 .../pages/questions-new/config/formConfig.config.js   |  2 +-
 .../pages/questions-new/src/questions-new.vue         |  6 ++----
 src/module-hmmm/router/index.js                       |  3 ++-
 6 files changed, 9 insertions(+), 22 deletions(-)
 delete mode 100644 src/module-hmmm/pages/questions-new.vue

diff --git a/.gitignore b/.gitignore
index a0dddc6..3676d68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 node_modules
 /dist
 
+/src/utils/request.js
+
 # local env files
 .env.local
 .env.*.local
diff --git a/src/base-ui/ZyForm/src/zy-form.vue b/src/base-ui/ZyForm/src/zy-form.vue
index 22bc730..53adfbc 100644
--- a/src/base-ui/ZyForm/src/zy-form.vue
+++ b/src/base-ui/ZyForm/src/zy-form.vue
@@ -24,8 +24,8 @@
             <template
               v-if="
                 item.type === 'input' ||
-                  item.type === 'password' ||
-                  item.type === 'textarea'
+                item.type === 'password' ||
+                item.type === 'textarea'
               "
             >
               <el-input
@@ -89,9 +89,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <footer class="footer">
-        <slot name="footer" />
-      </footer>
     </el-form>
     <!-- 底部内容插槽 -->
     <footer class="footer">
diff --git a/src/module-hmmm/pages/questions-new.vue b/src/module-hmmm/pages/questions-new.vue
deleted file mode 100644
index 3d6e66f..0000000
--- a/src/module-hmmm/pages/questions-new.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-  <div class="container">
-    试题录入
-  </div>
-</template>
-
-<script>
-export default {}
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/module-hmmm/pages/questions-new/config/formConfig.config.js b/src/module-hmmm/pages/questions-new/config/formConfig.config.js
index 94817b0..afd5c27 100644
--- a/src/module-hmmm/pages/questions-new/config/formConfig.config.js
+++ b/src/module-hmmm/pages/questions-new/config/formConfig.config.js
@@ -145,7 +145,7 @@ export const formConfig = {
       type: 'myEditor',
       label: '题干',
       otherOptions: {
-        itemStyle: 'height: 300px; overflow-y: hidden; text-align: left',
+        style: 'height: 300px; overflow-y: hidden; text-align: left',
         mode: 'simple'
       },
       editorConfig: {
diff --git a/src/module-hmmm/pages/questions-new/src/questions-new.vue b/src/module-hmmm/pages/questions-new/src/questions-new.vue
index a367447..0842d7b 100644
--- a/src/module-hmmm/pages/questions-new/src/questions-new.vue
+++ b/src/module-hmmm/pages/questions-new/src/questions-new.vue
@@ -8,9 +8,7 @@
         </template>
         <template #footer>
           <el-row type="flex" justify="center" align="middle">
-            <el-button type="primary" size="medium">
-              确认提交
-            </el-button>
+            <el-button type="primary" size="medium"> 确认提交 </el-button>
           </el-row>
         </template>
         <template #myEditor="{ otherOptions, editorConfig }">
@@ -24,7 +22,7 @@
 <script>
 import ZyForm from '@/base-ui/ZyForm'
 import ZyEditor from '@/base-ui/ZyEditor'
-import { formConfig } from '../config/formConfig.config.js'
+import { formConfig } from '../config/formConfig.config'
 export default {
   name: 'QuestionsNew',
   components: {
diff --git a/src/module-hmmm/router/index.js b/src/module-hmmm/router/index.js
index 73e8caf..e6334f6 100644
--- a/src/module-hmmm/router/index.js
+++ b/src/module-hmmm/router/index.js
@@ -45,7 +45,8 @@ export default [
       {
         path: 'new',
         // component: _import('hmmm/pages/questions-new'),
-        component: () => import('@/module-hmmm/pages/questions-new'),
+        component: () =>
+          import('@/module-hmmm/pages/questions-new/src/questions-new.vue'),
         name: 'questions-new',
         meta: { title: '试题录入', noCache: true, icon: 'component' }
       },
-- 
Gitee


From 968256da007dcc32e53abdeea578066aa09dc00f Mon Sep 17 00:00:00 2001
From: fy <773589090@qq.com>
Date: Sat, 17 Sep 2022 21:46:14 +0800
Subject: [PATCH 19/40] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BA=86git?=
 =?UTF-8?q?=E5=B8=A6=E6=9D=A5=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module-hmmm/components/tags-add.vue | 117 ++++++++++++++++++++----
 1 file changed, 98 insertions(+), 19 deletions(-)

diff --git a/src/module-hmmm/components/tags-add.vue b/src/module-hmmm/components/tags-add.vue
index fbd1996..b274a20 100644
--- a/src/module-hmmm/components/tags-add.vue
+++ b/src/module-hmmm/components/tags-add.vue
@@ -1,37 +1,116 @@
 <template>
   <div class="container">
-    添加标签对话框
-    <el-dialog :title="text + pageTitle" :visible.sync="dialogFormVisible">
-      <el-form
-        ref="dataForm"
-        :rules="ruleInline"
-        :model="formBase"
-        label-position="left"
-        label-width="120px"
-        style="width: 400px; margin-left: 120px"
-      />
+    <el-dialog :title="title" :visible="dialogFormVisible" width="380px" @close="cancel">
+      <el-form ref="newDirectory" :model="form" :rules="rules">
+        <el-form-item label="所属学科" prop="subjectID" :label-width="formLabelWidth">
+          <el-select v-model="form.subjectID" placeholder="请选择活动区域">
+            <el-option
+              v-for="item,index in simplelist"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="目录名称" prop="tagName" :label-width="formLabelWidth">
+          <el-input v-model="form.tagName" autocomplete="off" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="cancel">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="btnok">
+          确 定
+        </el-button>
+      </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
+import { simple } from '@/api/hmmm/subjects'
+import { add, update } from '@/api/hmmm/tags'
 export default {
-  data() {
+  name: 'Tagsadd',
+  props: {
+    dialogFormVisible: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true,
+      default: '新增学科'
+    }
+  },
+  data () {
     return {
-      dialogFormVisible: false
+      rules: {
+        subjectID: [
+          { required: true, message: '请选择活动学科', trigger: 'change' }
+        ],
+        tagName: [
+          { required: true, message: '请填写标签名称', trigger: 'blur' }
+        ]
+      },
+
+      form: {
+        id: null,
+        subjectID: '',
+        tagName: ''
+      },
+
+      simplelist: {},
+      formLabelWidth: '80px'
     }
   },
+  created() {
+    this.simple()
+  },
   methods: {
-    // 弹层显示
-    dialogFormV() {
-      this.dialogFormVisible = true
+    fn() {
+      alert(1)
+    },
+    async simple() {
+      const { data } = await simple()
+      // console.log(obj)
+      this.simplelist = data
+    },
+    cancel() {
+      this.$emit('update:dialogFormVisible', false)
+      this.$refs.newDirectory.resetFields()
     },
-    // 弹层隐藏
-    dialogFormH() {
-      this.dialogFormVisible = false
+    async btnok() {
+      if (this.form.id) {
+        await update(this.form)
+        // console.log(this.form.subjectID)
+      } else {
+        try {
+          await add(this.form)
+        } catch (error) {
+          console.log(error)
+        }
+      }
+      this.$message.success('操作成功')
+      this.$emit('update:dialogFormVisible', false)
+      this.$parent.list()
+    },
+    dialog(row) {
+      this.form.id = row.id
+      this.form.subjectID = row.subjectID
+      this.form.tagName = row.tagName
     }
   }
 }
 </script>
 
-<style scoped lang="less"></style>
+<style>
+ .el-dialog__footer {
+    text-align: end;
+}
+.el-select {
+    width: 100%;}
+    .el-dialog__body {
+    padding: 30px 20px 0;}
+</style>
-- 
Gitee


From 074df027f66fb4c5d5f6936b3f3ceb8ed91ba57a Mon Sep 17 00:00:00 2001
From: fy <773589090@qq.com>
Date: Sat, 17 Sep 2022 21:47:17 +0800
Subject: [PATCH 20/40] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BA=86git?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base-ui/ZyForm/src/zy-form.vue             |  4 ++--
 src/module-hmmm/pages/companys.vue             | 18 +++++++++---------
 .../pages/questions-new/src/questions-new.vue  |  4 +++-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/base-ui/ZyForm/src/zy-form.vue b/src/base-ui/ZyForm/src/zy-form.vue
index 53adfbc..85db26f 100644
--- a/src/base-ui/ZyForm/src/zy-form.vue
+++ b/src/base-ui/ZyForm/src/zy-form.vue
@@ -24,8 +24,8 @@
             <template
               v-if="
                 item.type === 'input' ||
-                item.type === 'password' ||
-                item.type === 'textarea'
+                  item.type === 'password' ||
+                  item.type === 'textarea'
               "
             >
               <el-input
diff --git a/src/module-hmmm/pages/companys.vue b/src/module-hmmm/pages/companys.vue
index ad93c11..e3ff6ad 100644
--- a/src/module-hmmm/pages/companys.vue
+++ b/src/module-hmmm/pages/companys.vue
@@ -44,9 +44,9 @@
           label="状态"
           width="115"
         >
-        <template slot-scope="{row}">
-          {{row.state==1?'启用':'禁用'}}
-        </template>
+          <template slot-scope="{row}">
+            {{ row.state==1?'启用':'禁用' }}
+          </template>
         </el-table-column>
         <el-table-column align="center" prop="address" label="操作" type="flex">
           <template v-slot="{ row }">
@@ -57,8 +57,8 @@
               circle
             />
             <el-tooltip class="item" effect="dark" content="禁用" placement="top">
-              <el-button @click="changestate(row.id,row.state)" v-if="row.state==1" type="warning" icon="el-icon-close" plain circle/>
-              <el-button @click="changestate(row.id,row.state)" v-else type="success" icon="el-icon-check" plain circle/>
+              <el-button v-if="row.state==1" type="warning" icon="el-icon-close" plain circle @click="changestate(row.id,row.state)" />
+              <el-button v-else type="success" icon="el-icon-check" plain circle @click="changestate(row.id,row.state)" />
             </el-tooltip>
             <el-button
               type="danger"
@@ -87,7 +87,7 @@
 
 <script>
 import companysadd from '../components/companys-add.vue'
-import { list, remove , disabled } from '@/api/hmmm/companys.js'
+import { list, remove, disabled } from '@/api/hmmm/companys.js'
 export default {
   components: {
     companysadd
@@ -109,7 +109,7 @@ export default {
     this.getlist()
   },
   methods: {
-    async changestate(id,state){
+    async changestate(id, state) {
       const confirmResult = await this.$confirm(
         '已成功禁用, 是否继续?',
         '提示',
@@ -120,9 +120,9 @@ export default {
         }
       ).catch((error) => error)
       if (confirmResult === 'confirm') {
-        await disabled(id,state);
+        await disabled(id, state)
         this.$message.success('已成功禁用')
-        
+
         console.log(this.page.total)
         this.getlist()
       } else {
diff --git a/src/module-hmmm/pages/questions-new/src/questions-new.vue b/src/module-hmmm/pages/questions-new/src/questions-new.vue
index 0842d7b..8fc7ee5 100644
--- a/src/module-hmmm/pages/questions-new/src/questions-new.vue
+++ b/src/module-hmmm/pages/questions-new/src/questions-new.vue
@@ -8,7 +8,9 @@
         </template>
         <template #footer>
           <el-row type="flex" justify="center" align="middle">
-            <el-button type="primary" size="medium"> 确认提交 </el-button>
+            <el-button type="primary" size="medium">
+              确认提交
+            </el-button>
           </el-row>
         </template>
         <template #myEditor="{ otherOptions, editorConfig }">
-- 
Gitee


From 1824153c106753808327c07a3ec58e0490080051 Mon Sep 17 00:00:00 2001
From: wzy <wzyzzqq@163.com>
Date: Sun, 18 Sep 2022 02:44:19 +0800
Subject: [PATCH 21/40] =?UTF-8?q?feat(wzy):=20ZyFor=E7=BB=84=E4=BB=B6=20se?=
 =?UTF-8?q?let=E7=A7=8D=E7=B1=BB=E6=B7=BB=E5=8A=A0=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=95=B0=E6=8D=AE=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/wzy.md                                    | 106 ++++++++++++++++--
 src/base-ui/ZyEditor/src/zy-editor.vue        |  25 ++++-
 src/base-ui/ZyForm/src/zy-form.vue            |  37 ++++--
 .../questions-new/config/formConfig.config.js |  32 +++++-
 .../pages/questions-new/src/questions-new.vue |  31 +++--
 5 files changed, 199 insertions(+), 32 deletions(-)

diff --git a/doc/wzy.md b/doc/wzy.md
index 4696456..d87395b 100644
--- a/doc/wzy.md
+++ b/doc/wzy.md
@@ -1,7 +1,5 @@
 # 问题汇总
 
-
-
 ### 组件封装
 
 > time: 2022/9/17 上午
@@ -10,11 +8,11 @@
 
 **注意组件数据的单向流动问题**
 
->这里采用的解决思路 
+> 这里采用的解决思路
 >
->- sync使数据具备双向绑定特性
->- 子组件中深拷贝一下formData 为了不直接去修改formData的值违反数据单向流动 
->- watch监听MyFormData的变化 以emit父组件更新formData数据
+> - sync使数据具备双向绑定特性
+> - 子组件中深拷贝一下formData 为了不直接去修改formData的值违反数据单向流动
+> - watch监听MyFormData的变化 以emit父组件更新formData数据
 
 ```vue
 // 父组件
@@ -81,8 +79,98 @@ propE: {
 <template v-if="item.type === 'input' || item.type === 'password'">
 ```
 
-#### 使用富文本插件
+> time: 2022/9/17
+
+#### 具名插槽引发的血案
+
+忘记了咋使用的
+
+```vue
+// 子组件
+<current-user v-slot="slotProps">
+  {{ slotProps.user.firstName }}
+</current-user>
+// 父组件
+<current-user>
+  <template v-slot:default="slotProps">
+    {{ slotProps.user.firstName }}
+  </template>
+  </template>
+</current-user>
+```
+
+**补充** 解构prop & 动态插槽名
+
+```vue
+<current-user v-slot="{ user }">
+  {{ user.firstName }}
+</current-user>
+---
+<base-layout>
+  <template v-slot:[dynamicSlotName]>
+    ...
+  </template>
+</base-layout>
+```
+
+
+
+### 使用富文本插件
+
+> WangEditor 简单好用强大支持移动端（js，vue，react）
+>
+> https://www.wangeditor.com/v5/for-frame.html#%E4%BD%BF%E7%94%A8
+>
+> 使用注意：
+>
+> - 赋值 `this.editor` 时要使用 `Object.seal()` ，否则会报错
+>
+> - Vue 组件销毁时，及时销毁编辑器
+>
+> - 高度要大于300px
+>
+> - 设置初始文本左对齐 **直接设置text-align: left**
+>
+>   ```vue
+>    <Editor
+>            :mode="mode"
+>            style="{ text-align: left}"
+>            />
+>   ```
+>
+>   
 
-> WangEditor
+> more chiose
 >
-> https://www.wangeditor.com/v5/for-frame.html#%E4%BD%BF%E7%94%A8
\ No newline at end of file
+> https://juejin.cn/post/7084046542994145294
+
+
+
+---
+
+
+
+## 遗留问题
+
+ ### 动态参数问题
+
+这里的动态传参 [item.type] 报警告了  :green_heart: 已解决
+
+src\base-ui\ZyForm\src\zy-form.vue 79
+
+```vue
+<template v-else>
+	<slot :name="item.type" :[item.type]="item" />
+</template>
+```
+
+方案
+
+```vue
+<slot :name="item.type" :[`${item.type}`]="item" />
+```
+
+### wangEditor 的检测问题
+
+### wangEditor 的双向绑定问题
+
diff --git a/src/base-ui/ZyEditor/src/zy-editor.vue b/src/base-ui/ZyEditor/src/zy-editor.vue
index b35a70c..637e2c9 100644
--- a/src/base-ui/ZyEditor/src/zy-editor.vue
+++ b/src/base-ui/ZyEditor/src/zy-editor.vue
@@ -8,10 +8,12 @@
     />
     <!-- v-model="html"  -->
     <Editor
+      v-model="html"
       :mode="mode"
       :style="itemStyle"
       :default-config="editorConfig"
       @onCreated="onCreated"
+      @onBlur="onBlur"
     />
   </div>
 </template>
@@ -33,26 +35,37 @@ export default Vue.extend({
     },
     itemStyle: {
       type: String,
-      default: () => {}
+      default: ''
     },
     editorConfig: {
       type: Object,
-      default: () => {}
+      default: () => ({ autoFocus: false })
     },
     toolbarConfig: {
       type: Object,
       default: () => {}
+    },
+    value: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      editor: null
+      editor: null,
+      html: this.value
       // html: "<p>hello</p>",
       // toolbarConfig: {}
       // editorConfig: { autoFocus: false }
       // mode: 'simple' // default or 'simple'
     }
   },
+  watch: {
+    html(newValue) {
+      console.log(123)
+      this.$emit('updata:editorValue', newValue)
+    }
+  },
   beforeDestroy() {
     const editor = this.editor
     if (editor == null) return
@@ -61,6 +74,12 @@ export default Vue.extend({
   methods: {
     onCreated(editor) {
       this.editor = Object.seal(editor)
+    },
+    onBlur(editor) {
+      if (editor.getHtml()) {
+        this.html = editor.getHtml()
+        // this.$emit('updata:editorValue', editor.getHtml())
+      }
     }
   }
 })
diff --git a/src/base-ui/ZyForm/src/zy-form.vue b/src/base-ui/ZyForm/src/zy-form.vue
index 85db26f..c5a6bd6 100644
--- a/src/base-ui/ZyForm/src/zy-form.vue
+++ b/src/base-ui/ZyForm/src/zy-form.vue
@@ -24,8 +24,8 @@
             <template
               v-if="
                 item.type === 'input' ||
-                  item.type === 'password' ||
-                  item.type === 'textarea'
+                item.type === 'password' ||
+                item.type === 'textarea'
               "
             >
               <el-input
@@ -46,14 +46,16 @@
                 v-bind="item.otherOptions"
                 :placeholder="item.placeholder"
                 :multiple="item.type === 'tags'"
+                :loading="showSelectLoading"
+                @focus="onSelectFocus(item.func, item.field)"
               >
                 <el-option
                   v-for="option of item.options"
                   :key="option.value"
-                  :label="option.title"
+                  :label="option.label"
                   :value="option.value"
                 >
-                  {{ option.title }}
+                  {{ option.label }}
                 </el-option>
               </el-select>
             </template>
@@ -70,13 +72,13 @@
                 </el-radio>
               </el-radio-group>
             </template>
-            <!-- 提供自定义内容 定义内容 没有公用性 -->
-            <template v-else-if="item.type === 'more'">
-              <slot name="more" />
+            <!-- 提供自定义内容 定义内容 没有公用性 城市选则-->
+            <template v-else-if="item.type === 'choiceCity'">
+              <slot :name="item.type" />
             </template>
-            <!-- my-editor -->
-            <template v-else-if="item.type === 'myEditor'">
-              <slot name="myEditor" :editor="item" />
+            <!-- more -->
+            <template v-else>
+              <slot :name="item.type" :myEditor="item" />
             </template>
             <!-- datepicker -->
             <!-- <template v-else-if="item.type === 'datepicker'">
@@ -140,7 +142,8 @@ export default {
   },
   data() {
     return {
-      MyFormData: { ...this.formData }
+      MyFormData: { ...this.formData },
+      showSelectLoading: false
     }
   },
   watch: {
@@ -153,6 +156,18 @@ export default {
   },
   mounted() {
     // console.log(this.$refs.ruleForm)
+  },
+  methods: {
+    async onSelectFocus(func, field) {
+      try {
+        this.showSelectLoading = true
+        const { data } = await func()
+        this.$emit('selectUpdateFormData', { data, field })
+        this.showSelectLoading = false
+      } catch (e) {
+        console.log(e)
+      }
+    }
   }
 }
 </script>
diff --git a/src/module-hmmm/pages/questions-new/config/formConfig.config.js b/src/module-hmmm/pages/questions-new/config/formConfig.config.js
index afd5c27..aa967ac 100644
--- a/src/module-hmmm/pages/questions-new/config/formConfig.config.js
+++ b/src/module-hmmm/pages/questions-new/config/formConfig.config.js
@@ -1,3 +1,5 @@
+import { simple } from '@/api/hmmm/subjects'
+// import { simple } from 'src\api\hmmm\subjects.js'
 export const formConfig = {
   labelWidth: '85px',
   labelPosition: 'left',
@@ -17,6 +19,7 @@ export const formConfig = {
       field: 'subjectID',
       type: 'select',
       label: '学科:',
+      func: simple,
       rules: [
         {
           required: true,
@@ -145,9 +148,16 @@ export const formConfig = {
       type: 'myEditor',
       label: '题干',
       otherOptions: {
-        style: 'height: 300px; overflow-y: hidden; text-align: left',
+        itemStyle: 'height: 300px; overflow-y: hidden; text-align: left',
         mode: 'simple'
       },
+      rules: [
+        {
+          required: true,
+          message: '请输入题干',
+          trigger: 'blur'
+        }
+      ],
       editorConfig: {
         placeholder: '<p>请输入题干</p>'
       }
@@ -167,7 +177,25 @@ export const formConfig = {
       }
     },
     // 答案解析
-
+    {
+      field: 'answer',
+      type: 'myEditor',
+      label: '答案解析',
+      otherOptions: {
+        itemStyle: 'height: 300px; overflow-y: hidden; text-align: left',
+        mode: 'simple'
+      },
+      rules: [
+        {
+          required: true,
+          message: '请输入答案解析',
+          trigger: 'blur'
+        }
+      ],
+      editorConfig: {
+        placeholder: '<p>请输入答案解析</p>'
+      }
+    },
     // 题目备注
     {
       field: 'remarks',
diff --git a/src/module-hmmm/pages/questions-new/src/questions-new.vue b/src/module-hmmm/pages/questions-new/src/questions-new.vue
index 8fc7ee5..99d448a 100644
--- a/src/module-hmmm/pages/questions-new/src/questions-new.vue
+++ b/src/module-hmmm/pages/questions-new/src/questions-new.vue
@@ -1,21 +1,27 @@
 <template>
   <div class="questions-new">
     <el-card>
-      <zy-form :form-data.sync="formData" v-bind="formConfig">
+      <zy-form
+        :form-data.sync="formData"
+        v-bind="formConfig"
+        @selectUpdateFormData="selectUpdateFormData"
+      >
         <template #header>
           <span>试题录入</span>
           <el-divider />
         </template>
+        <template #myEditor="{ myEditor }">
+          <ZyEditor
+            v-model="formData[`${myEditor.field}`]"
+            v-bind="myEditor.otherOptions"
+            :editor-config="myEditor.editorConfig"
+          />
+        </template>
         <template #footer>
           <el-row type="flex" justify="center" align="middle">
-            <el-button type="primary" size="medium">
-              确认提交
-            </el-button>
+            <el-button type="primary" size="medium"> 确认提交 </el-button>
           </el-row>
         </template>
-        <template #myEditor="{ otherOptions, editorConfig }">
-          <ZyEditor v-bind="otherOptions" :editor-config="editorConfig" />
-        </template>
       </zy-form>
     </el-card>
   </div>
@@ -54,6 +60,17 @@ export default {
   },
   mounted() {
     // console.log(this.$refs.www)
+  },
+  methods: {
+    selectUpdateFormData({ data, field }) {
+      console.log(data)
+      this.formConfig.formItems.map((item) => {
+        if (item.field === field) {
+          item.options = data
+        }
+        return item
+      })
+    }
   }
 }
 </script>
-- 
Gitee


From 012910e1f0b5cbfff4933e175ca1de369e9f19a4 Mon Sep 17 00:00:00 2001
From: xiaoli <24567@qq.com>
Date: Sun, 18 Sep 2022 08:25:55 +0800
Subject: [PATCH 22/40] =?UTF-8?q?feat:=E7=9B=AE=E5=BD=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module-hmmm/components/directorys-add.vue |  33 ++-
 src/module-hmmm/pages/directorys.vue          | 227 +++++++++++-------
 src/module-hmmm/pages/subjects.vue            |  80 +++---
 src/utils/request.js                          |   5 +-
 4 files changed, 193 insertions(+), 152 deletions(-)

diff --git a/src/module-hmmm/components/directorys-add.vue b/src/module-hmmm/components/directorys-add.vue
index 835a4a9..da1ae36 100644
--- a/src/module-hmmm/components/directorys-add.vue
+++ b/src/module-hmmm/components/directorys-add.vue
@@ -22,12 +22,8 @@
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button @click="btncanel">
-        取消
-      </el-button>
-      <el-button type="primary" @click="btnok">
-        确定
-      </el-button>
+      <el-button @click="btncanel"> 取消 </el-button>
+      <el-button type="primary" @click="btnok"> 确定 </el-button>
     </div>
   </el-dialog>
 </template>
@@ -56,7 +52,6 @@ export default {
     return {
       // 双向绑定表单
       form: {
-        id: this.id,
         // 所属学科
         subjectID: '',
         directoryName: ''
@@ -77,6 +72,7 @@ export default {
   async created() {
     const res = await simple()
     this.subjectlist = res.data
+    console.log(this.subjectlist)
   },
   methods: {
     btncanel() {
@@ -84,22 +80,37 @@ export default {
       this.$emit('update:dialogshow', false)
       // 数据重置，表单验证信息取消
     },
+    // 编辑的时候需要判断下是否是编辑还是新增
     async btnok() {
       try {
         // 点击确认的时候先判断下是否校验成功
         await this.$refs.form.validate()
-        if (this.form.subjectID) {
-          console.log(this.form.subjectID)
+        if (this.form.id) {
+          console.log('从标签中来')
           await add(this.form)
+          this.$message.success('新增成功')
         } else {
           console.log(111)
+          // 修改的时候
           await update(this.form)
+          this.$message.success('更新目录成功')
         }
-        this.$message.success('操作成功')
+
+        // 去除校验
+        this.form = {
+          id: null,
+          // 所属学科
+          subjectID: '',
+          directoryName: ''
+        }
+        this.$parent.list()
+        this.$refs.form.resetFields()
       } catch (error) {
         console.log(error)
-        this.$message('新增失败')
+        this.$message('操作失败')
       }
+      // 关闭弹框
+      this.$emit('update:dialogshow', false)
     }
   }
 }
diff --git a/src/module-hmmm/pages/directorys.vue b/src/module-hmmm/pages/directorys.vue
index ab9e60e..5f7b7df 100644
--- a/src/module-hmmm/pages/directorys.vue
+++ b/src/module-hmmm/pages/directorys.vue
@@ -1,37 +1,73 @@
 <template>
   <div class="container" style="margin: 10px">
     <el-card shadow="never">
+      <div v-if="querydate.name" slot="header" class="clearfix">
+        <span>学科管理 > {{ querydate.name }} > 目录管理</span>
+      </div>
       <!-- 表格 -->
-      <ZyForm :form-data.sync="formData" v-bind="formConfig">
-        <template #footer>
-          <el-button
-            style="margin-left: 10px"
-            class="filter-item"
-            size="small"
-            type="primary"
-          >
-            清除
-          </el-button>
-
-          <el-button class="filter-item" size="small" type="primary">
-            搜索
-          </el-button>
-          <el-button plain>
-            <i class="el-icon-back" /> <span>返回学科 </span>
-          </el-button>
 
-          <el-button
-            class="filter-item fr"
-            size="small"
-            style="margin-left: 10px"
-            type="success"
-            icon="el-icon-edit"
-          >
-            {{ title }}
-          </el-button>
-        </template>
-      </ZyForm>
-      <!-- 显示一共少条数据 -->
+      <el-form ref="form" :model="tableform" label-width="70px">
+        <el-row type="flex" class="row-bg" justify="space-between">
+          <el-col :span="6">
+            <el-form-item label="目录名称">
+              <el-input
+                v-model="tableform.directoryName"
+                style="width: 85%"
+                placeholder="请输入"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="14">
+            <el-form-item label="状态">
+              <el-select
+                v-model="tableform.state"
+                placeholder="请选择"
+                style="width: 85%"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" class="btn">
+            <el-button
+              class="filter-item"
+              size="small"
+              type="primary"
+              @click="clear"
+            >
+              清除
+            </el-button>
+            <el-button
+              class="filter-item"
+              size="small"
+              type="primary"
+              @click="search"
+            >
+              搜索
+            </el-button>
+          </el-col>
+          <el-col v-if="querydate.name" :span="4" class="btn">
+            <el-button type="text" icon="el-icon-back" @click="$router.back()">
+              返回学科
+            </el-button>
+          </el-col>
+          <el-col :span="4" class="success">
+            <el-button
+              size="small"
+              type="success"
+              icon="el-icon-edit"
+              @click="newadd"
+            >
+              新增目录
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
       <el-alert
         style="margin: 15px"
         :title="alertText"
@@ -83,7 +119,7 @@
                 type="text"
                 size="medium "
                 :disabled="row.state === 1"
-                @click="edit(row.id)"
+                @click="edit(row)"
               >
                 修改
               </el-button>
@@ -103,75 +139,55 @@
       <el-pagination
         background
         style="margin-top: 20px"
-        :current-page="info.page"
+        :current-page="tableform.page"
         :page-sizes="[5, 10, 15]"
-        :page-size="info.pagesize"
+        :page-size="tableform.pagesize"
         layout="total, sizes, prev, pager, next, jumper"
-        :total="info.total"
+        :total="tableform.total"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
       />
     </el-card>
-    <!-- 点击新增 -->
-    <directorysadd :id="id" :dialogshow.sync="dialogshow" @close="close" />
+    <!-- 点击显示弹框-->
+    <directorysadd
+      :id="id"
+      ref="directorysadd"
+      :dialogshow.sync="dialogshow"
+      :subject="subject"
+      @close="close"
+    />
   </div>
 </template>
 
 <script>
 // 导入组件
-import ZyForm from '@/base-ui/ZyForm'
+// import ZyForm from '@/base-ui/ZyForm'
 import { list, remove, changeState } from '@/api/hmmm/directorys'
 // 导入新增
 import directorysadd from '../components/directorys-add.vue'
 
 export default {
   components: {
-    ZyForm,
+    // ZyForm,
     directorysadd
   },
   data() {
     return {
+      // 是否显示科目
+      subject: true,
       // 显示弹窗
       dialogshow: false,
       // id
       id: '',
-      // 页码
-      formData: {
-        name: '',
-        select: '',
-        password: '',
-        sport: ''
-      },
-      formConfig: {
-        labelWidth: '90px',
-        itemLayout: {
-          padding: '10px 30px'
-        },
-        formItems: [
-          {
-            field: '目录名称',
-            type: 'input',
-            label: '目录名称',
-            rules: [],
-            placeholder: ''
-          },
-          {
-            field: '状态',
-            type: 'select',
-            label: '状态',
-            placeholder: '请选择',
-            options: [
-              { title: '启用', value: '0' },
-              { title: '禁用', value: '1' }
-            ]
-          }
-        ]
+      // 表格显示信息
+      tableform: {
+        directoryName: '',
+        state: null,
+        page: 1,
+        pagesize: 10,
+        total: 0
       },
       value: '',
-      // requestParameters: {
-      //   username: ''
-      // },
-      title: '新增目录',
       alertText: '',
       options: [
         {
@@ -183,43 +199,80 @@ export default {
           label: '禁用'
         }
       ],
+      querydate: {
+        id: '',
+        name: ''
+      },
       // 信息
-      tableData: [], // 渲染表格数据
+      tableData: [] // 渲染表格数据
       /// 页码
-      info: {
-        page: 1,
-        pagesize: 10,
-        total: 0
-      }
     }
   },
   created() {
     this.list()
+    this.querydate = this.$route.query
+    console.log(this.querydate)
   },
   methods: {
-    // 点击编辑的时候显示弹框
-    edit(id) {
-      this.id = id
+    // 清除框
+    clear() {
+      // 置空
+      this.tableform = {}
+      this.list()
+    },
+    // 点击搜索的时候
+    search() {
+      console.log(111)
+      this.list()
+    },
+    // 新增,判断是否是从学科点击的
+    newadd() {
+      if (this.querydate.name) {
+        this.subject = false
+        const subjectID = Number(this.querydate.id)
+        this.$refs.directorysadd.form.subjectID = subjectID
+      }
+      this.list()
+      this.dialogshow = true
+    },
+    // 点击修改的时候显示弹框,把值过去
+    edit(row) {
+      if (this.querydate.name) {
+        this.subject = false
+      }
       this.dialogshow = true
+      const rowid = Number(row.id)
+      this.$refs.directorysadd.form.subjectID = rowid
+      this.$refs.directorysadd.form = {
+        id: rowid,
+        subjectID: row.subjectID,
+        directoryName: row.directoryName
+      }
     },
     async list() {
-      const { data } = await list(this.info)
+      this.$nextTick(() => {
+        if (this.querydate.name) {
+          // console.log(this.querydate.id)
+          this.tableform.subjectID = this.querydate.id
+        }
+      })
+      const { data } = await list(this.tableform)
       console.log(data)
-      this.info.total = data.counts
+      this.tableform.total = data.counts
       this.tableData = data.items
-      this.alertText = `共${this.info.total}条目录`
+      this.alertText = `共${this.tableform.total}条目录`
     },
     // 页码大小发生改变的时候
     handleSizeChange(val) {
-      this.info.page = 1
+      this.tableform.page = 1
       console.log(val)
-      this.info.pagesize = val
+      this.tableform.pagesize = val
       this.list()
     },
     // 当前页发生改变的时候
     handleCurrentChange(val) {
       console.log(val)
-      this.info.page = val
+      this.tableform.page = val
       this.list()
     },
     // 删除
diff --git a/src/module-hmmm/pages/subjects.vue b/src/module-hmmm/pages/subjects.vue
index 44dc707..e7570a4 100644
--- a/src/module-hmmm/pages/subjects.vue
+++ b/src/module-hmmm/pages/subjects.vue
@@ -2,58 +2,29 @@
   <div class="container">
     学科管理
 
-    <hr>
-    <el-table
-      :data="tableData"
-      border
-      style="width: 100%"
-    >
-      <el-table-column
-        type="index"
-        label="序号"
-        width="180"
-      />
-      <el-table-column
-        prop="subjectName"
-        label="学科名称"
-        width="180"
-      />
-      <el-table-column
-        prop="username"
-        label="创建者"
-      />
-      <el-table-column
-        prop="addDate"
-        label="创建日期"
-      >
-        <template slot-scope="{row}">
+    <hr />
+    <el-table :data="tableData" border style="width: 100%">
+      <el-table-column type="index" label="序号" width="180" />
+      <el-table-column prop="subjectName" label="学科名称" width="180" />
+      <el-table-column prop="username" label="创建者" />
+      <el-table-column prop="addDate" label="创建日期">
+        <template slot-scope="{ row }">
           {{ row.addDate | formatDate }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="isFrontDisplay"
-        label="前台是否提示"
-      >
-        <template slot-scope="{row}">
-          <span>{{ row.isFrontDisplay===1?'是':'否' }}</span>
+      <el-table-column prop="isFrontDisplay" label="前台是否提示">
+        <template slot-scope="{ row }">
+          <span>{{ row.isFrontDisplay === 1 ? '是' : '否' }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="twoLevelDirectory"
-        label="二级目录"
-      /> <el-table-column
-        prop="tags"
-        label="标签"
-      /><el-table-column
+      <el-table-column prop="twoLevelDirectory" label="二级目录" />
+      <el-table-column prop="tags" label="标签" /><el-table-column
         prop="totals"
         label="题目数量"
       />
-      <el-table-column
-        prop="address"
-        label="操作"
-      >
-        <template slot-scope="{row}">
-          <el-button type="text" size="medium " @click="disable(row.id,0)">
+      <el-table-column prop="address" label="操作">
+        <template slot-scope="{ row }">
+          <el-button type="text" size="medium " @click="disable(row)">
             学科分类
           </el-button>
           <el-button type="text" size="medium " @click="subjectLabels(row.id)">
@@ -70,10 +41,9 @@
     </el-table>
 
     <el-pagination
-
       background
       :current-page="page.page"
-      :page-sizes="[5,10, 20]"
+      :page-sizes="[5, 10, 20]"
       :page-size="page.pagesize"
       layout="  prev, pager, next,sizes, jumper"
       :total="page.total"
@@ -86,10 +56,9 @@
 <script>
 import { list } from '@/api/hmmm/subjects'
 export default {
-  data () {
+  data() {
     return {
-
-      tableData: [{ }],
+      tableData: [{}],
       page: {
         page: 1,
         pagesize: 5,
@@ -109,6 +78,16 @@ export default {
         }
       })
     },
+    disable(row) {
+      console.log(row)
+      this.$router.push({
+        path: '/subjects/directorys',
+        query: {
+          name: row.subjectName,
+          id: row.id
+        }
+      })
+    },
     async list() {
       const { data } = await list(this.page)
       this.tableData = data.items
@@ -126,8 +105,7 @@ export default {
       this.list()
     }
   }
-
 }
 </script>
 
-<style ></style>
+<style></style>
diff --git a/src/utils/request.js b/src/utils/request.js
index a0fa234..2279c9c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -5,12 +5,11 @@ import { getToken } from '@/utils/auth'
 
 // create an axios instance
 const instance = axios.create({
-
   // baseURL: 'http://192.168.34.80:7001/', // http://39.105.1.33:7001/ api的base_url
-  baseURL: 'http://127.0.0.1:7001/', // http://39.105.1.33:7001/ api的base_url
+  // baseURL: 'http://127.0.0.1:7001/', // http://39.105.1.33:7001/ api的base_url
 
   // baseURL: '192.168.34.80:7001/', // http://39.105.1.33:7001/ api的base_url
-  // baseURL: 'http://hmmm-api.itheima.net/', // http://39.105.1.33:7001/ api的base_url
+  baseURL: 'http://hmmm-api.itheima.net/', // http://39.105.1.33:7001/ api的base_url
 
   timeout: 5000 // request timeout
 })
-- 
Gitee


From 02e99f082bd91cf15275e35d3c7c4c9413462131 Mon Sep 17 00:00:00 2001
From: zwc <434657279@qq.com>
Date: Sun, 18 Sep 2022 09:57:43 +0800
Subject: [PATCH 23/40] =?UTF-8?q?=E9=A2=98=E7=9B=AE=E7=B2=BE=E9=80=89?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/QuestionChoiceSelect.vue       |  31 +--
 .../QuestionsChoiceNavbar/index.vue           | 183 +++++++++---------
 2 files changed, 109 insertions(+), 105 deletions(-)

diff --git a/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue b/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
index 68bd06e..3c2b852 100644
--- a/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
+++ b/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
@@ -1,15 +1,19 @@
 <template>
   <div class="container">
     <template>
-      <span class="project">{{ name }}</span>
-      <el-select v-model="value" placeholder="请选择" size="small" style="width:240px">
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        />
-      </el-select>
+      <el-form ref="form" :model="form" label-width="70px">
+        <el-form-item>
+          <template slot="label">
+            {{ name }}
+          </template>
+          <el-select v-model="value" placeholder="请选择" size="mini">
+            <el-option v-for="item in options" :key="item.value"
+                       :label="item.label"
+                       :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
     </template>
   </div>
 </template>
@@ -19,6 +23,9 @@ export default {
   props: ['name'],
   data() {
     return {
+      form: {
+
+      },
       options: [{
         value: '选项1',
         label: '黄金糕'
@@ -42,9 +49,5 @@ export default {
 </script>
 
 <style scoped >
-.project{
-  margin-right: 10px;
-  color: #606266;
-  font-weight: 700;
-}
+
 </style>
diff --git a/src/components/QuestionsChoiceNavbar/index.vue b/src/components/QuestionsChoiceNavbar/index.vue
index 47a30f0..28fbb77 100644
--- a/src/components/QuestionsChoiceNavbar/index.vue
+++ b/src/components/QuestionsChoiceNavbar/index.vue
@@ -1,78 +1,88 @@
 <template>
   <div>
-    <div class="head">
-      <div class="subject">
-        <QuestionChoiceSelect :name="subject" />
-      </div>
-      <div class="subject">
-        <QuestionChoiceSelect :name="directory" />
-      </div>
-      <div class="subject">
-        <QuestionChoiceSelect :name="label" />
-      </div>
-      <div class="subject">
-        <span class="keyword">关键字</span>
-        <el-input v-model="input" placeholder="根据题干搜索" size="small" style="width:240px" />
-      </div>
+    <div class="head1">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <QuestionChoiceSelect :name="subject" />
+        </el-col>
+        <el-col :span="6">
+          <QuestionChoiceSelect :name="directory" />
+        </el-col>
+        <el-col :span="6">
+          <QuestionChoiceSelect :name="label" />
+        </el-col>
+        <el-col :span="6">
+          <el-form label-width="70px">
+            <el-form-item label="关键字">
+              <el-input v-model="form.date1" placeholder="请根据题干搜索" size="mini" />
+            </el-form-item>
+          </el-form>
+        </el-col>
+      </el-row>
     </div>
-    <div class="second">
-      <div class="subject">
-        <QuestionChoiceSelect :name="type" />
-      </div>
-      <div class="subject">
-        <QuestionChoiceSelect :name="difficulty" />
-      </div>
-      <div class="subject">
-        <QuestionChoiceSelect :name="direction" />
-      </div>
-      <div class="subject">
-        <QuestionChoiceSelect :name="Entered" />
-      </div>
+    <div class="head">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <QuestionChoiceSelect :name="type" />
+        </el-col>
+        <el-col :span="6">
+          <QuestionChoiceSelect :name="difficulty" />
+        </el-col>
+        <el-col :span="6">
+          <QuestionChoiceSelect :name="direction" />
+        </el-col>
+        <el-col :span="6">
+          <QuestionChoiceSelect :name="Entered" />
+        </el-col>
+      </el-row>
     </div>
-    <div class="second">
-      <div class="subject">
-        <span class="keyword">题目备注</span>
-        <el-input v-model="input" size="small" style="width:240px" />
-      </div>
-      <div class="subject">
-        <span class="keyword">企业简称</span>
-        <el-input v-model="input" size="small" style="width:240px" />
-      </div>
-      <div class="city" style="width:320px">
-        <span class="keyword">城市</span>
-        <template>
-          <el-select v-model="value1" placeholder="请选择" size="small" style="width:116px;height: 32px;">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-          <el-select
-            v-model="value2"
-            collapse-tags
-            size="small"
-            style="margin-left: 10px;width:116px;height: 32px;"
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </template>
-      </div>
-      <div style="width:320px" class="button">
-        <el-button style="height:32px">
-          清除
-        </el-button>
-        <el-button type="primary" style="height:32px">
-          搜索
-        </el-button>
-      </div>
+    <div class="foot">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form label-width="70px">
+            <el-form-item label="题目备注">
+              <el-input v-model="input" size="mini" />
+            </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :span="6">
+          <el-form label-width="70px">
+            <el-form-item label="企业简称">
+              <el-input v-model="input" size="mini" />
+            </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :span="6">
+          <el-form label-width="70px">
+            <el-form-item label="城市">
+              <el-col :span="12" style="padding-left:0;">
+                <el-select v-model="form.date2" placeholder="请选择" size="mini">
+                  <el-option label="区域一" value="shanghai" />
+                  <el-option label="区域二" value="beijing" />
+                </el-select>
+              </el-col>
+              <el-col :span="12" style="padding-right:0;">
+                <el-select v-model="form.date3" placeholder="请选择" size="mini">
+                  <el-option label="区域一" value="shanghai" />
+                  <el-option label="区域二" value="beijing" />
+                </el-select>
+              </el-col>
+            </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :span="6">
+          <el-form>
+            <el-form-item style="display: flex;justify-content: end;">
+              <el-button size="mini">
+                清除
+              </el-button>
+              <el-button type="primary" size="mini">
+                搜索
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </el-col>
+      </el-row>
     </div>
   </div>
 </template>
@@ -81,6 +91,12 @@
 export default {
   data() {
     return {
+      form: {
+        date1: '',
+        date2: '',
+        date3: ''
+      },
+      input: '',
       subject: '学科',
       directory: '二级目录',
       label: '标签',
@@ -88,7 +104,6 @@ export default {
       difficulty: '难度',
       direction: '方向',
       Entered: '录入人',
-      input: '',
       options: [{
         value: '选项1',
         label: '黄金糕'
@@ -107,7 +122,8 @@ export default {
       }],
       value1: [],
       value2: [],
-      activeName: 'first'
+      activeName: 'first',
+      a: 'right'
     }
   }
 
@@ -115,30 +131,15 @@ export default {
 </script>
 
 <style scoped>
-.head{
+.head1{
   margin-top: 10px;
-  display: flex;
-  justify-content:space-between;
-}
-.subject{
-  display: flex;
-  justify-content: end;
-  width: 320px;
-}
-.second{
-  margin-top: 20px;
-  display: flex;
-  justify-content:space-between;
 }
-.keyword{
-  margin-right: 10px;
+.line{
   color: #606266;
   font-weight: 700;
   line-height: 32px;
 }
-.city{
-  display: flex;
-  justify-content: end;
+.cityselectright{
 }
 .button{
   display: flex;
-- 
Gitee


From 2c832fcf3b68b6524d716574afe34673c13972b2 Mon Sep 17 00:00:00 2001
From: jiangxiuguo <2872456851@qq.com>
Date: Sun, 18 Sep 2022 10:14:26 +0800
Subject: [PATCH 24/40] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AF=95=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/questions-preview.vue          |  11 -
 src/module-hmmm/pages/questions.vue           |  17 +-
 src/module-hmmm/pages/tags.vue                | 233 ------------------
 3 files changed, 10 insertions(+), 251 deletions(-)

diff --git a/src/module-hmmm/components/questions-preview.vue b/src/module-hmmm/components/questions-preview.vue
index 254c8af..e69de29 100644
--- a/src/module-hmmm/components/questions-preview.vue
+++ b/src/module-hmmm/components/questions-preview.vue
@@ -1,11 +0,0 @@
-<template>
-  <div class="container">
-    试题预览对话框
-  </div>
-</template>
-
-<script>
-export default {}
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/module-hmmm/pages/questions.vue b/src/module-hmmm/pages/questions.vue
index aae2a67..912db4b 100644
--- a/src/module-hmmm/pages/questions.vue
+++ b/src/module-hmmm/pages/questions.vue
@@ -2,7 +2,7 @@
   <div class="container">
     题组管理
     <el-card shadow="never">
-      <el-form ref="requestParameters" :model="requestParameters">
+      <el-form ref="requestParameters">
         <div class="filter-container">
           <span style="font-size: 0.75rem; color: pink">说明：目前支持学科和关键字条件筛选</span>
           <el-button
@@ -61,6 +61,7 @@
               icon="el-icon-view"
               circle
               plain
+
               @click="handleCreate"
             />
             <el-button
@@ -118,7 +119,9 @@
       <!-- end -->
     </el-card>
     <!-- 新增标签弹层 -->
-    <tagsAdd />
+    <questionsPreview
+      :dialog-visible.sync="dialogVisible"
+    />
   </div>
 </template>
 
@@ -127,20 +130,21 @@
 import PageTool from '@/module-manage/components/page-tool.vue'
 import { list, remove } from '@/api/hmmm/questions.js'
 
-import tagsAdd from '@/module-hmmm/components/tags-add.vue'
+import questionsPreview from '@/module-hmmm/components/questions-preview.vue'
 export default {
   components: {
     PageTool,
-    tagsAdd
+    questionsPreview
   },
   data() {
     return {
+      dialogVisible: false,
       pagination: {
         page: 1,
         // pagesize: 10
         total: 0,
         pageSize: 20,
-        pageSizes: [20, 50, 80, 120],
+        pageSizes: [2, 5, 10, 20],
         currentPage: 1
       },
       list: [],
@@ -168,8 +172,7 @@ export default {
     },
     // 显示弹层
     handleCreate() {
-      alert(123)
-      this.$refs.editUser.dialogFormV()
+      this.dialogVisible = true
     },
     getquestype(str) {
       if (str === 1) {
diff --git a/src/module-hmmm/pages/tags.vue b/src/module-hmmm/pages/tags.vue
index aa21011..e69de29 100644
--- a/src/module-hmmm/pages/tags.vue
+++ b/src/module-hmmm/pages/tags.vue
@@ -1,233 +0,0 @@
-<template>
-  <div class="tags">
-    <ZyForm ref="zychild" :form-items="formItems">
-      <template #header>
-        <el-button size="small" @click="remove">
-          清除
-        </el-button>
-        <el-button size="small" type="primary" @click="searchbtn">
-          搜索
-        </el-button>
-      </template>
-      <template #footer>
-        <el-button type="success" icon="el-icon-edit" @click="addbtn">
-          新增标签
-        </el-button>
-      </template>
-    </ZyForm>
-    <AlertShow :alert-text="alertText" />
-    <el-table
-
-      :data="tableData"
-      border
-      style="width: 100%"
-    >
-      <el-table-column
-        type="index"
-        label="序号"
-        width="180"
-      />
-      <el-table-column
-        prop="subjectName"
-        label="姓名"
-        width="180"
-      />
-      <el-table-column
-        prop="tagName"
-        label="标签名称"
-      /> <el-table-column
-        prop="username"
-        label="创建者"
-      />
-      <el-table-column
-        prop="addDate"
-        label="创建日期"
-      >
-        <template slot-scope="{row}">
-          {{ row.addDate | formatDate }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="state"
-        label="状态"
-      >
-        <template slot-scope="{row}">
-          <span v-if="row.state===0" type="text" size="small">
-            已禁用
-          </span>
-          <span v-else type="text" size="small">
-            已启用
-          </span>
-        </template>
-      </el-table-column>
-
-      <el-table-column
-        prop="address"
-        label="操作"
-      >
-        <template slot-scope="{row}">
-          <el-button v-if="row.state===1" type="text" size="medium " @click="disable(row.id,0)">
-            禁用
-          </el-button>
-          <el-button v-else type="text" size="medium " @click="disable(row.id,1)">
-            启用
-          </el-button>
-          <el-button :disabled="state(row.state)" type="text" size="medium " @click="edit(row)">
-            修改
-          </el-button> <el-button :disabled="state(row.state)" type="text" size="medium ">
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <el-pagination
-
-      background
-      :current-page="page.page"
-      :page-sizes="[5,10, 20]"
-      :page-size="page.pagesize"
-      layout="  prev, pager, next,sizes, jumper"
-      :total="page.total"
-      @size-change="SizeChange"
-      @current-change="CurrentChange"
-    />
-    <tagsAdd ref="dialog" :dialog-form-visible.sync="dialogFormVisible" :title="title" />
-  </div>
-</template>
-
-<script>
-import AlertShow from '@/base-ui/alert-show'
-import ZyForm from '@/base-ui/ZyForm'
-import tagsAdd from '../components/tags-add.vue'
-import { list, changeState, simple } from '@/api/hmmm/tags'
-
-// import test from 'node:test'
-export default {
-  name: 'Tags',
-  components: {
-    tagsAdd, AlertShow, ZyForm
-  },
-  data() {
-    // const wineList = () => {
-    //   return this.search.state == null && this.search.tagName === ''
-    // }
-    return {
-      search: {
-        tagName: '',
-        state: null,
-        page: 1,
-        pagesize: 5,
-        subjectID: 1
-      },
-      dialogFormVisible: false,
-      title: '新增学科',
-      tableData: [{ }],
-      showdisable: null,
-      page: {
-        page: 1,
-        pagesize: 5,
-        total: null
-      },
-      formItems: [{
-        field: 'tagName',
-        type: 'input',
-        label: '标签名称',
-        rules: []
-
-      }, {
-        field: 'state',
-        type: 'select',
-        label: '状态',
-        placeholder: '请选择',
-        options: [
-          { title: '启用', value: 1 },
-          { title: '禁用', value: 0 }
-        ]
-      }],
-      alertText: ''
-    }
-  },
-  created () {
-    // console.log(this.wineList)
-    this.list()
-    this.simple()
-  },
-  methods: {
-    state(flag) {
-      return Boolean(flag)
-    },
-    async simple() {
-      const { data } = await simple()
-      this.page.total = data.length
-      this.alertText = `当前数据共${this.page.total}条`
-    },
-    async list () {
-      if (this.search.state == null && this.search.tagName === '') {
-        const { data: { items } } = await list(this.page)
-        this.tableData = items
-        this.simple()
-      } else {
-        const { data } = await list(this.search)
-        this.page.total = data.counts
-        this.tableData = data.items
-        this.alertText = `当前数据共${data.counts}条`
-      }
-    },
-    async disable(id, state) { // 标签状态
-      const data = { id: id, state: state }
-      try {
-        await changeState(data)
-      } catch (error) {
-        console.log(error)
-      }
-      this.list()
-      this.$message.success('操作成功')
-    },
-    SizeChange(pagesize) {
-      if (this.search.state == null && this.search.tagName === '') {
-        this.page.pagesize = pagesize
-      } else {
-        this.search.pagesize = pagesize
-      } this.list()
-    },
-    CurrentChange(page) {
-      if (this.search.state == null && this.search.tagName === '') {
-        this.page.page = page
-      } else {
-        this.search.page = page
-      } this.list()
-    },
-    edit(row) {
-      this.$refs.dialog.dialog(row)
-      this.title = '编辑学科'
-      this.dialogFormVisible = true
-    },
-    addbtn() {
-      this.title = '新增目录'
-      this.dialogFormVisible = true
-    },
-    remove() {
-      this.$refs.zychild.MyFormData = {}
-      this.search = {}
-      this.list()
-    },
-    searchbtn() {
-      this.search.state = this.$refs.zychild.MyFormData.state
-      this.search.tagName = this.$refs.zychild.MyFormData.tagName
-      this.list()
-    }
-  }
-}
-</script>
-<style>
-  .tags{
-    margin: 10px;
-    padding: 15px;
-    border: 1px solid #ebeef5;
-    background-color: #fff;
-  }
-  .el-pagination {
-    text-align: end
-  }
-</style>
-- 
Gitee


From b98f3cc9ca71b42496c66d8716693f7c53f50249 Mon Sep 17 00:00:00 2001
From: zhangwei <1369734433@qq.com>
Date: Sun, 18 Sep 2022 10:45:38 +0800
Subject: [PATCH 25/40] der

---
 src/module-dashboard/components/pageTool.vue |  1 +
 src/module-hmmm/pages/questions-randoms.vue  | 66 ++++++++++++++------
 2 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/module-dashboard/components/pageTool.vue b/src/module-dashboard/components/pageTool.vue
index af6f754..9757f49 100644
--- a/src/module-dashboard/components/pageTool.vue
+++ b/src/module-dashboard/components/pageTool.vue
@@ -26,6 +26,7 @@ export default {
     },
     // 每页显示信息条数
     onPageSizeChange: function (pageSize) {
+      console.log(pageSize);
       this.$emit('pageSizeChange', pageSize)
     }
   }
diff --git a/src/module-hmmm/pages/questions-randoms.vue b/src/module-hmmm/pages/questions-randoms.vue
index ce6ab7f..0c66205 100644
--- a/src/module-hmmm/pages/questions-randoms.vue
+++ b/src/module-hmmm/pages/questions-randoms.vue
@@ -6,13 +6,13 @@
       <el-card shadow="never">
         <el-row type="flex" class="row-bg" justify="space-between">
           <el-col :span="6">
-            <el-input v-model="keyword" type="search" placeholder="根据编号搜索" />
+            <el-input v-model="pagination.keyword" type="search" placeholder="根据编号搜索" />
           </el-col>
-          <el-col :span="6" class="el-col-offset-12">
+          <el-col :span="18" class="el-col-offset-12">
             <el-button @click="btnClane()">
               清除
             </el-button>
-            <el-button type="primary" @click="btnSearch(keyword)">
+            <el-button type="primary" @click="btnSearch(pagination.keyword)">
               搜索
             </el-button>
           </el-col>
@@ -128,12 +128,12 @@
             </el-col>
             <el-col :span="6">
               <div class="grid-content bg-purple-light">
-                【学科】：{{ detailData.subjectID }}
+                【学科】：{{ detailData.subjectName }}
               </div>
             </el-col>
             <el-col :span="6">
               <div class="grid-content bg-purple-light">
-                【目录】：{{ detailData.catalogID }}
+                【目录】：{{ detailData.directoryName }}
               </div>
             </el-col>
             <el-col :span="6">
@@ -147,6 +147,7 @@
               <div class="grid-content bg-purple-light">
                 【题干】：
                 <div style="color:blue" v-html="detailData.question" />
+                <div>{{detailData.answer}}</div>
               </div>
             </el-col>
           </el-row>
@@ -154,11 +155,11 @@
             <el-col :span="24">
               <div class="grid-content bg-purple-light">
                 【参考答案】
-                <el-button type="danger">
+                <el-button type="danger" @click="fn()">
                   视频答案预览
                 </el-button>
-                <div>
-                  <video :src="detailData.videoURL" controls="controls">1</video>
+                <div v-if="videoShow">
+                  <video  :src="detailData.videoURL" controls="controls">1</video>
                 </div>
               </div>
             </el-col>
@@ -167,7 +168,7 @@
             <el-col :span="24">
               <div class="grid-content bg-purple-light">
                 【答案解析】：
-                <div v-html="detailData.answer" />
+                <span v-html="detailData.answer" />
               </div>
             </el-col>
           </el-row>
@@ -180,7 +181,7 @@
             <div />
           </el-row>
           <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="dialogVisible = false">关闭</el-button>
+            <el-button type="primary" @click="close()">关闭</el-button>
           </span>
         </el-dialog>
       </el-card>
@@ -195,10 +196,13 @@ export default {
   components: {
     PageTool
   },
+
   data() {
+
     return {
+
       tableKey: 0,
-      keyword: '',
+      videoShow:false,
       alertText: '',
       questionType: '',
       dialogVisible: false,
@@ -206,7 +210,7 @@ export default {
       detailData: {},
       pagination: {
         page: 1,
-        // pagesize: 10
+        keyword: '',
         total: 0,
         pageSize: 20,
         pageSizes: [10, 20, 30, 50],
@@ -218,11 +222,11 @@ export default {
     this.getList()
   },
   methods: {
-    async getList (page = 1, limit = 20) {
-      this.pagination.currentPage = page
-      this.pagination.pageSize = limit
-      this.tableData = []
-      const { data } = await randoms()
+    async getList () {
+      // this.pagination.currentPage = page
+      // this.pagination.pageSize = limit
+      // console.log(this.keyword);
+      const { data } = await randoms(this.pagination)
       this.pagination.total = data.counts
       this.tableData = data.items
       // console.log(this.tableData);
@@ -244,17 +248,24 @@ export default {
       // console.log(row);
       this.dialogVisible = true
       const { data } = await detail(row)
+      console.log(data)
       // console.log(data);
       this.detailData = data
       console.log(this.detailData.videoURL)
     },
     btnClane() {
-      this.input = ''
+      this.pagination.keyword = ''
+      this.getList()
     },
     btnSearch(keyword) {
       // console.log(keyword);
-      console.log(this.tableData)
-      // this.getList(keyword)
+      // console.log(this.tableData)
+      this.getList(keyword)
+      // console.log(randoms(keyword));
+    },
+    fn(){
+      // alert(1)
+      this.videoShow = true
     },
     // 每页显示信息条数
     handleSizeChange(val) {
@@ -265,6 +276,10 @@ export default {
       }
       // alert(1)
     },
+    close(){
+      this.dialogVisible = false
+      this.videoShow = false
+    },
     // 进入某一页
     handleCurrentChange(val) {
       this.pagination.page = val
@@ -277,6 +292,7 @@ export default {
         })
         .catch(_ => {})
     }
+
   }
 }
 </script>
@@ -295,4 +311,14 @@ export default {
   display: flex;
   justify-content: end !important;
 }
+.grid-content{
+  padding: 10px 0;
+}
+video{
+  margin-top: 10px;
+}
+.el-col-18{
+  display: flex;
+  justify-content: end;
+}
 </style>
-- 
Gitee


From 6b5ec46caa09966027d5d7b29741eca17f2febb4 Mon Sep 17 00:00:00 2001
From: wzy <wzyzzqq@163.com>
Date: Sun, 18 Sep 2022 10:46:31 +0800
Subject: [PATCH 26/40] =?UTF-8?q?fix(bug):=20delete=20doc/wzy.md=20&=20fix?=
 =?UTF-8?q?=20=E6=88=90=E5=91=98=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                                  |  18 +-
 .prettierrc                                   |   9 +-
 doc/wzy.md                                    | 176 -------
 .../QuestionsChoiceNavbar/index.vue           | 138 +++---
 src/module-hmmm/pages/questions-choice.vue    | 464 +++++++++---------
 src/module-hmmm/pages/questions-randoms.vue   | 273 +++++------
 6 files changed, 454 insertions(+), 624 deletions(-)
 delete mode 100644 doc/wzy.md

diff --git a/.eslintrc.js b/.eslintrc.js
index df62c64..72723d9 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -21,7 +21,23 @@ module.exports = {
     // 'vue/require-prop-types': 'off',
     'vue/no-use-v-if-with-v-for': 'off',
     'vue/no-v-html': 'off',
-    'vue/no-template-key': 'off'
+    'vue/no-template-key': 'off',
+    /* 临时解决 */
+    indent: 'off',
+    'vue/html-self-closing': 'off',
+    'vue/singleline-html-element-content-newline': 'off'
+    // 'vue/html-self-closing': [
+    //   'error',
+    //   {
+    //     html: {
+    //       void: 'always',
+    //       normal: 'never',
+    //       component: 'always'
+    //     },
+    //     svg: 'always',
+    //     math: 'always'
+    //   }
+    // ]
     // 'vue/require-default-prop': 'off'
   }
 }
diff --git a/.prettierrc b/.prettierrc
index 931e821..a817bbe 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -4,5 +4,12 @@
   "printWidth": 80,
   "singleQuote": true,
   "trailingComma": "none",
-  "semi": false
+  "semi": false,
+  "jsxSingleQuote": false,
+  "bracketSpacing": true,
+  "jsxBracketSameLine": false,
+  "arrowParens": "always",
+  "htmlWhitespaceSensitivity": "ignore",
+  "vueIndentScriptAndStyle": true,
+  "endOfLine": "lf"
 }
diff --git a/doc/wzy.md b/doc/wzy.md
deleted file mode 100644
index d87395b..0000000
--- a/doc/wzy.md
+++ /dev/null
@@ -1,176 +0,0 @@
-# 问题汇总
-
-### 组件封装
-
-> time: 2022/9/17 上午
-
-#### *vue2中父子组件双向绑定* sync方式 (v-model存在些问题后面补充)
-
-**注意组件数据的单向流动问题**
-
-> 这里采用的解决思路
->
-> - sync使数据具备双向绑定特性
-> - 子组件中深拷贝一下formData 为了不直接去修改formData的值违反数据单向流动
-> - watch监听MyFormData的变化 以emit父组件更新formData数据
-
-```vue
-// 父组件
-<zy-form :form-data.sync="formData" />
-// 子组件中
-<el-input v-model="MyFormData[`对象中的一个key`]" />
-<script>
-export default {
-    props: {
-        formData: {
-          type: Object,
-          default: () => {}
-        },
-    },
-    data() {
-    return {
-      MyFormData: { ...this.formData }
-    }
-  },
-  watch: {
-    MyFormData: {
-      handler(newValue) {
-        this.$emit('update:formData', newValue)
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-```
-
-#### 父组件给子组件绑定超多属性记录
-
-**可以使用不带参数的 `v-bind` (取代 `v-bind:prop-name`)**
-
-```vue
-<zy-form v-bind="formConfig" />
-// 等价于
-<zy-form :formItems="formConfig.formItems" :itemStyle="formConfig.itemStyle" 好多好多的property />
-```
-
-#### **注意：prop验证问题**
-
-为组件的 prop 指定验证传入类型时 遇到对象或数组默认值必须从一个工厂函数获取
-
-```vue
-propE: {
-    type: Object,
-    // 对象或数组默认值必须从一个工厂函数获取
-    default: function () {
-    return { message: 'hello' }
-    }
-},
-```
-
-> time: 2022/9/17
-
-#### v-if引发的bug
-
-- vue2中 v-if 标签中无法识别 ?? 必须使用 ||
-
-```vue
-<template v-if="item.type === 'input' || item.type === 'password'">
-```
-
-> time: 2022/9/17
-
-#### 具名插槽引发的血案
-
-忘记了咋使用的
-
-```vue
-// 子组件
-<current-user v-slot="slotProps">
-  {{ slotProps.user.firstName }}
-</current-user>
-// 父组件
-<current-user>
-  <template v-slot:default="slotProps">
-    {{ slotProps.user.firstName }}
-  </template>
-  </template>
-</current-user>
-```
-
-**补充** 解构prop & 动态插槽名
-
-```vue
-<current-user v-slot="{ user }">
-  {{ user.firstName }}
-</current-user>
----
-<base-layout>
-  <template v-slot:[dynamicSlotName]>
-    ...
-  </template>
-</base-layout>
-```
-
-
-
-### 使用富文本插件
-
-> WangEditor 简单好用强大支持移动端（js，vue，react）
->
-> https://www.wangeditor.com/v5/for-frame.html#%E4%BD%BF%E7%94%A8
->
-> 使用注意：
->
-> - 赋值 `this.editor` 时要使用 `Object.seal()` ，否则会报错
->
-> - Vue 组件销毁时，及时销毁编辑器
->
-> - 高度要大于300px
->
-> - 设置初始文本左对齐 **直接设置text-align: left**
->
->   ```vue
->    <Editor
->            :mode="mode"
->            style="{ text-align: left}"
->            />
->   ```
->
->   
-
-> more chiose
->
-> https://juejin.cn/post/7084046542994145294
-
-
-
----
-
-
-
-## 遗留问题
-
- ### 动态参数问题
-
-这里的动态传参 [item.type] 报警告了  :green_heart: 已解决
-
-src\base-ui\ZyForm\src\zy-form.vue 79
-
-```vue
-<template v-else>
-	<slot :name="item.type" :[item.type]="item" />
-</template>
-```
-
-方案
-
-```vue
-<slot :name="item.type" :[`${item.type}`]="item" />
-```
-
-### wangEditor 的检测问题
-
-### wangEditor 的双向绑定问题
-
diff --git a/src/components/QuestionsChoiceNavbar/index.vue b/src/components/QuestionsChoiceNavbar/index.vue
index eede429..e20593f 100644
--- a/src/components/QuestionsChoiceNavbar/index.vue
+++ b/src/components/QuestionsChoiceNavbar/index.vue
@@ -14,7 +14,11 @@
         <el-col :span="6">
           <el-form label-width="70px">
             <el-form-item label="关键字">
-              <el-input v-model="form.date1" placeholder="请根据题干搜索" size="mini" />
+              <el-input
+                v-model="form.date1"
+                placeholder="请根据题干搜索"
+                size="mini"
+              />
             </el-form-item>
           </el-form>
         </el-col>
@@ -55,14 +59,22 @@
         <el-col :span="6">
           <el-form label-width="70px">
             <el-form-item label="城市">
-              <el-col :span="12" style="padding-left:0;">
-                <el-select v-model="form.date2" placeholder="请选择" size="mini">
+              <el-col :span="12" style="padding-left: 0">
+                <el-select
+                  v-model="form.date2"
+                  placeholder="请选择"
+                  size="mini"
+                >
                   <el-option label="区域一" value="shanghai" />
                   <el-option label="区域二" value="beijing" />
                 </el-select>
               </el-col>
-              <el-col :span="12" style="padding-right:0;">
-                <el-select v-model="form.date3" placeholder="请选择" size="mini">
+              <el-col :span="12" style="padding-right: 0">
+                <el-select
+                  v-model="form.date3"
+                  placeholder="请选择"
+                  size="mini"
+                >
                   <el-option label="区域一" value="shanghai" />
                   <el-option label="区域二" value="beijing" />
                 </el-select>
@@ -72,13 +84,9 @@
         </el-col>
         <el-col :span="6">
           <el-form>
-            <el-form-item style="display: flex;justify-content: end;">
-              <el-button size="mini">
-                清除
-              </el-button>
-              <el-button type="primary" size="mini">
-                搜索
-              </el-button>
+            <el-form-item style="display: flex; justify-content: flex-end">
+              <el-button size="mini">清除</el-button>
+              <el-button type="primary" size="mini">搜索</el-button>
             </el-form-item>
           </el-form>
         </el-col>
@@ -88,60 +96,64 @@
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      form: {
-        date1: '',
-        date2: '',
-        date3: ''
-      },
-      input: '',
-      subject: '学科',
-      directory: '二级目录',
-      label: '标签',
-      type: '试题类型',
-      difficulty: '难度',
-      direction: '方向',
-      Entered: '录入人',
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
-      value1: [],
-      value2: [],
-      activeName: 'first',
-      a: 'right'
+  export default {
+    data() {
+      return {
+        form: {
+          date1: '',
+          date2: '',
+          date3: ''
+        },
+        input: '',
+        subject: '学科',
+        directory: '二级目录',
+        label: '标签',
+        type: '试题类型',
+        difficulty: '难度',
+        direction: '方向',
+        Entered: '录入人',
+        options: [
+          {
+            value: '选项1',
+            label: '黄金糕'
+          },
+          {
+            value: '选项2',
+            label: '双皮奶'
+          },
+          {
+            value: '选项3',
+            label: '蚵仔煎'
+          },
+          {
+            value: '选项4',
+            label: '龙须面'
+          },
+          {
+            value: '选项5',
+            label: '北京烤鸭'
+          }
+        ],
+        value1: [],
+        value2: [],
+        activeName: 'first',
+        a: 'right'
+      }
     }
   }
-
-}
 </script>
 
 <style scoped>
-.head1{
-  margin-top: 10px;
-}
-.line{
-  color: #606266;
-  font-weight: 700;
-  line-height: 32px;
-}
-.button{
-  display: flex;
-  justify-content: end;
-}
-
+  .head1 {
+    margin-top: 10px;
+  }
+  .line {
+    color: #606266;
+    font-weight: 700;
+    line-height: 32px;
+  }
+  .button {
+    display: flex;
+    justify-content: flex-end;
+  }
 </style>
diff --git a/src/module-hmmm/pages/questions-choice.vue b/src/module-hmmm/pages/questions-choice.vue
index 36c5dc5..12caf2e 100644
--- a/src/module-hmmm/pages/questions-choice.vue
+++ b/src/module-hmmm/pages/questions-choice.vue
@@ -18,57 +18,30 @@
           </el-tabs>
         </template>
         <div>
-          <el-alert
-            type="info"
-            show-icon
-            :closable="false"
-          >
+          <el-alert type="info" show-icon :closable="false">
             <template slot="title">
               <span>数据一共{{ counts }}条</span>
             </template>
           </el-alert>
         </div>
         <template>
-          <el-table
-            :data="tableData"
-            style="width: 100%"
-          >
-            <el-table-column
-              prop="number"
-              label="试题编号"
-              width="150"
-            />
-            <el-table-column
-              prop="subject"
-              label="学科"
-              width="120"
-            />
-            <el-table-column
-              prop="catalog"
-              label="目录"
-              width="120"
-            />
+          <el-table :data="tableData" style="width: 100%">
+            <el-table-column prop="number" label="试题编号" width="150" />
+            <el-table-column prop="subject" label="学科" width="120" />
+            <el-table-column prop="catalog" label="目录" width="120" />
             <el-table-column
               prop="questionType"
               label="题型"
               width="120"
               :formatter="questionType"
             />
-            <el-table-column
-              prop="question"
-              label="题干"
-              width="300"
-            >
-              <template v-slot="{row}">
+            <el-table-column prop="question" label="题干" width="300">
+              <template v-slot="{ row }">
                 <div v-html="row.question" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="addDate"
-              label="录入时间"
-              width="250"
-            >
-              <template v-slot="{row}">
+            <el-table-column prop="addDate" label="录入时间" width="250">
+              <template v-slot="{ row }">
                 {{ formatDate(row.addDate) }}
               </template>
             </el-table-column>
@@ -78,37 +51,26 @@
               width="120"
               :formatter="difficulty"
             />
-            <el-table-column
-              prop="creator"
-              label="录入人"
-              width="120"
-            />
+            <el-table-column prop="creator" label="录入人" width="120" />
             <el-table-column
               prop="chkState"
               label="审核状态"
               width="120"
               :formatter="chkState"
             />
-            <el-table-column
-              prop="chkRemarks"
-              label="审核意见"
-              width="120"
-            />
-            <el-table-column
-              prop="chkUser"
-              label="审核人"
-              width="120"
-            />
+            <el-table-column prop="chkRemarks" label="审核意见" width="120" />
+            <el-table-column prop="chkUser" label="审核人" width="120" />
             <el-table-column
               prop="publishState"
               label="发布状态"
               width="120"
               :formatter="publishState"
             />
-            <el-table-column align="center"
-                             fixed="right"
-                             label="操作"
-                             width="230"
+            <el-table-column
+              align="center"
+              fixed="right"
+              label="操作"
+              width="230"
             >
               <template slot-scope="scope">
                 <el-button
@@ -142,7 +104,7 @@
                 <el-button
                   type="text"
                   size="mini"
-                  @click.native.prevent="delete(scope.$index, tableData)"
+                  @click.native.prevent="delete (scope.$index, tableData)"
                 >
                   删除
                 </el-button>
@@ -162,17 +124,9 @@
             />
           </div>
         </div>
-        <el-dialog
-          title="题目审核"
-          :visible.sync="dialogVisible"
-          width="30%"
-        >
-          <el-radio v-model="radio" label="1">
-            通过
-          </el-radio>
-          <el-radio v-model="radio" label="2">
-            拒绝
-          </el-radio>
+        <el-dialog title="题目审核" :visible.sync="dialogVisible" width="30%">
+          <el-radio v-model="radio" label="1">通过</el-radio>
+          <el-radio v-model="radio" label="2">拒绝</el-radio>
           <div class="textarea">
             <el-input
               v-model="textarea"
@@ -183,14 +137,12 @@
           </div>
           <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            <el-button type="primary" @click="dialogVisible = false">
+              确 定
+            </el-button>
           </span>
         </el-dialog>
-        <el-dialog
-          title="题目预览"
-          :visible.sync="dialogVisible1"
-          width="60%"
-        >
+        <el-dialog title="题目预览" :visible.sync="dialogVisible1" width="60%">
           <div class="preview1">
             <el-row>
               <el-col :span="6">
@@ -237,29 +189,44 @@
               </el-col>
             </el-row>
           </div>
-          <hr>
+          <hr />
           <span>【题干】:</span>
           <p class="stem" v-html="previewList.question" />
-          <hr>
+          <hr />
           <div class="videoTab">
-            <p><span>【参考答案】：</span> <span><el-button type="danger" @click="isVideoShow=true">视频答案预览</el-button></span></p>
-            <video v-if="isVideoShow" controls width="300" height="300" class="video">
-              <source :src="previewList.videoURL"
-                      type="video/webm"
-              >
+            <p>
+              <span>【参考答案】：</span>
+              <span>
+                <el-button type="danger" @click="isVideoShow = true">
+                  视频答案预览
+                </el-button>
+              </span>
+            </p>
+            <video
+              v-if="isVideoShow"
+              controls
+              width="300"
+              height="300"
+              class="video"
+            >
+              <source :src="previewList.videoURL" type="video/webm" />
             </video>
           </div>
 
-          <hr>
+          <hr />
           <div class="answer">
-            <span>【答案解析】:</span><span v-html="previewList.answer" />
+            <span>【答案解析】:</span>
+            <span v-html="previewList.answer" />
           </div>
-          <hr>
+          <hr />
           <div class="remarks">
-            <span>【题目备注】:</span><span>{{ previewList.remarks }}</span>
+            <span>【题目备注】:</span>
+            <span>{{ previewList.remarks }}</span>
           </div>
           <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="dialogVisible1 = false">关 闭</el-button>
+            <el-button type="primary" @click="dialogVisible1 = false">
+              关 闭
+            </el-button>
           </span>
         </el-dialog>
       </div>
@@ -268,186 +235,195 @@
 </template>
 
 <script>
-import { choice } from '@/api/hmmm/questions'
-export default {
-  data() {
-    return {
-      activeName: 'first',
-      tableData: [],
-      counts: 3,
-      dialogVisible: false,
-      radio: '1',
-      textarea: '',
-      dialogVisible1: false,
-      isVideoShow: false,
-      previewList: {}
-    }
-  },
-  created() {
-    this.choiceAll()
-  },
-  methods: {
-    handleClick(val) {
-      if (val.index === '0') {
-        // console.log(0)
-        this.choiceAll()
-      } else if (val.index === '1') {
-        console.log(1)
-      } else if (val.index === '2') {
-        console.log(2)
-      } else {
-        console.log(3)
+  import { choice } from '@/api/hmmm/questions'
+  export default {
+    data() {
+      return {
+        activeName: 'first',
+        tableData: [],
+        counts: 3,
+        dialogVisible: false,
+        radio: '1',
+        textarea: '',
+        dialogVisible1: false,
+        isVideoShow: false,
+        previewList: {}
       }
     },
-    examineList() {
-
-    },
-    preview(tab, event) {
-      this.previewList = event[tab]
-      this.dialogVisible1 = true
-      // console.log(event[tab])
-    },
-    examine(tab, event) {
-      // console.log(tab, event)
-      this.dialogVisible = true
-    },
-    revise(tab, event) {
-      // console.log(tab, event)
-    },
-    grounding(tab, event) {
-      // console.log(tab, event)
+    created() {
+      this.choiceAll()
     },
-    delete(tab, event) {
-      // console.log(tab, event)
-    },
-    async choiceAll() {
-      const { data } = await choice()
-      this.tableData = data.items
-      // console.log(data)
-      this.counts = data.counts
-    },
-    questionType(row) {
-      if (row.questionType === '1') {
-        return '单选'
-      }
-      if (row.questionType === '2') {
-        return '多选'
-      }
-      if (row.questionType === '3') {
-        return '简答'
-      }
-    },
-    difficulty(row) {
-      if (row.difficulty === '1') {
-        return '简单'
-      } else if (row.difficulty === '2') {
-        return '一般'
-      } else if (row.difficulty === '3') {
-        return '困难'
-      }
-    },
-    chkState(row) {
-      if (row.chkState === 0) {
-        return '待审核'
-      }
-      if (row.chkState === 1) {
-        return '通过'
-      }
-      if (row.chkState === 2) {
-        return '拒绝'
-      }
-    },
-    formatDate(res) {
-      const date = new Date(res)
-      const formatObj = {
-        y: date.getFullYear(),
-        m: date.getMonth() + 1,
-        d: date.getDate(),
-        h: date.getHours(),
-        i: date.getMinutes(),
-        s: date.getSeconds(),
-        a: date.getDay()
-      }
-      if (formatObj.m < 10) {
-        formatObj.m = '0' + formatObj.m
-      }
-      if (formatObj.d < 10) {
-        formatObj.d = '0' + formatObj.d
-      }
-      if (formatObj.h < 10) {
-        formatObj.h = '0' + formatObj.h
-      }
-      if (formatObj.i < 10) {
-        formatObj.i = '0' + formatObj.i
+    methods: {
+      handleClick(val) {
+        if (val.index === '0') {
+          // console.log(0)
+          this.choiceAll()
+        } else if (val.index === '1') {
+          console.log(1)
+        } else if (val.index === '2') {
+          console.log(2)
+        } else {
+          console.log(3)
+        }
+      },
+      examineList() {},
+      preview(tab, event) {
+        this.previewList = event[tab]
+        this.dialogVisible1 = true
+        // console.log(event[tab])
+      },
+      examine(tab, event) {
+        // console.log(tab, event)
+        this.dialogVisible = true
+      },
+      revise(tab, event) {
+        // console.log(tab, event)
+      },
+      grounding(tab, event) {
+        // console.log(tab, event)
+      },
+      delete(tab, event) {
+        // console.log(tab, event)
+      },
+      async choiceAll() {
+        const { data } = await choice()
+        this.tableData = data.items
+        // console.log(data)
+        this.counts = data.counts
+      },
+      questionType(row) {
+        if (row.questionType === '1') {
+          return '单选'
+        }
+        if (row.questionType === '2') {
+          return '多选'
+        }
+        if (row.questionType === '3') {
+          return '简答'
+        }
+      },
+      difficulty(row) {
+        if (row.difficulty === '1') {
+          return '简单'
+        } else if (row.difficulty === '2') {
+          return '一般'
+        } else if (row.difficulty === '3') {
+          return '困难'
+        }
+      },
+      chkState(row) {
+        if (row.chkState === 0) {
+          return '待审核'
+        }
+        if (row.chkState === 1) {
+          return '通过'
+        }
+        if (row.chkState === 2) {
+          return '拒绝'
+        }
+      },
+      formatDate(res) {
+        const date = new Date(res)
+        const formatObj = {
+          y: date.getFullYear(),
+          m: date.getMonth() + 1,
+          d: date.getDate(),
+          h: date.getHours(),
+          i: date.getMinutes(),
+          s: date.getSeconds(),
+          a: date.getDay()
+        }
+        if (formatObj.m < 10) {
+          formatObj.m = '0' + formatObj.m
+        }
+        if (formatObj.d < 10) {
+          formatObj.d = '0' + formatObj.d
+        }
+        if (formatObj.h < 10) {
+          formatObj.h = '0' + formatObj.h
+        }
+        if (formatObj.i < 10) {
+          formatObj.i = '0' + formatObj.i
+        }
+        if (formatObj.s < 10) {
+          formatObj.s = '0' + formatObj.s
+        }
+        return (
+          formatObj.y +
+          '-' +
+          formatObj.m +
+          '-' +
+          formatObj.d +
+          '  ' +
+          formatObj.h +
+          ':' +
+          formatObj.i +
+          ':' +
+          formatObj.s
+        )
+      },
+      publishState(row) {
+        if (row.publishState === 0) {
+          return '下架'
+        } else if (row.publishState === 1) {
+          return '上架'
+        }
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+      },
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`)
       }
-      if (formatObj.s < 10) {
-        formatObj.s = '0' + formatObj.s
-      }
-      return formatObj.y + '-' + formatObj.m + '-' + formatObj.d + '  ' + formatObj.h + ':' + formatObj.i + ':' + formatObj.s
-    },
-    publishState(row) {
-      if (row.publishState === 0) {
-        return '下架'
-      } else if (row.publishState === 1) {
-        return '上架'
-      }
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-    },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`)
     }
   }
-}
-
 </script>
 <style scoped>
-  .container{
+  .container {
     padding: 8px 16px;
   }
   #content {
     background-color: #fff;
     padding: 20px 20px;
   }
-  #head{
+  #head {
     font-size: 12px;
     display: flex;
-    justify-content:space-between;
+    justify-content: space-between;
   }
   #head p {
     color: pink;
   }
-  .el-button--small{
+  .el-button--small {
     width: 97px;
     height: 32px;
   }
-  .table{
-  margin-top: 20px;
-}
-.textarea{
-  margin-top: 20px;
-}
-.preview2{
-  margin-top: 30px;
-  margin-bottom: 20px;
-}
-.preview1{
-  margin-top: 20px;
-}
-.answer{
-  margin-top: 20px;
-  margin-bottom: 20px;
-}
-.remarks{
-  margin-top: 20px;
-}
-.stem{
-  color: blue;
-}
-.foot{
-  margin-top: 20px;
-  display: flex;
-  justify-content: end;
-}
+  .table {
+    margin-top: 20px;
+  }
+  .textarea {
+    margin-top: 20px;
+  }
+  .preview2 {
+    margin-top: 30px;
+    margin-bottom: 20px;
+  }
+  .preview1 {
+    margin-top: 20px;
+  }
+  .answer {
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
+  .remarks {
+    margin-top: 20px;
+  }
+  .stem {
+    color: blue;
+  }
+  .foot {
+    margin-top: 20px;
+    display: flex;
+    justify-content: flex-end;
+  }
 </style>
diff --git a/src/module-hmmm/pages/questions-randoms.vue b/src/module-hmmm/pages/questions-randoms.vue
index ce6ab7f..7d0a78b 100644
--- a/src/module-hmmm/pages/questions-randoms.vue
+++ b/src/module-hmmm/pages/questions-randoms.vue
@@ -1,17 +1,17 @@
 <template>
-  <div
-    class="dashboard-container"
-  >
+  <div class="dashboard-container">
     <div class="app-container">
       <el-card shadow="never">
         <el-row type="flex" class="row-bg" justify="space-between">
           <el-col :span="6">
-            <el-input v-model="keyword" type="search" placeholder="根据编号搜索" />
+            <el-input
+              v-model="keyword"
+              type="search"
+              placeholder="根据编号搜索"
+            />
           </el-col>
           <el-col :span="6" class="el-col-offset-12">
-            <el-button @click="btnClane()">
-              清除
-            </el-button>
+            <el-button @click="btnClane()">清除</el-button>
             <el-button type="primary" @click="btnSearch(keyword)">
               搜索
             </el-button>
@@ -32,12 +32,7 @@
           highlight-current-row
           style="width: 100%"
         >
-          <el-table-column
-            prop="id"
-            align="center"
-            label="编号"
-            width="180"
-          />
+          <el-table-column prop="id" align="center" label="编号" width="180" />
           <el-table-column
             prop="questionType"
             align="center"
@@ -50,18 +45,18 @@
             label="题目编号"
             width="200"
           >
-            <template v-slot="{row}">
-              <span v-for="(item,index) in row.questionIDs" :key="index" @click="getdetail(item)">
+            <template v-slot="{ row }">
+              <span
+                v-for="(item, index) in row.questionIDs"
+                :key="index"
+                @click="getdetail(item)"
+              >
                 <a href="#">{{ item.number }}</a>
-                <br>
+                <br />
               </span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="addTime"
-            align="center"
-            label="录入时间"
-          />
+          <el-table-column prop="addTime" align="center" label="录入时间" />
           <el-table-column
             prop="totalSeconds"
             align="center"
@@ -72,17 +67,15 @@
             align="center"
             label="真确率(%)"
           />
-          <el-table-column
-            prop="userName"
-            align="center"
-            label="录入人"
-          />
-          <el-table-column
-            label="操作"
-            align="center"
-          >
-            <template v-slot="{row}">
-              <el-button type="danger" icon="el-icon-delete" circle @click="delList(row)" />
+          <el-table-column prop="userName" align="center" label="录入人" />
+          <el-table-column label="操作" align="center">
+            <template v-slot="{ row }">
+              <el-button
+                type="danger"
+                icon="el-icon-delete"
+                circle
+                @click="delList(row)"
+              />
             </template>
           </el-table-column>
         </el-table>
@@ -105,7 +98,7 @@
           width="50%"
           :before-close="handleClose"
         >
-          <el-row style="border-bottom:1px solid #000;">
+          <el-row style="border-bottom: 1px solid #000">
             <el-col :span="6">
               <div class="grid-content bg-purple">
                 【题型】：{{ detailData.questionType }}
@@ -142,32 +135,32 @@
               </div>
             </el-col>
           </el-row>
-          <el-row style="border-bottom:1px solid #000;">
+          <el-row style="border-bottom: 1px solid #000">
             <el-col :span="24">
               <div class="grid-content bg-purple-light">
                 【题干】：
-                <div style="color:blue" v-html="detailData.question" />
+                <div style="color: blue" v-html="detailData.question"></div>
               </div>
             </el-col>
           </el-row>
-          <el-row style="border-bottom:1px solid #000;">
+          <el-row style="border-bottom: 1px solid #000">
             <el-col :span="24">
               <div class="grid-content bg-purple-light">
                 【参考答案】
-                <el-button type="danger">
-                  视频答案预览
-                </el-button>
+                <el-button type="danger">视频答案预览</el-button>
                 <div>
-                  <video :src="detailData.videoURL" controls="controls">1</video>
+                  <video :src="detailData.videoURL" controls="controls">
+                    1
+                  </video>
                 </div>
               </div>
             </el-col>
           </el-row>
-          <el-row style="border-bottom:1px solid #000;">
+          <el-row style="border-bottom: 1px solid #000">
             <el-col :span="24">
               <div class="grid-content bg-purple-light">
                 【答案解析】：
-                <div v-html="detailData.answer" />
+                <div v-html="detailData.answer"></div>
               </div>
             </el-col>
           </el-row>
@@ -177,10 +170,12 @@
                 【题目备注】：{{ detailData.remarks }}
               </div>
             </el-col>
-            <div />
+            <div></div>
           </el-row>
           <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="dialogVisible = false">关闭</el-button>
+            <el-button type="primary" @click="dialogVisible = false">
+              关闭
+            </el-button>
           </span>
         </el-dialog>
       </el-card>
@@ -189,110 +184,110 @@
 </template>
 
 <script>
-import PageTool from '@/module-dashboard/components/pageTool.vue'
-import { randoms, removeRandoms, detail } from '@/api/hmmm/questions'
-export default {
-  components: {
-    PageTool
-  },
-  data() {
-    return {
-      tableKey: 0,
-      keyword: '',
-      alertText: '',
-      questionType: '',
-      dialogVisible: false,
-      tableData: [],
-      detailData: {},
-      pagination: {
-        page: 1,
-        // pagesize: 10
-        total: 0,
-        pageSize: 20,
-        pageSizes: [10, 20, 30, 50],
-        currentPage: 1
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    async getList (page = 1, limit = 20) {
-      this.pagination.currentPage = page
-      this.pagination.pageSize = limit
-      this.tableData = []
-      const { data } = await randoms()
-      this.pagination.total = data.counts
-      this.tableData = data.items
-      // console.log(this.tableData);
-      this.alertText = `共 ${data.counts} 条记录`
-      // console.log(data);
-    },
-    async delList(row) {
-      try {
-        await this.$confirm('您确定删除吗')
-        await removeRandoms(row)
-        // alert(2)
-        this.getList()
-        this.$message.success('删除成功')
-      } catch (error) {
-        console.log(error)
-      }
-    },
-    async getdetail(row) {
-      // console.log(row);
-      this.dialogVisible = true
-      const { data } = await detail(row)
-      // console.log(data);
-      this.detailData = data
-      console.log(this.detailData.videoURL)
-    },
-    btnClane() {
-      this.input = ''
+  import PageTool from '@/module-dashboard/components/pageTool.vue'
+  import { randoms, removeRandoms, detail } from '@/api/hmmm/questions'
+  export default {
+    components: {
+      PageTool
     },
-    btnSearch(keyword) {
-      // console.log(keyword);
-      console.log(this.tableData)
-      // this.getList(keyword)
-    },
-    // 每页显示信息条数
-    handleSizeChange(val) {
-      // console.log(val);
-      this.pagination.pagesize = val
-      if (this.pagination.page === 1) {
-        this.getList(this.pagination)
+    data() {
+      return {
+        tableKey: 0,
+        keyword: '',
+        alertText: '',
+        questionType: '',
+        dialogVisible: false,
+        tableData: [],
+        detailData: {},
+        pagination: {
+          page: 1,
+          // pagesize: 10
+          total: 0,
+          pageSize: 20,
+          pageSizes: [10, 20, 30, 50],
+          currentPage: 1
+        }
       }
-      // alert(1)
     },
-    // 进入某一页
-    handleCurrentChange(val) {
-      this.pagination.page = val
+    created() {
       this.getList()
     },
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done()
-        })
-        .catch(_ => {})
+    methods: {
+      async getList(page = 1, limit = 20) {
+        this.pagination.currentPage = page
+        this.pagination.pageSize = limit
+        this.tableData = []
+        const { data } = await randoms()
+        this.pagination.total = data.counts
+        this.tableData = data.items
+        // console.log(this.tableData);
+        this.alertText = `共 ${data.counts} 条记录`
+        // console.log(data);
+      },
+      async delList(row) {
+        try {
+          await this.$confirm('您确定删除吗')
+          await removeRandoms(row)
+          // alert(2)
+          this.getList()
+          this.$message.success('删除成功')
+        } catch (error) {
+          console.log(error)
+        }
+      },
+      async getdetail(row) {
+        // console.log(row);
+        this.dialogVisible = true
+        const { data } = await detail(row)
+        // console.log(data);
+        this.detailData = data
+        console.log(this.detailData.videoURL)
+      },
+      btnClane() {
+        this.input = ''
+      },
+      btnSearch(keyword) {
+        // console.log(keyword);
+        console.log(this.tableData)
+        // this.getList(keyword)
+      },
+      // 每页显示信息条数
+      handleSizeChange(val) {
+        // console.log(val);
+        this.pagination.pagesize = val
+        if (this.pagination.page === 1) {
+          this.getList(this.pagination)
+        }
+        // alert(1)
+      },
+      // 进入某一页
+      handleCurrentChange(val) {
+        this.pagination.page = val
+        this.getList()
+      },
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then((_) => {
+            done()
+          })
+          .catch((_) => {})
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" scoped lang="scss">
   .alert {
-  margin: 10px 0px;
-}
-.el-input{
-  width: 20vw;
-}
-.el-col-offset-12{
-  margin-left: 50%;
-}
-.dialog-footer{
-  display: flex;
-  justify-content: end !important;
-}
+    margin: 10px 0px;
+  }
+  .el-input {
+    width: 20vw;
+  }
+  .el-col-offset-12 {
+    margin-left: 50%;
+  }
+  .dialog-footer {
+    display: flex;
+    justify-content: flex-end !important;
+  }
 </style>
-- 
Gitee


From 1b865d40d27dd03e85cba3224c31f688497c66bc Mon Sep 17 00:00:00 2001
From: xiaoli <24567@qq.com>
Date: Sun, 18 Sep 2022 10:53:28 +0800
Subject: [PATCH 27/40] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module-hmmm/components/directorys-add.vue | 17 +++++----
 src/module-hmmm/pages/directorys.vue          | 38 ++++++++++++-------
 src/module-hmmm/pages/subjects.vue            |  2 +-
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/module-hmmm/components/directorys-add.vue b/src/module-hmmm/components/directorys-add.vue
index da1ae36..53d111f 100644
--- a/src/module-hmmm/components/directorys-add.vue
+++ b/src/module-hmmm/components/directorys-add.vue
@@ -22,8 +22,12 @@
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button @click="btncanel"> 取消 </el-button>
-      <el-button type="primary" @click="btnok"> 确定 </el-button>
+      <el-button @click="btncanel">
+        取消
+      </el-button>
+      <el-button type="primary" @click="btnok">
+        确定
+      </el-button>
     </div>
   </el-dialog>
 </template>
@@ -86,14 +90,13 @@ export default {
         // 点击确认的时候先判断下是否校验成功
         await this.$refs.form.validate()
         if (this.form.id) {
-          console.log('从标签中来')
-          await add(this.form)
-          this.$message.success('新增成功')
+          await update(this.form)
+          this.$message.success('更新目录成功')
         } else {
           console.log(111)
           // 修改的时候
-          await update(this.form)
-          this.$message.success('更新目录成功')
+          await add(this.form)
+          this.$message.success('新增目录成功')
         }
 
         // 去除校验
diff --git a/src/module-hmmm/pages/directorys.vue b/src/module-hmmm/pages/directorys.vue
index 5f7b7df..22b9eb6 100644
--- a/src/module-hmmm/pages/directorys.vue
+++ b/src/module-hmmm/pages/directorys.vue
@@ -2,13 +2,16 @@
   <div class="container" style="margin: 10px">
     <el-card shadow="never">
       <div v-if="querydate.name" slot="header" class="clearfix">
-        <span>学科管理 > {{ querydate.name }} > 目录管理</span>
+        <span>
+          学科管理 <i class="el-breadcrumb__separator el-icon-arrow-right" />
+          {{ querydate.name }}
+          <i class="el-breadcrumb__separator el-icon-arrow-right" />
+          目录管理</span>
       </div>
       <!-- 表格 -->
-
       <el-form ref="form" :model="tableform" label-width="70px">
         <el-row type="flex" class="row-bg" justify="space-between">
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="目录名称">
               <el-input
                 v-model="tableform.directoryName"
@@ -17,7 +20,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="14">
+          <el-col :span="10">
             <el-form-item label="状态">
               <el-select
                 v-model="tableform.state"
@@ -152,6 +155,7 @@
     <directorysadd
       :id="id"
       ref="directorysadd"
+      :title="title"
       :dialogshow.sync="dialogshow"
       :subject="subject"
       @close="close"
@@ -179,6 +183,7 @@ export default {
       dialogshow: false,
       // id
       id: '',
+      title: '新增目录',
       // 表格显示信息
       tableform: {
         directoryName: '',
@@ -218,7 +223,6 @@ export default {
     clear() {
       // 置空
       this.tableform = {}
-      this.list()
     },
     // 点击搜索的时候
     search() {
@@ -227,16 +231,17 @@ export default {
     },
     // 新增,判断是否是从学科点击的
     newadd() {
+      this.title = '新增目录'
       if (this.querydate.name) {
         this.subject = false
         const subjectID = Number(this.querydate.id)
         this.$refs.directorysadd.form.subjectID = subjectID
       }
-      this.list()
       this.dialogshow = true
     },
     // 点击修改的时候显示弹框,把值过去
     edit(row) {
+      this.title = '修改目录'
       if (this.querydate.name) {
         this.subject = false
       }
@@ -250,12 +255,12 @@ export default {
       }
     },
     async list() {
-      this.$nextTick(() => {
-        if (this.querydate.name) {
-          // console.log(this.querydate.id)
-          this.tableform.subjectID = this.querydate.id
-        }
-      })
+      // this.$nextTick(() => {
+      if (this.querydate.name) {
+        // console.log(this.querydate.id)
+        this.tableform.subjectID = this.querydate.id
+      }
+      // })
       const { data } = await list(this.tableform)
       console.log(data)
       this.tableform.total = data.counts
@@ -284,7 +289,7 @@ export default {
         // 调用下接口
         this.list()
       } catch (error) {
-        this.$message('操作失败')
+        console.log(error)
       }
     },
     // 修改状态
@@ -302,4 +307,9 @@ export default {
 }
 </script>
 
-<style></style>
+<style>
+.clearfix {
+  color: #606266;
+  font-size: 14px;
+}
+</style>
diff --git a/src/module-hmmm/pages/subjects.vue b/src/module-hmmm/pages/subjects.vue
index e7570a4..818c3e5 100644
--- a/src/module-hmmm/pages/subjects.vue
+++ b/src/module-hmmm/pages/subjects.vue
@@ -2,7 +2,7 @@
   <div class="container">
     学科管理
 
-    <hr />
+    <hr>
     <el-table :data="tableData" border style="width: 100%">
       <el-table-column type="index" label="序号" width="180" />
       <el-table-column prop="subjectName" label="学科名称" width="180" />
-- 
Gitee


From 76f50bb9ec737f617c169585ea1f85b8c5fc0987 Mon Sep 17 00:00:00 2001
From: fy <773589090@qq.com>
Date: Sun, 18 Sep 2022 10:57:46 +0800
Subject: [PATCH 28/40] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=AD=A6=E7=A7=91?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=A0=87=E7=AD=BE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base-ui/ZyForm/src/zy-form.vue      |  4 +-
 src/module-hmmm/components/tags-add.vue | 52 ++++++++++++++++++++-----
 src/module-hmmm/pages/tags.vue          |  3 +-
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/src/base-ui/ZyForm/src/zy-form.vue b/src/base-ui/ZyForm/src/zy-form.vue
index c5a6bd6..7e33908 100644
--- a/src/base-ui/ZyForm/src/zy-form.vue
+++ b/src/base-ui/ZyForm/src/zy-form.vue
@@ -24,8 +24,8 @@
             <template
               v-if="
                 item.type === 'input' ||
-                item.type === 'password' ||
-                item.type === 'textarea'
+                  item.type === 'password' ||
+                  item.type === 'textarea'
               "
             >
               <el-input
diff --git a/src/module-hmmm/components/tags-add.vue b/src/module-hmmm/components/tags-add.vue
index b274a20..5719071 100644
--- a/src/module-hmmm/components/tags-add.vue
+++ b/src/module-hmmm/components/tags-add.vue
@@ -2,8 +2,8 @@
   <div class="container">
     <el-dialog :title="title" :visible="dialogFormVisible" width="380px" @close="cancel">
       <el-form ref="newDirectory" :model="form" :rules="rules">
-        <el-form-item label="所属学科" prop="subjectID" :label-width="formLabelWidth">
-          <el-select v-model="form.subjectID" placeholder="请选择活动区域">
+        <el-form-item v-if=" !labelshow" label="所属学科" prop="subjectID" :label-width="formLabelWidth">
+          <el-select v-model="form.subjectID" placeholder="请选择所属学科">
             <el-option
               v-for="item,index in simplelist"
               :key="index"
@@ -31,6 +31,7 @@
 <script>
 import { simple } from '@/api/hmmm/subjects'
 import { add, update } from '@/api/hmmm/tags'
+// import { number } from 'echarts/lib/export'
 export default {
   name: 'Tagsadd',
   props: {
@@ -38,11 +39,18 @@ export default {
       type: Boolean,
       default: false
     },
+    labelshow: {
+      type: Boolean,
+      default: false
+    },
     title: {
       type: String,
       required: true,
       default: '新增学科'
     }
+    // tagid: {
+    //   type: String
+    // }
   },
   data () {
     return {
@@ -60,7 +68,7 @@ export default {
         subjectID: '',
         tagName: ''
       },
-
+      state: null,
       simplelist: {},
       formLabelWidth: '80px'
     }
@@ -69,9 +77,6 @@ export default {
     this.simple()
   },
   methods: {
-    fn() {
-      alert(1)
-    },
     async simple() {
       const { data } = await simple()
       // console.log(obj)
@@ -80,11 +85,23 @@ export default {
     cancel() {
       this.$emit('update:dialogFormVisible', false)
       this.$refs.newDirectory.resetFields()
+      this.form = {
+        id: null,
+        subjectID: '',
+        tagName: ''
+      }
     },
     async btnok() {
-      if (this.form.id) {
+      if (this.state === 2) {
         await update(this.form)
         // console.log(this.form.subjectID)
+      } else if (this.state === 1) {
+        const data = { subjectID: this.form.subjectID, tagName: this.form.tagName }
+        try {
+          await add(data)
+        } catch (error) {
+          console.log(error)
+        }
       } else {
         try {
           await add(this.form)
@@ -94,12 +111,27 @@ export default {
       }
       this.$message.success('操作成功')
       this.$emit('update:dialogFormVisible', false)
+      this.$refs.newDirectory.resetFields()
       this.$parent.list()
     },
     dialog(row) {
-      this.form.id = row.id
-      this.form.subjectID = row.subjectID
-      this.form.tagName = row.tagName
+      this.state = typeof (row)
+      console.log(this.state)
+      if (this.state === 'string') {
+        this.state = 1
+        alert('学科跳转过来的')
+        this.form.subjectID = parseInt(row)
+        console.log(this.form.subjectID)
+      } else if (this.state === 'object') {
+        this.state = 2
+        alert('修改')
+        this.form.id = row.id
+        this.form.subjectID = row.subjectID
+        this.form.tagName = row.tagName
+      } else {
+        alert('新增')
+        this.form = {}
+      }
     }
   }
 }
diff --git a/src/module-hmmm/pages/tags.vue b/src/module-hmmm/pages/tags.vue
index 6c6d209..892a515 100644
--- a/src/module-hmmm/pages/tags.vue
+++ b/src/module-hmmm/pages/tags.vue
@@ -90,7 +90,7 @@
       @size-change="SizeChange"
       @current-change="CurrentChange"
     />
-    <tagsAdd ref="dialog" :dialog-form-visible.sync="dialogFormVisible" :title="title" />
+    <tagsAdd ref="dialog" :dialog-form-visible.sync="dialogFormVisible" :labelshow="labelshow" :tagid="tagid" :title="title" />
   </div>
 </template>
 
@@ -222,6 +222,7 @@ export default {
       this.dialogFormVisible = true
     },
     addbtn() {
+      this.$refs.dialog.dialog(this.tagid)
       this.title = '新增目录'
       this.dialogFormVisible = true
     },
-- 
Gitee


From f64edccce45e2252a234a5002f72d393e044f66f Mon Sep 17 00:00:00 2001
From: fy <773589090@qq.com>
Date: Sun, 18 Sep 2022 11:02:54 +0800
Subject: [PATCH 29/40] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=AD=A6=E7=A7=91?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=A0=87=E7=AD=BE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module-hmmm/pages/questions-new/src/questions-new.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/module-hmmm/pages/questions-new/src/questions-new.vue b/src/module-hmmm/pages/questions-new/src/questions-new.vue
index 99d448a..f49626b 100644
--- a/src/module-hmmm/pages/questions-new/src/questions-new.vue
+++ b/src/module-hmmm/pages/questions-new/src/questions-new.vue
@@ -19,7 +19,9 @@
         </template>
         <template #footer>
           <el-row type="flex" justify="center" align="middle">
-            <el-button type="primary" size="medium"> 确认提交 </el-button>
+            <el-button type="primary" size="medium">
+              确认提交
+            </el-button>
           </el-row>
         </template>
       </zy-form>
-- 
Gitee


From aba34d1b36614ed4251b6cae9755fac87108ace6 Mon Sep 17 00:00:00 2001
From: fy <773589090@qq.com>
Date: Sun, 18 Sep 2022 11:17:52 +0800
Subject: [PATCH 30/40] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=AD=A6=E7=A7=91?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=A0=87=E7=AD=BE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module-hmmm/components/tags-add.vue | 3 ---
 src/module-hmmm/pages/tags.vue          | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/module-hmmm/components/tags-add.vue b/src/module-hmmm/components/tags-add.vue
index 5719071..4b90a61 100644
--- a/src/module-hmmm/components/tags-add.vue
+++ b/src/module-hmmm/components/tags-add.vue
@@ -119,17 +119,14 @@ export default {
       console.log(this.state)
       if (this.state === 'string') {
         this.state = 1
-        alert('学科跳转过来的')
         this.form.subjectID = parseInt(row)
         console.log(this.form.subjectID)
       } else if (this.state === 'object') {
         this.state = 2
-        alert('修改')
         this.form.id = row.id
         this.form.subjectID = row.subjectID
         this.form.tagName = row.tagName
       } else {
-        alert('新增')
         this.form = {}
       }
     }
diff --git a/src/module-hmmm/pages/tags.vue b/src/module-hmmm/pages/tags.vue
index 892a515..8935a1a 100644
--- a/src/module-hmmm/pages/tags.vue
+++ b/src/module-hmmm/pages/tags.vue
@@ -133,6 +133,7 @@ export default {
         field: 'state',
         type: 'select',
         label: '状态',
+        func: '',
         placeholder: '请选择',
         options: [
           { title: '启用', value: 1 },
-- 
Gitee


From 8b66d8f534209081b218b74dc1b4441dd5cba0a2 Mon Sep 17 00:00:00 2001
From: wzy <wzyzzqq@163.com>
Date: Sun, 18 Sep 2022 15:10:10 +0800
Subject: [PATCH 31/40] =?UTF-8?q?fix(wzy):ZyForm=20=E5=B0=86=E4=BC=A0?=
 =?UTF-8?q?=E5=85=A5select=E4=B8=8B=E6=8B=89=E6=89=A7=E8=A1=8C=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E8=AE=BE=E4=B8=BA=E5=8F=AF=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base-ui/ZyForm/src/zy-form.vue            | 162 ++++++++++--------
 .../questions-new/config/formConfig.config.js |  55 +++---
 2 files changed, 118 insertions(+), 99 deletions(-)

diff --git a/src/base-ui/ZyForm/src/zy-form.vue b/src/base-ui/ZyForm/src/zy-form.vue
index 7e33908..17be6a8 100644
--- a/src/base-ui/ZyForm/src/zy-form.vue
+++ b/src/base-ui/ZyForm/src/zy-form.vue
@@ -24,8 +24,8 @@
             <template
               v-if="
                 item.type === 'input' ||
-                  item.type === 'password' ||
-                  item.type === 'textarea'
+                item.type === 'password' ||
+                item.type === 'textarea'
               "
             >
               <el-input
@@ -47,7 +47,7 @@
                 :placeholder="item.placeholder"
                 :multiple="item.type === 'tags'"
                 :loading="showSelectLoading"
-                @focus="onSelectFocus(item.func, item.field)"
+                @focus="item?.func && onSelectFocus(item.func, item.field)"
               >
                 <el-option
                   v-for="option of item.options"
@@ -100,84 +100,102 @@
 </template>
 
 <script>
-export default {
-  name: 'ZyForm',
-  // model: {
-  //   props: 'modelValue',
-  //   emit: 'updata:modelValue'
-  // },
-  props: {
-    formData: {
-      type: Object,
-      default: () => {}
-    },
-    formItems: {
-      type: Array,
-      default: () => {
-        return []
+  export default {
+    name: 'ZyForm',
+    // model: {
+    //   props: 'modelValue',
+    //   emit: 'updata:modelValue'
+    // },
+    props: {
+      formData: {
+        type: Object,
+        default: () => {}
+      },
+      formItems: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      labelWidth: {
+        type: String,
+        default: '80px'
+      },
+      labelPosition: {
+        type: String,
+        default: 'right'
+      },
+      itemStyle: {
+        type: Object,
+        default: () => ({ padding: '10px 40px' })
+      },
+      colLayout: {
+        type: Object,
+        default: () => ({
+          xl: 6,
+          lg: 6,
+          md: 12,
+          sm: 24,
+          xs: 24
+        })
       }
     },
-    labelWidth: {
-      type: String,
-      default: '80px'
+    data() {
+      return {
+        MyFormData: { ...this.formData },
+        showSelectLoading: false
+      }
     },
-    labelPosition: {
-      type: String,
-      default: 'right'
+    watch: {
+      MyFormData: {
+        handler(newValue) {
+          this.$emit('update:formData', newValue)
+        },
+        deep: true
+      }
     },
-    itemStyle: {
-      type: Object,
-      default: () => ({ padding: '10px 40px' })
+    mounted() {
+      // console.log(this.$refs.ruleForm)
     },
-    colLayout: {
-      type: Object,
-      default: () => ({
-        xl: 6,
-        lg: 6,
-        md: 12,
-        sm: 24,
-        xs: 24
-      })
-    }
-  },
-  data() {
-    return {
-      MyFormData: { ...this.formData },
-      showSelectLoading: false
-    }
-  },
-  watch: {
-    MyFormData: {
-      handler(newValue) {
-        this.$emit('update:formData', newValue)
-      },
-      deep: true
-    }
-  },
-  mounted() {
-    // console.log(this.$refs.ruleForm)
-  },
-  methods: {
-    async onSelectFocus(func, field) {
-      try {
-        this.showSelectLoading = true
-        const { data } = await func()
-        this.$emit('selectUpdateFormData', { data, field })
-        this.showSelectLoading = false
-      } catch (e) {
-        console.log(e)
+    methods: {
+      /**
+       * select聚焦自触发传入函数
+       * @param {Array} func:[函数体,传参] 由配置项传入的请求下拉框中数据的函数
+       * @param {*} field 用于找出配置项中是哪一个input控件
+       */
+      async onSelectFocus(func, field) {
+        try {
+          this.showSelectLoading = true
+          let args = null
+          if (func?.[1] && typeof func[1] === 'string') {
+            if (!this.MyFormData?.[func[1]]) {
+              // 优化
+              // 若此时还没获取到当前select 所依赖的前置请求条件 就直接跳出 不发送请求
+              return
+            }
+            args = {
+              [func[1]]: `${this.MyFormData[func[1]]}`
+            }
+          } else if (func?.[1]) {
+            args = func[1]
+          }
+          const { data } = await func[0](args)
+          this.$emit('selectUpdateFormData', { data, field })
+          this.showSelectLoading = false
+        } catch (e) {
+          console.log(e)
+        }
       }
     }
   }
-}
 </script>
 <style lang="scss" scoped>
-.zy-form {
-  // .zy-form-row {
-  //   // margin: ;
-  // }
-  ::v-deep(.el-form-item) {
-    padding: 0 !important;
+  .zy-form {
+    // .zy-form-row {
+    //   // margin: ;
+    // }
+    ::v-deep(.el-form-item) {
+      padding: 0 !important;
+    }
   }
-}
 </style>
diff --git a/src/module-hmmm/pages/questions-new/config/formConfig.config.js b/src/module-hmmm/pages/questions-new/config/formConfig.config.js
index aa967ac..6469f78 100644
--- a/src/module-hmmm/pages/questions-new/config/formConfig.config.js
+++ b/src/module-hmmm/pages/questions-new/config/formConfig.config.js
@@ -1,5 +1,11 @@
-import { simple } from '@/api/hmmm/subjects'
-// import { simple } from 'src\api\hmmm\subjects.js'
+// 引入select中请求数据接口
+import {
+  subjectsSimple,
+  directorysSimple,
+  companysList,
+  tagsSimple
+} from '../func'
+
 export const formConfig = {
   labelWidth: '85px',
   labelPosition: 'left',
@@ -19,7 +25,7 @@ export const formConfig = {
       field: 'subjectID',
       type: 'select',
       label: '学科:',
-      func: simple,
+      func: [subjectsSimple],
       rules: [
         {
           required: true,
@@ -31,16 +37,14 @@ export const formConfig = {
       otherOptions: {
         style: 'max-width: 400px'
       },
-      options: [
-        { title: '篮球', value: 'basketball' },
-        { title: '足球', value: 'football' }
-      ]
+      options: []
     },
     // 目录
     {
       field: 'catalogID',
       type: 'select',
       label: '目录:',
+      func: [directorysSimple, 'subjectID'],
       rules: [
         {
           required: true,
@@ -51,13 +55,15 @@ export const formConfig = {
       placeholder: '请选择',
       otherOptions: {
         style: 'max-width: 400px'
-      }
+      },
+      options: []
     },
     // 企业
     {
       field: 'enterpriseID',
       type: 'select',
       label: '企业:',
+      func: [companysList, { pagesize: 10000 }],
       rules: [
         {
           required: true,
@@ -104,7 +110,16 @@ export const formConfig = {
       placeholder: '请选择',
       otherOptions: {
         style: 'max-width: 400px'
-      }
+      },
+      options: [
+        { label: '外包服务', value: '外包服务' },
+        { label: '企业服务', value: '企业服务' },
+        { label: '互联网金融', value: '互联网金融' },
+        { label: '企业咨询', value: '企业咨询' },
+        { label: '互联网', value: '互联网' },
+        { label: '电子商务', value: '电子商务' },
+        { label: '其他', value: '其他' }
+      ]
     },
     // 题型
     {
@@ -206,7 +221,8 @@ export const formConfig = {
       otherOptions: {
         style: 'max-width: 400px',
         maxlength: '100',
-        'show-word-limit': true
+        'show-word-limit': true,
+        rows: '5'
       }
     },
     // 试题标签
@@ -219,23 +235,8 @@ export const formConfig = {
       otherOptions: {
         style: 'max-width: 400px'
       },
-      options: [
-        { title: '篮球', value: 'basketball' },
-        { title: '足球', value: 'football' },
-        { title: '球', value: 'footbalafafasl' }
-      ]
+      func: [tagsSimple, 'subjectID'],
+      options: []
     }
-    //   field: 'sport',
-    //   type: 'select',
-    //   label: '喜欢的运动',
-    //   placeholder: '请输入喜欢的运动',
-    //   options: [
-    //     { title: '篮球', value: 'basketball' },
-    //     { title: '足球', value: 'football' }
-    //   ]
-    // },
-    // {
-    //   type: 'more'
-    // }
   ]
 }
-- 
Gitee


From d140ed76f519609a8a0ae69aca3fa3cc351b34d9 Mon Sep 17 00:00:00 2001
From: wzy <wzyzzqq@163.com>
Date: Sun, 18 Sep 2022 15:12:16 +0800
Subject: [PATCH 32/40] =?UTF-8?q?fix(wzy):=20=E9=85=8D=E5=90=88py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base-ui/ZyForm/src/zy-form.vue                | 4 ++--
 src/module-hmmm/pages/questions-new/func/index.js | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 src/module-hmmm/pages/questions-new/func/index.js

diff --git a/src/base-ui/ZyForm/src/zy-form.vue b/src/base-ui/ZyForm/src/zy-form.vue
index 17be6a8..bc6fa82 100644
--- a/src/base-ui/ZyForm/src/zy-form.vue
+++ b/src/base-ui/ZyForm/src/zy-form.vue
@@ -24,8 +24,8 @@
             <template
               v-if="
                 item.type === 'input' ||
-                item.type === 'password' ||
-                item.type === 'textarea'
+                  item.type === 'password' ||
+                  item.type === 'textarea'
               "
             >
               <el-input
diff --git a/src/module-hmmm/pages/questions-new/func/index.js b/src/module-hmmm/pages/questions-new/func/index.js
new file mode 100644
index 0000000..4fe5d2b
--- /dev/null
+++ b/src/module-hmmm/pages/questions-new/func/index.js
@@ -0,0 +1,6 @@
+import { simple as subjectsSimple } from '@/api/hmmm/subjects'
+import { simple as directorysSimple } from '@/api/hmmm/directorys'
+import { list as companysList } from '@/api/hmmm/companys'
+import { simple as tagsSimple } from '@/api/hmmm/tags'
+
+export { subjectsSimple, directorysSimple, companysList, tagsSimple }
-- 
Gitee


From af9456dab470efd612a050fcd7680cab6c044f30 Mon Sep 17 00:00:00 2001
From: fy <773589090@qq.com>
Date: Sun, 18 Sep 2022 15:35:02 +0800
Subject: [PATCH 33/40] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=AD=A6=E7=A7=91?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=A0=87=E7=AD=BE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module-hmmm/pages/tags.vue | 260 +++++++++++++++++++++------------
 1 file changed, 169 insertions(+), 91 deletions(-)

diff --git a/src/module-hmmm/pages/tags.vue b/src/module-hmmm/pages/tags.vue
index 8935a1a..83e26d6 100644
--- a/src/module-hmmm/pages/tags.vue
+++ b/src/module-hmmm/pages/tags.vue
@@ -1,7 +1,16 @@
 <template>
   <div class="tags">
-    <ZyForm ref="zychild" :form-items="formItems">
-      <template #header>
+    <div id="all">
+      <div id="left">
+        <ZyForm ref="zychild" :form-items="formItems" />
+      </div>
+      <div>
+        <el-button size="small" @click="removebtn">清除</el-button>
+        <el-button size="small" type="primary" @click="searchbtn">
+          搜索
+        </el-button>
+      </div>
+      <!-- <template #header>
         <el-button size="small" @click="removebtn">
           清除
         </el-button>
@@ -16,63 +25,78 @@
         <el-button type="success" icon="el-icon-edit" @click="addbtn">
           新增标签
         </el-button>
-      </template>
-    </ZyForm>
+      </template> -->
+
+      <div id="right">
+        <el-button
+          v-if="labelshow"
+          size="small"
+          type="text"
+          icon="el-icon-back"
+          @click="$router.back()"
+        >
+          返回学科
+        </el-button>
+        <el-button
+          size="small"
+          type="success"
+          icon="el-icon-edit"
+          @click="addbtn"
+        >
+          新增标签
+        </el-button>
+      </div>
+    </div>
     <AlertShow :alert-text="alertText" />
-    <el-table
 
-      :data="tableData"
-      border
-      style="width: 100%"
-    >
-      <el-table-column
-        type="index"
-        label="序号"
-        width="180"
-      />
-      <el-table-column
-        prop="subjectName"
-        label="所属学科"
-        width="180"
-      />
-      <el-table-column
-        prop="tagName"
-        label="标签名称"
-      /> <el-table-column
-        prop="username"
-        label="创建者"
-      />
-      <el-table-column
-        prop="addDate"
-        label="创建日期"
-      >
-        <template slot-scope="{row}">
+    <el-table :data="tableData" border style="width: 100%">
+      <el-table-column type="index" label="序号" width="180" />
+      <el-table-column prop="subjectName" label="所属学科" width="180" />
+      <el-table-column prop="tagName" label="标签名称" />
+      <el-table-column prop="username" label="创建者" />
+      <el-table-column prop="addDate" label="创建日期">
+        <template slot-scope="{ row }">
           {{ row.addDate | formatDate }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="state"
-        label="状态"
-      >
-        <template slot-scope="{row}">
-          <span>{{ row.state===0?'已禁用':'已启用' }}</span>
+      <el-table-column prop="state" label="状态">
+        <template slot-scope="{ row }">
+          <span>{{ row.state === 0 ? '已禁用' : '已启用' }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column
-        prop="address"
-        label="操作"
-      >
-        <template slot-scope="{row}">
-          <el-button v-if="row.state===1" type="text" size="medium " @click="disable(row.id,0)">
+      <el-table-column prop="address" label="操作">
+        <template slot-scope="{ row }">
+          <el-button
+            v-if="row.state === 1"
+            type="text"
+            size="medium "
+            @click="disable(row.id, 0)"
+          >
             禁用
           </el-button>
-          <el-button v-else type="text" size="medium " @click="disable(row.id,1)">
+          <el-button
+            v-else
+            type="text"
+            size="medium "
+            @click="disable(row.id, 1)"
+          >
             启用
           </el-button>
-          <el-button :disabled="state(row.state)" type="text" size="medium " @click="edit(row)">
+          <el-button
+            :disabled="state(row.state)"
+            type="text"
+            size="medium "
+            @click="edit(row)"
+          >
             修改
-          </el-button> <el-button :disabled="state(row.state)" type="text" size="medium " @click="remove(row)">
+          </el-button>
+          <el-button
+            :disabled="state(row.state)"
+            type="text"
+            size="medium "
+            @click="remove(row)"
+          >
             删除
           </el-button>
         </template>
@@ -80,17 +104,22 @@
     </el-table>
 
     <el-pagination
-
       background
       :current-page="page.page"
-      :page-sizes="[5,10, 20]"
+      :page-sizes="[5, 10, 20]"
       :page-size="page.pagesize"
       layout="  prev, pager, next,sizes, jumper"
       :total="page.total"
       @size-change="SizeChange"
       @current-change="CurrentChange"
     />
-    <tagsAdd ref="dialog" :dialog-form-visible.sync="dialogFormVisible" :labelshow="labelshow" :tagid="tagid" :title="title" />
+    <tagsAdd
+      ref="dialog"
+      :dialog-form-visible.sync="dialogFormVisible"
+      :labelshow="labelshow"
+      :tagid="tagid"
+      :title="title"
+    />
   </div>
 </template>
 
@@ -102,7 +131,9 @@ import { list, remove, changeState, simple } from '@/api/hmmm/tags'
 export default {
   name: 'Tags',
   components: {
-    tagsAdd, AlertShow, ZyForm
+    tagsAdd,
+    AlertShow,
+    ZyForm
   },
   data() {
     return {
@@ -116,35 +147,36 @@ export default {
       dialogFormVisible: false,
       tagid: this.$route.query.id,
       title: '新增学科',
-      tableData: [{ }],
+      tableData: [{}],
       showdisable: null,
       page: {
         page: 1,
         pagesize: 5,
         total: null
       },
-      formItems: [{
-        field: 'tagName',
-        type: 'input',
-        label: '标签名称',
-        rules: []
-
-      }, {
-        field: 'state',
-        type: 'select',
-        label: '状态',
-        func: '',
-        placeholder: '请选择',
-        options: [
-          { title: '启用', value: 1 },
-          { title: '禁用', value: 0 }
-        ]
-      }],
+      formItems: [
+        {
+          field: 'tagName',
+          type: 'input',
+          label: '标签名称',
+          rules: []
+        },
+        {
+          field: 'state',
+          type: 'select',
+          label: '状态',
+          placeholder: '请选择',
+          options: [
+            { label: '启用', value: 1 },
+            { label: '禁用', value: 0 }
+          ]
+        }
+      ],
       alertText: '',
       labelshow: false
     }
   },
-  created () {
+  created() {
     this.list()
     this.simple()
   },
@@ -169,20 +201,39 @@ export default {
         this.alertText = `当前数据共${this.page.total}条`
       }
     },
-    async list () {
+    async list() {
       if (this.tagid) {
+        // 跳转并且搜索框为空
+        if (this.search.state == null && this.search.tagName === '') {
+          this.labelshow = true
+          const data1 = {
+            page: this.page.page,
+            pagesize: this.page.pagesize,
+            subjectID: this.tagid
+          }
+          const { data } = await list(data1)
+          this.page.total = null
+          this.page.total = data.counts
+          this.tableData = data.items
+          this.alertText = `当前数据共${data.counts}条`
+        } else {
+        // 跳转并且搜索框不为空
         this.labelshow = true
-        const data1 = {
-          page: this.page.page,
-          pagesize: this.page.pagesize,
-          subjectID: this.tagid
+          const data1 = {
+            page: this.page.page,
+            pagesize: this.page.pagesize,
+            subjectID: this.tagid,
+            state: this.search.state,
+            tagName: this.search.tagName
+          }
+          const { data } = await list(data1)
+          this.page.total = null
+          this.page.total = data.counts
+          this.tableData = data.items
+          this.alertText = `当前数据共${data.counts}条`
         }
-        const { data } = await list(data1)
-        this.page.total = null
-        this.page.total = data.counts
-        this.tableData = data.items
-        this.alertText = `当前数据共${data.counts}条`
       } else if (this.search.state == null && this.search.tagName === '') {
+        // 未跳转并且 搜索框为空的情况
         const { data: { items } } = await list(this.page)
         this.tableData = items
         this.simple()
@@ -193,7 +244,8 @@ export default {
         this.alertText = `当前数据共${data.counts}条`
       }
     },
-    async disable(id, state) { // 标签状态
+    async disable(id, state) {
+      // 标签状态
       const data = { id: id, state: state }
       try {
         await changeState(data)
@@ -208,14 +260,16 @@ export default {
         this.page.pagesize = pagesize
       } else {
         this.search.pagesize = pagesize
-      } this.list()
+      }
+      this.list()
     },
     CurrentChange(page) {
       if (this.search.state == null && this.search.tagName === '') {
         this.page.page = page
       } else {
         this.search.page = page
-      } this.list()
+      }
+      this.list()
     },
     edit(row) {
       this.$refs.dialog.dialog(row)
@@ -241,13 +295,37 @@ export default {
 }
 </script>
 <style>
-  .tags{
-    margin: 10px;
-    padding: 15px;
-    border: 1px solid #ebeef5;
-    background-color: #fff;
-  }
-  .el-pagination {
-    text-align: end
-  }
+.tags {
+  margin: 10px;
+  padding: 15px;
+  border: 1px solid #ebeef5;
+  background-color: #fff;
+}
+.el-pagination {
+  text-align: end;
+}
+#all {
+  display: flex;
+  align-items: flex-start;
+}
+#left {
+  margin: 0 10px;
+  /* display: flex; */
+  flex: 4;
+  justify-content: space-around;
+  /* width: 60%; */
+}
+.el-col-lg-6 {
+  width: 49%;
+}
+/* .el-form--label-right{
+    width: 330%;
+  } */
+#right {
+  text-align: end;
+  flex: 4;
+}
+.alert-show {
+  margin: 0 0 13px;
+}
 </style>
-- 
Gitee


From b0c38cf5f766268a5366473b8724615bafa37630 Mon Sep 17 00:00:00 2001
From: fy <773589090@qq.com>
Date: Sun, 18 Sep 2022 16:03:22 +0800
Subject: [PATCH 34/40] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=AD=A6=E7=A7=91?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=A0=87=E7=AD=BE=E6=B2=A1=E6=9C=89title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module-hmmm/pages/subjects.vue |  9 ++++++---
 src/module-hmmm/pages/tags.vue     | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/module-hmmm/pages/subjects.vue b/src/module-hmmm/pages/subjects.vue
index 44dc707..8cf589b 100644
--- a/src/module-hmmm/pages/subjects.vue
+++ b/src/module-hmmm/pages/subjects.vue
@@ -56,7 +56,7 @@
           <el-button type="text" size="medium " @click="disable(row.id,0)">
             学科分类
           </el-button>
-          <el-button type="text" size="medium " @click="subjectLabels(row.id)">
+          <el-button type="text" size="medium " @click="subjectLabels(row)">
             学科标签
           </el-button>
           <el-button type="text" size="medium " @click="edit(row)">
@@ -101,11 +101,14 @@ export default {
     this.list()
   },
   methods: {
-    subjectLabels(id) {
+    subjectLabels(row) {
+      console.log(row)
       this.$router.push({
         path: '/subjects/tags',
         query: {
-          id
+          id: row.id,
+          name: row.subjectName
+
         }
       })
     },
diff --git a/src/module-hmmm/pages/tags.vue b/src/module-hmmm/pages/tags.vue
index 83e26d6..e2b62ad 100644
--- a/src/module-hmmm/pages/tags.vue
+++ b/src/module-hmmm/pages/tags.vue
@@ -1,5 +1,12 @@
 <template>
   <div class="tags">
+    <div v-if="labelshow" class="titile">
+      <span>学科管理 </span>
+      <span class="el-icon-arrow-right"> {{ tagname }}</span>
+      <span class="el-icon-arrow-right">标签管理</span>
+      <hr>
+    </div>
+
     <div id="all">
       <div id="left">
         <ZyForm ref="zychild" :form-items="formItems" />
@@ -146,6 +153,7 @@ export default {
       },
       dialogFormVisible: false,
       tagid: this.$route.query.id,
+      tagname: this.$route.query.name,
       title: '新增学科',
       tableData: [{}],
       showdisable: null,
@@ -328,4 +336,12 @@ export default {
 .alert-show {
   margin: 0 0 13px;
 }
+.titile{
+  margin-bottom: 10px;
+  color: #606266;
+}
+.titile span{
+
+  font-size: 14px;
+}
 </style>
-- 
Gitee


From 03262d90d1d44d6e26440c439c9f3a48848118ac Mon Sep 17 00:00:00 2001
From: xx <2355@qq.com>
Date: Sun, 18 Sep 2022 20:27:15 +0800
Subject: [PATCH 35/40] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/hmmm/companys.js                    |   6 +-
 src/module-hmmm/components/companys-add.vue | 218 +++++++++++---------
 src/module-hmmm/pages/companys.vue          |  77 +++++--
 src/module-hmmm/pages/companys/index.vue    | 117 +++++++++++
 4 files changed, 304 insertions(+), 114 deletions(-)
 create mode 100644 src/module-hmmm/pages/companys/index.vue

diff --git a/src/api/hmmm/companys.js b/src/api/hmmm/companys.js
index 1ae67d0..2b0124e 100644
--- a/src/api/hmmm/companys.js
+++ b/src/api/hmmm/companys.js
@@ -11,10 +11,10 @@ import { createAPI } from '@/utils/request'
 
 export const list = (data) => createAPI('/companys', 'get', data) // 获取管理列表
 export const add = (data) => createAPI('/companys', 'post', data) // 企业管理添加
-export const update = (data) => createAPI(`/companys/${data.id}`, 'put', data) // 企业管理修改
+export const update = (data) => createAPI(`/companys/${data.id}`, 'put',data) // 企业管理修改
 export const remove = (id) =>
   createAPI(`/companys/${id}`, 'delete') // 企业管理删除
 
-export const detail = (data) => createAPI(`/companys/${data.id}`, 'get', data) // 企业管理详情
+export const detail = (id) => createAPI(`/companys/${id}`, 'get') // 企业管理详情
 export const disabled = (id) =>
-  createAPI(`/companys/${id}/state`, 'post') // 企业管理设置状态
+  createAPI(`/companys/${id}`, 'post') // 企业管理设置状态
diff --git a/src/module-hmmm/components/companys-add.vue b/src/module-hmmm/components/companys-add.vue
index 4c14b10..7d899c0 100644
--- a/src/module-hmmm/components/companys-add.vue
+++ b/src/module-hmmm/components/companys-add.vue
@@ -1,115 +1,147 @@
 <template>
   <div class="headcontainer">
-    <el-form ref="form" :model="form" label-width="70px">
-      <el-row>
+    <el-dialog :title="showtext" :visible="showDialog" @close="delbtn">
+      <el-form
+        label-width="120px"
+        :rules="rules"
+        :model="formData"
+        ref="perForm"
+      >
+        <el-form-item label="企业名称" prop="shortName">
+          <el-input style="width: 70%" v-model="formData.shortName" />
+        </el-form-item>
+        <el-form-item label="所属公司" prop="company">
+          <el-input style="width: 70%" v-model="formData.company" />
+        </el-form-item>
+        <el-form-item>
+          <p class="companyprofile">
+            https://www.tianyancha.com （在此可查询所属公司全称及简称）
+          </p>
+        </el-form-item>
+        <el-form-item label="城市地区" prop="city">
+          <el-select
+            placeholder="请选择"
+            style="width: 34%"
+            class="cityselect"
+            v-model="formData.province"
+          >
+            <el-option value="123"></el-option>
+          </el-select>
+          <el-select
+            placeholder="请选择"
+            style="width: 34%"
+            v-model="formData.city"
+          >
+            <el-option value="123"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="方向(企业标签)" prop="tags">
+          <el-input style="width: 70%" v-model="formData.tags" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input
+            type="textarea"
+            style="width: 70%"
+            placeholder="请输入"
+            v-model="formData.remarks"
+          />
+        </el-form-item>
+      </el-form>
+      <!-- 底部 -->
+      <el-row slot="footer" type="flex" justify="center">
         <el-col :span="6">
-          <el-form-item label="标签名称">
-            <el-input
-              v-model="form.name"
-              style="width: 85%"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="城市">
-            <el-select v-model="value" placeholder="请选择" style="width: 85%">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="地区">
-            <el-select v-model="value" placeholder="请选择" style="width: 85%">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="企业简称">
-            <el-input v-model="form.name" style="width: 85%" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row type="flex" justify="space-between">
-        <el-col :span="6">
-          <el-form-item label="状态">
-            <el-select v-model="value" placeholder="请选择" style="width: 85%">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="14" class="btn">
-          <el-button>清除</el-button>
-          <el-button type="primary">
-            搜索
-          </el-button>
-        </el-col>
-        <el-col :span="3" class="success">
-          <el-button type="success">
-            新增用户
-          </el-button>
+          <el-button size="medium" @click="delbtn">取消</el-button>
+          <el-button size="medium" @click="addbtn" type="primary">确定</el-button>
         </el-col>
       </el-row>
-    </el-form>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import {add,update} from '@/api/hmmm/companys.js'
 export default {
+  computed: {
+    showtext() {
+      return this.formData.id ? '编辑用户' : '创建用户';
+    },
+  },
+  created () {
+
+  },
+  methods: {
+    async addbtn(){
+      try{
+        await this.$refs.perForm.validate()
+        if(this.formData.id){
+          // let tid =  ':'+this.formData.id
+          await update(this.formData)
+        }else{
+          await add(this.formData)
+        }
+        this.$emit('update:showDialog', false)
+        this.$emit('addbtn')
+      }catch(err){
+        console.log(err);
+      }
+    },
+    delbtn(){
+      this.formData= {
+        city: '',
+        company: '',
+        isFamous: true,
+        province: '',
+        remarks: '',
+        shortName: '',
+        tags: ''
+      }
+      this.$refs.perForm.resetFields()
+			this.$emit('update:showDialog', false)
+    }
+  },
   data() {
     return {
-      form: {
-        name: ''
+      formData: {
+        city: '',
+        company: '',
+        isFamous: true,
+        province: '',
+        remarks: '',
+        shortName: '',
+        tags: ''
+      },
+      rules: {
+        shortName: [
+          { required: true, message: '企业简称不能为空', trigger: 'blur' }
+        ],
+        company: [
+          { required: true, message: '所属公司不能为空', trigger: 'blur' }
+        ],
+        tags: [{ required: true, message: '请输标签', trigger: 'blur' }],
+        remarks: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+        city: [{ required: true, message: '省市不能为空', trigger: 'change' }],
       },
-      options: [
-        {
-          value: '选项1',
-          label: '黄金糕'
-        },
-        {
-          value: '选项2',
-          label: '双皮奶'
-        },
-        {
-          value: '选项3',
-          label: '蚵仔煎'
-        },
-        {
-          value: '选项4',
-          label: '龙须面'
-        },
-        {
-          value: '选项5',
-          label: '北京烤鸭'
-        }
-      ],
-      value: ''
     }
+  },
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: true
+    },
+
   }
 }
 </script>
 
 <style  scoped>
-.btn {
-  margin-left: 20px;
+.companyprofile {
+  font-size: 15px;
+  width: 350px;
+}
+.el-form {
+  margin: 5px 0 50px 40px;
 }
-.headcontainer{
-  padding: 0;
+.cityselect {
+  margin-right: 10px;
 }
 </style>
diff --git a/src/module-hmmm/pages/companys.vue b/src/module-hmmm/pages/companys.vue
index e3ff6ad..9ae01c1 100644
--- a/src/module-hmmm/pages/companys.vue
+++ b/src/module-hmmm/pages/companys.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="container">
     <el-card>
-      <companysadd />
-      <el-alert :title="textnum" type="info" show-icon :closable="false" />
+      <companys />
+      <el-alert :title="textnum" type="info" show-icon :closable="false" class="topalert"/>
       <el-table
         :loading="loading"
         :data="list"
@@ -11,7 +11,7 @@
         style="width: 100%"
         :header-cell-style="{ background: '#fafafa', border: '3px' }"
       >
-        <el-table-column align="center" prop="id" label="序号" width="120" />
+        <el-table-column align="center" type="index" label="序号" width="120" />
         <el-table-column
           align="center"
           prop="number"
@@ -37,28 +37,49 @@
           label="创建日期"
           width="115"
         />
-        <el-table-column align="center" prop="remarks" label="备注" width="115" />
         <el-table-column
           align="center"
-          prop="state"
-          label="状态"
+          prop="remarks"
+          label="备注"
           width="115"
-        >
-          <template slot-scope="{row}">
-            {{ row.state==1?'启用':'禁用' }}
+        />
+        <el-table-column align="center" prop="state" label="状态" width="115">
+          <template slot-scope="{ row }">
+            {{ row.state == 1 ? '启用' : '禁用' }}
           </template>
         </el-table-column>
         <el-table-column align="center" prop="address" label="操作" type="flex">
           <template v-slot="{ row }">
             <el-button
+              @click="revisebtn(row.id)"
               type="primary"
               icon="el-icon-edit"
               plain
               circle
             />
-            <el-tooltip class="item" effect="dark" content="禁用" placement="top">
-              <el-button v-if="row.state==1" type="warning" icon="el-icon-close" plain circle @click="changestate(row.id,row.state)" />
-              <el-button v-else type="success" icon="el-icon-check" plain circle @click="changestate(row.id,row.state)" />
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="row.state == 0 ? '启用' : '禁用'"
+              placement="top"
+            >
+              <el-button
+                v-if="row.state == btnstate"
+                type="warning"
+                icon="el-icon-close"
+                plain
+                circle
+                @click="changestate(row.id, 0)"
+              />
+
+              <el-button
+                v-else
+                type="success"
+                icon="el-icon-check"
+                plain
+                circle
+                @click="changestate(row.id, 1)"
+              />
             </el-tooltip>
             <el-button
               type="danger"
@@ -82,18 +103,23 @@
         />
       </div>
     </el-card>
+    <companysadd :showDialog.sync="showDialog" @addbtn="addfn" ref="companysadd"/>
   </div>
 </template>
 
 <script>
+import companys from './companys/index.vue'
 import companysadd from '../components/companys-add.vue'
-import { list, remove, disabled } from '@/api/hmmm/companys.js'
+import { list, remove, disabled, detail } from '@/api/hmmm/companys.js'
 export default {
   components: {
+    companys,
     companysadd
   },
   data() {
     return {
+      showDialog: false,
+      btnstate: 1,
       textnum: '',
       currentPage4: 1,
       list: [],
@@ -107,11 +133,24 @@ export default {
   },
   created() {
     this.getlist()
+
   },
   methods: {
+    addfn(){
+      this.getlist()
+    },
+    async revisebtn(id) {
+      try{
+      this.showDialog = true
+      let {data}= await detail(id)
+      this.$refs.companysadd.formData= data
+      }catch(err){
+        console.log(err);
+      }
+    },
     async changestate(id, state) {
       const confirmResult = await this.$confirm(
-        '已成功禁用, 是否继续?',
+        state == 1 ? '已成功启用, 是否继续?' : '已成功禁用, 是否继续?',
         '提示',
         {
           confirmButtonText: '确定',
@@ -120,10 +159,9 @@ export default {
         }
       ).catch((error) => error)
       if (confirmResult === 'confirm') {
-        await disabled(id, state)
-        this.$message.success('已成功禁用')
-
-        console.log(this.page.total)
+        const test = id + '/' + state
+        await disabled(test)
+        this.$message.success(state == 1 ? '已成功启用' : '已成功禁用')
         this.getlist()
       } else {
         return this.$message.info('已取消删除')
@@ -167,6 +205,9 @@ export default {
 .container {
   padding: 20px;
 }
+.topalert{
+  margin-bottom: 20px;
+}
 .pagination {
   margin: 10px;
   float: right;
diff --git a/src/module-hmmm/pages/companys/index.vue b/src/module-hmmm/pages/companys/index.vue
new file mode 100644
index 0000000..6f43b51
--- /dev/null
+++ b/src/module-hmmm/pages/companys/index.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="headcontainer">
+    <el-form ref="form" :model="form" label-width="70px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="标签名称">
+            <el-input
+              v-model="form.name"
+              style="width: 85%"
+              placeholder="请输入"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="城市">
+            <el-select v-model="value" placeholder="请选择" style="width: 85%">
+              <el-option
+                v-for="item in province"
+                :key="item"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="地区">
+            <el-select v-model="value1" placeholder="请选择" style="width: 85%">
+              <el-option
+                v-for="item1 in city"
+                :key="item1"
+                :label="item1"
+                :value="item1"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="企业简称">
+            <el-input v-model="form.name" style="width: 85%" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="space-between">
+        <el-col :span="6">
+          <el-form-item label="状态">
+            <el-select v-model="value2" placeholder="请选择" style="width: 85%">
+              <el-option
+                v-for="item3 in option"
+                :key="item3"
+                :label="item3"
+                :value="item3"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="14" class="btn">
+          <el-button>清除</el-button>
+          <el-button type="primary">
+            搜索
+          </el-button>
+        </el-col>
+        <el-col :span="3" class="success">
+          <el-button type="success" @click="addbtn">
+            新增用户
+          </el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import {provinces,citys} from '@/api/hmmm/citys.js'
+
+export default {
+  data () {
+    return {
+    }
+  },
+  methods: {
+    async addbtn(){
+      this.$parent.$parent.showDialog=true
+      try{
+        await add()
+      }catch(err){
+
+      }
+    }
+  },
+  created () {
+    console.log(this.city);
+  },
+  data() {
+    return {
+      option:['禁用','启用'],
+      province:provinces(),
+      city:citys(),
+      form: {
+        name: ''
+      },
+      value: '',
+      value1:'',
+      value2:''
+    }
+  }
+}
+</script>
+
+<style  scoped>
+.btn {
+  margin-left: 20px;
+}
+.headcontainer{
+  padding: 0;
+}
+</style>
-- 
Gitee


From d6025f8a285121bad78310a7134b55bf86399f22 Mon Sep 17 00:00:00 2001
From: wzy <wzyzzqq@163.com>
Date: Sun, 18 Sep 2022 20:28:03 +0800
Subject: [PATCH 36/40] =?UTF-8?q?feat(wzy):=20=E5=AE=8C=E5=96=84ZyForm's?=
 =?UTF-8?q?=20select=20=E4=B8=8B=E6=8B=89=E8=A7=A6=E5=8F=91=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E8=AF=B7=E6=B1=82=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/json/china.json                        |   1 +
 src/base-ui/ZyEditor/src/zy-editor.vue        | 111 +++++++++---------
 src/base-ui/ZyForm/src/zy-form.vue            |  16 ++-
 src/main.js                                   |   2 +-
 src/module-hmmm/index.js                      |   4 +-
 .../questions-new/config/formConfig.config.js |  52 +++++++-
 .../pages/questions-new/func/getCityData.js   |  28 +++++
 .../pages/questions-new/func/index.js         |  18 ++-
 .../pages/questions-new/src/questions-new.vue | 102 +++++++++-------
 .../questions-new/utils/comListToSelect.js    |  33 ++++++
 src/module-hmmm/store/app.js                  |  25 +++-
 .../store/utils/chinaMapToArray.js            |  41 +++++++
 src/store/getters.js                          |   3 +-
 13 files changed, 320 insertions(+), 116 deletions(-)
 create mode 100644 public/json/china.json
 create mode 100644 src/module-hmmm/pages/questions-new/func/getCityData.js
 create mode 100644 src/module-hmmm/pages/questions-new/utils/comListToSelect.js
 create mode 100644 src/module-hmmm/store/utils/chinaMapToArray.js

diff --git a/public/json/china.json b/public/json/china.json
new file mode 100644
index 0000000..943e518
--- /dev/null
+++ b/public/json/china.json
@@ -0,0 +1 @@
+{"110000":"北京市","110100":"北京市","110101":"东城区","110102":"西城区","110105":"朝阳区","110106":"丰台区","110107":"石景山区","110108":"海淀区","110109":"门头沟区","110111":"房山区","110112":"通州区","110113":"顺义区","110114":"昌平区","110115":"大兴区","110116":"怀柔区","110117":"平谷区","110118":"密云区","110119":"延庆区","120000":"天津市","120100":"天津市","120101":"和平区","120102":"河东区","120103":"河西区","120104":"南开区","120105":"河北区","120106":"红桥区","120110":"东丽区","120111":"西青区","120112":"津南区","120113":"北辰区","120114":"武清区","120115":"宝坻区","120116":"滨海新区","120117":"宁河区","120118":"静海区","120119":"蓟州区","130000":"河北省","130100":"石家庄市","130102":"长安区","130104":"桥西区","130105":"新华区","130107":"井陉矿区","130108":"裕华区","130109":"藁城区","130110":"鹿泉区","130111":"栾城区","130121":"井陉县","130123":"正定县","130125":"行唐县","130126":"灵寿县","130127":"高邑县","130128":"深泽县","130129":"赞皇县","130130":"无极县","130131":"平山县","130132":"元氏县","130133":"赵县","130181":"辛集市","130183":"晋州市","130184":"新乐市","130200":"唐山市","130202":"路南区","130203":"路北区","130204":"古冶区","130205":"开平区","130207":"丰南区","130208":"丰润区","130209":"曹妃甸区","130223":"滦县","130224":"滦南县","130225":"乐亭县","130227":"迁西县","130229":"玉田县","130281":"遵化市","130283":"迁安市","130300":"秦皇岛市","130302":"海港区","130303":"山海关区","130304":"北戴河区","130306":"抚宁区","130321":"青龙满族自治县","130322":"昌黎县","130324":"卢龙县","130400":"邯郸市","130402":"邯山区","130403":"丛台区","130404":"复兴区","130406":"峰峰矿区","130407":"肥乡区","130408":"永年区","130423":"临漳县","130424":"成安县","130425":"大名县","130426":"涉县","130427":"磁县","130430":"邱县","130431":"鸡泽县","130432":"广平县","130433":"馆陶县","130434":"魏县","130435":"曲周县","130481":"武安市","130500":"邢台市","130502":"桥东区","130503":"桥西区","130521":"邢台县","130522":"临城县","130523":"内丘县","130524":"柏乡县","130525":"隆尧县","130526":"任县","130527":"南和县","130528":"宁晋县","130529":"巨鹿县","130530":"新河县","130531":"广宗县","130532":"平乡县","130533":"威县","130534":"清河县","130535":"临西县","130581":"南宫市","130582":"沙河市","130600":"保定市","130602":"竞秀区","130606":"莲池区","130607":"满城区","130608":"清苑区","130609":"徐水区","130623":"涞水县","130624":"阜平县","130626":"定兴县","130627":"唐县","130628":"高阳县","130629":"容城县","130630":"涞源县","130631":"望都县","130632":"安新县","130633":"易县","130634":"曲阳县","130635":"蠡县","130636":"顺平县","130637":"博野县","130638":"雄县","130681":"涿州市","130682":"定州市","130683":"安国市","130684":"高碑店市","130700":"张家口市","130702":"桥东区","130703":"桥西区","130705":"宣化区","130706":"下花园区","130708":"万全区","130709":"崇礼区","130722":"张北县","130723":"康保县","130724":"沽源县","130725":"尚义县","130726":"蔚县","130727":"阳原县","130728":"怀安县","130730":"怀来县","130731":"涿鹿县","130732":"赤城县","130800":"承德市","130802":"双桥区","130803":"双滦区","130804":"鹰手营子矿区","130821":"承德县","130822":"兴隆县","130824":"滦平县","130825":"隆化县","130826":"丰宁满族自治县","130827":"宽城满族自治县","130828":"围场满族蒙古族自治县","130881":"平泉市","130900":"沧州市","130902":"新华区","130903":"运河区","130921":"沧县","130922":"青县","130923":"东光县","130924":"海兴县","130925":"盐山县","130926":"肃宁县","130927":"南皮县","130928":"吴桥县","130929":"献县","130930":"孟村回族自治县","130981":"泊头市","130982":"任丘市","130983":"黄骅市","130984":"河间市","131000":"廊坊市","131002":"安次区","131003":"广阳区","131022":"固安县","131023":"永清县","131024":"香河县","131025":"大城县","131026":"文安县","131028":"大厂回族自治县","131081":"霸州市","131082":"三河市","131100":"衡水市","131102":"桃城区","131103":"冀州区","131121":"枣强县","131122":"武邑县","131123":"武强县","131124":"饶阳县","131125":"安平县","131126":"故城县","131127":"景县","131128":"阜城县","131182":"深州市","140000":"山西省","140100":"太原市","140105":"小店区","140106":"迎泽区","140107":"杏花岭区","140108":"尖草坪区","140109":"万柏林区","140110":"晋源区","140121":"清徐县","140122":"阳曲县","140123":"娄烦县","140181":"古交市","140200":"大同市","140202":"城区","140203":"矿区","140211":"南郊区","140212":"新荣区","140221":"阳高县","140222":"天镇县","140223":"广灵县","140224":"灵丘县","140225":"浑源县","140226":"左云县","140227":"大同县","140300":"阳泉市","140302":"城区","140303":"矿区","140311":"郊区","140321":"平定县","140322":"盂县","140400":"长治市","140402":"城区","140411":"郊区","140421":"长治县","140423":"襄垣县","140424":"屯留县","140425":"平顺县","140426":"黎城县","140427":"壶关县","140428":"长子县","140429":"武乡县","140430":"沁县","140431":"沁源县","140481":"潞城市","140500":"晋城市","140502":"城区","140521":"沁水县","140522":"阳城县","140524":"陵川县","140525":"泽州县","140581":"高平市","140600":"朔州市","140602":"朔城区","140603":"平鲁区","140621":"山阴县","140622":"应县","140623":"右玉县","140624":"怀仁县","140700":"晋中市","140702":"榆次区","140721":"榆社县","140722":"左权县","140723":"和顺县","140724":"昔阳县","140725":"寿阳县","140726":"太谷县","140727":"祁县","140728":"平遥县","140729":"灵石县","140781":"介休市","140800":"运城市","140802":"盐湖区","140821":"临猗县","140822":"万荣县","140823":"闻喜县","140824":"稷山县","140825":"新绛县","140826":"绛县","140827":"垣曲县","140828":"夏县","140829":"平陆县","140830":"芮城县","140881":"永济市","140882":"河津市","140900":"忻州市","140902":"忻府区","140921":"定襄县","140922":"五台县","140923":"代县","140924":"繁峙县","140925":"宁武县","140926":"静乐县","140927":"神池县","140928":"五寨县","140929":"岢岚县","140930":"河曲县","140931":"保德县","140932":"偏关县","140981":"原平市","141000":"临汾市","141002":"尧都区","141021":"曲沃县","141022":"翼城县","141023":"襄汾县","141024":"洪洞县","141025":"古县","141026":"安泽县","141027":"浮山县","141028":"吉县","141029":"乡宁县","141030":"大宁县","141031":"隰县","141032":"永和县","141033":"蒲县","141034":"汾西县","141081":"侯马市","141082":"霍州市","141100":"吕梁市","141102":"离石区","141121":"文水县","141122":"交城县","141123":"兴县","141124":"临县","141125":"柳林县","141126":"石楼县","141127":"岚县","141128":"方山县","141129":"中阳县","141130":"交口县","141181":"孝义市","141182":"汾阳市","150000":"内蒙古自治区","150100":"呼和浩特市","150102":"新城区","150103":"回民区","150104":"玉泉区","150105":"赛罕区","150121":"土默特左旗","150122":"托克托县","150123":"和林格尔县","150124":"清水河县","150125":"武川县","150200":"包头市","150202":"东河区","150203":"昆都仑区","150204":"青山区","150205":"石拐区","150206":"白云鄂博矿区","150207":"九原区","150221":"土默特右旗","150222":"固阳县","150223":"达尔罕茂明安联合旗","150300":"乌海市","150302":"海勃湾区","150303":"海南区","150304":"乌达区","150400":"赤峰市","150402":"红山区","150403":"元宝山区","150404":"松山区","150421":"阿鲁科尔沁旗","150422":"巴林左旗","150423":"巴林右旗","150424":"林西县","150425":"克什克腾旗","150426":"翁牛特旗","150428":"喀喇沁旗","150429":"宁城县","150430":"敖汉旗","150500":"通辽市","150502":"科尔沁区","150521":"科尔沁左翼中旗","150522":"科尔沁左翼后旗","150523":"开鲁县","150524":"库伦旗","150525":"奈曼旗","150526":"扎鲁特旗","150581":"霍林郭勒市","150600":"鄂尔多斯市","150602":"东胜区","150603":"康巴什区","150621":"达拉特旗","150622":"准格尔旗","150623":"鄂托克前旗","150624":"鄂托克旗","150625":"杭锦旗","150626":"乌审旗","150627":"伊金霍洛旗","150700":"呼伦贝尔市","150702":"海拉尔区","150703":"扎赉诺尔区","150721":"阿荣旗","150722":"莫力达瓦达斡尔族自治旗","150723":"鄂伦春自治旗","150724":"鄂温克族自治旗","150725":"陈巴尔虎旗","150726":"新巴尔虎左旗","150727":"新巴尔虎右旗","150781":"满洲里市","150782":"牙克石市","150783":"扎兰屯市","150784":"额尔古纳市","150785":"根河市","150800":"巴彦淖尔市","150802":"临河区","150821":"五原县","150822":"磴口县","150823":"乌拉特前旗","150824":"乌拉特中旗","150825":"乌拉特后旗","150826":"杭锦后旗","150900":"乌兰察布市","150902":"集宁区","150921":"卓资县","150922":"化德县","150923":"商都县","150924":"兴和县","150925":"凉城县","150926":"察哈尔右翼前旗","150927":"察哈尔右翼中旗","150928":"察哈尔右翼后旗","150929":"四子王旗","150981":"丰镇市","152200":"兴安盟","152201":"乌兰浩特市","152202":"阿尔山市","152221":"科尔沁右翼前旗","152222":"科尔沁右翼中旗","152223":"扎赉特旗","152224":"突泉县","152500":"锡林郭勒盟","152501":"二连浩特市","152502":"锡林浩特市","152522":"阿巴嘎旗","152523":"苏尼特左旗","152524":"苏尼特右旗","152525":"东乌珠穆沁旗","152526":"西乌珠穆沁旗","152527":"太仆寺旗","152528":"镶黄旗","152529":"正镶白旗","152530":"正蓝旗","152531":"多伦县","152900":"阿拉善盟","152921":"阿拉善左旗","152922":"阿拉善右旗","152923":"额济纳旗","210000":"辽宁省","210100":"沈阳市","210102":"和平区","210103":"沈河区","210104":"大东区","210105":"皇姑区","210106":"铁西区","210111":"苏家屯区","210112":"浑南区","210113":"沈北新区","210114":"于洪区","210115":"辽中区","210123":"康平县","210124":"法库县","210181":"新民市","210200":"大连市","210202":"中山区","210203":"西岗区","210204":"沙河口区","210211":"甘井子区","210212":"旅顺口区","210213":"金州区","210214":"普兰店区","210224":"长海县","210281":"瓦房店市","210283":"庄河市","210300":"鞍山市","210302":"铁东区","210303":"铁西区","210304":"立山区","210311":"千山区","210321":"台安县","210323":"岫岩满族自治县","210381":"海城市","210400":"抚顺市","210402":"新抚区","210403":"东洲区","210404":"望花区","210411":"顺城区","210421":"抚顺县","210422":"新宾满族自治县","210423":"清原满族自治县","210500":"本溪市","210502":"平山区","210503":"溪湖区","210504":"明山区","210505":"南芬区","210521":"本溪满族自治县","210522":"桓仁满族自治县","210600":"丹东市","210602":"元宝区","210603":"振兴区","210604":"振安区","210624":"宽甸满族自治县","210681":"东港市","210682":"凤城市","210700":"锦州市","210702":"古塔区","210703":"凌河区","210711":"太和区","210726":"黑山县","210727":"义县","210781":"凌海市","210782":"北镇市","210800":"营口市","210802":"站前区","210803":"西市区","210804":"鲅鱼圈区","210811":"老边区","210881":"盖州市","210882":"大石桥市","210900":"阜新市","210902":"海州区","210903":"新邱区","210904":"太平区","210905":"清河门区","210911":"细河区","210921":"阜新蒙古族自治县","210922":"彰武县","211000":"辽阳市","211002":"白塔区","211003":"文圣区","211004":"宏伟区","211005":"弓长岭区","211011":"太子河区","211021":"辽阳县","211081":"灯塔市","211100":"盘锦市","211102":"双台子区","211103":"兴隆台区","211104":"大洼区","211122":"盘山县","211200":"铁岭市","211202":"银州区","211204":"清河区","211221":"铁岭县","211223":"西丰县","211224":"昌图县","211281":"调兵山市","211282":"开原市","211300":"朝阳市","211302":"双塔区","211303":"龙城区","211321":"朝阳县","211322":"建平县","211324":"喀喇沁左翼蒙古族自治县","211381":"北票市","211382":"凌源市","211400":"葫芦岛市","211402":"连山区","211403":"龙港区","211404":"南票区","211421":"绥中县","211422":"建昌县","211481":"兴城市","220000":"吉林省","220100":"长春市","220102":"南关区","220103":"宽城区","220104":"朝阳区","220105":"二道区","220106":"绿园区","220112":"双阳区","220113":"九台区","220122":"农安县","220182":"榆树市","220183":"德惠市","220200":"吉林市","220202":"昌邑区","220203":"龙潭区","220204":"船营区","220211":"丰满区","220221":"永吉县","220281":"蛟河市","220282":"桦甸市","220283":"舒兰市","220284":"磐石市","220300":"四平市","220302":"铁西区","220303":"铁东区","220322":"梨树县","220323":"伊通满族自治县","220381":"公主岭市","220382":"双辽市","220400":"辽源市","220402":"龙山区","220403":"西安区","220421":"东丰县","220422":"东辽县","220500":"通化市","220502":"东昌区","220503":"二道江区","220521":"通化县","220523":"辉南县","220524":"柳河县","220581":"梅河口市","220582":"集安市","220600":"白山市","220602":"浑江区","220605":"江源区","220621":"抚松县","220622":"靖宇县","220623":"长白朝鲜族自治县","220681":"临江市","220700":"松原市","220702":"宁江区","220721":"前郭尔罗斯蒙古族自治县","220722":"长岭县","220723":"乾安县","220781":"扶余市","220800":"白城市","220802":"洮北区","220821":"镇赉县","220822":"通榆县","220881":"洮南市","220882":"大安市","222400":"延边朝鲜族自治州","222401":"延吉市","222402":"图们市","222403":"敦化市","222404":"珲春市","222405":"龙井市","222406":"和龙市","222424":"汪清县","222426":"安图县","230000":"黑龙江省","230100":"哈尔滨市","230102":"道里区","230103":"南岗区","230104":"道外区","230108":"平房区","230109":"松北区","230110":"香坊区","230111":"呼兰区","230112":"阿城区","230113":"双城区","230123":"依兰县","230124":"方正县","230125":"宾县","230126":"巴彦县","230127":"木兰县","230128":"通河县","230129":"延寿县","230183":"尚志市","230184":"五常市","230200":"齐齐哈尔市","230202":"龙沙区","230203":"建华区","230204":"铁锋区","230205":"昂昂溪区","230206":"富拉尔基区","230207":"碾子山区","230208":"梅里斯达斡尔族区","230221":"龙江县","230223":"依安县","230224":"泰来县","230225":"甘南县","230227":"富裕县","230229":"克山县","230230":"克东县","230231":"拜泉县","230281":"讷河市","230300":"鸡西市","230302":"鸡冠区","230303":"恒山区","230304":"滴道区","230305":"梨树区","230306":"城子河区","230307":"麻山区","230321":"鸡东县","230381":"虎林市","230382":"密山市","230400":"鹤岗市","230402":"向阳区","230403":"工农区","230404":"南山区","230405":"兴安区","230406":"东山区","230407":"兴山区","230421":"萝北县","230422":"绥滨县","230500":"双鸭山市","230502":"尖山区","230503":"岭东区","230505":"四方台区","230506":"宝山区","230521":"集贤县","230522":"友谊县","230523":"宝清县","230524":"饶河县","230600":"大庆市","230602":"萨尔图区","230603":"龙凤区","230604":"让胡路区","230605":"红岗区","230606":"大同区","230621":"肇州县","230622":"肇源县","230623":"林甸县","230624":"杜尔伯特蒙古族自治县","230700":"伊春市","230702":"伊春区","230703":"南岔区","230704":"友好区","230705":"西林区","230706":"翠峦区","230707":"新青区","230708":"美溪区","230709":"金山屯区","230710":"五营区","230711":"乌马河区","230712":"汤旺河区","230713":"带岭区","230714":"乌伊岭区","230715":"红星区","230716":"上甘岭区","230722":"嘉荫县","230781":"铁力市","230800":"佳木斯市","230803":"向阳区","230804":"前进区","230805":"东风区","230811":"郊区","230822":"桦南县","230826":"桦川县","230828":"汤原县","230881":"同江市","230882":"富锦市","230883":"抚远市","230900":"七台河市","230902":"新兴区","230903":"桃山区","230904":"茄子河区","230921":"勃利县","231000":"牡丹江市","231002":"东安区","231003":"阳明区","231004":"爱民区","231005":"西安区","231025":"林口县","231081":"绥芬河市","231083":"海林市","231084":"宁安市","231085":"穆棱市","231086":"东宁市","231100":"黑河市","231102":"爱辉区","231121":"嫩江县","231123":"逊克县","231124":"孙吴县","231181":"北安市","231182":"五大连池市","231200":"绥化市","231202":"北林区","231221":"望奎县","231222":"兰西县","231223":"青冈县","231224":"庆安县","231225":"明水县","231226":"绥棱县","231281":"安达市","231282":"肇东市","231283":"海伦市","232700":"大兴安岭地区","232721":"呼玛县","232722":"塔河县","232723":"漠河县","310000":"上海市","310100":"上海市","310101":"黄浦区","310104":"徐汇区","310105":"长宁区","310106":"静安区","310107":"普陀区","310109":"虹口区","310110":"杨浦区","310112":"闵行区","310113":"宝山区","310114":"嘉定区","310115":"浦东新区","310116":"金山区","310117":"松江区","310118":"青浦区","310120":"奉贤区","310151":"崇明区","320000":"江苏省","320100":"南京市","320102":"玄武区","320104":"秦淮区","320105":"建邺区","320106":"鼓楼区","320111":"浦口区","320113":"栖霞区","320114":"雨花台区","320115":"江宁区","320116":"六合区","320117":"溧水区","320118":"高淳区","320200":"无锡市","320205":"锡山区","320206":"惠山区","320211":"滨湖区","320213":"梁溪区","320214":"新吴区","320281":"江阴市","320282":"宜兴市","320300":"徐州市","320302":"鼓楼区","320303":"云龙区","320305":"贾汪区","320311":"泉山区","320312":"铜山区","320321":"丰县","320322":"沛县","320324":"睢宁县","320381":"新沂市","320382":"邳州市","320400":"常州市","320402":"天宁区","320404":"钟楼区","320411":"新北区","320412":"武进区","320413":"金坛区","320481":"溧阳市","320500":"苏州市","320505":"虎丘区","320506":"吴中区","320507":"相城区","320508":"姑苏区","320509":"吴江区","320581":"常熟市","320582":"张家港市","320583":"昆山市","320585":"太仓市","320600":"南通市","320602":"崇川区","320611":"港闸区","320612":"通州区","320621":"海安县","320623":"如东县","320681":"启东市","320682":"如皋市","320684":"海门市","320700":"连云港市","320703":"连云区","320706":"海州区","320707":"赣榆区","320722":"东海县","320723":"灌云县","320724":"灌南县","320800":"淮安市","320803":"淮安区","320804":"淮阴区","320812":"清江浦区","320813":"洪泽区","320826":"涟水县","320830":"盱眙县","320831":"金湖县","320900":"盐城市","320902":"亭湖区","320903":"盐都区","320904":"大丰区","320921":"响水县","320922":"滨海县","320923":"阜宁县","320924":"射阳县","320925":"建湖县","320981":"东台市","321000":"扬州市","321002":"广陵区","321003":"邗江区","321012":"江都区","321023":"宝应县","321081":"仪征市","321084":"高邮市","321100":"镇江市","321102":"京口区","321111":"润州区","321112":"丹徒区","321181":"丹阳市","321182":"扬中市","321183":"句容市","321200":"泰州市","321202":"海陵区","321203":"高港区","321204":"姜堰区","321281":"兴化市","321282":"靖江市","321283":"泰兴市","321300":"宿迁市","321302":"宿城区","321311":"宿豫区","321322":"沭阳县","321323":"泗阳县","321324":"泗洪县","330000":"浙江省","330100":"杭州市","330102":"上城区","330103":"下城区","330104":"江干区","330105":"拱墅区","330106":"西湖区","330108":"滨江区","330109":"萧山区","330110":"余杭区","330111":"富阳区","330112":"临安区","330122":"桐庐县","330127":"淳安县","330182":"建德市","330200":"宁波市","330203":"海曙区","330205":"江北区","330206":"北仑区","330211":"镇海区","330212":"鄞州区","330213":"奉化区","330225":"象山县","330226":"宁海县","330281":"余姚市","330282":"慈溪市","330300":"温州市","330302":"鹿城区","330303":"龙湾区","330304":"瓯海区","330305":"洞头区","330324":"永嘉县","330326":"平阳县","330327":"苍南县","330328":"文成县","330329":"泰顺县","330381":"瑞安市","330382":"乐清市","330400":"嘉兴市","330402":"南湖区","330411":"秀洲区","330421":"嘉善县","330424":"海盐县","330481":"海宁市","330482":"平湖市","330483":"桐乡市","330500":"湖州市","330502":"吴兴区","330503":"南浔区","330521":"德清县","330522":"长兴县","330523":"安吉县","330600":"绍兴市","330602":"越城区","330603":"柯桥区","330604":"上虞区","330624":"新昌县","330681":"诸暨市","330683":"嵊州市","330700":"金华市","330702":"婺城区","330703":"金东区","330723":"武义县","330726":"浦江县","330727":"磐安县","330781":"兰溪市","330782":"义乌市","330783":"东阳市","330784":"永康市","330800":"衢州市","330802":"柯城区","330803":"衢江区","330822":"常山县","330824":"开化县","330825":"龙游县","330881":"江山市","330900":"舟山市","330902":"定海区","330903":"普陀区","330921":"岱山县","330922":"嵊泗县","331000":"台州市","331002":"椒江区","331003":"黄岩区","331004":"路桥区","331022":"三门县","331023":"天台县","331024":"仙居县","331081":"温岭市","331082":"临海市","331083":"玉环市","331100":"丽水市","331102":"莲都区","331121":"青田县","331122":"缙云县","331123":"遂昌县","331124":"松阳县","331125":"云和县","331126":"庆元县","331127":"景宁畲族自治县","331181":"龙泉市","340000":"安徽省","340100":"合肥市","340102":"瑶海区","340103":"庐阳区","340104":"蜀山区","340111":"包河区","340121":"长丰县","340122":"肥东县","340123":"肥西县","340124":"庐江县","340181":"巢湖市","340200":"芜湖市","340202":"镜湖区","340203":"弋江区","340207":"鸠江区","340208":"三山区","340221":"芜湖县","340222":"繁昌县","340223":"南陵县","340225":"无为县","340300":"蚌埠市","340302":"龙子湖区","340303":"蚌山区","340304":"禹会区","340311":"淮上区","340321":"怀远县","340322":"五河县","340323":"固镇县","340400":"淮南市","340402":"大通区","340403":"田家庵区","340404":"谢家集区","340405":"八公山区","340406":"潘集区","340421":"凤台县","340422":"寿县","340500":"马鞍山市","340503":"花山区","340504":"雨山区","340506":"博望区","340521":"当涂县","340522":"含山县","340523":"和县","340600":"淮北市","340602":"杜集区","340603":"相山区","340604":"烈山区","340621":"濉溪县","340700":"铜陵市","340705":"铜官区","340706":"义安区","340711":"郊区","340722":"枞阳县","340800":"安庆市","340802":"迎江区","340803":"大观区","340811":"宜秀区","340822":"怀宁县","340824":"潜山县","340825":"太湖县","340826":"宿松县","340827":"望江县","340828":"岳西县","340881":"桐城市","341000":"黄山市","341002":"屯溪区","341003":"黄山区","341004":"徽州区","341021":"歙县","341022":"休宁县","341023":"黟县","341024":"祁门县","341100":"滁州市","341102":"琅琊区","341103":"南谯区","341122":"来安县","341124":"全椒县","341125":"定远县","341126":"凤阳县","341181":"天长市","341182":"明光市","341200":"阜阳市","341202":"颍州区","341203":"颍东区","341204":"颍泉区","341221":"临泉县","341222":"太和县","341225":"阜南县","341226":"颍上县","341282":"界首市","341300":"宿州市","341302":"埇桥区","341321":"砀山县","341322":"萧县","341323":"灵璧县","341324":"泗县","341500":"六安市","341502":"金安区","341503":"裕安区","341504":"叶集区","341522":"霍邱县","341523":"舒城县","341524":"金寨县","341525":"霍山县","341600":"亳州市","341602":"谯城区","341621":"涡阳县","341622":"蒙城县","341623":"利辛县","341700":"池州市","341702":"贵池区","341721":"东至县","341722":"石台县","341723":"青阳县","341800":"宣城市","341802":"宣州区","341821":"郎溪县","341822":"广德县","341823":"泾县","341824":"绩溪县","341825":"旌德县","341881":"宁国市","350000":"福建省","350100":"福州市","350102":"鼓楼区","350103":"台江区","350104":"仓山区","350105":"马尾区","350111":"晋安区","350121":"闽侯县","350122":"连江县","350123":"罗源县","350124":"闽清县","350125":"永泰县","350128":"平潭县","350181":"福清市","350182":"长乐区","350200":"厦门市","350203":"思明区","350205":"海沧区","350206":"湖里区","350211":"集美区","350212":"同安区","350213":"翔安区","350300":"莆田市","350302":"城厢区","350303":"涵江区","350304":"荔城区","350305":"秀屿区","350322":"仙游县","350400":"三明市","350402":"梅列区","350403":"三元区","350421":"明溪县","350423":"清流县","350424":"宁化县","350425":"大田县","350426":"尤溪县","350427":"沙县","350428":"将乐县","350429":"泰宁县","350430":"建宁县","350481":"永安市","350500":"泉州市","350502":"鲤城区","350503":"丰泽区","350504":"洛江区","350505":"泉港区","350521":"惠安县","350524":"安溪县","350525":"永春县","350526":"德化县","350527":"金门县","350581":"石狮市","350582":"晋江市","350583":"南安市","350600":"漳州市","350602":"芗城区","350603":"龙文区","350622":"云霄县","350623":"漳浦县","350624":"诏安县","350625":"长泰县","350626":"东山县","350627":"南靖县","350628":"平和县","350629":"华安县","350681":"龙海市","350700":"南平市","350702":"延平区","350703":"建阳区","350721":"顺昌县","350722":"浦城县","350723":"光泽县","350724":"松溪县","350725":"政和县","350781":"邵武市","350782":"武夷山市","350783":"建瓯市","350800":"龙岩市","350802":"新罗区","350803":"永定区","350821":"长汀县","350823":"上杭县","350824":"武平县","350825":"连城县","350881":"漳平市","350900":"宁德市","350902":"蕉城区","350921":"霞浦县","350922":"古田县","350923":"屏南县","350924":"寿宁县","350925":"周宁县","350926":"柘荣县","350981":"福安市","350982":"福鼎市","360000":"江西省","360100":"南昌市","360102":"东湖区","360103":"西湖区","360104":"青云谱区","360105":"湾里区","360111":"青山湖区","360112":"新建区","360121":"南昌县","360123":"安义县","360124":"进贤县","360200":"景德镇市","360202":"昌江区","360203":"珠山区","360222":"浮梁县","360281":"乐平市","360300":"萍乡市","360302":"安源区","360313":"湘东区","360321":"莲花县","360322":"上栗县","360323":"芦溪县","360400":"九江市","360402":"濂溪区","360403":"浔阳区","360421":"柴桑区","360423":"武宁县","360424":"修水县","360425":"永修县","360426":"德安县","360428":"都昌县","360429":"湖口县","360430":"彭泽县","360481":"瑞昌市","360482":"共青城市","360483":"庐山市","360500":"新余市","360502":"渝水区","360521":"分宜县","360600":"鹰潭市","360602":"月湖区","360622":"余江县","360681":"贵溪市","360700":"赣州市","360702":"章贡区","360703":"南康区","360704":"赣县区","360722":"信丰县","360723":"大余县","360724":"上犹县","360725":"崇义县","360726":"安远县","360727":"龙南县","360728":"定南县","360729":"全南县","360730":"宁都县","360731":"于都县","360732":"兴国县","360733":"会昌县","360734":"寻乌县","360735":"石城县","360781":"瑞金市","360800":"吉安市","360802":"吉州区","360803":"青原区","360821":"吉安县","360822":"吉水县","360823":"峡江县","360824":"新干县","360825":"永丰县","360826":"泰和县","360827":"遂川县","360828":"万安县","360829":"安福县","360830":"永新县","360881":"井冈山市","360900":"宜春市","360902":"袁州区","360921":"奉新县","360922":"万载县","360923":"上高县","360924":"宜丰县","360925":"靖安县","360926":"铜鼓县","360981":"丰城市","360982":"樟树市","360983":"高安市","361000":"抚州市","361002":"临川区","361003":"东乡区","361021":"南城县","361022":"黎川县","361023":"南丰县","361024":"崇仁县","361025":"乐安县","361026":"宜黄县","361027":"金溪县","361028":"资溪县","361030":"广昌县","361100":"上饶市","361102":"信州区","361103":"广丰区","361121":"上饶县","361123":"玉山县","361124":"铅山县","361125":"横峰县","361126":"弋阳县","361127":"余干县","361128":"鄱阳县","361129":"万年县","361130":"婺源县","361181":"德兴市","370000":"山东省","370100":"济南市","370102":"历下区","370103":"市中区","370104":"槐荫区","370105":"天桥区","370112":"历城区","370113":"长清区","370114":"章丘区","370124":"平阴县","370125":"济阳县","370126":"商河县","370200":"青岛市","370202":"市南区","370203":"市北区","370211":"黄岛区","370212":"崂山区","370213":"李沧区","370214":"城阳区","370281":"胶州市","370282":"即墨区","370283":"平度市","370285":"莱西市","370300":"淄博市","370302":"淄川区","370303":"张店区","370304":"博山区","370305":"临淄区","370306":"周村区","370321":"桓台县","370322":"高青县","370323":"沂源县","370400":"枣庄市","370402":"市中区","370403":"薛城区","370404":"峄城区","370405":"台儿庄区","370406":"山亭区","370481":"滕州市","370500":"东营市","370502":"东营区","370503":"河口区","370505":"垦利区","370522":"利津县","370523":"广饶县","370600":"烟台市","370602":"芝罘区","370611":"福山区","370612":"牟平区","370613":"莱山区","370634":"长岛县","370681":"龙口市","370682":"莱阳市","370683":"莱州市","370684":"蓬莱市","370685":"招远市","370686":"栖霞市","370687":"海阳市","370700":"潍坊市","370702":"潍城区","370703":"寒亭区","370704":"坊子区","370705":"奎文区","370724":"临朐县","370725":"昌乐县","370781":"青州市","370782":"诸城市","370783":"寿光市","370784":"安丘市","370785":"高密市","370786":"昌邑市","370800":"济宁市","370811":"任城区","370812":"兖州区","370826":"微山县","370827":"鱼台县","370828":"金乡县","370829":"嘉祥县","370830":"汶上县","370831":"泗水县","370832":"梁山县","370881":"曲阜市","370883":"邹城市","370900":"泰安市","370902":"泰山区","370911":"岱岳区","370921":"宁阳县","370923":"东平县","370982":"新泰市","370983":"肥城市","371000":"威海市","371002":"环翠区","371003":"文登区","371082":"荣成市","371083":"乳山市","371100":"日照市","371102":"东港区","371103":"岚山区","371121":"五莲县","371122":"莒县","371200":"莱芜市","371202":"莱城区","371203":"钢城区","371300":"临沂市","371302":"兰山区","371311":"罗庄区","371312":"河东区","371321":"沂南县","371322":"郯城县","371323":"沂水县","371324":"兰陵县","371325":"费县","371326":"平邑县","371327":"莒南县","371328":"蒙阴县","371329":"临沭县","371400":"德州市","371402":"德城区","371403":"陵城区","371422":"宁津县","371423":"庆云县","371424":"临邑县","371425":"齐河县","371426":"平原县","371427":"夏津县","371428":"武城县","371481":"乐陵市","371482":"禹城市","371500":"聊城市","371502":"东昌府区","371521":"阳谷县","371522":"莘县","371523":"茌平县","371524":"东阿县","371525":"冠县","371526":"高唐县","371581":"临清市","371600":"滨州市","371602":"滨城区","371603":"沾化区","371621":"惠民县","371622":"阳信县","371623":"无棣县","371625":"博兴县","371626":"邹平县","371700":"菏泽市","371702":"牡丹区","371703":"定陶区","371721":"曹县","371722":"单县","371723":"成武县","371724":"巨野县","371725":"郓城县","371726":"鄄城县","371728":"东明县","410000":"河南省","410100":"郑州市","410102":"中原区","410103":"二七区","410104":"管城回族区","410105":"金水区","410106":"上街区","410108":"惠济区","410122":"中牟县","410181":"巩义市","410182":"荥阳市","410183":"新密市","410184":"新郑市","410185":"登封市","410200":"开封市","410202":"龙亭区","410203":"顺河回族区","410204":"鼓楼区","410205":"禹王台区","410212":"祥符区","410221":"杞县","410222":"通许县","410223":"尉氏县","410225":"兰考县","410300":"洛阳市","410302":"老城区","410303":"西工区","410304":"瀍河回族区","410305":"涧西区","410306":"吉利区","410311":"洛龙区","410322":"孟津县","410323":"新安县","410324":"栾川县","410325":"嵩县","410326":"汝阳县","410327":"宜阳县","410328":"洛宁县","410329":"伊川县","410381":"偃师市","410400":"平顶山市","410402":"新华区","410403":"卫东区","410404":"石龙区","410411":"湛河区","410421":"宝丰县","410422":"叶县","410423":"鲁山县","410425":"郏县","410481":"舞钢市","410482":"汝州市","410500":"安阳市","410502":"文峰区","410503":"北关区","410505":"殷都区","410506":"龙安区","410522":"安阳县","410523":"汤阴县","410526":"滑县","410527":"内黄县","410581":"林州市","410600":"鹤壁市","410602":"鹤山区","410603":"山城区","410611":"淇滨区","410621":"浚县","410622":"淇县","410700":"新乡市","410702":"红旗区","410703":"卫滨区","410704":"凤泉区","410711":"牧野区","410721":"新乡县","410724":"获嘉县","410725":"原阳县","410726":"延津县","410727":"封丘县","410728":"长垣县","410781":"卫辉市","410782":"辉县市","410800":"焦作市","410802":"解放区","410803":"中站区","410804":"马村区","410811":"山阳区","410821":"修武县","410822":"博爱县","410823":"武陟县","410825":"温县","410882":"沁阳市","410883":"孟州市","410900":"濮阳市","410902":"华龙区","410922":"清丰县","410923":"南乐县","410926":"范县","410927":"台前县","410928":"濮阳县","411000":"许昌市","411002":"魏都区","411003":"建安区","411024":"鄢陵县","411025":"襄城县","411081":"禹州市","411082":"长葛市","411100":"漯河市","411102":"源汇区","411103":"郾城区","411104":"召陵区","411121":"舞阳县","411122":"临颍县","411200":"三门峡市","411202":"湖滨区","411203":"陕州区","411221":"渑池县","411224":"卢氏县","411281":"义马市","411282":"灵宝市","411300":"南阳市","411302":"宛城区","411303":"卧龙区","411321":"南召县","411322":"方城县","411323":"西峡县","411324":"镇平县","411325":"内乡县","411326":"淅川县","411327":"社旗县","411328":"唐河县","411329":"新野县","411330":"桐柏县","411381":"邓州市","411400":"商丘市","411402":"梁园区","411403":"睢阳区","411421":"民权县","411422":"睢县","411423":"宁陵县","411424":"柘城县","411425":"虞城县","411426":"夏邑县","411481":"永城市","411500":"信阳市","411502":"浉河区","411503":"平桥区","411521":"罗山县","411522":"光山县","411523":"新县","411524":"商城县","411525":"固始县","411526":"潢川县","411527":"淮滨县","411528":"息县","411600":"周口市","411602":"川汇区","411621":"扶沟县","411622":"西华县","411623":"商水县","411624":"沈丘县","411625":"郸城县","411626":"淮阳县","411627":"太康县","411628":"鹿邑县","411681":"项城市","411700":"驻马店市","411702":"驿城区","411721":"西平县","411722":"上蔡县","411723":"平舆县","411724":"正阳县","411725":"确山县","411726":"泌阳县","411727":"汝南县","411728":"遂平县","411729":"新蔡县","419001":"济源市","420000":"湖北省","420100":"武汉市","420102":"江岸区","420103":"江汉区","420104":"硚口区","420105":"汉阳区","420106":"武昌区","420107":"青山区","420111":"洪山区","420112":"东西湖区","420113":"汉南区","420114":"蔡甸区","420115":"江夏区","420116":"黄陂区","420117":"新洲区","420200":"黄石市","420202":"黄石港区","420203":"西塞山区","420204":"下陆区","420205":"铁山区","420222":"阳新县","420281":"大冶市","420300":"十堰市","420302":"茅箭区","420303":"张湾区","420304":"郧阳区","420322":"郧西县","420323":"竹山县","420324":"竹溪县","420325":"房县","420381":"丹江口市","420500":"宜昌市","420502":"西陵区","420503":"伍家岗区","420504":"点军区","420505":"猇亭区","420506":"夷陵区","420525":"远安县","420526":"兴山县","420527":"秭归县","420528":"长阳土家族自治县","420529":"五峰土家族自治县","420581":"宜都市","420582":"当阳市","420583":"枝江市","420600":"襄阳市","420602":"襄城区","420606":"樊城区","420607":"襄州区","420624":"南漳县","420625":"谷城县","420626":"保康县","420682":"老河口市","420683":"枣阳市","420684":"宜城市","420700":"鄂州市","420702":"梁子湖区","420703":"华容区","420704":"鄂城区","420800":"荆门市","420802":"东宝区","420804":"掇刀区","420821":"京山县","420822":"沙洋县","420881":"钟祥市","420900":"孝感市","420902":"孝南区","420921":"孝昌县","420922":"大悟县","420923":"云梦县","420981":"应城市","420982":"安陆市","420984":"汉川市","421000":"荆州市","421002":"沙市区","421003":"荆州区","421022":"公安县","421023":"监利县","421024":"江陵县","421081":"石首市","421083":"洪湖市","421087":"松滋市","421100":"黄冈市","421102":"黄州区","421121":"团风县","421122":"红安县","421123":"罗田县","421124":"英山县","421125":"浠水县","421126":"蕲春县","421127":"黄梅县","421181":"麻城市","421182":"武穴市","421200":"咸宁市","421202":"咸安区","421221":"嘉鱼县","421222":"通城县","421223":"崇阳县","421224":"通山县","421281":"赤壁市","421300":"随州市","421303":"曾都区","421321":"随县","421381":"广水市","422800":"恩施土家族苗族自治州","422801":"恩施市","422802":"利川市","422822":"建始县","422823":"巴东县","422825":"宣恩县","422826":"咸丰县","422827":"来凤县","422828":"鹤峰县","429004":"仙桃市","429005":"潜江市","429006":"天门市","429021":"神农架林区","430000":"湖南省","430100":"长沙市","430102":"芙蓉区","430103":"天心区","430104":"岳麓区","430105":"开福区","430111":"雨花区","430112":"望城区","430121":"长沙县","430124":"宁乡市","430181":"浏阳市","430200":"株洲市","430202":"荷塘区","430203":"芦淞区","430204":"石峰区","430211":"天元区","430221":"株洲县","430223":"攸县","430224":"茶陵县","430225":"炎陵县","430281":"醴陵市","430300":"湘潭市","430302":"雨湖区","430304":"岳塘区","430321":"湘潭县","430381":"湘乡市","430382":"韶山市","430400":"衡阳市","430405":"珠晖区","430406":"雁峰区","430407":"石鼓区","430408":"蒸湘区","430412":"南岳区","430421":"衡阳县","430422":"衡南县","430423":"衡山县","430424":"衡东县","430426":"祁东县","430481":"耒阳市","430482":"常宁市","430500":"邵阳市","430502":"双清区","430503":"大祥区","430511":"北塔区","430521":"邵东县","430522":"新邵县","430523":"邵阳县","430524":"隆回县","430525":"洞口县","430527":"绥宁县","430528":"新宁县","430529":"城步苗族自治县","430581":"武冈市","430600":"岳阳市","430602":"岳阳楼区","430603":"云溪区","430611":"君山区","430621":"岳阳县","430623":"华容县","430624":"湘阴县","430626":"平江县","430681":"汨罗市","430682":"临湘市","430700":"常德市","430702":"武陵区","430703":"鼎城区","430721":"安乡县","430722":"汉寿县","430723":"澧县","430724":"临澧县","430725":"桃源县","430726":"石门县","430781":"津市市","430800":"张家界市","430802":"永定区","430811":"武陵源区","430821":"慈利县","430822":"桑植县","430900":"益阳市","430902":"资阳区","430903":"赫山区","430921":"南县","430922":"桃江县","430923":"安化县","430981":"沅江市","431000":"郴州市","431002":"北湖区","431003":"苏仙区","431021":"桂阳县","431022":"宜章县","431023":"永兴县","431024":"嘉禾县","431025":"临武县","431026":"汝城县","431027":"桂东县","431028":"安仁县","431081":"资兴市","431100":"永州市","431102":"零陵区","431103":"冷水滩区","431121":"祁阳县","431122":"东安县","431123":"双牌县","431124":"道县","431125":"江永县","431126":"宁远县","431127":"蓝山县","431128":"新田县","431129":"江华瑶族自治县","431200":"怀化市","431202":"鹤城区","431221":"中方县","431222":"沅陵县","431223":"辰溪县","431224":"溆浦县","431225":"会同县","431226":"麻阳苗族自治县","431227":"新晃侗族自治县","431228":"芷江侗族自治县","431229":"靖州苗族侗族自治县","431230":"通道侗族自治县","431281":"洪江市","431300":"娄底市","431302":"娄星区","431321":"双峰县","431322":"新化县","431381":"冷水江市","431382":"涟源市","433100":"湘西土家族苗族自治州","433101":"吉首市","433122":"泸溪县","433123":"凤凰县","433124":"花垣县","433125":"保靖县","433126":"古丈县","433127":"永顺县","433130":"龙山县","440000":"广东省","440100":"广州市","440103":"荔湾区","440104":"越秀区","440105":"海珠区","440106":"天河区","440111":"白云区","440112":"黄埔区","440113":"番禺区","440114":"花都区","440115":"南沙区","440117":"从化区","440118":"增城区","440200":"韶关市","440203":"武江区","440204":"浈江区","440205":"曲江区","440222":"始兴县","440224":"仁化县","440229":"翁源县","440232":"乳源瑶族自治县","440233":"新丰县","440281":"乐昌市","440282":"南雄市","440300":"深圳市","440303":"罗湖区","440304":"福田区","440305":"南山区","440306":"宝安区","440307":"龙岗区","440308":"盐田区","440309":"龙华区","440310":"坪山区","440400":"珠海市","440402":"香洲区","440403":"斗门区","440404":"金湾区","440500":"汕头市","440507":"龙湖区","440511":"金平区","440512":"濠江区","440513":"潮阳区","440514":"潮南区","440515":"澄海区","440523":"南澳县","440600":"佛山市","440604":"禅城区","440605":"南海区","440606":"顺德区","440607":"三水区","440608":"高明区","440700":"江门市","440703":"蓬江区","440704":"江海区","440705":"新会区","440781":"台山市","440783":"开平市","440784":"鹤山市","440785":"恩平市","440800":"湛江市","440802":"赤坎区","440803":"霞山区","440804":"坡头区","440811":"麻章区","440823":"遂溪县","440825":"徐闻县","440881":"廉江市","440882":"雷州市","440883":"吴川市","440900":"茂名市","440902":"茂南区","440904":"电白区","440981":"高州市","440982":"化州市","440983":"信宜市","441200":"肇庆市","441202":"端州区","441203":"鼎湖区","441204":"高要区","441223":"广宁县","441224":"怀集县","441225":"封开县","441226":"德庆县","441284":"四会市","441300":"惠州市","441302":"惠城区","441303":"惠阳区","441322":"博罗县","441323":"惠东县","441324":"龙门县","441400":"梅州市","441402":"梅江区","441403":"梅县区","441422":"大埔县","441423":"丰顺县","441424":"五华县","441426":"平远县","441427":"蕉岭县","441481":"兴宁市","441500":"汕尾市","441502":"城区","441521":"海丰县","441523":"陆河县","441581":"陆丰市","441600":"河源市","441602":"源城区","441621":"紫金县","441622":"龙川县","441623":"连平县","441624":"和平县","441625":"东源县","441700":"阳江市","441702":"江城区","441704":"阳东区","441721":"阳西县","441781":"阳春市","441800":"清远市","441802":"清城区","441803":"清新区","441821":"佛冈县","441823":"阳山县","441825":"连山壮族瑶族自治县","441826":"连南瑶族自治县","441881":"英德市","441882":"连州市","441900":"东莞市","442000":"中山市","445100":"潮州市","445102":"湘桥区","445103":"潮安区","445122":"饶平县","445200":"揭阳市","445202":"榕城区","445203":"揭东区","445222":"揭西县","445224":"惠来县","445281":"普宁市","445300":"云浮市","445302":"云城区","445303":"云安区","445321":"新兴县","445322":"郁南县","445381":"罗定市","450000":"广西壮族自治区","450100":"南宁市","450102":"兴宁区","450103":"青秀区","450105":"江南区","450107":"西乡塘区","450108":"良庆区","450109":"邕宁区","450110":"武鸣区","450123":"隆安县","450124":"马山县","450125":"上林县","450126":"宾阳县","450127":"横县","450200":"柳州市","450202":"城中区","450203":"鱼峰区","450204":"柳南区","450205":"柳北区","450206":"柳江区","450222":"柳城县","450223":"鹿寨县","450224":"融安县","450225":"融水苗族自治县","450226":"三江侗族自治县","450300":"桂林市","450302":"秀峰区","450303":"叠彩区","450304":"象山区","450305":"七星区","450311":"雁山区","450312":"临桂区","450321":"阳朔县","450323":"灵川县","450324":"全州县","450325":"兴安县","450326":"永福县","450327":"灌阳县","450328":"龙胜各族自治县","450329":"资源县","450330":"平乐县","450331":"荔浦县","450332":"恭城瑶族自治县","450400":"梧州市","450403":"万秀区","450405":"长洲区","450406":"龙圩区","450421":"苍梧县","450422":"藤县","450423":"蒙山县","450481":"岑溪市","450500":"北海市","450502":"海城区","450503":"银海区","450512":"铁山港区","450521":"合浦县","450600":"防城港市","450602":"港口区","450603":"防城区","450621":"上思县","450681":"东兴市","450700":"钦州市","450702":"钦南区","450703":"钦北区","450721":"灵山县","450722":"浦北县","450800":"贵港市","450802":"港北区","450803":"港南区","450804":"覃塘区","450821":"平南县","450881":"桂平市","450900":"玉林市","450902":"玉州区","450903":"福绵区","450921":"容县","450922":"陆川县","450923":"博白县","450924":"兴业县","450981":"北流市","451000":"百色市","451002":"右江区","451021":"田阳县","451022":"田东县","451023":"平果县","451024":"德保县","451026":"那坡县","451027":"凌云县","451028":"乐业县","451029":"田林县","451030":"西林县","451031":"隆林各族自治县","451081":"靖西市","451100":"贺州市","451102":"八步区","451103":"平桂区","451121":"昭平县","451122":"钟山县","451123":"富川瑶族自治县","451200":"河池市","451202":"金城江区","451203":"宜州区","451221":"南丹县","451222":"天峨县","451223":"凤山县","451224":"东兰县","451225":"罗城仫佬族自治县","451226":"环江毛南族自治县","451227":"巴马瑶族自治县","451228":"都安瑶族自治县","451229":"大化瑶族自治县","451300":"来宾市","451302":"兴宾区","451321":"忻城县","451322":"象州县","451323":"武宣县","451324":"金秀瑶族自治县","451381":"合山市","451400":"崇左市","451402":"江州区","451421":"扶绥县","451422":"宁明县","451423":"龙州县","451424":"大新县","451425":"天等县","451481":"凭祥市","460000":"海南省","460100":"海口市","460105":"秀英区","460106":"龙华区","460107":"琼山区","460108":"美兰区","460200":"三亚市","460202":"海棠区","460203":"吉阳区","460204":"天涯区","460205":"崖州区","460300":"三沙市","460321":"西沙群岛","460322":"南沙群岛","460323":"中沙群岛","460324":"永乐群岛","460400":"儋州市","469001":"五指山市","469002":"琼海市","469005":"文昌市","469006":"万宁市","469007":"东方市","469021":"定安县","469022":"屯昌县","469023":"澄迈县","469024":"临高县","469025":"白沙黎族自治县","469026":"昌江黎族自治县","469027":"乐东黎族自治县","469028":"陵水黎族自治县","469029":"保亭黎族苗族自治县","469030":"琼中黎族苗族自治县","500000":"重庆市","500100":"重庆市","500101":"万州区","500102":"涪陵区","500103":"渝中区","500104":"大渡口区","500105":"江北区","500106":"沙坪坝区","500107":"九龙坡区","500108":"南岸区","500109":"北碚区","500110":"綦江区","500111":"大足区","500112":"渝北区","500113":"巴南区","500114":"黔江区","500115":"长寿区","500116":"江津区","500117":"合川区","500118":"永川区","500119":"南川区","500120":"璧山区","500151":"铜梁区","500152":"潼南区","500153":"荣昌区","500154":"开州区","500155":"梁平区","500156":"武隆区","500229":"城口县","500230":"丰都县","500231":"垫江县","500233":"忠县","500235":"云阳县","500236":"奉节县","500237":"巫山县","500238":"巫溪县","500240":"石柱土家族自治县","500241":"秀山土家族苗族自治县","500242":"酉阳土家族苗族自治县","500243":"彭水苗族土家族自治县","510000":"四川省","510100":"成都市","510104":"锦江区","510105":"青羊区","510106":"金牛区","510107":"武侯区","510108":"成华区","510112":"龙泉驿区","510113":"青白江区","510114":"新都区","510115":"温江区","510116":"双流区","510117":"郫都区","510121":"金堂县","510129":"大邑县","510131":"蒲江县","510132":"新津县","510181":"都江堰市","510182":"彭州市","510183":"邛崃市","510184":"崇州市","510185":"简阳市","510300":"自贡市","510302":"自流井区","510303":"贡井区","510304":"大安区","510311":"沿滩区","510321":"荣县","510322":"富顺县","510400":"攀枝花市","510402":"东区","510403":"西区","510411":"仁和区","510421":"米易县","510422":"盐边县","510500":"泸州市","510502":"江阳区","510503":"纳溪区","510504":"龙马潭区","510521":"泸县","510522":"合江县","510524":"叙永县","510525":"古蔺县","510600":"德阳市","510603":"旌阳区","510623":"中江县","510626":"罗江县","510681":"广汉市","510682":"什邡市","510683":"绵竹市","510700":"绵阳市","510703":"涪城区","510704":"游仙区","510705":"安州区","510722":"三台县","510723":"盐亭县","510725":"梓潼县","510726":"北川羌族自治县","510727":"平武县","510781":"江油市","510800":"广元市","510802":"利州区","510811":"昭化区","510812":"朝天区","510821":"旺苍县","510822":"青川县","510823":"剑阁县","510824":"苍溪县","510900":"遂宁市","510903":"船山区","510904":"安居区","510921":"蓬溪县","510922":"射洪县","510923":"大英县","511000":"内江市","511002":"市中区","511011":"东兴区","511024":"威远县","511025":"资中县","511083":"隆昌市","511100":"乐山市","511102":"市中区","511111":"沙湾区","511112":"五通桥区","511113":"金口河区","511123":"犍为县","511124":"井研县","511126":"夹江县","511129":"沐川县","511132":"峨边彝族自治县","511133":"马边彝族自治县","511181":"峨眉山市","511300":"南充市","511302":"顺庆区","511303":"高坪区","511304":"嘉陵区","511321":"南部县","511322":"营山县","511323":"蓬安县","511324":"仪陇县","511325":"西充县","511381":"阆中市","511400":"眉山市","511402":"东坡区","511403":"彭山区","511421":"仁寿县","511423":"洪雅县","511424":"丹棱县","511425":"青神县","511500":"宜宾市","511502":"翠屏区","511503":"南溪区","511521":"宜宾县","511523":"江安县","511524":"长宁县","511525":"高县","511526":"珙县","511527":"筠连县","511528":"兴文县","511529":"屏山县","511600":"广安市","511602":"广安区","511603":"前锋区","511621":"岳池县","511622":"武胜县","511623":"邻水县","511681":"华蓥市","511700":"达州市","511702":"通川区","511703":"达川区","511722":"宣汉县","511723":"开江县","511724":"大竹县","511725":"渠县","511781":"万源市","511800":"雅安市","511802":"雨城区","511803":"名山区","511822":"荥经县","511823":"汉源县","511824":"石棉县","511825":"天全县","511826":"芦山县","511827":"宝兴县","511900":"巴中市","511902":"巴州区","511903":"恩阳区","511921":"通江县","511922":"南江县","511923":"平昌县","512000":"资阳市","512002":"雁江区","512021":"安岳县","512022":"乐至县","513200":"阿坝藏族羌族自治州","513201":"马尔康市","513221":"汶川县","513222":"理县","513223":"茂县","513224":"松潘县","513225":"九寨沟县","513226":"金川县","513227":"小金县","513228":"黑水县","513230":"壤塘县","513231":"阿坝县","513232":"若尔盖县","513233":"红原县","513300":"甘孜藏族自治州","513301":"康定市","513322":"泸定县","513323":"丹巴县","513324":"九龙县","513325":"雅江县","513326":"道孚县","513327":"炉霍县","513328":"甘孜县","513329":"新龙县","513330":"德格县","513331":"白玉县","513332":"石渠县","513333":"色达县","513334":"理塘县","513335":"巴塘县","513336":"乡城县","513337":"稻城县","513338":"得荣县","513400":"凉山彝族自治州","513401":"西昌市","513422":"木里藏族自治县","513423":"盐源县","513424":"德昌县","513425":"会理县","513426":"会东县","513427":"宁南县","513428":"普格县","513429":"布拖县","513430":"金阳县","513431":"昭觉县","513432":"喜德县","513433":"冕宁县","513434":"越西县","513435":"甘洛县","513436":"美姑县","513437":"雷波县","520000":"贵州省","520100":"贵阳市","520102":"南明区","520103":"云岩区","520111":"花溪区","520112":"乌当区","520113":"白云区","520115":"观山湖区","520121":"开阳县","520122":"息烽县","520123":"修文县","520181":"清镇市","520200":"六盘水市","520201":"钟山区","520203":"六枝特区","520221":"水城县","520281":"盘州市","520300":"遵义市","520302":"红花岗区","520303":"汇川区","520304":"播州区","520322":"桐梓县","520323":"绥阳县","520324":"正安县","520325":"道真仡佬族苗族自治县","520326":"务川仡佬族苗族自治县","520327":"凤冈县","520328":"湄潭县","520329":"余庆县","520330":"习水县","520381":"赤水市","520382":"仁怀市","520400":"安顺市","520402":"西秀区","520403":"平坝区","520422":"普定县","520423":"镇宁布依族苗族自治县","520424":"关岭布依族苗族自治县","520425":"紫云苗族布依族自治县","520500":"毕节市","520502":"七星关区","520521":"大方县","520522":"黔西县","520523":"金沙县","520524":"织金县","520525":"纳雍县","520526":"威宁彝族回族苗族自治县","520527":"赫章县","520600":"铜仁市","520602":"碧江区","520603":"万山区","520621":"江口县","520622":"玉屏侗族自治县","520623":"石阡县","520624":"思南县","520625":"印江土家族苗族自治县","520626":"德江县","520627":"沿河土家族自治县","520628":"松桃苗族自治县","522300":"黔西南布依族苗族自治州","522301":"兴义市","522322":"兴仁县","522323":"普安县","522324":"晴隆县","522325":"贞丰县","522326":"望谟县","522327":"册亨县","522328":"安龙县","522600":"黔东南苗族侗族自治州","522601":"凯里市","522622":"黄平县","522623":"施秉县","522624":"三穗县","522625":"镇远县","522626":"岑巩县","522627":"天柱县","522628":"锦屏县","522629":"剑河县","522630":"台江县","522631":"黎平县","522632":"榕江县","522633":"从江县","522634":"雷山县","522635":"麻江县","522636":"丹寨县","522700":"黔南布依族苗族自治州","522701":"都匀市","522702":"福泉市","522722":"荔波县","522723":"贵定县","522725":"瓮安县","522726":"独山县","522727":"平塘县","522728":"罗甸县","522729":"长顺县","522730":"龙里县","522731":"惠水县","522732":"三都水族自治县","530000":"云南省","530100":"昆明市","530102":"五华区","530103":"盘龙区","530111":"官渡区","530112":"西山区","530113":"东川区","530114":"呈贡区","530115":"晋宁区","530124":"富民县","530125":"宜良县","530126":"石林彝族自治县","530127":"嵩明县","530128":"禄劝彝族苗族自治县","530129":"寻甸回族彝族自治县","530181":"安宁市","530300":"曲靖市","530302":"麒麟区","530303":"沾益区","530321":"马龙县","530322":"陆良县","530323":"师宗县","530324":"罗平县","530325":"富源县","530326":"会泽县","530381":"宣威市","530400":"玉溪市","530402":"红塔区","530403":"江川区","530422":"澄江县","530423":"通海县","530424":"华宁县","530425":"易门县","530426":"峨山彝族自治县","530427":"新平彝族傣族自治县","530428":"元江哈尼族彝族傣族自治县","530500":"保山市","530502":"隆阳区","530521":"施甸县","530523":"龙陵县","530524":"昌宁县","530581":"腾冲市","530600":"昭通市","530602":"昭阳区","530621":"鲁甸县","530622":"巧家县","530623":"盐津县","530624":"大关县","530625":"永善县","530626":"绥江县","530627":"镇雄县","530628":"彝良县","530629":"威信县","530630":"水富县","530700":"丽江市","530702":"古城区","530721":"玉龙纳西族自治县","530722":"永胜县","530723":"华坪县","530724":"宁蒗彝族自治县","530800":"普洱市","530802":"思茅区","530821":"宁洱哈尼族彝族自治县","530822":"墨江哈尼族自治县","530823":"景东彝族自治县","530824":"景谷傣族彝族自治县","530825":"镇沅彝族哈尼族拉祜族自治县","530826":"江城哈尼族彝族自治县","530827":"孟连傣族拉祜族佤族自治县","530828":"澜沧拉祜族自治县","530829":"西盟佤族自治县","530900":"临沧市","530902":"临翔区","530921":"凤庆县","530922":"云县","530923":"永德县","530924":"镇康县","530925":"双江拉祜族佤族布朗族傣族自治县","530926":"耿马傣族佤族自治县","530927":"沧源佤族自治县","532300":"楚雄彝族自治州","532301":"楚雄市","532322":"双柏县","532323":"牟定县","532324":"南华县","532325":"姚安县","532326":"大姚县","532327":"永仁县","532328":"元谋县","532329":"武定县","532331":"禄丰县","532500":"红河哈尼族彝族自治州","532501":"个旧市","532502":"开远市","532503":"蒙自市","532504":"弥勒市","532523":"屏边苗族自治县","532524":"建水县","532525":"石屏县","532527":"泸西县","532528":"元阳县","532529":"红河县","532530":"金平苗族瑶族傣族自治县","532531":"绿春县","532532":"河口瑶族自治县","532600":"文山壮族苗族自治州","532601":"文山市","532622":"砚山县","532623":"西畴县","532624":"麻栗坡县","532625":"马关县","532626":"丘北县","532627":"广南县","532628":"富宁县","532800":"西双版纳傣族自治州","532801":"景洪市","532822":"勐海县","532823":"勐腊县","532900":"大理白族自治州","532901":"大理市","532922":"漾濞彝族自治县","532923":"祥云县","532924":"宾川县","532925":"弥渡县","532926":"南涧彝族自治县","532927":"巍山彝族回族自治县","532928":"永平县","532929":"云龙县","532930":"洱源县","532931":"剑川县","532932":"鹤庆县","533100":"德宏傣族景颇族自治州","533102":"瑞丽市","533103":"芒市","533122":"梁河县","533123":"盈江县","533124":"陇川县","533300":"怒江傈僳族自治州","533301":"泸水市","533323":"福贡县","533324":"贡山独龙族怒族自治县","533325":"兰坪白族普米族自治县","533400":"迪庆藏族自治州","533401":"香格里拉市","533422":"德钦县","533423":"维西傈僳族自治县","540000":"西藏自治区","540100":"拉萨市","540102":"城关区","540103":"堆龙德庆区","540121":"林周县","540122":"当雄县","540123":"尼木县","540124":"曲水县","540126":"达孜县","540127":"墨竹工卡县","540200":"日喀则市","540202":"桑珠孜区","540221":"南木林县","540222":"江孜县","540223":"定日县","540224":"萨迦县","540225":"达孜区","540226":"昂仁县","540227":"谢通门县","540228":"白朗县","540229":"仁布县","540230":"康马县","540231":"定结县","540232":"仲巴县","540233":"亚东县","540234":"吉隆县","540235":"聂拉木县","540236":"萨嘎县","540237":"岗巴县","540300":"昌都市","540302":"卡若区","540321":"江达县","540322":"贡觉县","540323":"类乌齐县","540324":"丁青县","540325":"察雅县","540326":"八宿县","540327":"左贡县","540328":"芒康县","540329":"洛隆县","540330":"边坝县","540400":"林芝市","540402":"巴宜区","540421":"工布江达县","540422":"米林县","540423":"墨脱县","540424":"波密县","540425":"察隅县","540426":"朗县","540500":"山南市","540502":"乃东区","540521":"扎囊县","540522":"贡嘎县","540523":"桑日县","540524":"琼结县","540525":"曲松县","540526":"措美县","540527":"洛扎县","540528":"加查县","540529":"隆子县","540530":"错那县","540531":"浪卡子县","542400":"那曲市","542421":"色尼区","542422":"嘉黎县","542423":"比如县","542424":"聂荣县","542425":"安多县","542426":"申扎县","542427":"索县","542428":"班戈县","542429":"巴青县","542430":"尼玛县","542431":"双湖县","542500":"阿里地区","542521":"普兰县","542522":"札达县","542523":"噶尔县","542524":"日土县","542525":"革吉县","542526":"改则县","542527":"措勤县","610000":"陕西省","610100":"西安市","610102":"新城区","610103":"碑林区","610104":"莲湖区","610111":"灞桥区","610112":"未央区","610113":"雁塔区","610114":"阎良区","610115":"临潼区","610116":"长安区","610117":"高陵区","610118":"鄠邑区","610122":"蓝田县","610124":"周至县","610200":"铜川市","610202":"王益区","610203":"印台区","610204":"耀州区","610222":"宜君县","610300":"宝鸡市","610302":"渭滨区","610303":"金台区","610304":"陈仓区","610322":"凤翔县","610323":"岐山县","610324":"扶风县","610326":"眉县","610327":"陇县","610328":"千阳县","610329":"麟游县","610330":"凤县","610331":"太白县","610400":"咸阳市","610402":"秦都区","610403":"杨陵区","610404":"渭城区","610422":"三原县","610423":"泾阳县","610424":"乾县","610425":"礼泉县","610426":"永寿县","610427":"彬县","610428":"长武县","610429":"旬邑县","610430":"淳化县","610431":"武功县","610481":"兴平市","610500":"渭南市","610502":"临渭区","610503":"华州区","610522":"潼关县","610523":"大荔县","610524":"合阳县","610525":"澄城县","610526":"蒲城县","610527":"白水县","610528":"富平县","610581":"韩城市","610582":"华阴市","610600":"延安市","610602":"宝塔区","610603":"安塞区","610621":"延长县","610622":"延川县","610623":"子长县","610625":"志丹县","610626":"吴起县","610627":"甘泉县","610628":"富县","610629":"洛川县","610630":"宜川县","610631":"黄龙县","610632":"黄陵县","610700":"汉中市","610702":"汉台区","610721":"南郑区","610722":"城固县","610723":"洋县","610724":"西乡县","610725":"勉县","610726":"宁强县","610727":"略阳县","610728":"镇巴县","610729":"留坝县","610730":"佛坪县","610800":"榆林市","610802":"榆阳区","610803":"横山区","610822":"府谷县","610824":"靖边县","610825":"定边县","610826":"绥德县","610827":"米脂县","610828":"佳县","610829":"吴堡县","610830":"清涧县","610831":"子洲县","610881":"神木市","610900":"安康市","610902":"汉滨区","610921":"汉阴县","610922":"石泉县","610923":"宁陕县","610924":"紫阳县","610925":"岚皋县","610926":"平利县","610927":"镇坪县","610928":"旬阳县","610929":"白河县","611000":"商洛市","611002":"商州区","611021":"洛南县","611022":"丹凤县","611023":"商南县","611024":"山阳县","611025":"镇安县","611026":"柞水县","620000":"甘肃省","620100":"兰州市","620102":"城关区","620103":"七里河区","620104":"西固区","620105":"安宁区","620111":"红古区","620121":"永登县","620122":"皋兰县","620123":"榆中县","620200":"嘉峪关市","620300":"金昌市","620302":"金川区","620321":"永昌县","620400":"白银市","620402":"白银区","620403":"平川区","620421":"靖远县","620422":"会宁县","620423":"景泰县","620500":"天水市","620502":"秦州区","620503":"麦积区","620521":"清水县","620522":"秦安县","620523":"甘谷县","620524":"武山县","620525":"张家川回族自治县","620600":"武威市","620602":"凉州区","620621":"民勤县","620622":"古浪县","620623":"天祝藏族自治县","620700":"张掖市","620702":"甘州区","620721":"肃南裕固族自治县","620722":"民乐县","620723":"临泽县","620724":"高台县","620725":"山丹县","620800":"平凉市","620802":"崆峒区","620821":"泾川县","620822":"灵台县","620823":"崇信县","620824":"华亭县","620825":"庄浪县","620826":"静宁县","620900":"酒泉市","620902":"肃州区","620921":"金塔县","620922":"瓜州县","620923":"肃北蒙古族自治县","620924":"阿克塞哈萨克族自治县","620981":"玉门市","620982":"敦煌市","621000":"庆阳市","621002":"西峰区","621021":"庆城县","621022":"环县","621023":"华池县","621024":"合水县","621025":"正宁县","621026":"宁县","621027":"镇原县","621100":"定西市","621102":"安定区","621121":"通渭县","621122":"陇西县","621123":"渭源县","621124":"临洮县","621125":"漳县","621126":"岷县","621200":"陇南市","621202":"武都区","621221":"成县","621222":"文县","621223":"宕昌县","621224":"康县","621225":"西和县","621226":"礼县","621227":"徽县","621228":"两当县","622900":"临夏回族自治州","622901":"临夏市","622921":"临夏县","622922":"康乐县","622923":"永靖县","622924":"广河县","622925":"和政县","622926":"东乡族自治县","622927":"积石山保安族东乡族撒拉族自治县","623000":"甘南藏族自治州","623001":"合作市","623021":"临潭县","623022":"卓尼县","623023":"舟曲县","623024":"迭部县","623025":"玛曲县","623026":"碌曲县","623027":"夏河县","630000":"青海省","630100":"西宁市","630102":"城东区","630103":"城中区","630104":"城西区","630105":"城北区","630121":"大通回族土族自治县","630122":"湟中县","630123":"湟源县","630200":"海东市","630202":"乐都区","630203":"平安区","630222":"民和回族土族自治县","630223":"互助土族自治县","630224":"化隆回族自治县","630225":"循化撒拉族自治县","632200":"海北藏族自治州","632221":"门源回族自治县","632222":"祁连县","632223":"海晏县","632224":"刚察县","632300":"黄南藏族自治州","632321":"同仁县","632322":"尖扎县","632323":"泽库县","632324":"河南蒙古族自治县","632500":"海南藏族自治州","632521":"共和县","632522":"同德县","632523":"贵德县","632524":"兴海县","632525":"贵南县","632600":"果洛藏族自治州","632621":"玛沁县","632622":"班玛县","632623":"甘德县","632624":"达日县","632625":"久治县","632626":"玛多县","632700":"玉树藏族自治州","632701":"玉树市","632722":"杂多县","632723":"称多县","632724":"治多县","632725":"囊谦县","632726":"曲麻莱县","632800":"海西蒙古族藏族自治州","632801":"格尔木市","632802":"德令哈市","632821":"乌兰县","632822":"都兰县","632823":"天峻县","640000":"宁夏回族自治区","640100":"银川市","640104":"兴庆区","640105":"西夏区","640106":"金凤区","640121":"永宁县","640122":"贺兰县","640181":"灵武市","640200":"石嘴山市","640202":"大武口区","640205":"惠农区","640221":"平罗县","640300":"吴忠市","640302":"利通区","640303":"红寺堡区","640323":"盐池县","640324":"同心县","640381":"青铜峡市","640400":"固原市","640402":"原州区","640422":"西吉县","640423":"隆德县","640424":"泾源县","640425":"彭阳县","640500":"中卫市","640502":"沙坡头区","640521":"中宁县","640522":"海原县","650000":"新疆维吾尔自治区","650100":"乌鲁木齐市","650102":"天山区","650103":"沙依巴克区","650104":"新市区","650105":"水磨沟区","650106":"头屯河区","650107":"达坂城区","650109":"米东区","650121":"乌鲁木齐县","650200":"克拉玛依市","650202":"独山子区","650203":"克拉玛依区","650204":"白碱滩区","650205":"乌尔禾区","650400":"吐鲁番市","650402":"高昌区","650421":"鄯善县","650422":"托克逊县","650500":"哈密市","650502":"伊州区","650521":"巴里坤哈萨克自治县","650522":"伊吾县","652300":"昌吉回族自治州","652301":"昌吉市","652302":"阜康市","652323":"呼图壁县","652324":"玛纳斯县","652325":"奇台县","652327":"吉木萨尔县","652328":"木垒哈萨克自治县","652700":"博尔塔拉蒙古自治州","652701":"博乐市","652702":"阿拉山口市","652722":"精河县","652723":"温泉县","652800":"巴音郭楞蒙古自治州","652801":"库尔勒市","652822":"轮台县","652823":"尉犁县","652824":"若羌县","652825":"且末县","652826":"焉耆回族自治县","652827":"和静县","652828":"和硕县","652829":"博湖县","652900":"阿克苏地区","652901":"阿克苏市","652922":"温宿县","652923":"库车县","652924":"沙雅县","652925":"新和县","652926":"拜城县","652927":"乌什县","652928":"阿瓦提县","652929":"柯坪县","653000":"克孜勒苏柯尔克孜自治州","653001":"阿图什市","653022":"阿克陶县","653023":"阿合奇县","653024":"乌恰县","653100":"喀什地区","653101":"喀什市","653121":"疏附县","653122":"疏勒县","653123":"英吉沙县","653124":"泽普县","653125":"莎车县","653126":"叶城县","653127":"麦盖提县","653128":"岳普湖县","653129":"伽师县","653130":"巴楚县","653131":"塔什库尔干塔吉克自治县","653200":"和田地区","653201":"和田市","653221":"和田县","653222":"墨玉县","653223":"皮山县","653224":"洛浦县","653225":"策勒县","653226":"于田县","653227":"民丰县","654000":"伊犁哈萨克自治州","654002":"伊宁市","654003":"奎屯市","654004":"霍尔果斯市","654021":"伊宁县","654022":"察布查尔锡伯自治县","654023":"霍城县","654024":"巩留县","654025":"新源县","654026":"昭苏县","654027":"特克斯县","654028":"尼勒克县","654200":"塔城地区","654201":"塔城市","654202":"乌苏市","654221":"额敏县","654223":"沙湾县","654224":"托里县","654225":"裕民县","654226":"和布克赛尔蒙古自治县","654300":"阿勒泰地区","654301":"阿勒泰市","654321":"布尔津县","654322":"富蕴县","654323":"福海县","654324":"哈巴河县","654325":"青河县","654326":"吉木乃县","659001":"石河子市","659002":"阿拉尔市","659003":"图木舒克市","659004":"五家渠市","659005":"北屯市","659006":"铁门关市","659007":"双河市","659008":"可克达拉市","659009":"昆玉市","710000":"台湾省","710100":"台北市","710101":"中正区","710102":"大同区","710103":"中山区","710104":"万华区","710105":"信义区","710106":"松山区","710107":"大安区","710108":"南港区","710109":"北投区","710110":"内湖区","710111":"士林区","710112":"文山区","710200":"新北市","710201":"板桥区","710202":"土城区","710203":"新庄区","710204":"新店区","710205":"深坑区","710206":"石碇区","710207":"坪林区","710208":"乌来区","710209":"五股区","710210":"八里区","710211":"林口区","710212":"淡水区","710213":"中和区","710214":"永和区","710215":"三重区","710216":"芦洲区","710217":"泰山区","710218":"树林区","710219":"莺歌区","710220":"三峡区","710221":"汐止区","710222":"金山区","710223":"万里区","710224":"三芝区","710225":"石门区","710226":"瑞芳区","710227":"贡寮区","710228":"双溪区","710229":"平溪区","710300":"桃园市","710301":"桃园区","710302":"中坜区","710303":"平镇区","710304":"八德区","710305":"杨梅区","710306":"芦竹区","710307":"大溪区","710308":"龙潭区","710309":"龟山区","710310":"大园区","710311":"观音区","710312":"新屋区","710313":"复兴区","710400":"台中市","710401":"中区","710402":"东区","710403":"西区","710404":"南区","710405":"北区","710406":"西屯区","710407":"南屯区","710408":"北屯区","710409":"丰原区","710410":"大里区","710411":"太平区","710412":"东势区","710413":"大甲区","710414":"清水区","710415":"沙鹿区","710416":"梧栖区","710417":"后里区","710418":"神冈区","710419":"潭子区","710420":"大雅区","710421":"新小区","710422":"石冈区","710423":"外埔区","710424":"大安区","710425":"乌日区","710426":"大肚区","710427":"龙井区","710428":"雾峰区","710429":"和平区","710500":"台南市","710501":"中西区","710502":"东区","710503":"南区","710504":"北区","710505":"安平区","710506":"安南区","710507":"永康区","710508":"归仁区","710509":"新化区","710510":"左镇区","710511":"玉井区","710512":"楠西区","710513":"南化区","710514":"仁德区","710515":"关庙区","710516":"龙崎区","710517":"官田区","710518":"麻豆区","710519":"佳里区","710520":"西港区","710521":"七股区","710522":"将军区","710523":"学甲区","710524":"北门区","710525":"新营区","710526":"后壁区","710527":"白河区","710528":"东山区","710529":"六甲区","710530":"下营区","710531":"柳营区","710532":"盐水区","710533":"善化区","710534":"大内区","710535":"山上区","710536":"新市区","710537":"安定区","710600":"高雄市","710601":"楠梓区","710602":"左营区","710603":"鼓山区","710604":"三民区","710605":"盐埕区","710606":"前金区","710607":"新兴区","710608":"苓雅区","710609":"前镇区","710610":"旗津区","710611":"小港区","710612":"凤山区","710613":"大寮区","710614":"鸟松区","710615":"林园区","710616":"仁武区","710617":"大树区","710618":"大社区","710619":"冈山区","710620":"路竹区","710621":"桥头区","710622":"梓官区","710623":"弥陀区","710624":"永安区","710625":"燕巢区","710626":"阿莲区","710627":"茄萣区","710628":"湖内区","710629":"旗山区","710630":"美浓区","710631":"内门区","710632":"杉林区","710633":"甲仙区","710634":"六龟区","710635":"茂林区","710636":"桃源区","710637":"那玛夏区","710700":"基隆市","710701":"中正区","710702":"七堵区","710703":"暖暖区","710704":"仁爱区","710705":"中山区","710706":"安乐区","710707":"信义区","710800":"新竹市","710801":"东区","710802":"北区","710803":"香山区","710900":"嘉义市","710901":"东区","710902":"西区","719001":"宜兰县","719002":"新竹县","719003":"苗栗县","719004":"彰化县","719005":"南投县","719006":"嘉义县","719007":"云林县","719008":"屏东县","719009":"台东县","719010":"花莲县","719011":"澎湖县","719012":"金门县","719013":"连江县","810000":"香港特别行政区","810101":"中西区","810102":"湾仔区","810103":"东区","810104":"南区","810105":"油尖旺区","810106":"深水埗区","810107":"九龙城区","810108":"黄大仙区","810109":"观塘区","810110":"北区","810111":"大埔区","810112":"沙田区","810113":"西贡区","810114":"荃湾区","810115":"屯门区","810116":"元朗区","810117":"葵青区","810118":"离岛区","820000":"澳门特别行政区","820101":"花地玛堂区","820102":"圣安多尼堂区","820103":"大堂区","820104":"望德堂区","820105":"风顺堂区","820106":"嘉模堂区","820107":"圣方济各堂区","820108":"路氹城","820109":"澳门新城"}
diff --git a/src/base-ui/ZyEditor/src/zy-editor.vue b/src/base-ui/ZyEditor/src/zy-editor.vue
index 637e2c9..5823d8d 100644
--- a/src/base-ui/ZyEditor/src/zy-editor.vue
+++ b/src/base-ui/ZyEditor/src/zy-editor.vue
@@ -19,70 +19,69 @@
 </template>
 
 <script>
-import Vue from 'vue'
-import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
+  import Vue from 'vue'
+  import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 
-export default Vue.extend({
-  name: 'ZyEditor',
-  components: { Editor, Toolbar },
-  props: {
-    mode: {
-      type: String,
-      default: 'simple',
-      validator: (value) => {
-        return ['default', 'simple'].includes(value)
+  export default Vue.extend({
+    name: 'ZyEditor',
+    components: { Editor, Toolbar },
+    props: {
+      mode: {
+        type: String,
+        default: 'simple',
+        validator: (value) => {
+          return ['default', 'simple'].includes(value)
+        }
+      },
+      itemStyle: {
+        type: String,
+        default: ''
+      },
+      editorConfig: {
+        type: Object,
+        default: () => ({ autoFocus: false })
+      },
+      toolbarConfig: {
+        type: Object,
+        default: () => {}
+      },
+      value: {
+        type: String,
+        default: ''
       }
     },
-    itemStyle: {
-      type: String,
-      default: ''
-    },
-    editorConfig: {
-      type: Object,
-      default: () => ({ autoFocus: false })
+    data() {
+      return {
+        editor: null,
+        html: this.value
+        // html: "<p>hello</p>",
+        // toolbarConfig: {}
+        // editorConfig: { autoFocus: false }
+        // mode: 'simple' // default or 'simple'
+      }
     },
-    toolbarConfig: {
-      type: Object,
-      default: () => {}
+    watch: {
+      html(newValue) {
+        this.$emit('updata:editorValue', newValue)
+      }
     },
-    value: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      editor: null,
-      html: this.value
-      // html: "<p>hello</p>",
-      // toolbarConfig: {}
-      // editorConfig: { autoFocus: false }
-      // mode: 'simple' // default or 'simple'
-    }
-  },
-  watch: {
-    html(newValue) {
-      console.log(123)
-      this.$emit('updata:editorValue', newValue)
-    }
-  },
-  beforeDestroy() {
-    const editor = this.editor
-    if (editor == null) return
-    editor.destroy() // 组件销毁时，及时销毁编辑器
-  },
-  methods: {
-    onCreated(editor) {
-      this.editor = Object.seal(editor)
+    beforeDestroy() {
+      const editor = this.editor
+      if (editor == null) return
+      editor.destroy() // 组件销毁时，及时销毁编辑器
     },
-    onBlur(editor) {
-      if (editor.getHtml()) {
-        this.html = editor.getHtml()
-        // this.$emit('updata:editorValue', editor.getHtml())
+    methods: {
+      onCreated(editor) {
+        this.editor = Object.seal(editor)
+      },
+      onBlur(editor) {
+        if (editor.getHtml()) {
+          this.html = editor.getHtml()
+          // this.$emit('updata:editorValue', editor.getHtml())
+        }
       }
     }
-  }
-})
+  })
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/base-ui/ZyForm/src/zy-form.vue b/src/base-ui/ZyForm/src/zy-form.vue
index bc6fa82..7db767e 100644
--- a/src/base-ui/ZyForm/src/zy-form.vue
+++ b/src/base-ui/ZyForm/src/zy-form.vue
@@ -13,19 +13,24 @@
       :model="MyFormData"
     >
       <el-row class="zy-form-row">
-        <el-col v-for="item of formItems" :key="item.label" v-bind="colLayout">
+        <el-col
+          v-for="item of formItems"
+          :key="item.label"
+          v-bind="{ ...colLayout, ...item?.itemStyle }"
+        >
           <el-form-item
             :label="item.label"
             :rules="item.rules"
             :style="itemStyle"
             :prop="item.field"
+            :label-width="item?.width"
           >
             <!-- input -->
             <template
               v-if="
                 item.type === 'input' ||
-                  item.type === 'password' ||
-                  item.type === 'textarea'
+                item.type === 'password' ||
+                item.type === 'textarea'
               "
             >
               <el-input
@@ -167,7 +172,10 @@
         try {
           this.showSelectLoading = true
           let args = null
-          if (func?.[1] && typeof func[1] === 'string') {
+          // 参数存在且为字符串 过滤掉传进province的情况
+          if (func?.[1] === 'province') {
+            args = this.MyFormData[func[1]]
+          } else if (func?.[1] && typeof func[1] === 'string') {
             if (!this.MyFormData?.[func[1]]) {
               // 优化
               // 若此时还没获取到当前select 所依赖的前置请求条件 就直接跳出 不发送请求
diff --git a/src/main.js b/src/main.js
index efd6e3e..4b34f02 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,7 +13,7 @@ import * as filters from './filters' // global filters
 import './mock' // simulation data
 // font-awesome
 import 'font-awesome/css/font-awesome.css'
-// 富文本样式
+// wangEditor富文本样式
 import '@wangeditor/editor/dist/css/style.css'
 import components from '@/components'
 /*
diff --git a/src/module-hmmm/index.js b/src/module-hmmm/index.js
index 25c0833..069e2cf 100644
--- a/src/module-hmmm/index.js
+++ b/src/module-hmmm/index.js
@@ -10,7 +10,7 @@
 import { asyncRouterMap } from '@/router'
 import routerMaps from './router'
 // vuex
-// import app from './store/app'
+import app from './store/app'
 
 export default {
   install(module, store) {
@@ -21,7 +21,7 @@ export default {
     // asyncRouterMap.push(routerMaps[0])
     // 注册状态管理
     if (store !== undefined) {
-      // store.registerModule('app', app)
+      store.registerModule('QuestionApp', app)
     }
   }
 }
diff --git a/src/module-hmmm/pages/questions-new/config/formConfig.config.js b/src/module-hmmm/pages/questions-new/config/formConfig.config.js
index 6469f78..b60663a 100644
--- a/src/module-hmmm/pages/questions-new/config/formConfig.config.js
+++ b/src/module-hmmm/pages/questions-new/config/formConfig.config.js
@@ -3,7 +3,9 @@ import {
   subjectsSimple,
   directorysSimple,
   companysList,
-  tagsSimple
+  tagsSimple,
+  getCityData,
+  getDistrictData
 } from '../func'
 
 export const formConfig = {
@@ -79,9 +81,44 @@ export const formConfig = {
     },
     // 城市 ？？？
     {
-      field: 'province,city',
+      field: 'province',
       type: 'select',
       label: '城市:',
+      itemStyle: {
+        xl: 12,
+        lg: 12,
+        md: 12,
+        sm: 12,
+        xs: 12
+      },
+      rules: [
+        {
+          required: true,
+          message: '请输入城市',
+          trigger: 'blur'
+        }
+      ],
+      func: [getCityData],
+      placeholder: '请选择城市',
+      otherOptions: {
+        style: 'max-width: 200px',
+        clearable: true
+      },
+      options: []
+    },
+    {
+      field: 'city',
+      type: 'select',
+      label: '',
+      width: '0px',
+      itemStyle: {
+        xl: 12,
+        lg: 12,
+        md: 12,
+        sm: 12,
+        xs: 12
+      },
+      func: [getDistrictData, 'province'],
       rules: [
         {
           required: true,
@@ -91,9 +128,10 @@ export const formConfig = {
       ],
       placeholder: '请选择',
       otherOptions: {
-        style: 'max-width: 400px',
+        style: 'max-width: 200px',
         clearable: true
-      }
+      },
+      options: []
     },
     // 方向
     {
@@ -178,7 +216,11 @@ export const formConfig = {
       }
     },
     // 选项
-    {},
+    {
+      field: 'options',
+      type: '',
+      label: '选项'
+    },
 
     // 解析视频
     {
diff --git a/src/module-hmmm/pages/questions-new/func/getCityData.js b/src/module-hmmm/pages/questions-new/func/getCityData.js
new file mode 100644
index 0000000..174f55e
--- /dev/null
+++ b/src/module-hmmm/pages/questions-new/func/getCityData.js
@@ -0,0 +1,28 @@
+import store from '@/store'
+
+/**
+ * 将省市区数据组合成列表数据存到vuex 并返回省的选项
+ * @returns [{label:xx,value:xx}] 用于select渲染的列表
+ */
+export const getCityData = async () => {
+  try {
+    const res = await store.dispatch('getCitysData')
+    return { data: res }
+  } catch (e) {
+    console.log(e)
+  }
+}
+
+export const getDistrictData = (city) => {
+  const province = store.getters.cityData
+  const ci = province.find((item) => {
+    return item.value === city
+  })
+  const res = ci.children.map((item) => {
+    return {
+      label: item.value,
+      value: item.value
+    }
+  })
+  return { data: res }
+}
diff --git a/src/module-hmmm/pages/questions-new/func/index.js b/src/module-hmmm/pages/questions-new/func/index.js
index 4fe5d2b..16fdd33 100644
--- a/src/module-hmmm/pages/questions-new/func/index.js
+++ b/src/module-hmmm/pages/questions-new/func/index.js
@@ -1,6 +1,22 @@
+// 配置项中传入Zyform组件的方法
 import { simple as subjectsSimple } from '@/api/hmmm/subjects'
 import { simple as directorysSimple } from '@/api/hmmm/directorys'
 import { list as companysList } from '@/api/hmmm/companys'
 import { simple as tagsSimple } from '@/api/hmmm/tags'
 
-export { subjectsSimple, directorysSimple, companysList, tagsSimple }
+import { getCityData, getDistrictData } from './getCityData'
+
+// 其他一些方法
+import { add } from '@/api/hmmm/questions'
+
+// 导出配置项中使用的方法
+export {
+  subjectsSimple,
+  directorysSimple,
+  companysList,
+  tagsSimple,
+  getCityData,
+  getDistrictData
+}
+// 导出其他方法
+export { add }
diff --git a/src/module-hmmm/pages/questions-new/src/questions-new.vue b/src/module-hmmm/pages/questions-new/src/questions-new.vue
index f49626b..710ead7 100644
--- a/src/module-hmmm/pages/questions-new/src/questions-new.vue
+++ b/src/module-hmmm/pages/questions-new/src/questions-new.vue
@@ -19,7 +19,7 @@
         </template>
         <template #footer>
           <el-row type="flex" justify="center" align="middle">
-            <el-button type="primary" size="medium">
+            <el-button type="primary" size="medium" @click="btnSubmit">
               确认提交
             </el-button>
           </el-row>
@@ -30,55 +30,67 @@
 </template>
 
 <script>
-import ZyForm from '@/base-ui/ZyForm'
-import ZyEditor from '@/base-ui/ZyEditor'
-import { formConfig } from '../config/formConfig.config'
-export default {
-  name: 'QuestionsNew',
-  components: {
-    ZyForm,
-    ZyEditor
-  },
-  data() {
-    return {
-      formConfig,
-      formData: {
-        subjectID: '',
-        catalogID: '',
-        enterpriseID: '',
-        province: '',
-        city: '',
-        direction: '',
-        questionType: '',
-        difficulty: '',
-        question: '',
-        options: [],
-        videoURL: '',
-        answer: '',
-        remarks: '',
-        tags: []
+  import ZyForm from '@/base-ui/ZyForm'
+  import ZyEditor from '@/base-ui/ZyEditor'
+  import { formConfig } from '../config/formConfig.config'
+  import { comListToSelect } from '../utils/comListToSelect'
+  // eslint-disable-next-line
+  import { add } from '../func'
+  export default {
+    name: 'QuestionsNew',
+    components: {
+      ZyForm,
+      ZyEditor
+    },
+    data() {
+      return {
+        formConfig,
+        formData: {
+          subjectID: '',
+          catalogID: '',
+          enterpriseID: '',
+          province: '',
+          city: '',
+          direction: '',
+          questionType: '',
+          difficulty: '',
+          question: '',
+          options: [],
+          videoURL: '',
+          answer: '',
+          remarks: '',
+          tags: []
+        }
       }
-    }
-  },
-  mounted() {
-    // console.log(this.$refs.www)
-  },
-  methods: {
-    selectUpdateFormData({ data, field }) {
-      console.log(data)
-      this.formConfig.formItems.map((item) => {
-        if (item.field === field) {
-          item.options = data
+    },
+    mounted() {
+      // console.log(this.$refs.www)
+    },
+    methods: {
+      selectUpdateFormData({ data, field }) {
+        this.formConfig.formItems.map((item) => {
+          if (item.field === field) {
+            item.options = comListToSelect(data)
+          }
+          return item
+        })
+      },
+      async btnSubmit() {
+        console.log(this.$store.state.QuestionApp.name, '---')
+        try {
+          // await add(this.formData)
+          this.$message.success('试题录入成功')
+          // this.$router.push('/questions/list')
+        } catch (e) {
+          console.log(e)
         }
-        return item
-      })
+      }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
-.questions-new {
-  padding: 8px;
-}
+  .questions-new {
+    padding: 8px;
+  }
 </style>
diff --git a/src/module-hmmm/pages/questions-new/utils/comListToSelect.js b/src/module-hmmm/pages/questions-new/utils/comListToSelect.js
new file mode 100644
index 0000000..3947bec
--- /dev/null
+++ b/src/module-hmmm/pages/questions-new/utils/comListToSelect.js
@@ -0,0 +1,33 @@
+export const checkDataType = (data) => {
+  // 传入数组直接返回
+  if (Array.isArray(data)) return 1
+  // 传入数组为空时直接退出
+  if (!Array.isArray(data) && Object.keys(data).length === 0) return false
+  // 如果该数据符合 select 渲染规范 也不做处理
+  // if (
+  //   data.some(
+  //     (item) => Object.keys(item).length < 3 && item.value && item.label
+  //   )
+  // ) {
+  //   return 1
+  // }
+  return true
+}
+/**
+ *  处理不符合 select渲染规范的数据
+ *  @param {Array<Object>} list 一个列表数据
+ */
+export const comListToSelect = (list) => {
+  // 先检测传入的数据
+  if (!checkDataType(list)) return false
+  if (checkDataType(list) === 1) return list
+
+  if (list?.items) {
+    return list.items.map((item) => {
+      return {
+        label: item.company,
+        value: item.id
+      }
+    })
+  }
+}
diff --git a/src/module-hmmm/store/app.js b/src/module-hmmm/store/app.js
index 5d6df99..a51e0b7 100644
--- a/src/module-hmmm/store/app.js
+++ b/src/module-hmmm/store/app.js
@@ -5,14 +5,21 @@
  * @Last Modified by: hans.taozhiwei
  * @Last Modified time: 2018-04-13 16:15:33
  */
+import Axios from 'axios'
+import { chinaMapToArray } from './utils/chinaMapToArray'
+const ChinaUrl = './json/china.json'
 
 const app = {
   state: {
-    name: ''
+    name: '',
+    cityData: []
   },
   mutations: {
     SET_NAME: (state, name) => {
       state.name = name
+    },
+    SET_CITY: (state, city) => {
+      state.cityData = city
     }
   },
   actions: {
@@ -22,6 +29,22 @@ const app = {
         commit('SET_NAME', username)
         resolve()
       })
+    },
+    async getCitysData({ commit }) {
+      try {
+        const { data } = await Axios.get(ChinaUrl)
+        const res = chinaMapToArray(data)
+        commit('SET_CITY', res)
+        const arr = res.map((item) => {
+          return {
+            label: item.value,
+            value: item.value
+          }
+        })
+        return arr
+      } catch (e) {
+        console.log(e)
+      }
     }
   }
 }
diff --git a/src/module-hmmm/store/utils/chinaMapToArray.js b/src/module-hmmm/store/utils/chinaMapToArray.js
new file mode 100644
index 0000000..65c95a7
--- /dev/null
+++ b/src/module-hmmm/store/utils/chinaMapToArray.js
@@ -0,0 +1,41 @@
+/**
+ * 将请求到china 省市区名 转为数组格式数据
+ * @param {Object} options
+ * @return {Array} 数组格式的省市区
+ */
+export const chinaMapToArray = (options) => {
+  const province = []
+  const city = []
+  const block = []
+  for (const item in options) {
+    if (item.match(/0000$/)) {
+      // 省
+      province.push({ label: item, value: options[item], children: [] })
+    } else if (item.match(/00$/)) {
+      // 市
+      city.push({ label: item, value: options[item], children: [] })
+    } else {
+      // 区
+      block.push({ label: item, value: options[item] })
+    }
+  }
+  // // 分类区级
+  for (const item1 in city) {
+    for (var item2 in block) {
+      if (block[item2].label.slice(0, 4) === city[item1].label.slice(0, 4)) {
+        city[item1].children.push(block[item2])
+      }
+    }
+  }
+  // 分类市级
+  for (const index in province) {
+    for (const index1 in city) {
+      if (
+        province[index].label.slice(0, 2) === city[index1].label.slice(0, 2)
+      ) {
+        province[index].children.push(city[index1])
+      }
+    }
+  }
+  return province
+}
diff --git a/src/store/getters.js b/src/store/getters.js
index 5b3c6bf..c8481db 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -13,7 +13,8 @@ const getters = {
   setting: (state) => state.user.setting,
   permission_routers: (state) => state.permission.routers,
   addRouters: (state) => state.permission.addRouters,
-  errorLogs: (state) => state.errorLog.logs
+  errorLogs: (state) => state.errorLog.logs,
+  cityData: (state) => state.QuestionApp.cityData
 }
 
 export default getters
-- 
Gitee


From 93ba17736bbf976881bc568b43737ae9184a4723 Mon Sep 17 00:00:00 2001
From: xx <zqx123@126.com>
Date: Sun, 18 Sep 2022 20:47:16 +0800
Subject: [PATCH 37/40] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   4 +
 src/module-manage/components/menu-add.vue     |  32 ++--
 .../components/permissions-add.vue            |   3 +-
 src/module-manage/pages/menus.vue             | 139 +++++++++++++++++-
 4 files changed, 162 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index a0dddc6..0ab2df2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,10 @@ node_modules
 .env.local
 .env.*.local
 
+/src/utils/request.js
+/src/module-manage/pages/menus.vues
+/src\module-manage\components\menu-add.vue
+
 # Log files
 npm-debug.log*
 yarn-debug.log*
diff --git a/src/module-manage/components/menu-add.vue b/src/module-manage/components/menu-add.vue
index c5217a6..d422440 100644
--- a/src/module-manage/components/menu-add.vue
+++ b/src/module-manage/components/menu-add.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="add-form">
-    <el-dialog :title="text + pageTitle" :visible.sync="dialogFormVisible">
+    <el-dialog :title="text + menusTitle" :visible="dialogFormVisible" @close="handleClose">
       <el-form
         ref="formMenu"
         :rules="ruleInline"
@@ -73,7 +73,6 @@ import Utils from '@/components/TreeTable/utils/dataTranslate.js'
 let _this = []
 export default {
   name: 'Items',
-  // props: ['text', 'pageTitle', 'PermissionGroupsList',],
   props: {
     treeStructure: {
       type: Boolean,
@@ -87,12 +86,16 @@ export default {
       type: String
     },
     // eslint-disable-next-line
-    pageTitle: {
+    menusTitle: {
       type: String
     },
     // eslint-disable-next-line
     PermissionGroupsList: {
       type: Array
+    },
+    dialogFormVisible: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -135,7 +138,7 @@ export default {
       type: 'menu',
       showMenuBlock: true,
       showPointBlock: false,
-      dialogFormVisible: false,
+      // dialogFormVisible: false,
       typeStatus: false,
       notPointDataList: [],
       parentDataList: [],
@@ -170,13 +173,13 @@ export default {
   updated: function () {},
   methods: {
     // 弹层显示
-    dialogFormV() {
-      this.dialogFormVisible = true
-    },
+    // dialogFormV() {
+    //   this.$emit('update:dialogFormVisible', true)
+    // },
     // 弹层隐藏
-    dialogFormH() {
-      this.dialogFormVisible = false
-    },
+    // dialogFormH() {
+    //   this.$emit('update:dialogFormVisible', false)
+    // },
     handleChooseType() {
       if (this.type === 'menu') {
         _this.changeToMenu()
@@ -229,13 +232,17 @@ export default {
     },
     // 退出
     handleClose() {
-      this.$emit('handleCloseModal')
+      this.$emit('update:dialogFormVisible')
     },
     // 菜单和权限点选择：编辑
     handle_Edit(object) {
       update(this.formMenu).then(() => {
         this.$emit('handleCloseModal')
         this.$emit('newDataes', this.formMenu)
+        this.$parent.gitList()
+        this.$$parent.handleNodeClick()
+
+        this.$emit('update:dialogFormVisible', false)
       })
     },
     // 菜单和权限点选择：添加
@@ -245,6 +252,9 @@ export default {
         // _this.type = 'menu'
         this.$emit('handleCloseModal')
         this.$emit('newDataes', this.formMenu)
+        this.$parent.gitList()
+
+        this.$emit('update:dialogFormVisible', false)
       })
     },
     handle_Add(object) {
diff --git a/src/module-manage/components/permissions-add.vue b/src/module-manage/components/permissions-add.vue
index bd9d870..bfc0127 100644
--- a/src/module-manage/components/permissions-add.vue
+++ b/src/module-manage/components/permissions-add.vue
@@ -43,7 +43,6 @@ let _this = []
 export default {
   name: 'UsersAdd',
   props: {
-
     obj: {
       type: Object,
       default: null
@@ -152,7 +151,7 @@ export default {
   methods: {
     // 弹层显示
     dialogFormV() {
-      this.$emit('update:dialogFormVisible', false)
+      this.$emit('update:dialogFormVisible', true)
     },
     // 弹层隐藏
     dialogFormH() {
diff --git a/src/module-manage/pages/menus.vue b/src/module-manage/pages/menus.vue
index 8dfe995..ade8d3c 100644
--- a/src/module-manage/pages/menus.vue
+++ b/src/module-manage/pages/menus.vue
@@ -2,15 +2,148 @@
   <div class="dashboard-container">
     <div class="app-container">
       <el-card shadow="never">
-        菜单
+        <div class="btn">
+          <el-button type="success" icon="el-icon-edit" size="small" @click="add">
+            添加菜单
+          </el-button>
+        </div>
+        <el-table
+          :data="list"
+          style="width: 100%;margin-bottom: 20px;"
+          row-key="id"
+          border
+          lazy
+          :load="load"
+          default-expand-all
+          :tree-props="{children: 'childs', hasChildren: 'points'}"
+        >
+          <el-table-column
+            prop="title"
+            label="标题"
+            width="200"
+          />
+          <el-table-column
+            prop="code"
+            label="权限点代码"
+          />
+          <el-table-column
+            width="120"
+            align="center"
+            label="操作"
+          >
+            <template slot-scope="scope">
+              <el-button type="primary" icon="el-icon-edit" circle plain />
+              <el-button type="danger" icon="el-icon-delete" circle plain @click="detel(scope.row)" />
+            </template>
+          </el-table-column>
+        </el-table>
       </el-card>
+      <!-- 弹窗插件 -->
+      <menuAdd
+        ref="editMenu"
+        :text="text"
+        :dialog-form-visible.sync="dialogFormVisible"
+        :menus-title="menusTitles"
+      />
     </div>
   </div>
 </template>
 
 <script>
+import { list, remove } from '@/api/base/menus'
+import menuAdd from '../components/menu-add.vue'
 export default {
-  name: 'TreeTableDemo'
+  name: 'TreeTableDemo',
+  components: {
+    menuAdd
+  },
+  data() {
+    return {
+      list: [],
+      points: [],
+      dialogFormVisible: false,
+      text: '',
+      menusTitles: '菜单',
+      PermissionGroupsList: [], // 权限组加载
+      node_had: [],
+      resolve_had: []
+    }
+  },
+  created () {
+    this.gitList()
+  },
+  methods: {
+    async gitList() {
+      const res = await list()
+      this.list = res.data
+      console.log(this.list)
+
+      console.log(res)
+    },
+    // load(tree, treeNode, resolve) {
+    //   console.log(1)
+    //   console.log(tree, '++++++++++++++++++++++++++++++')
+    //   console.log(treeNode, '----------------------------------')
+    //   console.log(resolve, '=============================')
+    //   this.tree = tree
+    //   this.treeNode = treeNode
+    //   resolve(treeNode = tree.points)
+    // },
+
+    load(node, treeNode, resolve) {
+      console.log('触发了--------------------------')
+      if (node.points.length === 0) {
+        this.node_had = node // 这里是关键！在data里面定义一个变量，将node.level == 0的node存起来
+        this.resolve_had = treeNode // 同上，把node.level == 0的resolve也存起来
+        return resolve(node)
+      }
+
+      // 其余节点处理
+      if (node.points.length >= 1) {
+        setTimeout(() => {
+          resolve(treeNode = node.points)
+        }, 500)
+        // resolve(treeNode = node.points)
+      }
+    },
+    // 触发 tree 的 :load=loadNode 重复触发  动态更新tree
+    requestNewData() {
+      console.log('request触发了=========================')
+      this.node_had.childNodes = [] // 把存起来的node的子节点清空，不然会界面会出现重复树！
+      this.load(this.node_had, this.resolve_had) // 再次执行懒加载的方法
+    },
+    // 点击 按钮时 显示tree 时候 触发 函数 重新渲染tree
+    handleNodeClick() {
+      console.log(1111111111111)
+      this.gitList()
+      console.log(this.node_had, this.resolve_had)
+      this.requestNewData(this.node_had, this.resolve_had)
+    },
+    add() {
+      // console.log(this.PermissionGroupsList)
+      this.dialogFormVisible = true
+      this.text = '创建'
+      this.$refs.editMenu.handleResetForm()
+    },
+    async detel(row) {
+      console.log(row)
+      try {
+        await this.$confirm('你确定删除该权限')
+        await remove(row)
+        this.gitList()
+        this.handleNodeClick()
+        this.$message.success('操作成功')
+      } catch (error) {
+        console.log(error)
+      }
+    }
+  }
 }
 </script>
-<style rel="stylesheet/scss" lang="scss" scoped></style>
+<style scoped>
+.btn{
+  text-align:right;
+  margin-bottom: 20px;
+}
+
+</style>
-- 
Gitee


From 4f5f5efc439c6cef5e94e626f48b1663e67140f1 Mon Sep 17 00:00:00 2001
From: zwc <434657279@qq.com>
Date: Sun, 18 Sep 2022 21:01:57 +0800
Subject: [PATCH 38/40] =?UTF-8?q?=E7=B2=BE=E9=80=89=E9=A2=98=E5=BA=93?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/QuestionChoiceSelect.vue       |  58 -----
 .../QuestionsChoiceNavbar/index.vue           | 202 ++++++++++++---
 .../questionsChiceDialog/index.vue            | 151 +++++++++++
 src/components/index.js                       |   4 +-
 src/module-hmmm/pages/questions-choice.vue    | 237 +++++++++---------
 5 files changed, 433 insertions(+), 219 deletions(-)
 delete mode 100644 src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
 create mode 100644 src/components/QuestionsChoiceNavbar/questionsChiceDialog/index.vue

diff --git a/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue b/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
deleted file mode 100644
index c4280c5..0000000
--- a/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <div class="container">
-    <template>
-      <el-form ref="form" :model="form" label-width="70px">
-        <el-form-item>
-          <template slot="label">
-            {{ name }}
-          </template>
-          <el-select v-model="value" placeholder="请选择" size="mini">
-            <el-option v-for="item in options" :key="item.value"
-                       :label="item.label"
-                       :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-form>
-    </template>
-  </div>
-</template>
-
-<script>
-export default {
-  // eslint-disable-next-line
-  props: ['name'],
-  data() {
-    return {
-      form: {
-
-      },
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
-      value: ''
-    }
-  }
-}
-</script>
-
-<style scoped >
-.project {
-  margin-right: 10px;
-  color: #606266;
-  font-weight: 700;
-}
-</style>
diff --git a/src/components/QuestionsChoiceNavbar/index.vue b/src/components/QuestionsChoiceNavbar/index.vue
index eede429..2ae986b 100644
--- a/src/components/QuestionsChoiceNavbar/index.vue
+++ b/src/components/QuestionsChoiceNavbar/index.vue
@@ -3,18 +3,58 @@
     <div class="head1">
       <el-row :gutter="20">
         <el-col :span="6">
-          <QuestionChoiceSelect :name="subject" />
+          <el-form ref="form" :model="form" label-width="70px">
+            <el-form-item>
+              <template slot="label">
+                学科
+              </template>
+              <el-select v-model="form.subjectID" placeholder="请选择" size="mini" trigger="click">
+                <el-option v-for="item in list" :key="item.id"
+                           :label="item.subjectName"
+                           :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
         </el-col>
         <el-col :span="6">
-          <QuestionChoiceSelect :name="directory" />
+          <el-form ref="form" :model="form" label-width="70px">
+            <el-form-item>
+              <template slot="label">
+                二级目录
+              </template>
+              <el-select v-model="value1" placeholder="请选择" size="mini" trigger="click">
+                <el-option v-for="item in list" :key="item.value"
+                           :label="item.twoLevelDirectory
+                           "
+                           :value="item.twoLevelDirectory
+                           "
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
         </el-col>
         <el-col :span="6">
-          <QuestionChoiceSelect :name="label" />
+          <el-form ref="form" :model="form" label-width="70px">
+            <el-form-item>
+              <template slot="label">
+                标签
+              </template>
+              <el-select v-model="value2" placeholder="请选择" size="mini" trigger="click">
+                <el-option v-for="item in list" :key="item.value"
+                           :label="item.tags
+                           "
+                           :value="item.tags
+                           "
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
         </el-col>
         <el-col :span="6">
           <el-form label-width="70px">
             <el-form-item label="关键字">
-              <el-input v-model="form.date1" placeholder="请根据题干搜索" size="mini" />
+              <el-input v-model="form.keyword" placeholder="请根据题干搜索" size="mini" />
             </el-form-item>
           </el-form>
         </el-col>
@@ -23,16 +63,70 @@
     <div class="head">
       <el-row :gutter="20">
         <el-col :span="6">
-          <QuestionChoiceSelect :name="type" />
+          <el-form ref="form" :model="form" label-width="70px">
+            <el-form-item>
+              <template slot="label">
+                试题类型
+              </template>
+              <el-select v-model="form.questionType" placeholder="请选择" size="mini" trigger="click">
+                <el-option v-for="item in questionType"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
         </el-col>
         <el-col :span="6">
-          <QuestionChoiceSelect :name="difficulty" />
+          <el-form ref="form" :model="form" label-width="70px">
+            <el-form-item>
+              <template slot="label">
+                难度
+              </template>
+              <el-select v-model="form.difficulty" placeholder="请选择" size="mini" trigger="click">
+                <el-option v-for="item in difficulty"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
         </el-col>
         <el-col :span="6">
-          <QuestionChoiceSelect :name="direction" />
+          <el-form ref="form" :model="form" label-width="70px">
+            <el-form-item>
+              <template slot="label">
+                方向
+              </template>
+              <el-select v-model="form.direction" placeholder="请选择" size="mini" trigger="click">
+                <el-option v-for="item in tableData" :key="item.value"
+                           :label="item.direction
+                           "
+                           :value="item.direction
+                           "
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
         </el-col>
         <el-col :span="6">
-          <QuestionChoiceSelect :name="Entered" />
+          <el-form ref="form" :model="form" label-width="70px">
+            <el-form-item>
+              <template slot="label">
+                录入人
+              </template>
+              <el-select v-model="form.Entered" placeholder="请选择" size="mini" trigger="click">
+                <el-option v-for="item in tableData" :key="item.value"
+                           :label="item.creator
+                           "
+                           :value="item.creatorID
+                           "
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
         </el-col>
       </el-row>
     </div>
@@ -41,14 +135,14 @@
         <el-col :span="6">
           <el-form label-width="70px">
             <el-form-item label="题目备注">
-              <el-input v-model="input" size="mini" />
+              <el-input v-model="form.remakes" size="mini" />
             </el-form-item>
           </el-form>
         </el-col>
         <el-col :span="6">
           <el-form label-width="70px">
             <el-form-item label="企业简称">
-              <el-input v-model="input" size="mini" />
+              <el-input v-model="form.shortName" size="mini" />
             </el-form-item>
           </el-form>
         </el-col>
@@ -73,10 +167,10 @@
         <el-col :span="6">
           <el-form>
             <el-form-item style="display: flex;justify-content: end;">
-              <el-button size="mini">
+              <el-button size="mini" @click="remove">
                 清除
               </el-button>
-              <el-button type="primary" size="mini">
+              <el-button type="primary" size="mini" @click="search">
                 搜索
               </el-button>
             </el-form-item>
@@ -88,43 +182,77 @@
 </template>
 
 <script>
+import { choice } from '@/api/hmmm/questions'
 export default {
+  name: 'QuestionChice',
+  props: {
+    list: {
+      required: true,
+      type: Array
+    },
+    tableData: {
+      required: true,
+      type: Array
+    }
+  },
   data() {
     return {
       form: {
-        date1: '',
-        date2: '',
-        date3: ''
+        subjectID: '',
+        questionType: '',
+        difficulty: '',
+        direction: '',
+        creatorID: '',
+        keyword: '',
+        remakes: '',
+        shortName: ''
       },
-      input: '',
-      subject: '学科',
-      directory: '二级目录',
-      label: '标签',
-      type: '试题类型',
-      difficulty: '难度',
-      direction: '方向',
-      Entered: '录入人',
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
+      questionType: [{
+        value: '1',
+        label: '单选'
       }, {
-        value: '选项2',
-        label: '双皮奶'
+        value: '2',
+        label: '多选'
       }, {
-        value: '选项3',
-        label: '蚵仔煎'
+        value: '3',
+        label: '简答'
+      }],
+      difficulty: [{
+        value: '1',
+        label: '简单'
       }, {
-        value: '选项4',
-        label: '龙须面'
+        value: '2',
+        label: '一般'
       }, {
-        value: '选项5',
-        label: '北京烤鸭'
+        value: '3',
+        label: '困难'
       }],
-      value1: [],
-      value2: [],
       activeName: 'first',
-      a: 'right'
+      value1: '',
+      value2: ''
     }
+  },
+  methods: {
+    remove() {
+      this.form = {
+        subjectID: '',
+        directory: '',
+        label: '',
+        questionType: '',
+        difficulty: '',
+        direction: '',
+        Entered: '',
+        stem: '',
+        remake: '',
+        introduction: ''
+      }
+    },
+    async search() {
+      const { data } = await choice(this.form)
+      console.log(data)
+      this.$emit('search', data.items)
+    }
+
   }
 
 }
diff --git a/src/components/QuestionsChoiceNavbar/questionsChiceDialog/index.vue b/src/components/QuestionsChoiceNavbar/questionsChiceDialog/index.vue
new file mode 100644
index 0000000..24618d6
--- /dev/null
+++ b/src/components/QuestionsChoiceNavbar/questionsChiceDialog/index.vue
@@ -0,0 +1,151 @@
+<template>
+  <el-dialog title="题目预览"
+             :visible="dialogVisible1"
+             width="60%"
+             @close="close"
+  >
+    <div class="preview1">
+      <el-row>
+        <el-col :span="6">
+          <div class="grid-content bg-purple">
+            【题型】:{{ questionType(previewList) }}
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="grid-content bg-purple-light">
+            【编号】:{{ previewList.id }}
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="grid-content bg-purple">
+            【难度】:{{ difficulty(previewList) }}
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="grid-content bg-purple-light">
+            【标签】:{{ previewList.tags }}
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+    <div class="preview2">
+      <el-row>
+        <el-col :span="6">
+          <div class="grid-content bg-purple">
+            【学科】:{{ previewList.subject }}
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="grid-content bg-purple-light">
+            【目录】:{{ previewList.catalog }}
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="grid-content bg-purple">
+            【方向】:{{ previewList.direction }}
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="grid-content bg-purple-light" />
+        </el-col>
+      </el-row>
+    </div>
+    <hr>
+    <span>【题干】:</span>
+    <p class="stem" v-html="previewList.question" />
+    <hr>
+    <div class="videoTab">
+      <p><span>【参考答案】：</span> <span><el-button type="danger" @click="isVideoShow=true">视频答案预览</el-button></span></p>
+      <video v-if="isVideoShow" controls width="300" height="300" class="video">
+        <source :src="previewList.videoURL"
+                type="video/webm"
+        >
+      </video>
+    </div>
+
+    <hr>
+    <div class="answer">
+      <span>【答案解析】:</span><span v-html="previewList.answer" />
+    </div>
+    <hr>
+    <div class="remarks">
+      <span>【题目备注】:</span><span>{{ previewList.remarks }}</span>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="close">关 闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+export default {
+  props: {
+    dialogVisible1: {
+      required: true,
+      type: Boolean
+    },
+    previewList: {
+      required: true,
+      type: Object
+    }
+  },
+  data() {
+    return {
+      isVideoShow: false
+    }
+  },
+  methods: {
+    questionType(row) {
+      if (row.questionType === '1') {
+        return '单选'
+      }
+      if (row.questionType === '2') {
+        return '多选'
+      }
+      if (row.questionType === '3') {
+        return '简答'
+      }
+    },
+    difficulty(row) {
+      if (row.difficulty === '1') {
+        return '简单'
+      } else if (row.difficulty === '2') {
+        return '一般'
+      } else if (row.difficulty === '3') {
+        return '困难'
+      }
+    },
+    close() {
+      this.$emit('closeDalog', false)
+      this.$emit('closeDalog2')
+    }
+  }
+}
+</script>
+<style scoped>
+
+.textarea{
+  margin-top: 20px;
+}
+.preview2{
+  margin-top: 30px;
+  margin-bottom: 20px;
+}
+.preview1{
+  margin-top: 20px;
+}
+.answer{
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+.remarks{
+  margin-top: 20px;
+}
+.stem{
+  color: blue;
+}
+.foot{
+  margin-top: 20px;
+  display: flex;
+  justify-content: end;
+}
+</style>
diff --git a/src/components/index.js b/src/components/index.js
index 0ad5d11..2dd948c 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,8 +1,8 @@
 import questionsChoice from '@/components/QuestionsChoiceNavbar'
-import QuestionChoiceSelect from '@/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect'
+import questionsChiceDalog from '@/components/QuestionsChoiceNavbar/questionsChiceDialog'
 export default {
   install(Vue) {
     Vue.component('questionsChoice', questionsChoice)
-    Vue.component('QuestionChoiceSelect', QuestionChoiceSelect)
+    Vue.component('questionsChiceDalog', questionsChiceDalog)
   }
 }
diff --git a/src/module-hmmm/pages/questions-choice.vue b/src/module-hmmm/pages/questions-choice.vue
index 36c5dc5..b7c9c8c 100644
--- a/src/module-hmmm/pages/questions-choice.vue
+++ b/src/module-hmmm/pages/questions-choice.vue
@@ -7,7 +7,7 @@
           新增试题
         </el-button>
       </div>
-      <questionsChoice />
+      <questionsChoice :list="list" :table-data="tableData" @search="searchList" />
       <div class="table">
         <template>
           <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
@@ -24,7 +24,7 @@
             :closable="false"
           >
             <template slot="title">
-              <span>数据一共{{ counts }}条</span>
+              <span>数据一共{{ tableData.length }}条</span>
             </template>
           </el-alert>
         </div>
@@ -109,6 +109,7 @@
                              fixed="right"
                              label="操作"
                              width="230"
+                             prop="chkState,publishState"
             >
               <template slot-scope="scope">
                 <el-button
@@ -121,6 +122,7 @@
                 <el-button
                   type="text"
                   size="mini"
+                  :disabled="!scope.row.chkState==0"
                   @click.native.prevent="examine(scope.$index, tableData)"
                 >
                   审核
@@ -128,6 +130,7 @@
                 <el-button
                   type="text"
                   size="mini"
+                  :disabled="scope.row.publishState==1"
                   @click.native.prevent="revise(scope.$index, tableData)"
                 >
                   修改
@@ -135,14 +138,15 @@
                 <el-button
                   type="text"
                   size="mini"
-                  @click.native.prevent="grounding(scope.$index, tableData)"
+                  @click.native.prevent="grounding(scope.$index,tableData)"
                 >
-                  上架
+                  {{ scope.row.publishState==0?'上架':'下架' }}
                 </el-button>
                 <el-button
                   type="text"
                   size="mini"
-                  @click.native.prevent="delete(scope.$index, tableData)"
+                  :disabled="scope.row.publishState==1"
+                  @click.native.prevent="deleteList(scope.$index, tableData)"
                 >
                   删除
                 </el-button>
@@ -150,6 +154,7 @@
             </el-table-column>
           </el-table>
         </template>
+        <!-- 分页组件 -->
         <div class="foot">
           <div class="block">
             <el-pagination
@@ -162,6 +167,7 @@
             />
           </div>
         </div>
+        <!-- 题目审核 -->
         <el-dialog
           title="题目审核"
           :visible.sync="dialogVisible"
@@ -183,93 +189,21 @@
           </div>
           <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-          </span>
-        </el-dialog>
-        <el-dialog
-          title="题目预览"
-          :visible.sync="dialogVisible1"
-          width="60%"
-        >
-          <div class="preview1">
-            <el-row>
-              <el-col :span="6">
-                <div class="grid-content bg-purple">
-                  【题型】:{{ questionType(previewList) }}
-                </div>
-              </el-col>
-              <el-col :span="6">
-                <div class="grid-content bg-purple-light">
-                  【编号】:{{ previewList.id }}
-                </div>
-              </el-col>
-              <el-col :span="6">
-                <div class="grid-content bg-purple">
-                  【难度】:{{ difficulty(previewList) }}
-                </div>
-              </el-col>
-              <el-col :span="6">
-                <div class="grid-content bg-purple-light">
-                  【标签】:{{ previewList.tags }}
-                </div>
-              </el-col>
-            </el-row>
-          </div>
-          <div class="preview2">
-            <el-row>
-              <el-col :span="6">
-                <div class="grid-content bg-purple">
-                  【学科】:{{ previewList.subject }}
-                </div>
-              </el-col>
-              <el-col :span="6">
-                <div class="grid-content bg-purple-light">
-                  【目录】:{{ previewList.catalog }}
-                </div>
-              </el-col>
-              <el-col :span="6">
-                <div class="grid-content bg-purple">
-                  【方向】:{{ previewList.direction }}
-                </div>
-              </el-col>
-              <el-col :span="6">
-                <div class="grid-content bg-purple-light" />
-              </el-col>
-            </el-row>
-          </div>
-          <hr>
-          <span>【题干】:</span>
-          <p class="stem" v-html="previewList.question" />
-          <hr>
-          <div class="videoTab">
-            <p><span>【参考答案】：</span> <span><el-button type="danger" @click="isVideoShow=true">视频答案预览</el-button></span></p>
-            <video v-if="isVideoShow" controls width="300" height="300" class="video">
-              <source :src="previewList.videoURL"
-                      type="video/webm"
-              >
-            </video>
-          </div>
-
-          <hr>
-          <div class="answer">
-            <span>【答案解析】:</span><span v-html="previewList.answer" />
-          </div>
-          <hr>
-          <div class="remarks">
-            <span>【题目备注】:</span><span>{{ previewList.remarks }}</span>
-          </div>
-          <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="dialogVisible1 = false">关 闭</el-button>
+            <el-button type="primary" @click="examineChice">确 定</el-button>
           </span>
         </el-dialog>
+        <!-- 预览弹层 -->
+        <questionsChiceDalog v-if="dialogVisible1" :dialog-visible1="dialogVisible1" :preview-list="previewList" @closeDalog="dialogVisible1=false" @closeDalog2="previewList={}" />
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { choice } from '@/api/hmmm/questions'
+import { choice, choicePublish, remove, choiceCheck } from '@/api/hmmm/questions'
+import { list } from '@/api/hmmm/subjects'
 export default {
+  name: 'Jingxuan',
   data() {
     return {
       activeName: 'first',
@@ -280,27 +214,52 @@ export default {
       textarea: '',
       dialogVisible1: false,
       isVideoShow: false,
-      previewList: {}
+      previewList: {},
+      list: [],
+      examineId: ''
     }
   },
   created() {
     this.choiceAll()
+    this.subjectList()
   },
   methods: {
-    handleClick(val) {
+    async examineChice() {
+      await choiceCheck({
+        id: this.examineId,
+        chkState: this.radio * 1,
+        chkRemarks: this.textarea
+      })
+      this.$message.success('审核成功')
+      this.choiceAll()
+      this.dialogVisible = false
+    },
+    async subjectList() {
+      const { data } = await list({
+        page: 1,
+        pagesize: 999
+      })
+      this.list = data.items
+    },
+    async handleClick(val) {
       if (val.index === '0') {
-        // console.log(0)
         this.choiceAll()
       } else if (val.index === '1') {
-        console.log(1)
+        const { data } = await choice({
+          chkState: 0
+        })
+        this.tableData = data.items
       } else if (val.index === '2') {
-        console.log(2)
+        const { data } = await choice({
+          chkState: 1
+        })
+        this.tableData = data.items
       } else {
-        console.log(3)
+        const { data } = await choice({
+          chkState: 2
+        })
+        this.tableData = data.items
       }
-    },
-    examineList() {
-
     },
     preview(tab, event) {
       this.previewList = event[tab]
@@ -308,22 +267,39 @@ export default {
       // console.log(event[tab])
     },
     examine(tab, event) {
-      // console.log(tab, event)
+      this.examineId = event[tab].id
+      // console.log(event[tab])
       this.dialogVisible = true
     },
     revise(tab, event) {
       // console.log(tab, event)
     },
     grounding(tab, event) {
-      // console.log(tab, event)
+      // console.log(event[tab])
+      this.open(event[tab])
     },
-    delete(tab, event) {
-      // console.log(tab, event)
+    deleteList(tab, event) {
+      this.$confirm('此操作将永久删除该题目, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async() => {
+        await remove({
+          id: event[tab].id
+        })
+        this.choiceAll()
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        })
+      }).catch(() => {
+        console.log('取消删除')
+      })
     },
     async choiceAll() {
       const { data } = await choice()
       this.tableData = data.items
-      // console.log(data)
+      // console.log(this.tableData)
       this.counts = data.counts
     },
     questionType(row) {
@@ -397,6 +373,48 @@ export default {
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`)
+    },
+    searchList(res) {
+      this.tableData = res
+    },
+    open(content) {
+      if (content.publishState === 1) {
+        this.$confirm('您确定下架这道题目吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async() => {
+          await choicePublish({
+            id: content.id,
+            publishState: 0
+          })
+          this.choiceAll()
+          this.$message({
+            type: 'success',
+            message: '下架成功!'
+          })
+        }).catch(() => {
+          console.log('取消下架')
+        })
+      } else {
+        this.$confirm('您确上架这道题目吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async() => {
+          await choicePublish({
+            id: content.id,
+            publishState: 1
+          })
+          this.choiceAll()
+          this.$message({
+            type: 'success',
+            message: '上架成功!'
+          })
+        }).catch(() => {
+          console.log('取消上架')
+        })
+      }
     }
   }
 }
@@ -425,29 +443,4 @@ export default {
   .table{
   margin-top: 20px;
 }
-.textarea{
-  margin-top: 20px;
-}
-.preview2{
-  margin-top: 30px;
-  margin-bottom: 20px;
-}
-.preview1{
-  margin-top: 20px;
-}
-.answer{
-  margin-top: 20px;
-  margin-bottom: 20px;
-}
-.remarks{
-  margin-top: 20px;
-}
-.stem{
-  color: blue;
-}
-.foot{
-  margin-top: 20px;
-  display: flex;
-  justify-content: end;
-}
 </style>
-- 
Gitee


From cfd7cd9e69cd56567c36dbd0b5954a84fae7b126 Mon Sep 17 00:00:00 2001
From: zhangwei <1369734433@qq.com>
Date: Sun, 18 Sep 2022 21:32:04 +0800
Subject: [PATCH 39/40] der

---
 src/module-dashboard/components/pageTool.vue |  2 +-
 src/module-hmmm/pages/questions-randoms.vue  | 92 ++++++++++++++++----
 2 files changed, 74 insertions(+), 20 deletions(-)

diff --git a/src/module-dashboard/components/pageTool.vue b/src/module-dashboard/components/pageTool.vue
index 9757f49..31898ec 100644
--- a/src/module-dashboard/components/pageTool.vue
+++ b/src/module-dashboard/components/pageTool.vue
@@ -26,7 +26,7 @@ export default {
     },
     // 每页显示信息条数
     onPageSizeChange: function (pageSize) {
-      console.log(pageSize);
+      console.log(pageSize)
       this.$emit('pageSizeChange', pageSize)
     }
   }
diff --git a/src/module-hmmm/pages/questions-randoms.vue b/src/module-hmmm/pages/questions-randoms.vue
index 0c66205..0dfc366 100644
--- a/src/module-hmmm/pages/questions-randoms.vue
+++ b/src/module-hmmm/pages/questions-randoms.vue
@@ -43,7 +43,11 @@
             align="center"
             label="题型"
             width="100"
-          />
+          >
+            <template v-slot="{row}">
+              <span>{{ row.questionType==1?'单选':(row.questionType==2?'多选':'简答') }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="questionIDs"
@@ -52,7 +56,7 @@
           >
             <template v-slot="{row}">
               <span v-for="(item,index) in row.questionIDs" :key="index" @click="getdetail(item)">
-                <a href="#">{{ item.number }}</a>
+                <a href="#" style="color: rgb(0, 153, 255)">{{ item.number }}</a>
                 <br>
               </span>
             </template>
@@ -108,7 +112,10 @@
           <el-row style="border-bottom:1px solid #000;">
             <el-col :span="6">
               <div class="grid-content bg-purple">
-                【题型】：{{ detailData.questionType }}
+                【题型】：
+                <template>
+                  {{ detailData.questionType==1?'单选题':(detailData.questionType==2?'多选题':'简答题') }}
+                </template>
               </div>
             </el-col>
             <el-col :span="6">
@@ -118,7 +125,10 @@
             </el-col>
             <el-col :span="6">
               <div class="grid-content bg-purple">
-                【难度】：{{ detailData.difficulty }}
+                【难度】：
+                <template>
+                  {{ detailData.difficulty==1?'简单':(detailData.difficulty==2?'一般':'困难') }}
+                </template>
               </div>
             </el-col>
             <el-col :span="6">
@@ -147,7 +157,15 @@
               <div class="grid-content bg-purple-light">
                 【题干】：
                 <div style="color:blue" v-html="detailData.question" />
-                <div>{{detailData.answer}}</div>
+                <div v-for="(item,index) in detailData.options" :key="index" style="padding: 8px 0px;">
+                  <label for="" aria-checked="true" role="radio" class="el-radio" :class="{'is-checked':item.isRight == '1' ? true : false}">
+                    <span class="el-radio__input" :class="{'is-checked':item.isRight == '1' ? true : false}">
+                      <span class="el-radio__inner" />
+                      <input type="radio" class="el-radio__original">
+                    </span>
+                    <span class="el-radio__label">{{ item.title }}</span>
+                  </label>
+                </div>
               </div>
             </el-col>
           </el-row>
@@ -159,7 +177,7 @@
                   视频答案预览
                 </el-button>
                 <div v-if="videoShow">
-                  <video  :src="detailData.videoURL" controls="controls">1</video>
+                  <video :src="detailData.videoURL" controls="controls" />
                 </div>
               </div>
             </el-col>
@@ -167,8 +185,7 @@
           <el-row style="border-bottom:1px solid #000;">
             <el-col :span="24">
               <div class="grid-content bg-purple-light">
-                【答案解析】：
-                <span v-html="detailData.answer" />
+                【答案解析】：{{ detailData.answer }}
               </div>
             </el-col>
           </el-row>
@@ -198,11 +215,10 @@ export default {
   },
 
   data() {
-
     return {
-
+      // str:'',
       tableKey: 0,
-      videoShow:false,
+      videoShow: false,
       alertText: '',
       questionType: '',
       dialogVisible: false,
@@ -229,11 +245,12 @@ export default {
       const { data } = await randoms(this.pagination)
       this.pagination.total = data.counts
       this.tableData = data.items
-      // console.log(this.tableData);
+      console.log(this.tableData)
       this.alertText = `共 ${data.counts} 条记录`
       // console.log(data);
     },
     async delList(row) {
+      console.log(row)
       try {
         await this.$confirm('您确定删除吗')
         await removeRandoms(row)
@@ -244,14 +261,14 @@ export default {
         console.log(error)
       }
     },
-    async getdetail(row) {
+    async getdetail(res) {
       // console.log(row);
       this.dialogVisible = true
-      const { data } = await detail(row)
-      console.log(data)
-      // console.log(data);
+      const { data } = await detail(res)
+      // console.log(data.answer);
       this.detailData = data
-      console.log(this.detailData.videoURL)
+
+      // console.log(this.detailData.videoURL)
     },
     btnClane() {
       this.pagination.keyword = ''
@@ -263,7 +280,7 @@ export default {
       this.getList(keyword)
       // console.log(randoms(keyword));
     },
-    fn(){
+    fn() {
       // alert(1)
       this.videoShow = true
     },
@@ -276,7 +293,7 @@ export default {
       }
       // alert(1)
     },
-    close(){
+    close() {
       this.dialogVisible = false
       this.videoShow = false
     },
@@ -289,6 +306,7 @@ export default {
       this.$confirm('确认关闭？')
         .then(_ => {
           done()
+          this.videoShow = false
         })
         .catch(_ => {})
     }
@@ -321,4 +339,40 @@ video{
   display: flex;
   justify-content: end;
 }
+// .el-radio__inner{
+//   font-size: 20px !important;
+//   // height: 10px;
+//   // line-height: 10px;
+// }
+.el-radio__label{
+  font-size: 14px;
+padding-left: 10px;
+}
+.el-radio__inner{
+  position: relative;
+  display: inline-block;
+}
+.el-radio__input{
+  cursor: pointer;
+  vertical-align: middle;
+  position: relative;
+  display: inline-block;
+  line-height: 1;
+  outline: 0;
+  white-space: nowrap;
+}
+.el-radio__original{
+    opacity: 0;
+    outline: 0;
+    position: absolute;
+    z-index: -1;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    margin: 0;
+}
+.ischecked {
+    color: #409eff;
+}
 </style>
-- 
Gitee


From 7363fa03a440461fc6a2a343a0304a63d789a292 Mon Sep 17 00:00:00 2001
From: wzy <wzyzzqq@163.com>
Date: Sun, 18 Sep 2022 22:12:04 +0800
Subject: [PATCH 40/40] =?UTF-8?q?fix(wzy):=202022/9/18=20=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98=E5=91=B5=E5=91=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 "doc/\351\241\271\347\233\256.md"             |   2 +-
 src/App.vue                                   |   6 +-
 src/api/hmmm/companys.js                      |   8 +-
 src/api/hmmm/questions.js                     |   3 +-
 src/base-ui/ZyForm/src/zy-form.vue            |   4 +-
 src/base-ui/alert-show/src/alert-show.vue     |  14 +-
 src/components/Breadcrumb/index.vue           |  84 +--
 src/components/Charts/keyboard.vue            | 286 ++++---
 src/components/Charts/lineMarker.vue          | 512 +++++++------
 src/components/Charts/mixChart.vue            | 430 ++++++-----
 src/components/ErrorLog/index.vue             | 102 +--
 src/components/Hamburger/index.vue            |  44 +-
 src/components/LangSelect/index.vue           |  63 +-
 .../components/QuestionChoiceSelect.vue       |  76 +-
 src/components/Screenfull/index.vue           |  78 +-
 src/components/ScrollBar/index.vue            |  78 +-
 src/components/ScrollPane/index.vue           | 116 +--
 src/components/SvgIcon/index.vue              |  56 +-
 src/components/ThemePicker/index.vue          | 246 +++---
 src/components/TreeTable/index.vue            | 211 +++---
 src/components/TreeTable/utils/expand.vue     |  44 +-
 src/filters/index.js                          |  10 +-
 .../components/dashboardAreaChart.vue         | 287 +++----
 .../components/dashboardBarChart.vue          | 201 +++--
 .../components/dashboardLineChart.vue         | 294 ++++----
 .../components/dashboardPieChart.vue          | 137 ++--
 .../components/dashboardRaddarChart.vue       | 201 +++--
 .../components/layoutAppMain.vue              |  38 +-
 .../components/layoutNavbar.vue               | 248 +++----
 .../components/layoutSidebar.vue              |  22 +-
 .../components/layoutSidebarItem.vue          |  38 +-
 .../components/layoutTags.vue                 | 327 ++++----
 .../components/loginSocialSignin.vue          | 150 ++--
 src/module-dashboard/components/pageTool.vue  |  36 +-
 src/module-dashboard/pages/401.vue            | 134 ++--
 src/module-dashboard/pages/404.vue            | 391 +++++-----
 src/module-dashboard/pages/authredirect.vue   |  14 +-
 src/module-dashboard/pages/dashboard.vue      | 585 +++++++--------
 src/module-dashboard/pages/layout.vue         |  75 +-
 src/module-dashboard/pages/login.vue          | 367 +++++----
 src/module-hmmm/components/articles-add.vue   |   6 +-
 .../components/articles-preview.vue           |   6 +-
 src/module-hmmm/components/companys-add.vue   | 167 ++---
 .../components/questions-check.vue            |   6 +-
 .../components/questions-preview.vue          |   6 +-
 src/module-hmmm/components/subjects-add.vue   |   6 +-
 src/module-hmmm/components/tags-add.vue       | 233 +++---
 src/module-hmmm/pages/articles.vue            |   6 +-
 src/module-hmmm/pages/companys.vue            | 198 ++---
 src/module-hmmm/pages/companys/index.vue      |  76 +-
 src/module-hmmm/pages/questions.vue           | 258 +++----
 src/module-hmmm/pages/subjects.vue            | 105 ++-
 src/module-hmmm/pages/tags.vue                | 399 +++++-----
 src/module-manage/components/menu-add.vue     | 702 +++++++++---------
 src/module-manage/components/page-tool.vue    |  44 +-
 .../components/permissions-add.vue            | 497 +++++++------
 .../components/permissionsApi-add.vue         | 264 +++----
 src/module-manage/components/user-add.vue     | 134 ++--
 src/module-manage/pages/logs.vue              | 201 +++--
 src/module-manage/pages/menus.vue             |  10 +-
 src/module-manage/pages/permissions.vue       | 250 +++----
 src/module-manage/pages/users.vue             | 456 ++++++------
 src/utils/openWindow.js                       |   8 +-
 63 files changed, 4940 insertions(+), 5116 deletions(-)

diff --git "a/doc/\351\241\271\347\233\256.md" "b/doc/\351\241\271\347\233\256.md"
index 53a286b..a27c318 100644
--- "a/doc/\351\241\271\347\233\256.md"
+++ "b/doc/\351\241\271\347\233\256.md"
@@ -8,7 +8,7 @@
 + 蒋秀国   **基础题库**
 + 张伟      **组题列表**
 + 钟文轩   **企业管理**
-+ 金晶     **菜单**
++ 金晶     菜单
 + 王泽宇  **试题录入**
 
 
diff --git a/src/App.vue b/src/App.vue
index ec9032c..051f8d4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-export default {
-  name: 'App'
-}
+  export default {
+    name: 'App'
+  }
 </script>
diff --git a/src/api/hmmm/companys.js b/src/api/hmmm/companys.js
index 2b0124e..06ebc5a 100644
--- a/src/api/hmmm/companys.js
+++ b/src/api/hmmm/companys.js
@@ -11,10 +11,8 @@ import { createAPI } from '@/utils/request'
 
 export const list = (data) => createAPI('/companys', 'get', data) // 获取管理列表
 export const add = (data) => createAPI('/companys', 'post', data) // 企业管理添加
-export const update = (data) => createAPI(`/companys/${data.id}`, 'put',data) // 企业管理修改
-export const remove = (id) =>
-  createAPI(`/companys/${id}`, 'delete') // 企业管理删除
+export const update = (data) => createAPI(`/companys/${data.id}`, 'put', data) // 企业管理修改
+export const remove = (id) => createAPI(`/companys/${id}`, 'delete') // 企业管理删除
 
 export const detail = (id) => createAPI(`/companys/${id}`, 'get') // 企业管理详情
-export const disabled = (id) =>
-  createAPI(`/companys/${id}`, 'post') // 企业管理设置状态
+export const disabled = (id) => createAPI(`/companys/${id}`, 'post') // 企业管理设置状态
diff --git a/src/api/hmmm/questions.js b/src/api/hmmm/questions.js
index abe157b..296bf01 100644
--- a/src/api/hmmm/questions.js
+++ b/src/api/hmmm/questions.js
@@ -55,4 +55,5 @@ export const setRecords = (data) =>
 export const randoms = (data) => createAPI('/questions/randoms', 'get', data)
 
 // 组题列表删除
-export const removeRandoms = (data) => createAPI(`/questions/randoms/${data.id}`, 'delete', data)
+export const removeRandoms = (data) =>
+  createAPI(`/questions/randoms/${data.id}`, 'delete', data)
diff --git a/src/base-ui/ZyForm/src/zy-form.vue b/src/base-ui/ZyForm/src/zy-form.vue
index 7db767e..d3f3ba9 100644
--- a/src/base-ui/ZyForm/src/zy-form.vue
+++ b/src/base-ui/ZyForm/src/zy-form.vue
@@ -29,8 +29,8 @@
             <template
               v-if="
                 item.type === 'input' ||
-                item.type === 'password' ||
-                item.type === 'textarea'
+                  item.type === 'password' ||
+                  item.type === 'textarea'
               "
             >
               <el-input
diff --git a/src/base-ui/alert-show/src/alert-show.vue b/src/base-ui/alert-show/src/alert-show.vue
index b50de70..ca7cbad 100644
--- a/src/base-ui/alert-show/src/alert-show.vue
+++ b/src/base-ui/alert-show/src/alert-show.vue
@@ -11,15 +11,15 @@
 </template>
 
 <script>
-export default {
-  name: 'AlertShow',
-  props: {
-    alertText: {
-      type: String,
-      default: ''
+  export default {
+    name: 'AlertShow',
+    props: {
+      alertText: {
+        type: String,
+        default: ''
+      }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index d5299bb..5594526 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,8 +1,5 @@
 <template>
-  <el-breadcrumb
-    class="app-breadcrumb"
-    separator="/"
-  >
+  <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item
         v-for="(item, index) in levelList"
@@ -14,14 +11,11 @@
             item.redirect === 'noredirect' || index === levelList.length - 1
           "
           class="no-redirect"
-        >{{ item.meta.title }}</span>
-        <router-link
-          v-else
-          :to="item.redirect || item.path"
         >
-          {{
-            item.meta.title
-          }}
+          {{ item.meta.title }}
+        </span>
+        <router-link v-else :to="item.redirect || item.path">
+          {{ item.meta.title }}
         </router-link>
       </el-breadcrumb-item>
     </transition-group>
@@ -29,47 +23,47 @@
 </template>
 
 <script>
-// import { generateTitle } from '@/utils/i18n'
+  // import { generateTitle } from '@/utils/i18n'
 
-export default {
-  data() {
-    return {
-      levelList: null
-    }
-  },
-  watch: {
-    $route() {
+  export default {
+    data() {
+      return {
+        levelList: null
+      }
+    },
+    watch: {
+      $route() {
+        this.getBreadcrumb()
+      }
+    },
+    created() {
       this.getBreadcrumb()
-    }
-  },
-  created() {
-    this.getBreadcrumb()
-  },
-  methods: {
-    // generateTitle,
-    getBreadcrumb() {
-      let matched = this.$route.matched.filter((item) => item.name)
-      const first = matched[0]
-      if (first && first.name !== 'dashboard') {
-        matched = [{ path: '/dashboard', meta: { title: '面板' } }].concat(
-          matched
-        )
+    },
+    methods: {
+      // generateTitle,
+      getBreadcrumb() {
+        let matched = this.$route.matched.filter((item) => item.name)
+        const first = matched[0]
+        if (first && first.name !== 'dashboard') {
+          matched = [{ path: '/dashboard', meta: { title: '面板' } }].concat(
+            matched
+          )
+        }
+        this.levelList = matched
       }
-      this.levelList = matched
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.app-breadcrumb.el-breadcrumb {
-  display: inline-block;
-  font-size: 14px;
-  line-height: 70px;
-  margin-left: 10px;
-  .no-redirect {
-    color: #fff;
-    cursor: text;
+  .app-breadcrumb.el-breadcrumb {
+    display: inline-block;
+    font-size: 14px;
+    line-height: 70px;
+    margin-left: 10px;
+    .no-redirect {
+      color: #fff;
+      cursor: text;
+    }
   }
-}
 </style>
diff --git a/src/components/Charts/keyboard.vue b/src/components/Charts/keyboard.vue
index 6569e0c..26fa47a 100644
--- a/src/components/Charts/keyboard.vue
+++ b/src/components/Charts/keyboard.vue
@@ -1,169 +1,165 @@
 <template>
-  <div
-    :id="id"
-    :class="className"
-    :style="{ height: height, width: width }"
-  />
+  <div :id="id" :class="className" :style="{ height: height, width: width }" />
 </template>
 
 <script>
-import echarts from 'echarts'
-import resize from './mixins/resize'
+  import echarts from 'echarts'
+  import resize from './mixins/resize'
 
-export default {
-  mixins: [resize],
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
+  export default {
+    mixins: [resize],
+    props: {
+      className: {
+        type: String,
+        default: 'chart'
+      },
+      id: {
+        type: String,
+        default: 'chart'
+      },
+      width: {
+        type: String,
+        default: '200px'
+      },
+      height: {
+        type: String,
+        default: '200px'
+      }
     },
-    id: {
-      type: String,
-      default: 'chart'
+    data() {
+      return {
+        chart: null
+      }
     },
-    width: {
-      type: String,
-      default: '200px'
+    mounted() {
+      this.initChart()
     },
-    height: {
-      type: String,
-      default: '200px'
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.initChart()
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(document.getElementById(this.id))
-
-      const xAxisData = []
-      const data = []
-      const data2 = []
-      for (let i = 0; i < 50; i++) {
-        xAxisData.push(i)
-        data.push((Math.sin(i / 5) * (i / 5 - 10) + i / 6) * 5)
-        data2.push((Math.sin(i / 5) * (i / 5 + 10) + i / 6) * 3)
+    beforeDestroy() {
+      if (!this.chart) {
+        return
       }
-      this.chart.setOption({
-        backgroundColor: '#08263a',
-        xAxis: [
-          {
-            show: false,
-            data: xAxisData
-          },
-          {
-            show: false,
-            data: xAxisData
-          }
-        ],
-        visualMap: {
-          show: false,
-          min: 0,
-          max: 50,
-          dimension: 0,
-          inRange: {
-            color: [
-              '#4a657a',
-              '#308e92',
-              '#b1cfa5',
-              '#f5d69f',
-              '#f5898b',
-              '#ef5055'
-            ]
-          }
-        },
-        yAxis: {
-          axisLine: {
-            show: false
-          },
-          axisLabel: {
-            textStyle: {
-              color: '#4a657a'
+      this.chart.dispose()
+      this.chart = null
+    },
+    methods: {
+      initChart() {
+        this.chart = echarts.init(document.getElementById(this.id))
+
+        const xAxisData = []
+        const data = []
+        const data2 = []
+        for (let i = 0; i < 50; i++) {
+          xAxisData.push(i)
+          data.push((Math.sin(i / 5) * (i / 5 - 10) + i / 6) * 5)
+          data2.push((Math.sin(i / 5) * (i / 5 + 10) + i / 6) * 3)
+        }
+        this.chart.setOption({
+          backgroundColor: '#08263a',
+          xAxis: [
+            {
+              show: false,
+              data: xAxisData
+            },
+            {
+              show: false,
+              data: xAxisData
             }
-          },
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: '#08263f'
+          ],
+          visualMap: {
+            show: false,
+            min: 0,
+            max: 50,
+            dimension: 0,
+            inRange: {
+              color: [
+                '#4a657a',
+                '#308e92',
+                '#b1cfa5',
+                '#f5d69f',
+                '#f5898b',
+                '#ef5055'
+              ]
             }
           },
-          axisTick: {
-            show: false
-          }
-        },
-        series: [
-          {
-            name: 'back',
-            type: 'bar',
-            data: data2,
-            z: 1,
-            itemStyle: {
-              normal: {
-                opacity: 0.4,
-                barBorderRadius: 5,
-                shadowBlur: 3,
-                shadowColor: '#111'
+          yAxis: {
+            axisLine: {
+              show: false
+            },
+            axisLabel: {
+              textStyle: {
+                color: '#4a657a'
+              }
+            },
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: '#08263f'
               }
+            },
+            axisTick: {
+              show: false
             }
           },
-          {
-            name: 'Simulate Shadow',
-            type: 'line',
-            data,
-            z: 2,
-            showSymbol: false,
-            animationDelay: 0,
-            animationEasing: 'linear',
-            animationDuration: 1200,
-            lineStyle: {
-              normal: {
-                color: 'transparent'
+          series: [
+            {
+              name: 'back',
+              type: 'bar',
+              data: data2,
+              z: 1,
+              itemStyle: {
+                normal: {
+                  opacity: 0.4,
+                  barBorderRadius: 5,
+                  shadowBlur: 3,
+                  shadowColor: '#111'
+                }
               }
             },
-            areaStyle: {
-              normal: {
-                color: '#08263a',
-                shadowBlur: 50,
-                shadowColor: '#000'
+            {
+              name: 'Simulate Shadow',
+              type: 'line',
+              data,
+              z: 2,
+              showSymbol: false,
+              animationDelay: 0,
+              animationEasing: 'linear',
+              animationDuration: 1200,
+              lineStyle: {
+                normal: {
+                  color: 'transparent'
+                }
+              },
+              areaStyle: {
+                normal: {
+                  color: '#08263a',
+                  shadowBlur: 50,
+                  shadowColor: '#000'
+                }
               }
-            }
-          },
-          {
-            name: 'front',
-            type: 'bar',
-            data,
-            xAxisIndex: 1,
-            z: 3,
-            itemStyle: {
-              normal: {
-                barBorderRadius: 5
+            },
+            {
+              name: 'front',
+              type: 'bar',
+              data,
+              xAxisIndex: 1,
+              z: 3,
+              itemStyle: {
+                normal: {
+                  barBorderRadius: 5
+                }
               }
             }
+          ],
+          animationEasing: 'elasticOut',
+          animationEasingUpdate: 'elasticOut',
+          animationDelay(idx) {
+            return idx * 20
+          },
+          animationDelayUpdate(idx) {
+            return idx * 20
           }
-        ],
-        animationEasing: 'elasticOut',
-        animationEasingUpdate: 'elasticOut',
-        animationDelay(idx) {
-          return idx * 20
-        },
-        animationDelayUpdate(idx) {
-          return idx * 20
-        }
-      })
+        })
+      }
     }
   }
-}
 </script>
diff --git a/src/components/Charts/lineMarker.vue b/src/components/Charts/lineMarker.vue
index 1bd2ce9..7af8b41 100644
--- a/src/components/Charts/lineMarker.vue
+++ b/src/components/Charts/lineMarker.vue
@@ -1,280 +1,276 @@
 <template>
-  <div
-    :id="id"
-    :class="className"
-    :style="{ height: height, width: width }"
-  />
+  <div :id="id" :class="className" :style="{ height: height, width: width }" />
 </template>
 
 <script>
-import echarts from 'echarts'
-import resize from './mixins/resize'
+  import echarts from 'echarts'
+  import resize from './mixins/resize'
 
-export default {
-  mixins: [resize],
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
+  export default {
+    mixins: [resize],
+    props: {
+      className: {
+        type: String,
+        default: 'chart'
+      },
+      id: {
+        type: String,
+        default: 'chart'
+      },
+      width: {
+        type: String,
+        default: '200px'
+      },
+      height: {
+        type: String,
+        default: '200px'
+      }
     },
-    id: {
-      type: String,
-      default: 'chart'
+    data() {
+      return {
+        chart: null
+      }
     },
-    width: {
-      type: String,
-      default: '200px'
+    mounted() {
+      this.initChart()
     },
-    height: {
-      type: String,
-      default: '200px'
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.initChart()
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(document.getElementById(this.id))
+    beforeDestroy() {
+      if (!this.chart) {
+        return
+      }
+      this.chart.dispose()
+      this.chart = null
+    },
+    methods: {
+      initChart() {
+        this.chart = echarts.init(document.getElementById(this.id))
 
-      this.chart.setOption({
-        backgroundColor: '#394056',
-        title: {
-          top: 20,
-          text: 'Requests',
-          textStyle: {
-            fontWeight: 'normal',
-            fontSize: 16,
-            color: '#F1F1F3'
-          },
-          left: '1%'
-        },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            lineStyle: {
-              color: '#57617B'
-            }
-          }
-        },
-        legend: {
-          top: 20,
-          icon: 'rect',
-          itemWidth: 14,
-          itemHeight: 5,
-          itemGap: 13,
-          data: ['CMCC', 'CTCC', 'CUCC'],
-          right: '4%',
-          textStyle: {
-            fontSize: 12,
-            color: '#F1F1F3'
-          }
-        },
-        grid: {
-          top: 100,
-          left: '3%',
-          right: '4%',
-          bottom: '2%',
-          containLabel: true
-        },
-        xAxis: [
-          {
-            type: 'category',
-            boundaryGap: false,
-            axisLine: {
-              lineStyle: {
-                color: '#57617B'
-              }
-            },
-            data: [
-              '13:00',
-              '13:05',
-              '13:10',
-              '13:15',
-              '13:20',
-              '13:25',
-              '13:30',
-              '13:35',
-              '13:40',
-              '13:45',
-              '13:50',
-              '13:55'
-            ]
-          }
-        ],
-        yAxis: [
-          {
-            type: 'value',
-            name: '(%)',
-            axisTick: {
-              show: false
+        this.chart.setOption({
+          backgroundColor: '#394056',
+          title: {
+            top: 20,
+            text: 'Requests',
+            textStyle: {
+              fontWeight: 'normal',
+              fontSize: 16,
+              color: '#F1F1F3'
             },
-            axisLine: {
-              lineStyle: {
-                color: '#57617B'
-              }
-            },
-            axisLabel: {
-              margin: 10,
-              textStyle: {
-                fontSize: 14
-              }
-            },
-            splitLine: {
+            left: '1%'
+          },
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
               lineStyle: {
                 color: '#57617B'
               }
             }
-          }
-        ],
-        series: [
-          {
-            name: 'CMCC',
-            type: 'line',
-            smooth: true,
-            symbol: 'circle',
-            symbolSize: 5,
-            showSymbol: false,
-            lineStyle: {
-              normal: {
-                width: 1
-              }
-            },
-            areaStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(
-                  0,
-                  0,
-                  0,
-                  1,
-                  [
-                    {
-                      offset: 0,
-                      color: 'rgba(137, 189, 27, 0.3)'
-                    },
-                    {
-                      offset: 0.8,
-                      color: 'rgba(137, 189, 27, 0)'
-                    }
-                  ],
-                  false
-                ),
-                shadowColor: 'rgba(0, 0, 0, 0.1)',
-                shadowBlur: 10
-              }
-            },
-            itemStyle: {
-              normal: {
-                color: 'rgb(137,189,27)',
-                borderColor: 'rgba(137,189,2,0.27)',
-                borderWidth: 12
-              }
-            },
-            data: [220, 182, 191, 134, 150, 120, 110, 125, 145, 122, 165, 122]
           },
-          {
-            name: 'CTCC',
-            type: 'line',
-            smooth: true,
-            symbol: 'circle',
-            symbolSize: 5,
-            showSymbol: false,
-            lineStyle: {
-              normal: {
-                width: 1
-              }
-            },
-            areaStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(
-                  0,
-                  0,
-                  0,
-                  1,
-                  [
-                    {
-                      offset: 0,
-                      color: 'rgba(0, 136, 212, 0.3)'
-                    },
-                    {
-                      offset: 0.8,
-                      color: 'rgba(0, 136, 212, 0)'
-                    }
-                  ],
-                  false
-                ),
-                shadowColor: 'rgba(0, 0, 0, 0.1)',
-                shadowBlur: 10
-              }
-            },
-            itemStyle: {
-              normal: {
-                color: 'rgb(0,136,212)',
-                borderColor: 'rgba(0,136,212,0.2)',
-                borderWidth: 12
-              }
-            },
-            data: [120, 110, 125, 145, 122, 165, 122, 220, 182, 191, 134, 150]
+          legend: {
+            top: 20,
+            icon: 'rect',
+            itemWidth: 14,
+            itemHeight: 5,
+            itemGap: 13,
+            data: ['CMCC', 'CTCC', 'CUCC'],
+            right: '4%',
+            textStyle: {
+              fontSize: 12,
+              color: '#F1F1F3'
+            }
           },
-          {
-            name: 'CUCC',
-            type: 'line',
-            smooth: true,
-            symbol: 'circle',
-            symbolSize: 5,
-            showSymbol: false,
-            lineStyle: {
-              normal: {
-                width: 1
-              }
-            },
-            areaStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(
-                  0,
-                  0,
-                  0,
-                  1,
-                  [
-                    {
-                      offset: 0,
-                      color: 'rgba(219, 50, 51, 0.3)'
-                    },
-                    {
-                      offset: 0.8,
-                      color: 'rgba(219, 50, 51, 0)'
-                    }
-                  ],
-                  false
-                ),
-                shadowColor: 'rgba(0, 0, 0, 0.1)',
-                shadowBlur: 10
+          grid: {
+            top: 100,
+            left: '3%',
+            right: '4%',
+            bottom: '2%',
+            containLabel: true
+          },
+          xAxis: [
+            {
+              type: 'category',
+              boundaryGap: false,
+              axisLine: {
+                lineStyle: {
+                  color: '#57617B'
+                }
+              },
+              data: [
+                '13:00',
+                '13:05',
+                '13:10',
+                '13:15',
+                '13:20',
+                '13:25',
+                '13:30',
+                '13:35',
+                '13:40',
+                '13:45',
+                '13:50',
+                '13:55'
+              ]
+            }
+          ],
+          yAxis: [
+            {
+              type: 'value',
+              name: '(%)',
+              axisTick: {
+                show: false
+              },
+              axisLine: {
+                lineStyle: {
+                  color: '#57617B'
+                }
+              },
+              axisLabel: {
+                margin: 10,
+                textStyle: {
+                  fontSize: 14
+                }
+              },
+              splitLine: {
+                lineStyle: {
+                  color: '#57617B'
+                }
               }
+            }
+          ],
+          series: [
+            {
+              name: 'CMCC',
+              type: 'line',
+              smooth: true,
+              symbol: 'circle',
+              symbolSize: 5,
+              showSymbol: false,
+              lineStyle: {
+                normal: {
+                  width: 1
+                }
+              },
+              areaStyle: {
+                normal: {
+                  color: new echarts.graphic.LinearGradient(
+                    0,
+                    0,
+                    0,
+                    1,
+                    [
+                      {
+                        offset: 0,
+                        color: 'rgba(137, 189, 27, 0.3)'
+                      },
+                      {
+                        offset: 0.8,
+                        color: 'rgba(137, 189, 27, 0)'
+                      }
+                    ],
+                    false
+                  ),
+                  shadowColor: 'rgba(0, 0, 0, 0.1)',
+                  shadowBlur: 10
+                }
+              },
+              itemStyle: {
+                normal: {
+                  color: 'rgb(137,189,27)',
+                  borderColor: 'rgba(137,189,2,0.27)',
+                  borderWidth: 12
+                }
+              },
+              data: [220, 182, 191, 134, 150, 120, 110, 125, 145, 122, 165, 122]
             },
-            itemStyle: {
-              normal: {
-                color: 'rgb(219,50,51)',
-                borderColor: 'rgba(219,50,51,0.2)',
-                borderWidth: 12
-              }
+            {
+              name: 'CTCC',
+              type: 'line',
+              smooth: true,
+              symbol: 'circle',
+              symbolSize: 5,
+              showSymbol: false,
+              lineStyle: {
+                normal: {
+                  width: 1
+                }
+              },
+              areaStyle: {
+                normal: {
+                  color: new echarts.graphic.LinearGradient(
+                    0,
+                    0,
+                    0,
+                    1,
+                    [
+                      {
+                        offset: 0,
+                        color: 'rgba(0, 136, 212, 0.3)'
+                      },
+                      {
+                        offset: 0.8,
+                        color: 'rgba(0, 136, 212, 0)'
+                      }
+                    ],
+                    false
+                  ),
+                  shadowColor: 'rgba(0, 0, 0, 0.1)',
+                  shadowBlur: 10
+                }
+              },
+              itemStyle: {
+                normal: {
+                  color: 'rgb(0,136,212)',
+                  borderColor: 'rgba(0,136,212,0.2)',
+                  borderWidth: 12
+                }
+              },
+              data: [120, 110, 125, 145, 122, 165, 122, 220, 182, 191, 134, 150]
             },
-            data: [220, 182, 125, 145, 122, 191, 134, 150, 120, 110, 165, 122]
-          }
-        ]
-      })
+            {
+              name: 'CUCC',
+              type: 'line',
+              smooth: true,
+              symbol: 'circle',
+              symbolSize: 5,
+              showSymbol: false,
+              lineStyle: {
+                normal: {
+                  width: 1
+                }
+              },
+              areaStyle: {
+                normal: {
+                  color: new echarts.graphic.LinearGradient(
+                    0,
+                    0,
+                    0,
+                    1,
+                    [
+                      {
+                        offset: 0,
+                        color: 'rgba(219, 50, 51, 0.3)'
+                      },
+                      {
+                        offset: 0.8,
+                        color: 'rgba(219, 50, 51, 0)'
+                      }
+                    ],
+                    false
+                  ),
+                  shadowColor: 'rgba(0, 0, 0, 0.1)',
+                  shadowBlur: 10
+                }
+              },
+              itemStyle: {
+                normal: {
+                  color: 'rgb(219,50,51)',
+                  borderColor: 'rgba(219,50,51,0.2)',
+                  borderWidth: 12
+                }
+              },
+              data: [220, 182, 125, 145, 122, 191, 134, 150, 120, 110, 165, 122]
+            }
+          ]
+        })
+      }
     }
   }
-}
 </script>
diff --git a/src/components/Charts/mixChart.vue b/src/components/Charts/mixChart.vue
index e49dd9b..8211f43 100644
--- a/src/components/Charts/mixChart.vue
+++ b/src/components/Charts/mixChart.vue
@@ -1,246 +1,242 @@
 <template>
-  <div
-    :id="id"
-    :class="className"
-    :style="{ height: height, width: width }"
-  />
+  <div :id="id" :class="className" :style="{ height: height, width: width }" />
 </template>
 
 <script>
-import echarts from 'echarts'
-import resize from './mixins/resize'
+  import echarts from 'echarts'
+  import resize from './mixins/resize'
 
-export default {
-  mixins: [resize],
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
+  export default {
+    mixins: [resize],
+    props: {
+      className: {
+        type: String,
+        default: 'chart'
+      },
+      id: {
+        type: String,
+        default: 'chart'
+      },
+      width: {
+        type: String,
+        default: '200px'
+      },
+      height: {
+        type: String,
+        default: '200px'
+      }
     },
-    id: {
-      type: String,
-      default: 'chart'
+    data() {
+      return {
+        chart: null
+      }
     },
-    width: {
-      type: String,
-      default: '200px'
+    mounted() {
+      this.initChart()
     },
-    height: {
-      type: String,
-      default: '200px'
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.initChart()
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(document.getElementById(this.id))
-      const xData = (function () {
-        const data = []
-        for (let i = 1; i < 13; i++) {
-          data.push(i + 'month')
-        }
-        return data
-      })()
-      this.chart.setOption({
-        backgroundColor: '#344b58',
-        title: {
-          text: 'statistics',
-          x: '20',
-          top: '20',
-          textStyle: {
-            color: '#fff',
-            fontSize: '22'
-          },
-          subtextStyle: {
-            color: '#90979c',
-            fontSize: '16'
+    beforeDestroy() {
+      if (!this.chart) {
+        return
+      }
+      this.chart.dispose()
+      this.chart = null
+    },
+    methods: {
+      initChart() {
+        this.chart = echarts.init(document.getElementById(this.id))
+        const xData = (function () {
+          const data = []
+          for (let i = 1; i < 13; i++) {
+            data.push(i + 'month')
           }
-        },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
+          return data
+        })()
+        this.chart.setOption({
+          backgroundColor: '#344b58',
+          title: {
+            text: 'statistics',
+            x: '20',
+            top: '20',
             textStyle: {
-              color: '#fff'
+              color: '#fff',
+              fontSize: '22'
+            },
+            subtextStyle: {
+              color: '#90979c',
+              fontSize: '16'
             }
-          }
-        },
-        grid: {
-          borderWidth: 0,
-          top: 110,
-          bottom: 95,
-          textStyle: {
-            color: '#fff'
-          }
-        },
-        legend: {
-          x: '5%',
-          top: '10%',
-          textStyle: {
-            color: '#90979c'
           },
-          data: ['female', 'male', 'average']
-        },
-        calculable: true,
-        xAxis: [
-          {
-            type: 'category',
-            axisLine: {
-              lineStyle: {
-                color: '#90979c'
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              textStyle: {
+                color: '#fff'
               }
+            }
+          },
+          grid: {
+            borderWidth: 0,
+            top: 110,
+            bottom: 95,
+            textStyle: {
+              color: '#fff'
+            }
+          },
+          legend: {
+            x: '5%',
+            top: '10%',
+            textStyle: {
+              color: '#90979c'
             },
-            splitLine: {
-              show: false
-            },
-            axisTick: {
-              show: false
-            },
-            splitArea: {
-              show: false
-            },
-            axisLabel: {
-              interval: 0
-            },
-            data: xData
-          }
-        ],
-        yAxis: [
-          {
-            type: 'value',
-            splitLine: {
-              show: false
-            },
-            axisLine: {
-              lineStyle: {
-                color: '#90979c'
+            data: ['female', 'male', 'average']
+          },
+          calculable: true,
+          xAxis: [
+            {
+              type: 'category',
+              axisLine: {
+                lineStyle: {
+                  color: '#90979c'
+                }
+              },
+              splitLine: {
+                show: false
+              },
+              axisTick: {
+                show: false
+              },
+              splitArea: {
+                show: false
+              },
+              axisLabel: {
+                interval: 0
+              },
+              data: xData
+            }
+          ],
+          yAxis: [
+            {
+              type: 'value',
+              splitLine: {
+                show: false
+              },
+              axisLine: {
+                lineStyle: {
+                  color: '#90979c'
+                }
+              },
+              axisTick: {
+                show: false
+              },
+              axisLabel: {
+                interval: 0
+              },
+              splitArea: {
+                show: false
               }
-            },
-            axisTick: {
-              show: false
-            },
-            axisLabel: {
-              interval: 0
-            },
-            splitArea: {
-              show: false
             }
-          }
-        ],
-        dataZoom: [
-          {
-            show: true,
-            height: 30,
-            xAxisIndex: [0],
-            bottom: 30,
-            start: 10,
-            end: 80,
-            handleIcon:
-              'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
-            handleSize: '110%',
-            handleStyle: {
-              color: '#d3dee5'
+          ],
+          dataZoom: [
+            {
+              show: true,
+              height: 30,
+              xAxisIndex: [0],
+              bottom: 30,
+              start: 10,
+              end: 80,
+              handleIcon:
+                'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
+              handleSize: '110%',
+              handleStyle: {
+                color: '#d3dee5'
+              },
+              textStyle: { color: '#fff' },
+              borderColor: '#90979c'
             },
-            textStyle: { color: '#fff' },
-            borderColor: '#90979c'
-          },
-          {
-            type: 'inside',
-            show: true,
-            height: 15,
-            start: 1,
-            end: 35
-          }
-        ],
-        series: [
-          {
-            name: 'female',
-            type: 'bar',
-            stack: 'total',
-            barMaxWidth: 35,
-            barGap: '10%',
-            itemStyle: {
-              normal: {
-                color: 'rgba(255,144,128,1)',
-                label: {
-                  show: true,
-                  textStyle: {
-                    color: '#fff'
-                  },
-                  position: 'insideTop',
-                  formatter(p) {
-                    return p.value > 0 ? p.value : ''
+            {
+              type: 'inside',
+              show: true,
+              height: 15,
+              start: 1,
+              end: 35
+            }
+          ],
+          series: [
+            {
+              name: 'female',
+              type: 'bar',
+              stack: 'total',
+              barMaxWidth: 35,
+              barGap: '10%',
+              itemStyle: {
+                normal: {
+                  color: 'rgba(255,144,128,1)',
+                  label: {
+                    show: true,
+                    textStyle: {
+                      color: '#fff'
+                    },
+                    position: 'insideTop',
+                    formatter(p) {
+                      return p.value > 0 ? p.value : ''
+                    }
                   }
                 }
-              }
+              },
+              data: [
+                709, 1917, 2455, 2610, 1719, 1433, 1544, 3285, 5208, 3372, 2484,
+                4078
+              ]
             },
-            data: [
-              709, 1917, 2455, 2610, 1719, 1433, 1544, 3285, 5208, 3372, 2484,
-              4078
-            ]
-          },
 
-          {
-            name: 'male',
-            type: 'bar',
-            stack: 'total',
-            itemStyle: {
-              normal: {
-                color: 'rgba(0,191,183,1)',
-                barBorderRadius: 0,
-                label: {
-                  show: true,
-                  position: 'top',
-                  formatter(p) {
-                    return p.value > 0 ? p.value : ''
+            {
+              name: 'male',
+              type: 'bar',
+              stack: 'total',
+              itemStyle: {
+                normal: {
+                  color: 'rgba(0,191,183,1)',
+                  barBorderRadius: 0,
+                  label: {
+                    show: true,
+                    position: 'top',
+                    formatter(p) {
+                      return p.value > 0 ? p.value : ''
+                    }
                   }
                 }
-              }
+              },
+              data: [
+                327, 1776, 507, 1200, 800, 482, 204, 1390, 1001, 951, 381, 220
+              ]
             },
-            data: [
-              327, 1776, 507, 1200, 800, 482, 204, 1390, 1001, 951, 381, 220
-            ]
-          },
-          {
-            name: 'average',
-            type: 'line',
-            stack: 'total',
-            symbolSize: 10,
-            symbol: 'circle',
-            itemStyle: {
-              normal: {
-                color: 'rgba(252,230,48,1)',
-                barBorderRadius: 0,
-                label: {
-                  show: true,
-                  position: 'top',
-                  formatter(p) {
-                    return p.value > 0 ? p.value : ''
+            {
+              name: 'average',
+              type: 'line',
+              stack: 'total',
+              symbolSize: 10,
+              symbol: 'circle',
+              itemStyle: {
+                normal: {
+                  color: 'rgba(252,230,48,1)',
+                  barBorderRadius: 0,
+                  label: {
+                    show: true,
+                    position: 'top',
+                    formatter(p) {
+                      return p.value > 0 ? p.value : ''
+                    }
                   }
                 }
-              }
-            },
-            data: [
-              1036, 3693, 2962, 3810, 2519, 1915, 1748, 4675, 6209, 4323, 2865,
-              4298
-            ]
-          }
-        ]
-      })
+              },
+              data: [
+                1036, 3693, 2962, 3810, 2519, 1915, 1748, 4675, 6209, 4323,
+                2865, 4298
+              ]
+            }
+          ]
+        })
+      }
     }
   }
-}
 </script>
diff --git a/src/components/ErrorLog/index.vue b/src/components/ErrorLog/index.vue
index ff861c3..38e6a38 100644
--- a/src/components/ErrorLog/index.vue
+++ b/src/components/ErrorLog/index.vue
@@ -1,23 +1,12 @@
 <template>
-  <div
-    v-if="errorLogs.length > 0"
-    style="margin-right: 20px"
-  >
-    <el-tooltip
-      effect="dark"
-      :content="$t('navbar.error')"
-      placement="bottom"
-    >
+  <div v-if="errorLogs.length > 0" style="margin-right: 20px">
+    <el-tooltip effect="dark" :content="$t('navbar.error')" placement="bottom">
       <el-badge
         :is-dot="true"
         style="line-height: 20px"
         @click.native="dialogTableVisible = true"
       >
-        <el-button
-          size="small"
-          type="danger"
-          class="bug-btn"
-        >
+        <el-button size="small" type="danger" class="bug-btn">
           <svg
             t="1492682037685"
             class="bug-svg"
@@ -37,15 +26,8 @@
         </el-button>
       </el-badge>
     </el-tooltip>
-    <el-dialog
-      title="Error Log"
-      :visible.sync="dialogTableVisible"
-      width="80%"
-    >
-      <el-table
-        :data="errorLogs"
-        border
-      >
+    <el-dialog title="Error Log" :visible.sync="dialogTableVisible" width="80%">
+      <el-table :data="errorLogs" border>
         <el-table-column label="Message">
           <template slot-scope="scope">
             <div>
@@ -54,26 +36,20 @@
                 {{ scope.row.err.message }}
               </el-tag>
             </div>
-            <br>
+            <br />
             <div>
-              <span
-                class="message-title"
-                style="padding-right: 10px"
-              >Info:
+              <span class="message-title" style="padding-right: 10px">
+                Info:
               </span>
-              <el-tag
-                type="warning"
-              >
+              <el-tag type="warning">
                 {{ scope.row.vm.$vnode.tag }} error in
                 {{ scope.row.info }}
               </el-tag>
             </div>
-            <br>
+            <br />
             <div>
-              <span
-                class="message-title"
-                style="padding-right: 16px"
-              >Url:
+              <span class="message-title" style="padding-right: 16px">
+                Url:
               </span>
               <el-tag type="success">
                 {{ scope.row.url }}
@@ -92,36 +68,36 @@
 </template>
 
 <script>
-export default {
-  name: 'ErrorLog',
-  data() {
-    return {
-      dialogTableVisible: false
-    }
-  },
-  computed: {
-    errorLogs() {
-      return this.$store.getters.errorLogs
+  export default {
+    name: 'ErrorLog',
+    data() {
+      return {
+        dialogTableVisible: false
+      }
+    },
+    computed: {
+      errorLogs() {
+        return this.$store.getters.errorLogs
+      }
     }
   }
-}
 </script>
 
 <style scoped>
-.bug-btn.el-button--small {
-  padding: 5px 5px;
-}
-.bug-svg {
-  width: 16px;
-  height: 16px;
-  vertical-align: -0.15em;
-  fill: currentColor;
-  overflow: hidden;
-}
-.message-title {
-  font-size: 16px;
-  color: #333;
-  font-weight: bold;
-  padding-right: 8px;
-}
+  .bug-btn.el-button--small {
+    padding: 5px 5px;
+  }
+  .bug-svg {
+    width: 16px;
+    height: 16px;
+    vertical-align: -0.15em;
+    fill: currentColor;
+    overflow: hidden;
+  }
+  .message-title {
+    font-size: 16px;
+    color: #333;
+    font-weight: bold;
+    padding-right: 8px;
+  }
 </style>
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 67dc1ae..7217c9a 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -9,32 +9,32 @@
 </template>
 
 <script>
-export default {
-  name: 'Hamburger',
-  props: {
-    isActive: {
-      type: Boolean,
-      default: false
+  export default {
+    name: 'Hamburger',
+    props: {
+      isActive: {
+        type: Boolean,
+        default: false
+      },
+      toggleClick: {
+        type: Function,
+        default: null
+      }
     },
-    toggleClick: {
-      type: Function,
-      default: null
-    }
-  },
-  computed: {
-    svgName() {
-      return this.isActive ? 'menu-unfold' : 'menu-fold'
+    computed: {
+      svgName() {
+        return this.isActive ? 'menu-unfold' : 'menu-fold'
+      }
     }
   }
-}
 </script>
 
 <style scoped>
-.hamburger {
-  display: inline-block;
-  cursor: pointer;
-  width: 20px;
-  height: 20px;
-  color: #fff;
-}
+  .hamburger {
+    display: inline-block;
+    cursor: pointer;
+    width: 20px;
+    height: 20px;
+    color: #fff;
+  }
 </style>
diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue
index 5fb9398..06580ca 100644
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -5,28 +5,15 @@
     @command="handleSetLanguage"
   >
     <div>
-      <el-tooltip
-        effect="dark"
-        :content="$t('navbar.lang')"
-        placement="bottom"
-      >
-        <svg-icon
-          class-name="international-icon"
-          icon-class="language"
-        />
+      <el-tooltip effect="dark" :content="$t('navbar.lang')" placement="bottom">
+        <svg-icon class-name="international-icon" icon-class="language" />
       </el-tooltip>
     </div>
     <el-dropdown-menu slot="dropdown">
-      <el-dropdown-item
-        command="zh"
-        :disabled="language === 'zh'"
-      >
+      <el-dropdown-item command="zh" :disabled="language === 'zh'">
         中文
       </el-dropdown-item>
-      <el-dropdown-item
-        command="en"
-        :disabled="language === 'en'"
-      >
+      <el-dropdown-item command="en" :disabled="language === 'en'">
         English
       </el-dropdown-item>
     </el-dropdown-menu>
@@ -34,30 +21,30 @@
 </template>
 
 <script>
-export default {
-  computed: {
-    language() {
-      return this.$store.getters.language
-    }
-  },
-  methods: {
-    handleSetLanguage(lang) {
-      this.$i18n.locale = lang
-      this.$store.dispatch('setLanguage', lang)
-      this.$message({
-        message: 'switch language success',
-        type: 'success'
-      })
+  export default {
+    computed: {
+      language() {
+        return this.$store.getters.language
+      }
+    },
+    methods: {
+      handleSetLanguage(lang) {
+        this.$i18n.locale = lang
+        this.$store.dispatch('setLanguage', lang)
+        this.$message({
+          message: 'switch language success',
+          type: 'success'
+        })
+      }
     }
   }
-}
 </script>
 
 <style scoped>
-.international-icon {
-  font-size: 20px;
-  cursor: pointer;
-  vertical-align: -4px !important;
-  margin-right: 10px;
-}
+  .international-icon {
+    font-size: 20px;
+    cursor: pointer;
+    vertical-align: -4px !important;
+    margin-right: 10px;
+  }
 </style>
diff --git a/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue b/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
index c4280c5..b1aecea 100644
--- a/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
+++ b/src/components/QuestionsChoiceNavbar/components/QuestionChoiceSelect.vue
@@ -7,9 +7,11 @@
             {{ name }}
           </template>
           <el-select v-model="value" placeholder="请选择" size="mini">
-            <el-option 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-select>
         </el-form-item>
@@ -19,40 +21,44 @@
 </template>
 
 <script>
-export default {
-  // eslint-disable-next-line
-  props: ['name'],
-  data() {
-    return {
-      form: {
-
-      },
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
-      value: ''
+  export default {
+    // eslint-disable-next-line
+    props: ['name'],
+    data() {
+      return {
+        form: {},
+        options: [
+          {
+            value: '选项1',
+            label: '黄金糕'
+          },
+          {
+            value: '选项2',
+            label: '双皮奶'
+          },
+          {
+            value: '选项3',
+            label: '蚵仔煎'
+          },
+          {
+            value: '选项4',
+            label: '龙须面'
+          },
+          {
+            value: '选项5',
+            label: '北京烤鸭'
+          }
+        ],
+        value: ''
+      }
     }
   }
-}
 </script>
 
-<style scoped >
-.project {
-  margin-right: 10px;
-  color: #606266;
-  font-weight: 700;
-}
+<style scoped>
+  .project {
+    margin-right: 10px;
+    color: #606266;
+    font-weight: 700;
+  }
 </style>
diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue
index 6b26edd..e8bd697 100644
--- a/src/components/Screenfull/index.vue
+++ b/src/components/Screenfull/index.vue
@@ -33,52 +33,52 @@
 </template>
 
 <script>
-import screenfull from 'screenfull'
+  import screenfull from 'screenfull'
 
-export default {
-  name: 'Screenfull',
-  props: {
-    width: {
-      type: Number,
-      default: 22
+  export default {
+    name: 'Screenfull',
+    props: {
+      width: {
+        type: Number,
+        default: 22
+      },
+      height: {
+        type: Number,
+        default: 22
+      },
+      fill: {
+        type: String,
+        default: '#48576a'
+      }
     },
-    height: {
-      type: Number,
-      default: 22
+    data() {
+      return {
+        isFullscreen: false
+      }
     },
-    fill: {
-      type: String,
-      default: '#48576a'
-    }
-  },
-  data() {
-    return {
-      isFullscreen: false
-    }
-  },
-  methods: {
-    click() {
-      if (!screenfull.enabled) {
-        this.$message({
-          message: 'you browser can not work',
-          type: 'warning'
-        })
-        return false
+    methods: {
+      click() {
+        if (!screenfull.enabled) {
+          this.$message({
+            message: 'you browser can not work',
+            type: 'warning'
+          })
+          return false
+        }
+        screenfull.toggle()
       }
-      screenfull.toggle()
     }
   }
-}
 </script>
 
 <style scoped>
-.screenfull-svg {
-  display: inline-block;
-  cursor: pointer;
-  fill: #fff;
-  width: 20px;
-  height: 20px;
-  vertical-align: -3px;
-  margin-right: 8px;
-}
+  .screenfull-svg {
+    display: inline-block;
+    cursor: pointer;
+    fill: #fff;
+    width: 20px;
+    height: 20px;
+    vertical-align: -3px;
+    margin-right: 8px;
+  }
 </style>
diff --git a/src/components/ScrollBar/index.vue b/src/components/ScrollBar/index.vue
index d9d341d..679ffee 100644
--- a/src/components/ScrollBar/index.vue
+++ b/src/components/ScrollBar/index.vue
@@ -15,55 +15,55 @@
 </template>
 
 <script>
-const delta = 15
+  const delta = 15
 
-export default {
-  name: 'ScrollBar',
-  data() {
-    return {
-      top: 0
-    }
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 3
-      const $container = this.$refs.scrollContainer
-      const $containerHeight = $container.offsetHeight
-      const $wrapper = this.$refs.scrollWrapper
-      const $wrapperHeight = $wrapper.offsetHeight
-      if (eventDelta > 0) {
-        this.top = Math.min(0, this.top + eventDelta)
-      } else {
-        if ($containerHeight - delta < $wrapperHeight) {
-          if (this.top < -($wrapperHeight - $containerHeight + delta)) {
-            // eslint-disable-next-line
-            this.top = this.top
+  export default {
+    name: 'ScrollBar',
+    data() {
+      return {
+        top: 0
+      }
+    },
+    methods: {
+      handleScroll(e) {
+        const eventDelta = e.wheelDelta || -e.deltaY * 3
+        const $container = this.$refs.scrollContainer
+        const $containerHeight = $container.offsetHeight
+        const $wrapper = this.$refs.scrollWrapper
+        const $wrapperHeight = $wrapper.offsetHeight
+        if (eventDelta > 0) {
+          this.top = Math.min(0, this.top + eventDelta)
+        } else {
+          if ($containerHeight - delta < $wrapperHeight) {
+            if (this.top < -($wrapperHeight - $containerHeight + delta)) {
+              // eslint-disable-next-line
+              this.top = this.top
+            } else {
+              this.top = Math.max(
+                this.top + eventDelta,
+                $containerHeight - $wrapperHeight - delta
+              )
+            }
           } else {
-            this.top = Math.max(
-              this.top + eventDelta,
-              $containerHeight - $wrapperHeight - delta
-            )
+            this.top = 0
           }
-        } else {
-          this.top = 0
         }
       }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-@import '../../styles/variables.scss';
+  @import '../../styles/variables.scss';
 
-.scroll-container {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  background-color: $menuBg;
-  .scroll-wrapper {
-    position: absolute;
-    width: 100% !important;
+  .scroll-container {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    background-color: $menuBg;
+    .scroll-wrapper {
+      position: absolute;
+      width: 100% !important;
+    }
   }
-}
 </style>
diff --git a/src/components/ScrollPane/index.vue b/src/components/ScrollPane/index.vue
index ea08c1e..51dd6f3 100644
--- a/src/components/ScrollPane/index.vue
+++ b/src/components/ScrollPane/index.vue
@@ -15,73 +15,77 @@
 </template>
 
 <script>
-const padding = 15 // tag's padding
+  const padding = 15 // tag's padding
 
-export default {
-  name: 'ScrollPane',
-  data() {
-    return {
-      left: 0
-    }
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 3
-      const $container = this.$refs.scrollContainer
-      const $containerWidth = $container.offsetWidth
-      const $wrapper = this.$refs.scrollWrapper
-      const $wrapperWidth = $wrapper.offsetWidth
+  export default {
+    name: 'ScrollPane',
+    data() {
+      return {
+        left: 0
+      }
+    },
+    methods: {
+      handleScroll(e) {
+        const eventDelta = e.wheelDelta || -e.deltaY * 3
+        const $container = this.$refs.scrollContainer
+        const $containerWidth = $container.offsetWidth
+        const $wrapper = this.$refs.scrollWrapper
+        const $wrapperWidth = $wrapper.offsetWidth
 
-      if (eventDelta > 0) {
-        this.left = Math.min(0, this.left + eventDelta)
-      } else {
-        if ($containerWidth - padding < $wrapperWidth) {
-          if (this.left < -($wrapperWidth - $containerWidth + padding)) {
-            // eslint-disable-next-line
-            this.left = this.left
+        if (eventDelta > 0) {
+          this.left = Math.min(0, this.left + eventDelta)
+        } else {
+          if ($containerWidth - padding < $wrapperWidth) {
+            if (this.left < -($wrapperWidth - $containerWidth + padding)) {
+              // eslint-disable-next-line
+              this.left = this.left
+            } else {
+              this.left = Math.max(
+                this.left + eventDelta,
+                $containerWidth - $wrapperWidth - padding
+              )
+            }
           } else {
-            this.left = Math.max(
-              this.left + eventDelta,
-              $containerWidth - $wrapperWidth - padding
-            )
+            this.left = 0
           }
-        } else {
-          this.left = 0
         }
-      }
-    },
-    moveToTarget($target) {
-      const $container = this.$refs.scrollContainer
-      const $containerWidth = $container.offsetWidth
-      const $targetLeft = $target.offsetLeft
-      const $targetWidth = $target.offsetWidth
+      },
+      moveToTarget($target) {
+        const $container = this.$refs.scrollContainer
+        const $containerWidth = $container.offsetWidth
+        const $targetLeft = $target.offsetLeft
+        const $targetWidth = $target.offsetWidth
 
-      if ($targetLeft < -this.left) {
-        // tag in the left
-        this.left = -$targetLeft + padding
-      } else if (
-        $targetLeft + padding > -this.left &&
-        $targetLeft + $targetWidth < -this.left + $containerWidth - padding
-      ) {
-        // tag in the current view
-        // eslint-disable-line
-      } else {
-        // tag in the right
-        this.left = -($targetLeft - ($containerWidth - $targetWidth) + padding)
+        if ($targetLeft < -this.left) {
+          // tag in the left
+          this.left = -$targetLeft + padding
+        } else if (
+          $targetLeft + padding > -this.left &&
+          $targetLeft + $targetWidth < -this.left + $containerWidth - padding
+        ) {
+          // tag in the current view
+          // eslint-disable-line
+        } else {
+          // tag in the right
+          this.left = -(
+            $targetLeft -
+            ($containerWidth - $targetWidth) +
+            padding
+          )
+        }
       }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.scroll-container {
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  .scroll-wrapper {
-    position: absolute;
+  .scroll-container {
+    white-space: nowrap;
+    position: relative;
+    overflow: hidden;
+    width: 100%;
+    .scroll-wrapper {
+      position: absolute;
+    }
   }
-}
 </style>
diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue
index 9c32ae8..44e3688 100644
--- a/src/components/SvgIcon/index.vue
+++ b/src/components/SvgIcon/index.vue
@@ -5,39 +5,39 @@
 </template>
 
 <script>
-export default {
-  name: 'SvgIcon',
-  props: {
-    iconClass: {
-      type: String,
-      required: true
-    },
-    // eslint-disable-next-line
-    className: {
-      type: String
-    }
-  },
-  computed: {
-    iconName() {
-      return `#icon-${this.iconClass}`
+  export default {
+    name: 'SvgIcon',
+    props: {
+      iconClass: {
+        type: String,
+        required: true
+      },
+      // eslint-disable-next-line
+      className: {
+        type: String
+      }
     },
-    svgClass() {
-      if (this.className) {
-        return 'svg-icon ' + this.className
-      } else {
-        return 'svg-icon'
+    computed: {
+      iconName() {
+        return `#icon-${this.iconClass}`
+      },
+      svgClass() {
+        if (this.className) {
+          return 'svg-icon ' + this.className
+        } else {
+          return 'svg-icon'
+        }
       }
     }
   }
-}
 </script>
 
 <style scoped>
-.svg-icon {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
-  fill: currentColor;
-  overflow: hidden;
-}
+  .svg-icon {
+    width: 1em;
+    height: 1em;
+    vertical-align: -0.15em;
+    fill: currentColor;
+    overflow: hidden;
+  }
 </style>
diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue
index be9fa40..d7a5eeb 100644
--- a/src/components/ThemePicker/index.vue
+++ b/src/components/ThemePicker/index.vue
@@ -7,110 +7,131 @@
 </template>
 
 <script>
-const version = require('element-ui/package.json').version // element-ui version from node_modules
-const ORIGINAL_THEME = '#409EFF' // default color
-
-export default {
-  data() {
-    return {
-      chalk: '', // content of theme-chalk css
-      theme: ORIGINAL_THEME
-    }
-  },
-  watch: {
-    theme(val, oldVal) {
-      if (typeof val !== 'string') return
-      const themeCluster = this.getThemeCluster(val.replace('#', ''))
-      const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
-      console.log(themeCluster, originalCluster)
-      const getHandler = (variable, id) => {
-        return () => {
-          const originalCluster = this.getThemeCluster(
-            ORIGINAL_THEME.replace('#', '')
-          )
-          const newStyle = this.updateStyle(
-            this[variable],
-            originalCluster,
-            themeCluster
-          )
-
-          let styleTag = document.getElementById(id)
-          if (!styleTag) {
-            styleTag = document.createElement('style')
-            styleTag.setAttribute('id', id)
-            document.head.appendChild(styleTag)
+  const version = require('element-ui/package.json').version // element-ui version from node_modules
+  const ORIGINAL_THEME = '#409EFF' // default color
+
+  export default {
+    data() {
+      return {
+        chalk: '', // content of theme-chalk css
+        theme: ORIGINAL_THEME
+      }
+    },
+    watch: {
+      theme(val, oldVal) {
+        if (typeof val !== 'string') return
+        const themeCluster = this.getThemeCluster(val.replace('#', ''))
+        const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
+        console.log(themeCluster, originalCluster)
+        const getHandler = (variable, id) => {
+          return () => {
+            const originalCluster = this.getThemeCluster(
+              ORIGINAL_THEME.replace('#', '')
+            )
+            const newStyle = this.updateStyle(
+              this[variable],
+              originalCluster,
+              themeCluster
+            )
+
+            let styleTag = document.getElementById(id)
+            if (!styleTag) {
+              styleTag = document.createElement('style')
+              styleTag.setAttribute('id', id)
+              document.head.appendChild(styleTag)
+            }
+            styleTag.innerText = newStyle
           }
-          styleTag.innerText = newStyle
         }
-      }
 
-      const chalkHandler = getHandler('chalk', 'chalk-style')
+        const chalkHandler = getHandler('chalk', 'chalk-style')
 
-      if (!this.chalk) {
-        const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
-        this.getCSSString(url, chalkHandler, 'chalk')
-      } else {
-        chalkHandler()
-      }
+        if (!this.chalk) {
+          const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
+          this.getCSSString(url, chalkHandler, 'chalk')
+        } else {
+          chalkHandler()
+        }
 
-      const styles = [].slice
-        .call(document.querySelectorAll('style'))
-        .filter((style) => {
-          const text = style.innerText
-          return (
-            new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
+        const styles = [].slice
+          .call(document.querySelectorAll('style'))
+          .filter((style) => {
+            const text = style.innerText
+            return (
+              new RegExp(oldVal, 'i').test(text) &&
+              !/Chalk Variables/.test(text)
+            )
+          })
+        styles.forEach((style) => {
+          const { innerText } = style
+          if (typeof innerText !== 'string') return
+          style.innerText = this.updateStyle(
+            innerText,
+            originalCluster,
+            themeCluster
           )
         })
-      styles.forEach((style) => {
-        const { innerText } = style
-        if (typeof innerText !== 'string') return
-        style.innerText = this.updateStyle(
-          innerText,
-          originalCluster,
-          themeCluster
-        )
-      })
-      this.$message({
-        message: '换肤成功',
-        type: 'success'
-      })
-    }
-  },
-
-  methods: {
-    updateStyle(style, oldCluster, newCluster) {
-      let newStyle = style
-      oldCluster.forEach((color, index) => {
-        newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
-      })
-      return newStyle
+        this.$message({
+          message: '换肤成功',
+          type: 'success'
+        })
+      }
     },
 
-    getCSSString(url, callback, variable) {
-      const xhr = new XMLHttpRequest()
-      xhr.onreadystatechange = () => {
-        if (xhr.readyState === 4 && xhr.status === 200) {
-          this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
-          callback()
+    methods: {
+      updateStyle(style, oldCluster, newCluster) {
+        let newStyle = style
+        oldCluster.forEach((color, index) => {
+          newStyle = newStyle.replace(
+            new RegExp(color, 'ig'),
+            newCluster[index]
+          )
+        })
+        return newStyle
+      },
+
+      getCSSString(url, callback, variable) {
+        const xhr = new XMLHttpRequest()
+        xhr.onreadystatechange = () => {
+          if (xhr.readyState === 4 && xhr.status === 200) {
+            this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
+            callback()
+          }
+        }
+        xhr.open('GET', url)
+        xhr.send()
+      },
+
+      getThemeCluster(theme) {
+        const tintColor = (color, tint) => {
+          let red = parseInt(color.slice(0, 2), 16)
+          let green = parseInt(color.slice(2, 4), 16)
+          let blue = parseInt(color.slice(4, 6), 16)
+
+          if (tint === 0) {
+            // when primary color is in its rgb space
+            return [red, green, blue].join(',')
+          } else {
+            red += Math.round(tint * (255 - red))
+            green += Math.round(tint * (255 - green))
+            blue += Math.round(tint * (255 - blue))
+
+            red = red.toString(16)
+            green = green.toString(16)
+            blue = blue.toString(16)
+
+            return `#${red}${green}${blue}`
+          }
         }
-      }
-      xhr.open('GET', url)
-      xhr.send()
-    },
 
-    getThemeCluster(theme) {
-      const tintColor = (color, tint) => {
-        let red = parseInt(color.slice(0, 2), 16)
-        let green = parseInt(color.slice(2, 4), 16)
-        let blue = parseInt(color.slice(4, 6), 16)
+        const shadeColor = (color, shade) => {
+          let red = parseInt(color.slice(0, 2), 16)
+          let green = parseInt(color.slice(2, 4), 16)
+          let blue = parseInt(color.slice(4, 6), 16)
 
-        if (tint === 0) {
-          // when primary color is in its rgb space
-          return [red, green, blue].join(',')
-        } else {
-          red += Math.round(tint * (255 - red))
-          green += Math.round(tint * (255 - green))
-          blue += Math.round(tint * (255 - blue))
+          red = Math.round((1 - shade) * red)
+          green = Math.round((1 - shade) * green)
+          blue = Math.round((1 - shade) * blue)
 
           red = red.toString(16)
           green = green.toString(16)
@@ -118,41 +139,24 @@ export default {
 
           return `#${red}${green}${blue}`
         }
-      }
 
-      const shadeColor = (color, shade) => {
-        let red = parseInt(color.slice(0, 2), 16)
-        let green = parseInt(color.slice(2, 4), 16)
-        let blue = parseInt(color.slice(4, 6), 16)
-
-        red = Math.round((1 - shade) * red)
-        green = Math.round((1 - shade) * green)
-        blue = Math.round((1 - shade) * blue)
-
-        red = red.toString(16)
-        green = green.toString(16)
-        blue = blue.toString(16)
-
-        return `#${red}${green}${blue}`
-      }
-
-      const clusters = [theme]
-      for (let i = 0; i <= 9; i++) {
-        clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
+        const clusters = [theme]
+        for (let i = 0; i <= 9; i++) {
+          clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
+        }
+        clusters.push(shadeColor(theme, 0.1))
+        return clusters
       }
-      clusters.push(shadeColor(theme, 0.1))
-      return clusters
     }
   }
-}
 </script>
 
 <style>
-.theme-picker .el-color-picker__trigger {
-  vertical-align: middle;
-}
+  .theme-picker .el-color-picker__trigger {
+    vertical-align: middle;
+  }
 
-.theme-picker-dropdown .el-color-dropdown__link-btn {
-  display: none;
-}
+  .theme-picker-dropdown .el-color-dropdown__link-btn {
+    display: none;
+  }
 </style>
diff --git a/src/components/TreeTable/index.vue b/src/components/TreeTable/index.vue
index fbb6c5e..76f78b4 100644
--- a/src/components/TreeTable/index.vue
+++ b/src/components/TreeTable/index.vue
@@ -28,17 +28,9 @@
         </span>
       </template>
     </el-table-column>
-    <el-table-column
-      label="操作"
-      width="260"
-      align="center"
-    >
+    <el-table-column label="操作" width="260" align="center">
       <template slot-scope="scope">
-        <el-button
-          size="mini"
-          type="primary"
-          @click="handleUpdate(scope.row)"
-        >
+        <el-button size="mini" type="primary" @click="handleUpdate(scope.row)">
           修改
         </el-button>
         <el-button
@@ -54,118 +46,123 @@
 </template>
 
 <script>
-import Utils from './utils/dataTranslate.js'
-import expand from './utils/expand'
-export default {
-  name: 'TreeTable',
-  components: { expand },
-  props: {
-    // 该属性是确认父组件传过来的数据是否已经是树形结构了，如果是，则不需要进行树形格式化
-    treeStructure: {
-      type: Boolean,
-      default: function () {
-        return false
+  import Utils from './utils/dataTranslate.js'
+  import expand from './utils/expand'
+  export default {
+    name: 'TreeTable',
+    components: { expand },
+    props: {
+      // 该属性是确认父组件传过来的数据是否已经是树形结构了，如果是，则不需要进行树形格式化
+      treeStructure: {
+        type: Boolean,
+        default: function () {
+          return false
+        }
+      },
+      data: {
+        type: Array,
+        default: function () {
+          return []
+        }
+      },
+      // 这是相应的字段展示
+      columns: {
+        type: Array,
+        default: function () {
+          return []
+        }
+      },
+      listLoading: {
+        type: Boolean,
+        default: false
+      },
+      // 是否默认展开所有树
+      defaultExpandAll: {
+        type: Boolean,
+        default: function () {
+          return true
+        }
       }
     },
-    data: {
-      type: Array,
-      default: function () {
-        return []
+    computed: {
+      // 格式化数据源
+      formatData: function () {
+        const me = this
+        if (me.treeStructure) {
+          const data = Utils.treeToArray(
+            me.data,
+            null,
+            null,
+            me.defaultExpandAll
+          )
+          return data
+        }
+        return me.data
       }
     },
-    // 这是相应的字段展示
-    columns: {
-      type: Array,
-      default: function () {
-        return []
+    methods: {
+      rowClassStatus: function () {
+        this.$emit('rowClassStatus')
+      },
+      handleUpdate(row) {
+        this.$emit('handleUpdate', row)
+      },
+      handleDelete(user) {
+        this.$emit('removeUser', user)
       }
-    },
-    listLoading: {
-      type: Boolean,
-      default: false
-    },
-    // 是否默认展开所有树
-    defaultExpandAll: {
-      type: Boolean,
-      default: function () {
-        return true
-      }
-    }
-  },
-  computed: {
-    // 格式化数据源
-    formatData: function () {
-      const me = this
-      if (me.treeStructure) {
-        const data = Utils.treeToArray(me.data, null, null, me.defaultExpandAll)
-        return data
-      }
-      return me.data
-    }
-  },
-  methods: {
-    rowClassStatus: function () {
-      this.$emit('rowClassStatus')
-    },
-    handleUpdate(row) {
-      this.$emit('handleUpdate', row)
-    },
-    handleDelete(user) {
-      this.$emit('removeUser', user)
     }
   }
-}
 </script>
 <style rel="stylesheet/css">
-.ivu-icon-ios-folder-outline {
-  content: '\F434';
-}
-@keyframes treeTableShow {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
+  .ivu-icon-ios-folder-outline {
+    content: '\F434';
   }
-}
-@-webkit-keyframes treeTableShow {
-  from {
-    opacity: 0;
+  @keyframes treeTableShow {
+    from {
+      opacity: 0;
+    }
+    to {
+      opacity: 1;
+    }
   }
-  to {
-    opacity: 1;
+  @-webkit-keyframes treeTableShow {
+    from {
+      opacity: 0;
+    }
+    to {
+      opacity: 1;
+    }
   }
-}
 </style>
 
 <style lang="scss" rel="stylesheet/scss" scoped>
-$color-blue: #2196f3;
-$space-width: 18px;
-.ms-tree-space {
-  position: relative;
-  top: 1px;
-  display: inline-block;
-  font-style: normal;
-  font-weight: 400;
-  line-height: 1;
-  width: $space-width;
-  height: 14px;
-  &::before {
-    content: '';
+  $color-blue: #2196f3;
+  $space-width: 18px;
+  .ms-tree-space {
+    position: relative;
+    top: 1px;
+    display: inline-block;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 1;
+    width: $space-width;
+    height: 14px;
+    &::before {
+      content: '';
+    }
+  }
+  .processContainer {
+    width: 100%;
+    height: 100%;
+  }
+  table td {
+    line-height: 26px;
   }
-}
-.processContainer {
-  width: 100%;
-  height: 100%;
-}
-table td {
-  line-height: 26px;
-}
 
-.tree-ctrl {
-  position: relative;
-  cursor: pointer;
-  color: $color-blue;
-  margin-left: -$space-width;
-}
+  .tree-ctrl {
+    position: relative;
+    cursor: pointer;
+    color: $color-blue;
+    margin-left: -$space-width;
+  }
 </style>
diff --git a/src/components/TreeTable/utils/expand.vue b/src/components/TreeTable/utils/expand.vue
index 0ff75f4..718ed58 100644
--- a/src/components/TreeTable/utils/expand.vue
+++ b/src/components/TreeTable/utils/expand.vue
@@ -1,26 +1,26 @@
 <script>
-export default {
-  name: 'TableExpand',
-  functional: true,
-  props: {
-    // eslint-disable-next-line
-    row: Object,
-    // eslint-disable-next-line
-    render: Function,
-    // eslint-disable-next-line
-    index: Number,
-    column: {
-      type: Object,
-      default: null
+  export default {
+    name: 'TableExpand',
+    functional: true,
+    props: {
+      // eslint-disable-next-line
+      row: Object,
+      // eslint-disable-next-line
+      render: Function,
+      // eslint-disable-next-line
+      index: Number,
+      column: {
+        type: Object,
+        default: null
+      }
+    },
+    render: (h, ctx) => {
+      const params = {
+        row: ctx.props.row,
+        index: ctx.props.index
+      }
+      if (ctx.props.column) params.column = ctx.props.column
+      return ctx.props.render(h, params)
     }
-  },
-  render: (h, ctx) => {
-    const params = {
-      row: ctx.props.row,
-      index: ctx.props.index
-    }
-    if (ctx.props.column) params.column = ctx.props.column
-    return ctx.props.render(h, params)
   }
-}
 </script>
diff --git a/src/filters/index.js b/src/filters/index.js
index a141546..7a0e83b 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -167,7 +167,10 @@ export function formatDate(date, fmt = 'yyyy-MM-dd hh:mm:ss') {
     date = new Date(date)
   }
   if (/(y+)/.test(fmt)) {
-    fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+    fmt = fmt.replace(
+      RegExp.$1,
+      (date.getFullYear() + '').substr(4 - RegExp.$1.length)
+    )
   }
   const o = {
     'M+': date.getMonth() + 1,
@@ -179,7 +182,10 @@ export function formatDate(date, fmt = 'yyyy-MM-dd hh:mm:ss') {
   for (const k in o) {
     if (new RegExp(`(${k})`).test(fmt)) {
       const str = o[k] + ''
-      fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str))
+      fmt = fmt.replace(
+        RegExp.$1,
+        RegExp.$1.length === 1 ? str : padLeftZero(str)
+      )
     }
   }
   return fmt
diff --git a/src/module-dashboard/components/dashboardAreaChart.vue b/src/module-dashboard/components/dashboardAreaChart.vue
index a9fe025..a0eef7e 100644
--- a/src/module-dashboard/components/dashboardAreaChart.vue
+++ b/src/module-dashboard/components/dashboardAreaChart.vue
@@ -3,159 +3,160 @@
 </template>
 
 <script>
-import echarts from 'echarts'
-import { debounce } from '@/utils'
-require('echarts/theme/macarons') // echarts theme
-// eslint-disable-next-line
-const animationDuration = 6000
+  import echarts from 'echarts'
+  import { debounce } from '@/utils'
+  require('echarts/theme/macarons') // echarts theme
+  // eslint-disable-next-line
+  const animationDuration = 6000
 
-export default {
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
+  export default {
+    props: {
+      className: {
+        type: String,
+        default: 'chart'
+      },
+      width: {
+        type: String,
+        default: '100%'
+      },
+      height: {
+        type: String,
+        default: '100%'
+      }
     },
-    width: {
-      type: String,
-      default: '100%'
+    data() {
+      return {
+        chart: null
+      }
     },
-    height: {
-      type: String,
-      default: '100%'
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.initChart()
-    this.__resizeHanlder = debounce(() => {
-      if (this.chart) {
-        this.chart.resize()
+    mounted() {
+      this.initChart()
+      this.__resizeHanlder = debounce(() => {
+        if (this.chart) {
+          this.chart.resize()
+        }
+      }, 100)
+      window.addEventListener('resize', this.__resizeHanlder)
+    },
+    beforeDestroy() {
+      if (!this.chart) {
+        return
       }
-    }, 100)
-    window.addEventListener('resize', this.__resizeHanlder)
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    window.removeEventListener('resize', this.__resizeHanlder)
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
-
-      this.chart.setOption({
-        tooltip: {
-          trigger: 'item',
-          formatter: '{a} <br/>{b}: {c} ({d}%)'
-        },
-        legend: {
-          orient: 'vertical',
-          x: 'left',
-          data: [
-            '直达',
-            '营销广告',
-            '搜索引擎',
-            '邮件营销',
-            '联盟广告',
-            '视频广告',
-            '百度',
-            '谷歌',
-            '必应',
-            '其他'
-          ]
-        },
-        series: [
-          {
-            name: '访问来源',
-            type: 'pie',
-            selectedMode: 'single',
-            radius: [0, '30%'],
+      window.removeEventListener('resize', this.__resizeHanlder)
+      this.chart.dispose()
+      this.chart = null
+    },
+    methods: {
+      initChart() {
+        this.chart = echarts.init(this.$el, 'macarons')
 
-            label: {
-              normal: {
-                position: 'inner'
-              }
-            },
-            labelLine: {
-              normal: {
-                show: false
-              }
-            },
+        this.chart.setOption({
+          tooltip: {
+            trigger: 'item',
+            formatter: '{a} <br/>{b}: {c} ({d}%)'
+          },
+          legend: {
+            orient: 'vertical',
+            x: 'left',
             data: [
-              { value: 335, name: '直达', selected: true },
-              { value: 679, name: '营销广告' },
-              { value: 1548, name: '搜索引擎' }
+              '直达',
+              '营销广告',
+              '搜索引擎',
+              '邮件营销',
+              '联盟广告',
+              '视频广告',
+              '百度',
+              '谷歌',
+              '必应',
+              '其他'
             ]
           },
-          {
-            name: '访问来源',
-            type: 'pie',
-            radius: ['60%', '75%'],
-            labelxxx: {
-              normal: {
-                formatter: '{a|{a}}{abg|}\n{hr|}\n  {b|{b}：}{c}  {per|{d}%}  ',
-                backgroundColor: '#eee',
-                borderColor: '#aaa',
-                borderWidth: 1,
-                borderRadius: 4,
-                // shadowBlur:3,
-                // shadowOffsetX: 2,
-                // shadowOffsetY: 2,
-                // shadowColor: '#999',
-                // padding: [0, 7],
-                rich: {
-                  a: {
-                    color: '#999',
-                    lineHeight: 22,
-                    align: 'center'
-                  },
-                  // abg: {
-                  //     backgroundColor: '#333',
-                  //     width: '100%',
-                  //     align: 'right',
-                  //     height: 22,
-                  //     borderRadius: [4, 4, 0, 0]
-                  // },
-                  hr: {
-                    borderColor: '#aaa',
-                    width: '100%',
-                    borderWidth: 0.5,
-                    height: 0
-                  },
-                  b: {
-                    fontSize: 16,
-                    lineHeight: 33
-                  },
-                  per: {
-                    color: '#eee',
-                    backgroundColor: '#334455',
-                    padding: [2, 4],
-                    borderRadius: 2
-                  }
+          series: [
+            {
+              name: '访问来源',
+              type: 'pie',
+              selectedMode: 'single',
+              radius: [0, '30%'],
+
+              label: {
+                normal: {
+                  position: 'inner'
                 }
-              }
+              },
+              labelLine: {
+                normal: {
+                  show: false
+                }
+              },
+              data: [
+                { value: 335, name: '直达', selected: true },
+                { value: 679, name: '营销广告' },
+                { value: 1548, name: '搜索引擎' }
+              ]
             },
-            data: [
-              { value: 335, name: '直达' },
-              { value: 310, name: '邮件营销' },
-              { value: 234, name: '联盟广告' },
-              { value: 135, name: '视频广告' },
-              { value: 1048, name: '百度' },
-              { value: 251, name: '谷歌' },
-              { value: 147, name: '必应' },
-              { value: 102, name: '其他' }
-            ]
-          }
-        ]
-      })
+            {
+              name: '访问来源',
+              type: 'pie',
+              radius: ['60%', '75%'],
+              labelxxx: {
+                normal: {
+                  formatter:
+                    '{a|{a}}{abg|}\n{hr|}\n  {b|{b}：}{c}  {per|{d}%}  ',
+                  backgroundColor: '#eee',
+                  borderColor: '#aaa',
+                  borderWidth: 1,
+                  borderRadius: 4,
+                  // shadowBlur:3,
+                  // shadowOffsetX: 2,
+                  // shadowOffsetY: 2,
+                  // shadowColor: '#999',
+                  // padding: [0, 7],
+                  rich: {
+                    a: {
+                      color: '#999',
+                      lineHeight: 22,
+                      align: 'center'
+                    },
+                    // abg: {
+                    //     backgroundColor: '#333',
+                    //     width: '100%',
+                    //     align: 'right',
+                    //     height: 22,
+                    //     borderRadius: [4, 4, 0, 0]
+                    // },
+                    hr: {
+                      borderColor: '#aaa',
+                      width: '100%',
+                      borderWidth: 0.5,
+                      height: 0
+                    },
+                    b: {
+                      fontSize: 16,
+                      lineHeight: 33
+                    },
+                    per: {
+                      color: '#eee',
+                      backgroundColor: '#334455',
+                      padding: [2, 4],
+                      borderRadius: 2
+                    }
+                  }
+                }
+              },
+              data: [
+                { value: 335, name: '直达' },
+                { value: 310, name: '邮件营销' },
+                { value: 234, name: '联盟广告' },
+                { value: 135, name: '视频广告' },
+                { value: 1048, name: '百度' },
+                { value: 251, name: '谷歌' },
+                { value: 147, name: '必应' },
+                { value: 102, name: '其他' }
+              ]
+            }
+          ]
+        })
+      }
     }
   }
-}
 </script>
diff --git a/src/module-dashboard/components/dashboardBarChart.vue b/src/module-dashboard/components/dashboardBarChart.vue
index 2c40727..1686185 100644
--- a/src/module-dashboard/components/dashboardBarChart.vue
+++ b/src/module-dashboard/components/dashboardBarChart.vue
@@ -1,118 +1,115 @@
 <template>
-  <div
-    :class="className"
-    :style="{ height: height, width: width }"
-  />
+  <div :class="className" :style="{ height: height, width: width }" />
 </template>
 
 <script>
-import echarts from 'echarts'
-import { debounce } from '@/utils'
-require('echarts/theme/macarons') // echarts theme
+  import echarts from 'echarts'
+  import { debounce } from '@/utils'
+  require('echarts/theme/macarons') // echarts theme
 
-const animationDuration = 6000
+  const animationDuration = 6000
 
-export default {
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
+  export default {
+    props: {
+      className: {
+        type: String,
+        default: 'chart'
+      },
+      width: {
+        type: String,
+        default: '100%'
+      },
+      height: {
+        type: String,
+        default: '100%'
+      }
     },
-    width: {
-      type: String,
-      default: '100%'
+    data() {
+      return {
+        chart: null
+      }
     },
-    height: {
-      type: String,
-      default: '100%'
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.initChart()
-    this.__resizeHanlder = debounce(() => {
-      if (this.chart) {
-        this.chart.resize()
+    mounted() {
+      this.initChart()
+      this.__resizeHanlder = debounce(() => {
+        if (this.chart) {
+          this.chart.resize()
+        }
+      }, 100)
+      window.addEventListener('resize', this.__resizeHanlder)
+    },
+    beforeDestroy() {
+      if (!this.chart) {
+        return
       }
-    }, 100)
-    window.addEventListener('resize', this.__resizeHanlder)
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    window.removeEventListener('resize', this.__resizeHanlder)
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
+      window.removeEventListener('resize', this.__resizeHanlder)
+      this.chart.dispose()
+      this.chart = null
+    },
+    methods: {
+      initChart() {
+        this.chart = echarts.init(this.$el, 'macarons')
 
-      this.chart.setOption({
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
-        },
-        grid: {
-          top: 10,
-          left: '2%',
-          right: '2%',
-          bottom: '3%',
-          containLabel: true
-        },
-        xAxis: [
-          {
-            type: 'category',
-            data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-            axisTick: {
-              alignWithLabel: true
-            }
-          }
-        ],
-        yAxis: [
-          {
-            type: 'value',
-            axisTick: {
-              show: false
+        this.chart.setOption({
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              // 坐标轴指示器，坐标轴触发有效
+              type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
             }
-          }
-        ],
-        series: [
-          {
-            name: 'pageA',
-            type: 'bar',
-            stack: 'vistors',
-            barWidth: '60%',
-            data: [79, 52, 200, 334, 390, 330, 220],
-            animationDuration
           },
-          {
-            name: 'pageB',
-            type: 'bar',
-            stack: 'vistors',
-            barWidth: '60%',
-            data: [80, 52, 200, 334, 390, 330, 220],
-            animationDuration
+          grid: {
+            top: 10,
+            left: '2%',
+            right: '2%',
+            bottom: '3%',
+            containLabel: true
           },
-          {
-            name: 'pageC',
-            type: 'bar',
-            stack: 'vistors',
-            barWidth: '60%',
-            data: [30, 52, 200, 334, 390, 330, 220],
-            animationDuration
-          }
-        ]
-      })
+          xAxis: [
+            {
+              type: 'category',
+              data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+              axisTick: {
+                alignWithLabel: true
+              }
+            }
+          ],
+          yAxis: [
+            {
+              type: 'value',
+              axisTick: {
+                show: false
+              }
+            }
+          ],
+          series: [
+            {
+              name: 'pageA',
+              type: 'bar',
+              stack: 'vistors',
+              barWidth: '60%',
+              data: [79, 52, 200, 334, 390, 330, 220],
+              animationDuration
+            },
+            {
+              name: 'pageB',
+              type: 'bar',
+              stack: 'vistors',
+              barWidth: '60%',
+              data: [80, 52, 200, 334, 390, 330, 220],
+              animationDuration
+            },
+            {
+              name: 'pageC',
+              type: 'bar',
+              stack: 'vistors',
+              barWidth: '60%',
+              data: [30, 52, 200, 334, 390, 330, 220],
+              animationDuration
+            }
+          ]
+        })
+      }
     }
   }
-}
 </script>
diff --git a/src/module-dashboard/components/dashboardLineChart.vue b/src/module-dashboard/components/dashboardLineChart.vue
index 0c1052c..bdcfdbe 100644
--- a/src/module-dashboard/components/dashboardLineChart.vue
+++ b/src/module-dashboard/components/dashboardLineChart.vue
@@ -3,167 +3,167 @@
 </template>
 
 <script>
-import echarts from 'echarts'
-import { debounce } from '@/utils'
-require('echarts/theme/macarons') // echarts theme
+  import echarts from 'echarts'
+  import { debounce } from '@/utils'
+  require('echarts/theme/macarons') // echarts theme
 
-export default {
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
-    },
-    width: {
-      type: String,
-      default: '100%'
+  export default {
+    props: {
+      className: {
+        type: String,
+        default: 'chart'
+      },
+      width: {
+        type: String,
+        default: '100%'
+      },
+      height: {
+        type: String,
+        default: '100%'
+      },
+      autoResize: {
+        type: Boolean,
+        default: true
+      },
+      // eslint-disable-next-line
+      chartData: {
+        type: Object
+      }
     },
-    height: {
-      type: String,
-      default: '100%'
+    data() {
+      return {
+        chart: null
+      }
     },
-    autoResize: {
-      type: Boolean,
-      default: true
+    watch: {
+      chartData: {
+        deep: true,
+        handler(val) {
+          this.setOptions(val)
+        }
+      }
     },
-    // eslint-disable-next-line
-    chartData: {
-      type: Object
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  watch: {
-    chartData: {
-      deep: true,
-      handler(val) {
-        this.setOptions(val)
+    mounted() {
+      this.initChart()
+      if (this.autoResize) {
+        this.__resizeHanlder = debounce(() => {
+          if (this.chart) {
+            this.chart.resize()
+          }
+        }, 100)
+        window.addEventListener('resize', this.__resizeHanlder)
       }
-    }
-  },
-  mounted() {
-    this.initChart()
-    if (this.autoResize) {
-      this.__resizeHanlder = debounce(() => {
-        if (this.chart) {
-          this.chart.resize()
-        }
-      }, 100)
-      window.addEventListener('resize', this.__resizeHanlder)
-    }
 
-    // 监听侧边栏的变化
-    const sidebarElm = document.getElementsByClassName('sidebar-container')[0]
-    sidebarElm.addEventListener('transitionend', this.__resizeHanlder)
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    if (this.autoResize) {
-      window.removeEventListener('resize', this.__resizeHanlder)
-    }
+      // 监听侧边栏的变化
+      const sidebarElm = document.getElementsByClassName('sidebar-container')[0]
+      sidebarElm.addEventListener('transitionend', this.__resizeHanlder)
+    },
+    beforeDestroy() {
+      if (!this.chart) {
+        return
+      }
+      if (this.autoResize) {
+        window.removeEventListener('resize', this.__resizeHanlder)
+      }
 
-    const sidebarElm = document.getElementsByClassName('sidebar-container')[0]
-    sidebarElm.removeEventListener('transitionend', this.__resizeHanlder)
+      const sidebarElm = document.getElementsByClassName('sidebar-container')[0]
+      sidebarElm.removeEventListener('transitionend', this.__resizeHanlder)
 
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    setOptions({ expectedData, actualData } = {}) {
-      this.chart.setOption({
-        xAxis: {
-          data: [
-            'Mon',
-            'Tue',
-            'Wed',
-            'Thu',
-            'Fri',
-            'Sat',
-            'Sun',
-            'Mon',
-            'Tue',
-            'Wed',
-            'Thu',
-            'Fri',
-            'Sat',
-            'Sun'
-          ],
-          boundaryGap: false,
-          axisTick: {
-            show: false
-          }
-        },
-        grid: {
-          left: 10,
-          right: 10,
-          bottom: 20,
-          top: 30,
-          containLabel: true
-        },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross'
+      this.chart.dispose()
+      this.chart = null
+    },
+    methods: {
+      setOptions({ expectedData, actualData } = {}) {
+        this.chart.setOption({
+          xAxis: {
+            data: [
+              'Mon',
+              'Tue',
+              'Wed',
+              'Thu',
+              'Fri',
+              'Sat',
+              'Sun',
+              'Mon',
+              'Tue',
+              'Wed',
+              'Thu',
+              'Fri',
+              'Sat',
+              'Sun'
+            ],
+            boundaryGap: false,
+            axisTick: {
+              show: false
+            }
           },
-          padding: [5, 10]
-        },
-        yAxis: {
-          axisTick: {
-            show: false
-          }
-        },
-        legend: {
-          data: ['expected', 'actual']
-        },
-        series: [
-          {
-            name: 'expected',
-            itemStyle: {
-              normal: {
-                color: '#FF005A',
-                lineStyle: {
+          grid: {
+            left: 10,
+            right: 10,
+            bottom: 20,
+            top: 30,
+            containLabel: true
+          },
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'cross'
+            },
+            padding: [5, 10]
+          },
+          yAxis: {
+            axisTick: {
+              show: false
+            }
+          },
+          legend: {
+            data: ['expected', 'actual']
+          },
+          series: [
+            {
+              name: 'expected',
+              itemStyle: {
+                normal: {
                   color: '#FF005A',
-                  width: 2
+                  lineStyle: {
+                    color: '#FF005A',
+                    width: 2
+                  }
                 }
-              }
+              },
+              smooth: true,
+              type: 'line',
+              data: expectedData,
+              animationDuration: 2800,
+              animationEasing: 'cubicInOut'
             },
-            smooth: true,
-            type: 'line',
-            data: expectedData,
-            animationDuration: 2800,
-            animationEasing: 'cubicInOut'
-          },
-          {
-            name: 'actual',
-            smooth: true,
-            type: 'line',
-            itemStyle: {
-              normal: {
-                color: '#3888fa',
-                lineStyle: {
+            {
+              name: 'actual',
+              smooth: true,
+              type: 'line',
+              itemStyle: {
+                normal: {
                   color: '#3888fa',
-                  width: 2
-                },
-                areaStyle: {
-                  color: '#f3f8ff'
+                  lineStyle: {
+                    color: '#3888fa',
+                    width: 2
+                  },
+                  areaStyle: {
+                    color: '#f3f8ff'
+                  }
                 }
-              }
-            },
-            data: actualData,
-            animationDuration: 2800,
-            animationEasing: 'quadraticOut'
-          }
-        ]
-      })
-    },
-    initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
-      this.setOptions(this.chartData)
+              },
+              data: actualData,
+              animationDuration: 2800,
+              animationEasing: 'quadraticOut'
+            }
+          ]
+        })
+      },
+      initChart() {
+        this.chart = echarts.init(this.$el, 'macarons')
+        this.setOptions(this.chartData)
+      }
     }
   }
-}
 </script>
diff --git a/src/module-dashboard/components/dashboardPieChart.vue b/src/module-dashboard/components/dashboardPieChart.vue
index 0435cc9..6c9fe19 100644
--- a/src/module-dashboard/components/dashboardPieChart.vue
+++ b/src/module-dashboard/components/dashboardPieChart.vue
@@ -1,82 +1,79 @@
 <template>
-  <div
-    :class="className"
-    :style="{ height: height, width: width }"
-  />
+  <div :class="className" :style="{ height: height, width: width }" />
 </template>
 
 <script>
-import echarts from 'echarts'
-import { debounce } from '@/utils'
-require('echarts/theme/macarons') // echarts theme
+  import echarts from 'echarts'
+  import { debounce } from '@/utils'
+  require('echarts/theme/macarons') // echarts theme
 
-export default {
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
+  export default {
+    props: {
+      className: {
+        type: String,
+        default: 'chart'
+      },
+      width: {
+        type: String,
+        default: '100%'
+      },
+      height: {
+        type: String,
+        default: '100%'
+      }
     },
-    width: {
-      type: String,
-      default: '100%'
+    data() {
+      return {
+        chart: null
+      }
     },
-    height: {
-      type: String,
-      default: '100%'
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.initChart()
-    this.__resizeHanlder = debounce(() => {
-      if (this.chart) {
-        this.chart.resize()
+    mounted() {
+      this.initChart()
+      this.__resizeHanlder = debounce(() => {
+        if (this.chart) {
+          this.chart.resize()
+        }
+      }, 100)
+      window.addEventListener('resize', this.__resizeHanlder)
+    },
+    beforeDestroy() {
+      if (!this.chart) {
+        return
       }
-    }, 100)
-    window.addEventListener('resize', this.__resizeHanlder)
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    window.removeEventListener('resize', this.__resizeHanlder)
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
+      window.removeEventListener('resize', this.__resizeHanlder)
+      this.chart.dispose()
+      this.chart = null
+    },
+    methods: {
+      initChart() {
+        this.chart = echarts.init(this.$el, 'macarons')
 
-      this.chart.setOption({
-        tooltip: {
-          trigger: 'item',
-          formatter: '{a} <br/>{b} : {c} ({d}%)'
-        },
-        calculable: true,
-        series: [
-          {
-            name: 'WEEKLY WRITE ARTICLES',
-            type: 'pie',
-            roseType: 'radius',
-            radius: [15, 50],
-            center: ['50%', '50%'],
-            data: [
-              { value: 320, name: 'Industries' },
-              { value: 240, name: 'Technology' },
-              { value: 149, name: 'Forex' },
-              { value: 100, name: 'Gold' },
-              { value: 59, name: 'Forecasts' }
-            ],
-            animationEasing: 'cubicInOut',
-            animationDuration: 2600
-          }
-        ]
-      })
+        this.chart.setOption({
+          tooltip: {
+            trigger: 'item',
+            formatter: '{a} <br/>{b} : {c} ({d}%)'
+          },
+          calculable: true,
+          series: [
+            {
+              name: 'WEEKLY WRITE ARTICLES',
+              type: 'pie',
+              roseType: 'radius',
+              radius: [15, 50],
+              center: ['50%', '50%'],
+              data: [
+                { value: 320, name: 'Industries' },
+                { value: 240, name: 'Technology' },
+                { value: 149, name: 'Forex' },
+                { value: 100, name: 'Gold' },
+                { value: 59, name: 'Forecasts' }
+              ],
+              animationEasing: 'cubicInOut',
+              animationDuration: 2600
+            }
+          ]
+        })
+      }
     }
   }
-}
 </script>
diff --git a/src/module-dashboard/components/dashboardRaddarChart.vue b/src/module-dashboard/components/dashboardRaddarChart.vue
index a46413e..d449a36 100644
--- a/src/module-dashboard/components/dashboardRaddarChart.vue
+++ b/src/module-dashboard/components/dashboardRaddarChart.vue
@@ -1,121 +1,118 @@
 <template>
-  <div
-    :class="className"
-    :style="{ height: height, width: width }"
-  />
+  <div :class="className" :style="{ height: height, width: width }" />
 </template>
 
 <script>
-import echarts from 'echarts'
-import { debounce } from '@/utils'
-require('echarts/theme/macarons') // echarts theme
+  import echarts from 'echarts'
+  import { debounce } from '@/utils'
+  require('echarts/theme/macarons') // echarts theme
 
-const animationDuration = 3000
+  const animationDuration = 3000
 
-export default {
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
+  export default {
+    props: {
+      className: {
+        type: String,
+        default: 'chart'
+      },
+      width: {
+        type: String,
+        default: '100%'
+      },
+      height: {
+        type: String,
+        default: '100%'
+      }
     },
-    width: {
-      type: String,
-      default: '100%'
+    data() {
+      return {
+        chart: null
+      }
     },
-    height: {
-      type: String,
-      default: '100%'
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.initChart()
-    this.__resizeHanlder = debounce(() => {
-      if (this.chart) {
-        this.chart.resize()
+    mounted() {
+      this.initChart()
+      this.__resizeHanlder = debounce(() => {
+        if (this.chart) {
+          this.chart.resize()
+        }
+      }, 100)
+      window.addEventListener('resize', this.__resizeHanlder)
+    },
+    beforeDestroy() {
+      if (!this.chart) {
+        return
       }
-    }, 100)
-    window.addEventListener('resize', this.__resizeHanlder)
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    window.removeEventListener('resize', this.__resizeHanlder)
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
+      window.removeEventListener('resize', this.__resizeHanlder)
+      this.chart.dispose()
+      this.chart = null
+    },
+    methods: {
+      initChart() {
+        this.chart = echarts.init(this.$el, 'macarons')
 
-      this.chart.setOption({
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
-        },
-        radar: {
-          radius: '66%',
-          center: ['50%', '42%'],
-          splitNumber: 8,
-          splitArea: {
-            areaStyle: {
-              color: 'rgba(127,95,132,.3)',
-              opacity: 1,
-              shadowBlur: 45,
-              shadowColor: 'rgba(0,0,0,.5)',
-              shadowOffsetX: 0,
-              shadowOffsetY: 15
+        this.chart.setOption({
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              // 坐标轴指示器，坐标轴触发有效
+              type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
             }
           },
-          indicator: [
-            { name: 'Sales', max: 10000 },
-            { name: 'Administration', max: 20000 },
-            { name: 'Information Techology', max: 20000 },
-            { name: 'Customer Support', max: 20000 },
-            { name: 'Development', max: 20000 },
-            { name: 'Marketing', max: 20000 }
-          ]
-        },
-        series: [
-          {
-            type: 'radar',
-            symbolSize: 0,
-            areaStyle: {
-              normal: {
-                shadowBlur: 13,
-                shadowColor: 'rgba(0,0,0,.2)',
+          radar: {
+            radius: '66%',
+            center: ['50%', '42%'],
+            splitNumber: 8,
+            splitArea: {
+              areaStyle: {
+                color: 'rgba(127,95,132,.3)',
+                opacity: 1,
+                shadowBlur: 45,
+                shadowColor: 'rgba(0,0,0,.5)',
                 shadowOffsetX: 0,
-                shadowOffsetY: 10,
-                opacity: 1
+                shadowOffsetY: 15
               }
             },
-            data: [
-              {
-                value: [5000, 7000, 12000, 11000, 15000, 14000],
-                name: 'Allocated Budget'
-              },
-              {
-                value: [4000, 9000, 15000, 15000, 13000, 11000],
-                name: 'Expected Spending'
+            indicator: [
+              { name: 'Sales', max: 10000 },
+              { name: 'Administration', max: 20000 },
+              { name: 'Information Techology', max: 20000 },
+              { name: 'Customer Support', max: 20000 },
+              { name: 'Development', max: 20000 },
+              { name: 'Marketing', max: 20000 }
+            ]
+          },
+          series: [
+            {
+              type: 'radar',
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: 'rgba(0,0,0,.2)',
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1
+                }
               },
-              {
-                value: [5500, 11000, 12000, 15000, 12000, 12000],
-                name: 'Actual Spending'
-              }
-            ],
-            animationDuration: animationDuration
-          }
-        ]
-      })
+              data: [
+                {
+                  value: [5000, 7000, 12000, 11000, 15000, 14000],
+                  name: 'Allocated Budget'
+                },
+                {
+                  value: [4000, 9000, 15000, 15000, 13000, 11000],
+                  name: 'Expected Spending'
+                },
+                {
+                  value: [5500, 11000, 12000, 15000, 12000, 12000],
+                  name: 'Actual Spending'
+                }
+              ],
+              animationDuration: animationDuration
+            }
+          ]
+        })
+      }
     }
   }
-}
 </script>
diff --git a/src/module-dashboard/components/layoutAppMain.vue b/src/module-dashboard/components/layoutAppMain.vue
index 9db7980..3139ca4 100644
--- a/src/module-dashboard/components/layoutAppMain.vue
+++ b/src/module-dashboard/components/layoutAppMain.vue
@@ -1,12 +1,6 @@
 <template>
-  <section
-    class="app-main"
-    style="min-height: 100%"
-  >
-    <transition
-      name="fade"
-      mode="out-in"
-    >
+  <section class="app-main" style="min-height: 100%">
+    <transition name="fade" mode="out-in">
       <keep-alive :include="cachedViews">
         <router-view />
       </keep-alive>
@@ -15,22 +9,22 @@
 </template>
 
 <script>
-export default {
-  name: 'LayoutAppMain',
-  computed: {
-    cachedViews() {
-      return this.$store.state.tagsView.cachedViews
+  export default {
+    name: 'LayoutAppMain',
+    computed: {
+      cachedViews() {
+        return this.$store.state.tagsView.cachedViews
+      }
+      // key() {
+      //   return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date()
+      // }
     }
-    // key() {
-    //   return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date()
-    // }
   }
-}
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-.app-main {
-  position: relative;
-  top: 75px;
-  // z-index: 0;
-}
+  .app-main {
+    position: relative;
+    top: 75px;
+    // z-index: 0;
+  }
 </style>
diff --git a/src/module-dashboard/components/layoutNavbar.vue b/src/module-dashboard/components/layoutNavbar.vue
index 45da7c2..629ae4d 100644
--- a/src/module-dashboard/components/layoutNavbar.vue
+++ b/src/module-dashboard/components/layoutNavbar.vue
@@ -2,10 +2,10 @@
   <el-menu class="navbar" mode="horizontal">
     <div style="float: left">
       <div class="sidebar-logo">
-        <img src="../assets/logo.png">
+        <img src="../assets/logo.png" />
       </div>
       <div class="sidebar-logo-mini">
-        <img src="../assets/minilogo.png">
+        <img src="../assets/minilogo.png" />
       </div>
     </div>
     <hamburger
@@ -74,9 +74,9 @@
             <el-dropdown-item>{{ $t('navbar.dashboard') }}</el-dropdown-item>
           </router-link>
           <el-dropdown-item divided>
-            <span style="display: block" @click="logout">{{
-              $t('navbar.logOut')
-            }}</span>
+            <span style="display: block" @click="logout">
+              {{ $t('navbar.logOut') }}
+            </span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
@@ -85,144 +85,144 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-import Screenfull from '@/components/Screenfull'
-import ThemePicker from '@/components/ThemePicker'
-import { search } from '@/api/base/menus'
+  import { mapGetters } from 'vuex'
+  import Breadcrumb from '@/components/Breadcrumb'
+  import Hamburger from '@/components/Hamburger'
+  import Screenfull from '@/components/Screenfull'
+  import ThemePicker from '@/components/ThemePicker'
+  import { search } from '@/api/base/menus'
 
-export default {
-  name: 'LayoutNavBar',
-  components: {
-    Breadcrumb,
-    Hamburger,
-    Screenfull,
-    ThemePicker
-  },
-  data() {
-    return {
-      searchVal: '',
-      timeout: null,
-      showSearchInput: false,
-      restaurants: []
-    }
-  },
-  computed: {
-    ...mapGetters(['sidebar', 'name', 'avatar'])
-  },
-  mounted() {
-    this.restaurants = search()
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('toggleSideBar')
+  export default {
+    name: 'LayoutNavBar',
+    components: {
+      Breadcrumb,
+      Hamburger,
+      Screenfull,
+      ThemePicker
     },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // In order to re-instantiate the vue-router object to avoid bugs
-      })
+    data() {
+      return {
+        searchVal: '',
+        timeout: null,
+        showSearchInput: false,
+        restaurants: []
+      }
     },
-    handleBtnSearch() {
-      this.showSearchInput = !this.showSearchInput
-      this.$nextTick(() => {
-        this.$refs.searchInput.focus()
-      })
+    computed: {
+      ...mapGetters(['sidebar', 'name', 'avatar'])
     },
-    querySearchAsync(queryString, cb) {
-      var restaurants = this.restaurants
-      var results = queryString
-        ? restaurants.filter(this.createStateFilter(queryString))
-        : restaurants
-
-      clearTimeout(this.timeout)
-      this.timeout = setTimeout(() => {
-        cb(results)
-      }, 1000 * Math.random())
+    mounted() {
+      this.restaurants = search()
     },
-    createStateFilter(queryString) {
-      return (state) => {
-        return (
-          state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
-        )
+    methods: {
+      toggleSideBar() {
+        this.$store.dispatch('toggleSideBar')
+      },
+      logout() {
+        this.$store.dispatch('LogOut').then(() => {
+          location.reload() // In order to re-instantiate the vue-router object to avoid bugs
+        })
+      },
+      handleBtnSearch() {
+        this.showSearchInput = !this.showSearchInput
+        this.$nextTick(() => {
+          this.$refs.searchInput.focus()
+        })
+      },
+      querySearchAsync(queryString, cb) {
+        var restaurants = this.restaurants
+        var results = queryString
+          ? restaurants.filter(this.createStateFilter(queryString))
+          : restaurants
+
+        clearTimeout(this.timeout)
+        this.timeout = setTimeout(() => {
+          cb(results)
+        }, 1000 * Math.random())
+      },
+      createStateFilter(queryString) {
+        return (state) => {
+          return (
+            state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+          )
+        }
+      },
+      handleSelect(item) {
+        this.searchVal = ''
+        this.showSearchInput = false
+        console.log(item)
+        this.$message({
+          message: `选取了 ${item.value}`,
+          type: 'success'
+        })
       }
-    },
-    handleSelect(item) {
-      this.searchVal = ''
-      this.showSearchInput = false
-      console.log(item)
-      this.$message({
-        message: `选取了 ${item.value}`,
-        type: 'success'
-      })
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.navbar .item .el-input__inner {
-  border: 0px;
-  border-bottom: 1px solid #dcdfe6;
-  border-radius: 0px;
-}
-.Homelogo {
-  background: #1493fa;
-  height: 56px;
-  padding: 15px 0 0;
-  text-align: center;
-  span {
-    background: url(../assets/logo.png) no-repeat 50%;
-    display: block;
-    height: 28px;
+  .navbar .item .el-input__inner {
+    border: 0px;
+    border-bottom: 1px solid #dcdfe6;
+    border-radius: 0px;
+  }
+  .Homelogo {
+    background: #1493fa;
+    height: 56px;
+    padding: 15px 0 0;
+    text-align: center;
+    span {
+      background: url(../assets/logo.png) no-repeat 50%;
+      display: block;
+      height: 28px;
+    }
   }
-}
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  position: fixed;
-  z-index: 999;
-  width: 100%;
-  height: 70px;
-  line-height: 70px;
-  border-radius: 0px !important;
-  background: linear-gradient(to right, #1493fa, #01c6fa);
-  .hamburger-container {
-    line-height: 70px;
+  .navbar {
+    position: fixed;
+    z-index: 999;
+    width: 100%;
     height: 70px;
-    float: left;
-    padding: 0 10px;
-  }
-  .breadcrumb-container {
-    float: left;
-  }
-  .errLog-container {
-    display: inline-block;
-    vertical-align: top;
-  }
-  .right-menu {
-    // float: right;
-    position: absolute;
-    right: 0px;
-    height: 50px;
-    .item {
+    line-height: 70px;
+    border-radius: 0px !important;
+    background: linear-gradient(to right, #1493fa, #01c6fa);
+    .hamburger-container {
+      line-height: 70px;
+      height: 70px;
+      float: left;
+      padding: 0 10px;
+    }
+    .breadcrumb-container {
+      float: left;
+    }
+    .errLog-container {
       display: inline-block;
-      color: #fff;
-      margin-right: 10px;
-      i {
-        font-size: 18px;
-      }
-      .btnSearch {
-        margin-right: 5px;
-        font-size: 18px;
+      vertical-align: top;
+    }
+    .right-menu {
+      // float: right;
+      position: absolute;
+      right: 0px;
+      height: 50px;
+      .item {
+        display: inline-block;
         color: #fff;
-      }
-      .avatar {
-        width: 22px;
-        vertical-align: -5px;
+        margin-right: 10px;
+        i {
+          font-size: 18px;
+        }
+        .btnSearch {
+          margin-right: 5px;
+          font-size: 18px;
+          color: #fff;
+        }
+        .avatar {
+          width: 22px;
+          vertical-align: -5px;
+        }
       }
     }
   }
-}
 </style>
diff --git a/src/module-dashboard/components/layoutSidebar.vue b/src/module-dashboard/components/layoutSidebar.vue
index 54bd0c1..5df59cb 100644
--- a/src/module-dashboard/components/layoutSidebar.vue
+++ b/src/module-dashboard/components/layoutSidebar.vue
@@ -12,18 +12,18 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import SidebarItem from './layoutSidebarItem'
-import ScrollBar from '@/components/ScrollBar'
+  import { mapGetters } from 'vuex'
+  import SidebarItem from './layoutSidebarItem'
+  import ScrollBar from '@/components/ScrollBar'
 
-export default {
-  name: 'LayoutSidebar',
-  components: { SidebarItem, ScrollBar },
-  computed: {
-    ...mapGetters(['permission_routers', 'sidebar']),
-    isCollapse() {
-      return !this.sidebar.opened
+  export default {
+    name: 'LayoutSidebar',
+    components: { SidebarItem, ScrollBar },
+    computed: {
+      ...mapGetters(['permission_routers', 'sidebar']),
+      isCollapse() {
+        return !this.sidebar.opened
+      }
     }
   }
-}
 </script>
diff --git a/src/module-dashboard/components/layoutSidebarItem.vue b/src/module-dashboard/components/layoutSidebarItem.vue
index 88a083d..6ae50c1 100644
--- a/src/module-dashboard/components/layoutSidebarItem.vue
+++ b/src/module-dashboard/components/layoutSidebarItem.vue
@@ -20,7 +20,9 @@
           <span
             v-if="item.children[0].meta && item.children[0].meta.title"
             slot="title"
-          >{{ item.children[0].meta.title }}</span>
+          >
+            {{ item.children[0].meta.title }}
+          </span>
         </el-menu-item>
       </router-link>
       <el-submenu v-else :key="item.name" :index="item.name || item.path">
@@ -38,9 +40,9 @@
                 v-if="child.meta && child.meta.icon"
                 :icon-class="child.meta.icon"
               />
-              <span v-if="child.meta && child.meta.title">{{
-                child.meta.title
-              }}</span>
+              <span v-if="child.meta && child.meta.title">
+                {{ child.meta.title }}
+              </span>
             </el-menu-item>
           </router-link>
         </template>
@@ -50,22 +52,22 @@
 </template>
 
 <script>
-import { generateTitle } from '@/utils/i18n'
+  import { generateTitle } from '@/utils/i18n'
 
-export default {
-  name: 'LayoutSidebarItem',
-  props: {
-    // eslint-disable-next-line
-    routes: {
-      type: Array
+  export default {
+    name: 'LayoutSidebarItem',
+    props: {
+      // eslint-disable-next-line
+      routes: {
+        type: Array
+      },
+      isNest: {
+        type: Boolean,
+        default: false
+      }
     },
-    isNest: {
-      type: Boolean,
-      default: false
+    methods: {
+      generateTitle
     }
-  },
-  methods: {
-    generateTitle
   }
-}
 </script>
diff --git a/src/module-dashboard/components/layoutTags.vue b/src/module-dashboard/components/layoutTags.vue
index 345e648..f9b2815 100644
--- a/src/module-dashboard/components/layoutTags.vue
+++ b/src/module-dashboard/components/layoutTags.vue
@@ -1,9 +1,6 @@
 <template>
   <div class="tags-view-container">
-    <scroll-pane
-      ref="scrollPane"
-      class="tags-view-wrapper"
-    >
+    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
       <router-link
         v-for="tag in Array.from(visitedViews)"
         ref="tag"
@@ -39,193 +36,195 @@
 </template>
 
 <script>
-import ScrollPane from '@/components/ScrollPane'
-import { generateTitle } from '@/utils/i18n'
+  import ScrollPane from '@/components/ScrollPane'
+  import { generateTitle } from '@/utils/i18n'
 
-export default {
-  name: 'LayoutTags',
-  components: { ScrollPane },
-  data() {
-    return {
-      visible: false,
-      top: 0,
-      left: 0,
-      selectedTag: {}
-    }
-  },
-  computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    }
-  },
-  watch: {
-    $route() {
-      this.addViewTags()
-      this.moveToCurrentTag()
+  export default {
+    name: 'LayoutTags',
+    components: { ScrollPane },
+    data() {
+      return {
+        visible: false,
+        top: 0,
+        left: 0,
+        selectedTag: {}
+      }
     },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
-      } else {
-        document.body.removeEventListener('click', this.closeMenu)
+    computed: {
+      visitedViews() {
+        return this.$store.state.tagsView.visitedViews
       }
-    }
-  },
-  mounted() {
-    this.addViewTags()
-  },
-  methods: {
-    generateTitle, // generateTitle by vue-i18n
-    generateRoute() {
-      if (this.$route.name) {
-        return this.$route
+    },
+    watch: {
+      $route() {
+        this.addViewTags()
+        this.moveToCurrentTag()
+      },
+      visible(value) {
+        if (value) {
+          document.body.addEventListener('click', this.closeMenu)
+        } else {
+          document.body.removeEventListener('click', this.closeMenu)
+        }
       }
-      return false
     },
-    isActive(route) {
-      return route.path === this.$route.path || route.name === this.$route.name
+    mounted() {
+      this.addViewTags()
     },
-    addViewTags() {
-      const route = this.generateRoute()
-      if (!route) {
+    methods: {
+      generateTitle, // generateTitle by vue-i18n
+      generateRoute() {
+        if (this.$route.name) {
+          return this.$route
+        }
         return false
-      }
-      this.$store.dispatch('addVisitedViews', route)
-    },
-    moveToCurrentTag() {
-      const tags = this.$refs.tag
-      this.$nextTick(() => {
-        for (const tag of tags) {
-          if (tag.to === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag.$el)
-            break
-          }
+      },
+      isActive(route) {
+        return (
+          route.path === this.$route.path || route.name === this.$route.name
+        )
+      },
+      addViewTags() {
+        const route = this.generateRoute()
+        if (!route) {
+          return false
         }
-      })
-    },
-    closeSelectedTag(view) {
-      this.$store.dispatch('delVisitedViews', view).then((views) => {
-        if (this.isActive(view)) {
-          const latestView = views.slice(-1)[0]
-          if (latestView) {
-            this.$router.push(latestView.path)
-          } else {
-            this.$router.push('/')
+        this.$store.dispatch('addVisitedViews', route)
+      },
+      moveToCurrentTag() {
+        const tags = this.$refs.tag
+        this.$nextTick(() => {
+          for (const tag of tags) {
+            if (tag.to === this.$route.path) {
+              this.$refs.scrollPane.moveToTarget(tag.$el)
+              break
+            }
           }
-        }
-      })
-    },
-    closeOthersTags() {
-      this.$router.push(this.selectedTag.path)
-      this.$store.dispatch('delOthersViews', this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
-    },
-    closeAllTags() {
-      this.$store.dispatch('delAllViews')
-      this.$router.push('/')
-    },
-    openMenu(tag, e) {
-      this.visible = true
-      this.selectedTag = tag
-      this.left = e.clientX
-      this.top = e.clientY
-    },
-    closeMenu() {
-      this.visible = false
+        })
+      },
+      closeSelectedTag(view) {
+        this.$store.dispatch('delVisitedViews', view).then((views) => {
+          if (this.isActive(view)) {
+            const latestView = views.slice(-1)[0]
+            if (latestView) {
+              this.$router.push(latestView.path)
+            } else {
+              this.$router.push('/')
+            }
+          }
+        })
+      },
+      closeOthersTags() {
+        this.$router.push(this.selectedTag.path)
+        this.$store.dispatch('delOthersViews', this.selectedTag).then(() => {
+          this.moveToCurrentTag()
+        })
+      },
+      closeAllTags() {
+        this.$store.dispatch('delAllViews')
+        this.$router.push('/')
+      },
+      openMenu(tag, e) {
+        this.visible = true
+        this.selectedTag = tag
+        this.left = e.clientX
+        this.top = e.clientY
+      },
+      closeMenu() {
+        this.visible = false
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.tags-view-container {
-  .tags-view-wrapper {
-    position: relative;
-    top: 70px;
-    // z-index: 0;
-    background: #fff;
-    height: 34px;
-    border-bottom: 1px solid #d8dce5;
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
-    .tags-view-item {
-      display: inline-block;
+  .tags-view-container {
+    .tags-view-wrapper {
       position: relative;
-      height: 26px;
-      line-height: 26px;
-      border: 1px solid #d8dce5;
-      color: #495060;
+      top: 70px;
+      // z-index: 0;
       background: #fff;
-      padding: 0 8px;
-      font-size: 12px;
-      margin-left: 5px;
-      margin-top: 4px;
-      &:first-of-type {
-        margin-left: 15px;
-      }
-      &.active {
-        background-color: #1493fa;
-        color: #fff;
-        border-color: #1493fa;
-        &::before {
-          content: '';
-          background: #fff;
-          display: inline-block;
-          width: 8px;
-          height: 8px;
-          border-radius: 50%;
-          position: relative;
-          margin-right: 2px;
+      height: 34px;
+      border-bottom: 1px solid #d8dce5;
+      box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+      .tags-view-item {
+        display: inline-block;
+        position: relative;
+        height: 26px;
+        line-height: 26px;
+        border: 1px solid #d8dce5;
+        color: #495060;
+        background: #fff;
+        padding: 0 8px;
+        font-size: 12px;
+        margin-left: 5px;
+        margin-top: 4px;
+        &:first-of-type {
+          margin-left: 15px;
+        }
+        &.active {
+          background-color: #1493fa;
+          color: #fff;
+          border-color: #1493fa;
+          &::before {
+            content: '';
+            background: #fff;
+            display: inline-block;
+            width: 8px;
+            height: 8px;
+            border-radius: 50%;
+            position: relative;
+            margin-right: 2px;
+          }
         }
       }
     }
-  }
-  .contextmenu {
-    margin: 0;
-    background: #fff;
-    z-index: 2;
-    position: absolute;
-    list-style-type: none;
-    padding: 5px 0;
-    border-radius: 4px;
-    font-size: 12px;
-    font-weight: 400;
-    color: #333;
-    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
-    li {
+    .contextmenu {
       margin: 0;
-      padding: 7px 16px;
-      cursor: pointer;
-      &:hover {
-        background: #eee;
+      background: #fff;
+      z-index: 2;
+      position: absolute;
+      list-style-type: none;
+      padding: 5px 0;
+      border-radius: 4px;
+      font-size: 12px;
+      font-weight: 400;
+      color: #333;
+      box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
+      li {
+        margin: 0;
+        padding: 7px 16px;
+        cursor: pointer;
+        &:hover {
+          background: #eee;
+        }
       }
     }
   }
-}
 </style>
 
 <style rel="stylesheet/scss" lang="scss">
-//reset element css of el-icon-close
-.tags-view-wrapper {
-  .tags-view-item {
-    .el-icon-close {
-      width: 16px;
-      height: 16px;
-      vertical-align: 2px;
-      border-radius: 50%;
-      text-align: center;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-      transform-origin: 100% 50%;
-      &:before {
-        transform: scale(0.6);
-        display: inline-block;
-        vertical-align: -3px;
-      }
-      &:hover {
-        background-color: #b4bccc;
-        color: #fff;
+  //reset element css of el-icon-close
+  .tags-view-wrapper {
+    .tags-view-item {
+      .el-icon-close {
+        width: 16px;
+        height: 16px;
+        vertical-align: 2px;
+        border-radius: 50%;
+        text-align: center;
+        transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+        transform-origin: 100% 50%;
+        &:before {
+          transform: scale(0.6);
+          display: inline-block;
+          vertical-align: -3px;
+        }
+        &:hover {
+          background-color: #b4bccc;
+          color: #fff;
+        }
       }
     }
   }
-}
 </style>
diff --git a/src/module-dashboard/components/loginSocialSignin.vue b/src/module-dashboard/components/loginSocialSignin.vue
index b1cacc8..8470e17 100644
--- a/src/module-dashboard/components/loginSocialSignin.vue
+++ b/src/module-dashboard/components/loginSocialSignin.vue
@@ -1,99 +1,87 @@
 <template>
   <div class="social-signup-container">
-    <div
-      class="sign-btn"
-      @click="wechatHandleClick('wechat')"
-    >
-      <span
-        class="wx-svg-container"
-      ><svg-icon
-        icon-class="wechat"
-        class="icon"
-      /></span>
+    <div class="sign-btn" @click="wechatHandleClick('wechat')">
+      <span class="wx-svg-container">
+        <svg-icon icon-class="wechat" class="icon" />
+      </span>
       Wechat
     </div>
-    <div
-      class="sign-btn"
-      @click="tencentHandleClick('tencent')"
-    >
-      <span
-        class="qq-svg-container"
-      ><svg-icon
-        icon-class="qq"
-        class="icon"
-      /></span>
+    <div class="sign-btn" @click="tencentHandleClick('tencent')">
+      <span class="qq-svg-container">
+        <svg-icon icon-class="qq" class="icon" />
+      </span>
       QQ
     </div>
   </div>
 </template>
 
 <script>
-import openWindow from '@/utils/openWindow'
+  import openWindow from '@/utils/openWindow'
 
-export default {
-  name: 'LoginSocialSignin',
-  methods: {
-    wechatHandleClick(thirdpart) {
-      this.$store.commit('SET_AUTH_TYPE', thirdpart)
-      const appid = 'xxxxx'
-      const redirectUri = encodeURIComponent(
-        'xxx/redirect?redirect=' + window.location.origin + '/authredirect'
-      )
-      const url =
-        'https://open.weixin.qq.com/connect/qrconnect?appid=' +
-        appid +
-        '&redirectUri=' +
-        redirectUri +
-        '&response_type=code&scope=snsapi_login#wechat_redirect'
-      openWindow(url, thirdpart, 540, 540)
-    },
-    tencentHandleClick(thirdpart) {
-      this.$store.commit('SET_AUTH_TYPE', thirdpart)
-      const clientId = 'xxxxx'
-      const redirectUri = encodeURIComponent(
-        'xxx/redirect?redirect=' + window.location.origin + '/authredirect'
-      )
-      const url =
-        'https://graph.qq.com/oauth2.0/authorize?response_type=code&clientId=' +
-        clientId +
-        '&redirectUri=' +
-        redirectUri
-      openWindow(url, thirdpart, 540, 540)
+  export default {
+    name: 'LoginSocialSignin',
+    methods: {
+      wechatHandleClick(thirdpart) {
+        this.$store.commit('SET_AUTH_TYPE', thirdpart)
+        const appid = 'xxxxx'
+        const redirectUri = encodeURIComponent(
+          'xxx/redirect?redirect=' + window.location.origin + '/authredirect'
+        )
+        const url =
+          'https://open.weixin.qq.com/connect/qrconnect?appid=' +
+          appid +
+          '&redirectUri=' +
+          redirectUri +
+          '&response_type=code&scope=snsapi_login#wechat_redirect'
+        openWindow(url, thirdpart, 540, 540)
+      },
+      tencentHandleClick(thirdpart) {
+        this.$store.commit('SET_AUTH_TYPE', thirdpart)
+        const clientId = 'xxxxx'
+        const redirectUri = encodeURIComponent(
+          'xxx/redirect?redirect=' + window.location.origin + '/authredirect'
+        )
+        const url =
+          'https://graph.qq.com/oauth2.0/authorize?response_type=code&clientId=' +
+          clientId +
+          '&redirectUri=' +
+          redirectUri
+        openWindow(url, thirdpart, 540, 540)
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.social-signup-container {
-  margin: 20px 0;
-  .sign-btn {
-    display: inline-block;
-    cursor: pointer;
-  }
-  .icon {
-    color: #fff;
-    font-size: 30px;
-    margin-top: 6px;
-  }
-  .wx-svg-container,
-  .qq-svg-container {
-    display: inline-block;
-    width: 40px;
-    height: 40px;
-    line-height: 40px;
-    text-align: center;
-    padding-top: 1px;
-    border-radius: 4px;
-    margin-bottom: 20px;
-    margin-right: 5px;
-  }
-  .wx-svg-container {
-    background-color: #8dc349;
-  }
-  .qq-svg-container {
-    background-color: #6ba2d6;
-    margin-left: 50px;
+  .social-signup-container {
+    margin: 20px 0;
+    .sign-btn {
+      display: inline-block;
+      cursor: pointer;
+    }
+    .icon {
+      color: #fff;
+      font-size: 30px;
+      margin-top: 6px;
+    }
+    .wx-svg-container,
+    .qq-svg-container {
+      display: inline-block;
+      width: 40px;
+      height: 40px;
+      line-height: 40px;
+      text-align: center;
+      padding-top: 1px;
+      border-radius: 4px;
+      margin-bottom: 20px;
+      margin-right: 5px;
+    }
+    .wx-svg-container {
+      background-color: #8dc349;
+    }
+    .qq-svg-container {
+      background-color: #6ba2d6;
+      margin-left: 50px;
+    }
   }
-}
 </style>
diff --git a/src/module-dashboard/components/pageTool.vue b/src/module-dashboard/components/pageTool.vue
index 1510c6d..c2cf48f 100644
--- a/src/module-dashboard/components/pageTool.vue
+++ b/src/module-dashboard/components/pageTool.vue
@@ -13,27 +13,27 @@
   </div>
 </template>
 <script>
-export default {
-  name: 'PageTool',
-  // eslint-disable-next-line
-  props: ['total', 'paginationPage', 'paginationPagesize'],
-  data() {
-    return {}
-  },
-  methods: {
-    // 进入某一页
-    onPageChange: function (pageNum) {
-      this.$emit('pageChange', pageNum)
+  export default {
+    name: 'PageTool',
+    // eslint-disable-next-line
+    props: ['total', 'paginationPage', 'paginationPagesize'],
+    data() {
+      return {}
     },
-    // 每页显示信息条数
-    onPageSizeChange: function (pageSize) {
-      this.$emit('pageSizeChange', pageSize)
+    methods: {
+      // 进入某一页
+      onPageChange: function (pageNum) {
+        this.$emit('pageChange', pageNum)
+      },
+      // 每页显示信息条数
+      onPageSizeChange: function (pageSize) {
+        this.$emit('pageSizeChange', pageSize)
+      }
     }
   }
-}
 </script>
 <style>
-.blue {
-  color: #409eff;
-}
+  .blue {
+    color: #409eff;
+  }
 </style>
diff --git a/src/module-dashboard/pages/401.vue b/src/module-dashboard/pages/401.vue
index f838f04..4371778 100644
--- a/src/module-dashboard/pages/401.vue
+++ b/src/module-dashboard/pages/401.vue
@@ -1,38 +1,26 @@
 <template>
   <div class="errPage-container">
-    <el-button
-      icon="arrow-left"
-      class="pan-back-btn"
-      @click="back"
-    >
+    <el-button icon="arrow-left" class="pan-back-btn" @click="back">
       返回
     </el-button>
     <el-row>
       <el-col :span="12">
-        <h1 class="text-jumbo text-ginormous">
-          Oops!
-        </h1>
-        gif来源<a
-          href="https://zh.airbnb.com/"
-          target="_blank"
-        >airbnb</a> 页面
+        <h1 class="text-jumbo text-ginormous">Oops!</h1>
+        gif来源
+        <a href="https://zh.airbnb.com/" target="_blank">airbnb</a>
+        页面
         <h2>你没有权限去该页面</h2>
         <h6>如有不满请联系你领导</h6>
         <ul class="list-unstyled">
           <li>或者你可以去:</li>
           <li class="link-type">
-            <router-link to="/dashboard">
-              回首页
-            </router-link>
+            <router-link to="/dashboard">回首页</router-link>
           </li>
           <li class="link-type">
             <a href="https://www.taobao.com/">随便看看</a>
           </li>
           <li>
-            <a
-              href="#"
-              @click.prevent="dialogVisible = true"
-            >点我看图</a>
+            <a href="#" @click.prevent="dialogVisible = true">点我看图</a>
           </li>
         </ul>
       </el-col>
@@ -42,79 +30,73 @@
           width="313"
           height="428"
           alt="Girl has dropped her ice cream."
-        >
+        />
       </el-col>
     </el-row>
-    <el-dialog
-      title="随便看"
-      :visible.sync="dialogVisible"
-    >
-      <img
-        class="pan-img"
-        :src="ewizardClap"
-      >
+    <el-dialog title="随便看" :visible.sync="dialogVisible">
+      <img class="pan-img" :src="ewizardClap" />
     </el-dialog>
   </div>
 </template>
 
 <script>
-import errGif from '@/assets/401_images/401.gif'
+  import errGif from '@/assets/401_images/401.gif'
 
-export default {
-  name: 'Page401',
-  data() {
-    return {
-      errGif: errGif + '?' + +new Date(),
-      ewizardClap:
-        'https://wpimg.wallstcn.com/007ef517-bafd-4066-aae4-6883632d9646',
-      dialogVisible: false
-    }
-  },
-  methods: {
-    back() {
-      if (this.$route.query.noGoBack) {
-        this.$router.push({ path: '/dashboard' })
-      } else {
-        this.$router.go(-1)
+  export default {
+    name: 'Page401',
+    data() {
+      return {
+        errGif: errGif + '?' + +new Date(),
+        ewizardClap:
+          'https://wpimg.wallstcn.com/007ef517-bafd-4066-aae4-6883632d9646',
+        dialogVisible: false
+      }
+    },
+    methods: {
+      back() {
+        if (this.$route.query.noGoBack) {
+          this.$router.push({ path: '/dashboard' })
+        } else {
+          this.$router.go(-1)
+        }
       }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.errPage-container {
-  width: 800px;
-  margin: 100px auto;
-  .pan-back-btn {
-    background: #008489;
-    color: #fff;
-  }
-  .pan-gif {
-    margin: 0 auto;
-    display: block;
-  }
-  .pan-img {
-    display: block;
-    margin: 0 auto;
-  }
-  .text-jumbo {
-    font-size: 60px;
-    font-weight: 700;
-    color: #484848;
-  }
-  .list-unstyled {
-    font-size: 14px;
-    li {
-      padding-bottom: 5px;
+  .errPage-container {
+    width: 800px;
+    margin: 100px auto;
+    .pan-back-btn {
+      background: #008489;
+      color: #fff;
+    }
+    .pan-gif {
+      margin: 0 auto;
+      display: block;
+    }
+    .pan-img {
+      display: block;
+      margin: 0 auto;
     }
-    a {
-      color: #008489;
-      text-decoration: none;
-      &:hover {
-        text-decoration: underline;
+    .text-jumbo {
+      font-size: 60px;
+      font-weight: 700;
+      color: #484848;
+    }
+    .list-unstyled {
+      font-size: 14px;
+      li {
+        padding-bottom: 5px;
+      }
+      a {
+        color: #008489;
+        text-decoration: none;
+        &:hover {
+          text-decoration: underline;
+        }
       }
     }
   }
-}
 </style>
diff --git a/src/module-dashboard/pages/404.vue b/src/module-dashboard/pages/404.vue
index 2179cfe..d5ee325 100644
--- a/src/module-dashboard/pages/404.vue
+++ b/src/module-dashboard/pages/404.vue
@@ -2,38 +2,18 @@
   <div style="background: #f0f2f5; margin-top: -20px; height: 100%">
     <div class="wscn-http404">
       <div class="pic-404">
-        <img
-          class="pic-404__parent"
-          :src="img404"
-          alt="404"
-        >
-        <img
-          class="pic-404__child left"
-          :src="img404Cloud"
-          alt="404"
-        >
-        <img
-          class="pic-404__child mid"
-          :src="img404Cloud"
-          alt="404"
-        >
-        <img
-          class="pic-404__child right"
-          :src="img404Cloud"
-          alt="404"
-        >
+        <img class="pic-404__parent" :src="img404" alt="404" />
+        <img class="pic-404__child left" :src="img404Cloud" alt="404" />
+        <img class="pic-404__child mid" :src="img404Cloud" alt="404" />
+        <img class="pic-404__child right" :src="img404Cloud" alt="404" />
       </div>
       <div class="bullshit">
-        <div class="bullshit__oops">
-          OOPS!
-        </div>
+        <div class="bullshit__oops">OOPS!</div>
         <div class="bullshit__info">
           版权所有
-          <a
-            class="link-type"
-            href="https://wallstreetcn.com"
-            target="_blank"
-          >华尔街见闻</a>
+          <a class="link-type" href="https://wallstreetcn.com" target="_blank">
+            华尔街见闻
+          </a>
         </div>
         <div class="bullshit__headline">
           {{ message }}
@@ -41,221 +21,218 @@
         <div class="bullshit__info">
           请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告
         </div>
-        <a
-          href="/"
-          class="bullshit__return-home"
-        >返回首页</a>
+        <a href="/" class="bullshit__return-home">返回首页</a>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import img404 from '@/assets/404_images/404.png'
-import img404Cloud from '@/assets/404_images/404_cloud.png'
+  import img404 from '@/assets/404_images/404.png'
+  import img404Cloud from '@/assets/404_images/404_cloud.png'
 
-export default {
-  name: 'Page404',
-  data() {
-    return {
-      img404,
-      img404Cloud
-    }
-  },
-  computed: {
-    message() {
-      return '特朗普说这个页面你不能进......'
+  export default {
+    name: 'Page404',
+    data() {
+      return {
+        img404,
+        img404Cloud
+      }
+    },
+    computed: {
+      message() {
+        return '特朗普说这个页面你不能进......'
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.wscn-http404 {
-  position: relative;
-  width: 1200px;
-  margin: 20px auto 60px;
-  padding: 0 100px;
-  overflow: hidden;
-  .pic-404 {
+  .wscn-http404 {
     position: relative;
-    float: left;
-    width: 600px;
-    padding: 150px 0;
+    width: 1200px;
+    margin: 20px auto 60px;
+    padding: 0 100px;
     overflow: hidden;
-    &__parent {
-      width: 100%;
-    }
-    &__child {
-      position: absolute;
-      &.left {
-        width: 80px;
-        top: 17px;
-        left: 220px;
-        opacity: 0;
-        animation-name: cloudLeft;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1s;
-      }
-      &.mid {
-        width: 46px;
-        top: 10px;
-        left: 420px;
-        opacity: 0;
-        animation-name: cloudMid;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1.2s;
-      }
-      &.right {
-        width: 62px;
-        top: 100px;
-        left: 500px;
-        opacity: 0;
-        animation-name: cloudRight;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1s;
+    .pic-404 {
+      position: relative;
+      float: left;
+      width: 600px;
+      padding: 150px 0;
+      overflow: hidden;
+      &__parent {
+        width: 100%;
       }
-      @keyframes cloudLeft {
-        0% {
+      &__child {
+        position: absolute;
+        &.left {
+          width: 80px;
           top: 17px;
           left: 220px;
           opacity: 0;
+          animation-name: cloudLeft;
+          animation-duration: 2s;
+          animation-timing-function: linear;
+          animation-fill-mode: forwards;
+          animation-delay: 1s;
         }
-        20% {
-          top: 33px;
-          left: 188px;
-          opacity: 1;
-        }
-        80% {
-          top: 81px;
-          left: 92px;
-          opacity: 1;
-        }
-        100% {
-          top: 97px;
-          left: 60px;
-          opacity: 0;
-        }
-      }
-      @keyframes cloudMid {
-        0% {
+        &.mid {
+          width: 46px;
           top: 10px;
           left: 420px;
           opacity: 0;
+          animation-name: cloudMid;
+          animation-duration: 2s;
+          animation-timing-function: linear;
+          animation-fill-mode: forwards;
+          animation-delay: 1.2s;
         }
-        20% {
-          top: 40px;
-          left: 360px;
-          opacity: 1;
-        }
-        70% {
-          top: 130px;
-          left: 180px;
-          opacity: 1;
-        }
-        100% {
-          top: 160px;
-          left: 120px;
-          opacity: 0;
-        }
-      }
-      @keyframes cloudRight {
-        0% {
+        &.right {
+          width: 62px;
           top: 100px;
           left: 500px;
           opacity: 0;
+          animation-name: cloudRight;
+          animation-duration: 2s;
+          animation-timing-function: linear;
+          animation-fill-mode: forwards;
+          animation-delay: 1s;
         }
-        20% {
-          top: 120px;
-          left: 460px;
-          opacity: 1;
+        @keyframes cloudLeft {
+          0% {
+            top: 17px;
+            left: 220px;
+            opacity: 0;
+          }
+          20% {
+            top: 33px;
+            left: 188px;
+            opacity: 1;
+          }
+          80% {
+            top: 81px;
+            left: 92px;
+            opacity: 1;
+          }
+          100% {
+            top: 97px;
+            left: 60px;
+            opacity: 0;
+          }
         }
-        80% {
-          top: 180px;
-          left: 340px;
-          opacity: 1;
+        @keyframes cloudMid {
+          0% {
+            top: 10px;
+            left: 420px;
+            opacity: 0;
+          }
+          20% {
+            top: 40px;
+            left: 360px;
+            opacity: 1;
+          }
+          70% {
+            top: 130px;
+            left: 180px;
+            opacity: 1;
+          }
+          100% {
+            top: 160px;
+            left: 120px;
+            opacity: 0;
+          }
         }
-        100% {
-          top: 200px;
-          left: 300px;
-          opacity: 0;
+        @keyframes cloudRight {
+          0% {
+            top: 100px;
+            left: 500px;
+            opacity: 0;
+          }
+          20% {
+            top: 120px;
+            left: 460px;
+            opacity: 1;
+          }
+          80% {
+            top: 180px;
+            left: 340px;
+            opacity: 1;
+          }
+          100% {
+            top: 200px;
+            left: 300px;
+            opacity: 0;
+          }
         }
       }
     }
-  }
-  .bullshit {
-    position: relative;
-    float: left;
-    width: 300px;
-    padding: 150px 0;
-    overflow: hidden;
-    &__oops {
-      font-size: 32px;
-      font-weight: bold;
-      line-height: 40px;
-      color: #1482f0;
-      opacity: 0;
-      margin-bottom: 20px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-fill-mode: forwards;
-    }
-    &__headline {
-      font-size: 20px;
-      line-height: 24px;
-      color: #1482f0;
-      opacity: 0;
-      margin-bottom: 10px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.1s;
-      animation-fill-mode: forwards;
-    }
-    &__info {
-      font-size: 13px;
-      line-height: 21px;
-      color: grey;
-      opacity: 0;
-      margin-bottom: 30px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.2s;
-      animation-fill-mode: forwards;
-    }
-    &__return-home {
-      display: block;
+    .bullshit {
+      position: relative;
       float: left;
-      width: 110px;
-      height: 36px;
-      background: #1482f0;
-      border-radius: 100px;
-      text-align: center;
-      color: #ffffff;
-      opacity: 0;
-      font-size: 14px;
-      line-height: 36px;
-      cursor: pointer;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.3s;
-      animation-fill-mode: forwards;
-    }
-    @keyframes slideUp {
-      0% {
-        transform: translateY(60px);
+      width: 300px;
+      padding: 150px 0;
+      overflow: hidden;
+      &__oops {
+        font-size: 32px;
+        font-weight: bold;
+        line-height: 40px;
+        color: #1482f0;
+        opacity: 0;
+        margin-bottom: 20px;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-fill-mode: forwards;
+      }
+      &__headline {
+        font-size: 20px;
+        line-height: 24px;
+        color: #1482f0;
+        opacity: 0;
+        margin-bottom: 10px;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-delay: 0.1s;
+        animation-fill-mode: forwards;
+      }
+      &__info {
+        font-size: 13px;
+        line-height: 21px;
+        color: grey;
         opacity: 0;
+        margin-bottom: 30px;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-delay: 0.2s;
+        animation-fill-mode: forwards;
       }
-      100% {
-        transform: translateY(0);
-        opacity: 1;
+      &__return-home {
+        display: block;
+        float: left;
+        width: 110px;
+        height: 36px;
+        background: #1482f0;
+        border-radius: 100px;
+        text-align: center;
+        color: #ffffff;
+        opacity: 0;
+        font-size: 14px;
+        line-height: 36px;
+        cursor: pointer;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-delay: 0.3s;
+        animation-fill-mode: forwards;
+      }
+      @keyframes slideUp {
+        0% {
+          transform: translateY(60px);
+          opacity: 0;
+        }
+        100% {
+          transform: translateY(0);
+          opacity: 1;
+        }
       }
     }
   }
-}
 </style>
diff --git a/src/module-dashboard/pages/authredirect.vue b/src/module-dashboard/pages/authredirect.vue
index 52eb1ae..a0d1c70 100644
--- a/src/module-dashboard/pages/authredirect.vue
+++ b/src/module-dashboard/pages/authredirect.vue
@@ -1,10 +1,10 @@
 <script>
-export default {
-  name: 'Authredirect',
-  created() {
-    const hash = window.location.search.slice(1)
-    window.opener.location.href = window.location.origin + '/login#' + hash
-    window.close()
+  export default {
+    name: 'Authredirect',
+    created() {
+      const hash = window.location.search.slice(1)
+      window.opener.location.href = window.location.origin + '/login#' + hash
+      window.close()
+    }
   }
-}
 </script>
diff --git a/src/module-dashboard/pages/dashboard.vue b/src/module-dashboard/pages/dashboard.vue
index 5630fa1..3ed9442 100644
--- a/src/module-dashboard/pages/dashboard.vue
+++ b/src/module-dashboard/pages/dashboard.vue
@@ -1,11 +1,7 @@
 <template>
   <div class="dashboard-container">
     <el-row :gutter="20">
-      <el-col
-        :xs="24"
-        :sm="6"
-        :span="6"
-      >
+      <el-col :xs="24" :sm="6" :span="6">
         <el-card
           class="box-card"
           :body-style="{ padding: '5px 20px', minHeight: '230px' }"
@@ -21,24 +17,25 @@
               <i class="el-icon-warning" />
             </el-tooltip>
           </div>
-          <div class="total">
-            ¥ 126,560
-          </div>
+          <div class="total">¥ 126,560</div>
           <div class="trends">
-            <span>周同比 12% <i class="el-icon-caret-top" /></span>
-            <span>日环比 11% <i class="el-icon-caret-bottom" /></span>
+            <span>
+              周同比 12%
+              <i class="el-icon-caret-top" />
+            </span>
+            <span>
+              日环比 11%
+              <i class="el-icon-caret-bottom" />
+            </span>
           </div>
           <div class="hr" />
           <div class="footer">
-            <span>日均销售额</span> <span>￥12,423</span>
+            <span>日均销售额</span>
+            <span>￥12,423</span>
           </div>
         </el-card>
       </el-col>
-      <el-col
-        :xs="24"
-        :sm="6"
-        :span="6"
-      >
+      <el-col :xs="24" :sm="6" :span="6">
         <el-card
           class="box-card"
           :body-style="{ padding: '5px 20px', minHeight: '230px' }"
@@ -59,15 +56,12 @@
           </div>
           <div class="hr" />
           <div class="footer">
-            <span>日访问量</span> <span>1,234</span>
+            <span>日访问量</span>
+            <span>1,234</span>
           </div>
         </el-card>
       </el-col>
-      <el-col
-        :xs="24"
-        :sm="6"
-        :span="6"
-      >
+      <el-col :xs="24" :sm="6" :span="6">
         <el-card
           class="box-card"
           :body-style="{ padding: '5px 20px', minHeight: '230px' }"
@@ -88,15 +82,12 @@
           </div>
           <div class="hr" />
           <div class="footer">
-            <span>转化率</span> <span>1,234</span>
+            <span>转化率</span>
+            <span>1,234</span>
           </div>
         </el-card>
       </el-col>
-      <el-col
-        :xs="24"
-        :sm="6"
-        :span="6"
-      >
+      <el-col :xs="24" :sm="6" :span="6">
         <el-card
           class="box-card"
           :body-style="{ padding: '5px 20px', minHeight: '230px' }"
@@ -117,14 +108,20 @@
           </div>
           <div class="hr" />
           <div class="trends">
-            <span>周同比 12% <i class="el-icon-caret-top" /></span>
-            <span>日环比 11% <i class="el-icon-caret-bottom" /></span>
+            <span>
+              周同比 12%
+              <i class="el-icon-caret-top" />
+            </span>
+            <span>
+              日环比 11%
+              <i class="el-icon-caret-bottom" />
+            </span>
           </div>
         </el-card>
       </el-col>
     </el-row>
 
-    <br>
+    <br />
     <!-- 销售表 -->
     <el-card class="sales-card">
       <div class="header">
@@ -139,31 +136,16 @@
           :picker-options="pickerOptions2"
         />
       </div>
-      <el-tabs
-        v-model="activeName"
-        @tab-click="handleSetLineChartData"
-      >
-        <el-tab-pane
-          label="销售额"
-          name="newVisitis"
-        />
-        <el-tab-pane
-          label="访问量"
-          name="messages"
-        />
+      <el-tabs v-model="activeName" @tab-click="handleSetLineChartData">
+        <el-tab-pane label="销售额" name="newVisitis" />
+        <el-tab-pane label="访问量" name="messages" />
         <el-row :gutter="20">
-          <el-col
-            :xs="24"
-            :sm="16"
-          >
+          <el-col :xs="24" :sm="16">
             <div class="chart">
               <line-chart :chart-data="lineChartData" />
             </div>
           </el-col>
-          <el-col
-            :xs="24"
-            :sm="8"
-          >
+          <el-col :xs="24" :sm="8">
             <div class="table">
               <h4>门店销售额排名</h4>
               <ul>
@@ -173,12 +155,8 @@
                     :key="'sals-' + index"
                     class="row"
                   >
-                    <el-col
-                      :span="3"
-                    >
-                      <div
-                        :class="[item.num > 3 ? 'light' : '', 'circular']"
-                      >
+                    <el-col :span="3">
+                      <div :class="[item.num > 3 ? 'light' : '', 'circular']">
                         {{ item.num }}
                       </div>
                     </el-col>
@@ -198,25 +176,17 @@
     </el-card>
     <!-- 销售表 /-->
 
-    <br>
+    <br />
     <!-- 搜索热度 -->
     <el-row :gutter="20">
-      <el-col
-        :xs="24"
-        :sm="12"
-      >
+      <el-col :xs="24" :sm="12">
         <el-card class="hots">
-          <div
-            slot="header"
-            class="header"
-          >
+          <div slot="header" class="header">
             <span>线上热门搜索</span>
-            <el-dropdown
-              trigger="click"
-              class="ops"
-            >
+            <el-dropdown trigger="click" class="ops">
               <span class="el-dropdown-link">
-                ...<i class="el-icon-arrow-down el-icon--right" />
+                ...
+                <i class="el-icon-arrow-down el-icon--right" />
               </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item>菜单一</el-dropdown-item>
@@ -230,20 +200,9 @@
             style="width: 100%"
             :default-sort="{ prop: 'users', order: 'descending' }"
           >
-            <el-table-column
-              type="index"
-              width="50"
-            />
-            <el-table-column
-              prop="title"
-              label="关键词"
-            />
-            <el-table-column
-              prop="users"
-              label="人数"
-              sortable
-              width="80"
-            />
+            <el-table-column type="index" width="50" />
+            <el-table-column prop="title" label="关键词" />
+            <el-table-column prop="users" label="人数" sortable width="80" />
             <el-table-column
               prop="increase"
               label="周增长率"
@@ -259,22 +218,14 @@
           />
         </el-card>
       </el-col>
-      <el-col
-        :xs="24"
-        :sm="12"
-      >
+      <el-col :xs="24" :sm="12">
         <el-card class="hots">
-          <div
-            slot="header"
-            class="header"
-          >
+          <div slot="header" class="header">
             <span>销售额类别占比</span>
-            <el-dropdown
-              trigger="click"
-              class="ops"
-            >
+            <el-dropdown trigger="click" class="ops">
               <span class="el-dropdown-link">
-                ...<i class="el-icon-arrow-down el-icon--right" />
+                ...
+                <i class="el-icon-arrow-down el-icon--right" />
               </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item>菜单一</el-dropdown-item>
@@ -283,10 +234,7 @@
             </el-dropdown>
           </div>
           <div>
-            <el-radio-group
-              v-model="radioArea"
-              size="mini"
-            >
+            <el-radio-group v-model="radioArea" size="mini">
               <el-radio-button label="全渠道" />
               <el-radio-button label="直达" />
               <el-radio-button label="百度" />
@@ -303,20 +251,15 @@
     </el-row>
     <!-- 搜索热度 /-->
 
-    <br>
+    <br />
     <!-- 周搜索趋势 -->
     <el-card class="hots">
-      <div
-        slot="header"
-        class="header"
-      >
+      <div slot="header" class="header">
         <span>周搜索趋势</span>
-        <el-dropdown
-          trigger="click"
-          class="ops"
-        >
+        <el-dropdown trigger="click" class="ops">
           <span class="el-dropdown-link">
-            ...<i class="el-icon-arrow-down el-icon--right" />
+            ...
+            <i class="el-icon-arrow-down el-icon--right" />
           </span>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item>菜单一</el-dropdown-item>
@@ -333,243 +276,243 @@
 </template>
 
 <script>
-import LineChart from './../components/dashboardLineChart'
-import RaddarChart from './../components/dashboardRaddarChart'
-import PieChart from './../components/dashboardPieChart'
-import BarChart from './../components/dashboardBarChart'
-import AreaChart from './../components/dashboardAreaChart'
+  import LineChart from './../components/dashboardLineChart'
+  import RaddarChart from './../components/dashboardRaddarChart'
+  import PieChart from './../components/dashboardPieChart'
+  import BarChart from './../components/dashboardBarChart'
+  import AreaChart from './../components/dashboardAreaChart'
 
-const lineChartData = {
-  newVisitis: {
-    expectedData: [
-      100, 120, 161, 134, 105, 160, 165, 100, 120, 161, 134, 105, 160, 165
-    ],
-    actualData: [
-      120, 82, 91, 154, 162, 140, 15, 120, 82, 91, 154, 162, 140, 145
-    ]
-  },
-  messages: {
-    expectedData: [200, 192, 120, 144, 160, 130, 140],
-    actualData: [180, 160, 151, 106, 145, 150, 130]
-  },
-  purchases: {
-    expectedData: [80, 100, 121, 104, 105, 90, 100],
-    actualData: [120, 90, 100, 138, 142, 130, 130]
-  },
-  shoppings: {
-    expectedData: [130, 140, 141, 142, 145, 150, 160],
-    actualData: [120, 82, 91, 154, 162, 140, 130]
+  const lineChartData = {
+    newVisitis: {
+      expectedData: [
+        100, 120, 161, 134, 105, 160, 165, 100, 120, 161, 134, 105, 160, 165
+      ],
+      actualData: [
+        120, 82, 91, 154, 162, 140, 15, 120, 82, 91, 154, 162, 140, 145
+      ]
+    },
+    messages: {
+      expectedData: [200, 192, 120, 144, 160, 130, 140],
+      actualData: [180, 160, 151, 106, 145, 150, 130]
+    },
+    purchases: {
+      expectedData: [80, 100, 121, 104, 105, 90, 100],
+      actualData: [120, 90, 100, 138, 142, 130, 130]
+    },
+    shoppings: {
+      expectedData: [130, 140, 141, 142, 145, 150, 160],
+      actualData: [120, 82, 91, 154, 162, 140, 130]
+    }
   }
-}
 
-export default {
-  name: 'Dashboard',
-  components: {
-    LineChart,
-    RaddarChart,
-    PieChart,
-    BarChart,
-    AreaChart
-  },
-  data() {
-    return {
-      lineChartData: lineChartData.newVisitis,
-      activeName: 'newVisitis',
-      datePicker: '',
-      pickerOptions2: {
-        shortcuts: [
-          {
-            text: '最近一周',
-            onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-              picker.$emit('pick', [start, end])
-            }
-          },
-          {
-            text: '最近一个月',
-            onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-              picker.$emit('pick', [start, end])
+  export default {
+    name: 'Dashboard',
+    components: {
+      LineChart,
+      RaddarChart,
+      PieChart,
+      BarChart,
+      AreaChart
+    },
+    data() {
+      return {
+        lineChartData: lineChartData.newVisitis,
+        activeName: 'newVisitis',
+        datePicker: '',
+        pickerOptions2: {
+          shortcuts: [
+            {
+              text: '最近一周',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+                picker.$emit('pick', [start, end])
+              }
+            },
+            {
+              text: '最近一个月',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+                picker.$emit('pick', [start, end])
+              }
+            },
+            {
+              text: '最近三个月',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+                picker.$emit('pick', [start, end])
+              }
             }
-          },
-          {
-            text: '最近三个月',
-            onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-              picker.$emit('pick', [start, end])
-            }
-          }
-        ]
-      },
-      salesTable: [],
-      hotsTableData: [],
-      radioArea: '全渠道'
-    }
-  },
-  computed: {},
-  created() {
-    for (let i = 1; i < 9; i++) {
-      this.salesTable.push({
-        num: i,
-        title: `工专路 ${i} 号店`,
-        val: '323,234'
-      })
-      this.hotsTableData.push({
-        num: i,
-        title: `搜索关键词-${i}`,
-        users: Math.round(Math.random() * 500 + 300),
-        increase: `${Math.round(Math.random() * 50 + 40)}%`
-      })
-    }
-  },
-  methods: {
-    handleSetLineChartData(type) {
-      this.lineChartData = lineChartData[type.name]
+          ]
+        },
+        salesTable: [],
+        hotsTableData: [],
+        radioArea: '全渠道'
+      }
+    },
+    computed: {},
+    created() {
+      for (let i = 1; i < 9; i++) {
+        this.salesTable.push({
+          num: i,
+          title: `工专路 ${i} 号店`,
+          val: '323,234'
+        })
+        this.hotsTableData.push({
+          num: i,
+          title: `搜索关键词-${i}`,
+          users: Math.round(Math.random() * 500 + 300),
+          increase: `${Math.round(Math.random() * 50 + 40)}%`
+        })
+      }
+    },
+    methods: {
+      handleSetLineChartData(type) {
+        this.lineChartData = lineChartData[type.name]
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.dashboard-container {
-  margin: 10px;
-}
+  .dashboard-container {
+    margin: 10px;
+  }
 
-.box-card {
-  padding: 5px 10px;
-  .header {
-    height: 25px;
-    span {
-      color: #97a8be;
-      font-size: 14px;
+  .box-card {
+    padding: 5px 10px;
+    .header {
+      height: 25px;
+      span {
+        color: #97a8be;
+        font-size: 14px;
+      }
+      .item {
+        color: #97a8be;
+        float: right;
+        padding: 3px 0;
+      }
     }
-    .item {
-      color: #97a8be;
-      float: right;
-      padding: 3px 0;
+    // 总销售额
+    .total {
+      font-size: 30px;
+      height: 140px;
+      line-height: 140px;
+      padding-left: 20px;
     }
-  }
-  // 总销售额
-  .total {
-    font-size: 30px;
-    height: 140px;
-    line-height: 140px;
-    padding-left: 20px;
-  }
-  .trends {
-    height: 22px;
-    font-size: 14px;
-    span {
-      display: inline;
-      i {
-        color: red;
+    .trends {
+      height: 22px;
+      font-size: 14px;
+      span {
+        display: inline;
+        i {
+          color: red;
+        }
       }
-    }
-    span:last-child {
-      margin-left: 20px;
-      display: inline;
-      i {
-        color: green;
+      span:last-child {
+        margin-left: 20px;
+        display: inline;
+        i {
+          color: green;
+        }
       }
     }
-  }
-  .chart {
-    height: 160px;
-  }
-  .hr {
-    border-top: 1px solid #e8e8e8;
-    margin: 0px 0px 10px 0px;
-  }
-  .footer {
-    span {
-      font-size: 14px;
-      line-height: 22px;
+    .chart {
+      height: 160px;
+    }
+    .hr {
+      border-top: 1px solid #e8e8e8;
+      margin: 0px 0px 10px 0px;
     }
-    span:last-child {
-      margin-left: 8px;
-      color: rgba(0, 0, 0, 0.85);
+    .footer {
+      span {
+        font-size: 14px;
+        line-height: 22px;
+      }
+      span:last-child {
+        margin-left: 8px;
+        color: rgba(0, 0, 0, 0.85);
+      }
     }
+    // 总销售额 end
   }
-  // 总销售额 end
-}
 
-// 销售额
-.sales-card {
-  position: relative;
-  .header {
-    position: absolute;
-    right: 20px;
-    top: 15px;
-    z-index: 1;
-  }
-  .chart {
-    widows: 100%;
-    height: 300px;
-  }
-  .table {
-    color: rgba(0, 0, 0, 0.65);
-    h4 {
-      color: #000;
-      font-weight: 500;
-    }
-    ul {
-      list-style: none;
-      margin: 0px;
-      padding: 0px;
-      .row {
-        margin-bottom: 10px;
-      }
+  // 销售额
+  .sales-card {
+    position: relative;
+    .header {
+      position: absolute;
+      right: 20px;
+      top: 15px;
+      z-index: 1;
     }
-    .circular {
-      width: 20px;
-      height: 20px;
-      background-color: #314659;
-      color: #fff;
-      text-align: center;
-      font-size: 12px;
-      line-height: 20px;
-      font-weight: 600;
-      border-radius: 50%;
+    .chart {
+      widows: 100%;
+      height: 300px;
     }
-    .light {
-      background-color: #f5f5f5;
+    .table {
       color: rgba(0, 0, 0, 0.65);
+      h4 {
+        color: #000;
+        font-weight: 500;
+      }
+      ul {
+        list-style: none;
+        margin: 0px;
+        padding: 0px;
+        .row {
+          margin-bottom: 10px;
+        }
+      }
+      .circular {
+        width: 20px;
+        height: 20px;
+        background-color: #314659;
+        color: #fff;
+        text-align: center;
+        font-size: 12px;
+        line-height: 20px;
+        font-weight: 600;
+        border-radius: 50%;
+      }
+      .light {
+        background-color: #f5f5f5;
+        color: rgba(0, 0, 0, 0.65);
+      }
     }
   }
-}
 
-// 线上热门搜索
-.hots {
-  height: 400px;
-  position: relative;
-  .header {
-    color: #97a8be;
-    .ops {
+  // 线上热门搜索
+  .hots {
+    height: 400px;
+    position: relative;
+    .header {
+      color: #97a8be;
+      .ops {
+        position: absolute;
+        right: 20px;
+      }
+    }
+    .pagination {
       position: absolute;
-      right: 20px;
+      right: 12px;
+      bottom: 5px;
+    }
+    .chart {
+      height: 300px;
     }
   }
-  .pagination {
-    position: absolute;
-    right: 12px;
-    bottom: 5px;
-  }
-  .chart {
-    height: 300px;
-  }
-}
 
-// 周搜索
-.month-card {
-  height: 400px;
-  .chart {
-    height: 300px;
+  // 周搜索
+  .month-card {
+    height: 400px;
+    .chart {
+      height: 300px;
+    }
   }
-}
 </style>
diff --git a/src/module-dashboard/pages/layout.vue b/src/module-dashboard/pages/layout.vue
index 4ce6364..021c9a4 100644
--- a/src/module-dashboard/pages/layout.vue
+++ b/src/module-dashboard/pages/layout.vue
@@ -1,8 +1,5 @@
 <template>
-  <div
-    class="app-wrapper"
-    :class="{ hideSidebar: !sidebar.opened }"
-  >
+  <div class="app-wrapper" :class="{ hideSidebar: !sidebar.opened }">
     <layout-navbar />
     <layout-sidebar class="sidebar-container" />
     <div class="main-container">
@@ -10,16 +7,14 @@
       <layout-app-main />
       <div class="bottom">
         <p>
-          <a
-            href="#"
-            target="_blank"
-          >
+          <a href="#" target="_blank">
             <svg-icon icon-class="github" />
           </a>
         </p>
         <p>
           Copyright
-          <svg-icon icon-class="copyright" />2019
+          <svg-icon icon-class="copyright" />
+          2019
         </p>
       </div>
     </div>
@@ -27,42 +22,42 @@
 </template>
 
 <script>
-import layoutNavbar from './../components/layoutNavbar'
-import layoutSidebar from './../components/layoutSidebar'
-import layoutTags from './../components/layoutTags'
-import layoutAppMain from './../components/layoutAppMain'
+  import layoutNavbar from './../components/layoutNavbar'
+  import layoutSidebar from './../components/layoutSidebar'
+  import layoutTags from './../components/layoutTags'
+  import layoutAppMain from './../components/layoutAppMain'
 
-export default {
-  name: 'Layout',
-  components: {
-    layoutNavbar,
-    layoutSidebar,
-    layoutTags,
-    layoutAppMain
-  },
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
+  export default {
+    name: 'Layout',
+    components: {
+      layoutNavbar,
+      layoutSidebar,
+      layoutTags,
+      layoutAppMain
+    },
+    computed: {
+      sidebar() {
+        return this.$store.state.app.sidebar
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-@import 'src/styles/mixin.scss';
-.app-wrapper {
-  @include clearfix;
-  position: relative;
-  height: 100%;
-  width: 100%;
-}
-.bottom {
-  height: 150px;
-  padding-top: 60px;
-  p {
-    text-align: center;
-    color: rgba(0, 0, 0, 0.45);
-    font-size: 14px;
+  @import 'src/styles/mixin.scss';
+  .app-wrapper {
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    width: 100%;
+  }
+  .bottom {
+    height: 150px;
+    padding-top: 60px;
+    p {
+      text-align: center;
+      color: rgba(0, 0, 0, 0.45);
+      font-size: 14px;
+    }
   }
-}
 </style>
diff --git a/src/module-dashboard/pages/login.vue b/src/module-dashboard/pages/login.vue
index b3e4691..412d996 100644
--- a/src/module-dashboard/pages/login.vue
+++ b/src/module-dashboard/pages/login.vue
@@ -43,10 +43,7 @@
             placeholder="password"
             @keyup.enter.native="handleLogin"
           />
-          <span
-            class="show-pwd"
-            @click="showPwd"
-          >
+          <span class="show-pwd" @click="showPwd">
             <svg-icon icon-class="eye" />
           </span>
         </el-form-item>
@@ -65,217 +62,217 @@
 </template>
 
 <script>
-import { validateEmail } from '@/utils/validate'
-import LangSelect from '@/components/LangSelect'
-import shajs from 'sha.js'
+  import { validateEmail } from '@/utils/validate'
+  import LangSelect from '@/components/LangSelect'
+  import shajs from 'sha.js'
 
-export default {
-  name: 'Login',
-  components: { LangSelect },
-  data() {
-    const validateUsername = (rule, value, callback) => {
-      if (!validateEmail(value)) {
-        callback(new Error('Please enter the email user name'))
-      } else {
-        callback()
+  export default {
+    name: 'Login',
+    components: { LangSelect },
+    data() {
+      const validateUsername = (rule, value, callback) => {
+        if (!validateEmail(value)) {
+          callback(new Error('Please enter the email user name'))
+        } else {
+          callback()
+        }
       }
-    }
-    const validatePassword = (rule, value, callback) => {
-      if (value.length < 6) {
-        callback(new Error('The password can not be less than 6 digits'))
-      } else {
-        callback()
+      const validatePassword = (rule, value, callback) => {
+        if (value.length < 6) {
+          callback(new Error('The password can not be less than 6 digits'))
+        } else {
+          callback()
+        }
       }
-    }
-    return {
-      loginForm: {
-        username: 'root@admin.com',
-        password: '123456'
-      },
-      loginRules: {
-        username: [
-          { required: true, trigger: 'blur', validator: validateUsername }
-        ],
-        password: [
-          { required: true, trigger: 'blur', validator: validatePassword }
-        ]
-      },
-      passwordType: 'password',
-      loading: false,
-      showDialog: false
-    }
-  },
-  created() {},
-  destroyed() {},
-  methods: {
-    showPwd() {
-      if (this.passwordType === 'password') {
-        this.passwordType = ''
-      } else {
-        this.passwordType = 'password'
+      return {
+        loginForm: {
+          username: 'root@admin.com',
+          password: '123456'
+        },
+        loginRules: {
+          username: [
+            { required: true, trigger: 'blur', validator: validateUsername }
+          ],
+          password: [
+            { required: true, trigger: 'blur', validator: validatePassword }
+          ]
+        },
+        passwordType: 'password',
+        loading: false,
+        showDialog: false
       }
     },
-    handleLogin() {
-      this.$refs.loginForm.validate(async (valid) => {
-        if (valid) {
-          this.loading = true
-          await this.$store
-            .dispatch('LoginByUsername', {
-              username: this.loginForm.username,
-              password: shajs('sha256')
-                .update(this.loginForm.password)
-                .digest('hex')
-            })
-            .then(() => {
-              this.loading = false
-              this.$router.push({ path: '/' })
-            })
-            .catch(() => {
-              this.loading = false
-            })
+    created() {},
+    destroyed() {},
+    methods: {
+      showPwd() {
+        if (this.passwordType === 'password') {
+          this.passwordType = ''
         } else {
-          // console.log('error submit!!')
-          return false
+          this.passwordType = 'password'
         }
-      })
+      },
+      handleLogin() {
+        this.$refs.loginForm.validate(async (valid) => {
+          if (valid) {
+            this.loading = true
+            await this.$store
+              .dispatch('LoginByUsername', {
+                username: this.loginForm.username,
+                password: shajs('sha256')
+                  .update(this.loginForm.password)
+                  .digest('hex')
+              })
+              .then(() => {
+                this.loading = false
+                this.$router.push({ path: '/' })
+              })
+              .catch(() => {
+                this.loading = false
+              })
+          } else {
+            // console.log('error submit!!')
+            return false
+          }
+        })
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-$bg: #2d3a4b;
-$light_gray: #333;
+  $bg: #2d3a4b;
+  $light_gray: #333;
 
-/* reset element-ui css */
-.login-container {
-  .el-input {
-    display: inline-block;
-    height: 47px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 12px 5px 12px 15px;
-      color: $light_gray;
+  /* reset element-ui css */
+  .login-container {
+    .el-input {
+      display: inline-block;
       height: 47px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $bg inset !important;
-        -webkit-text-fill-color: #fff !important;
+      width: 85%;
+      input {
+        background: transparent;
+        border: 0px;
+        -webkit-appearance: none;
+        border-radius: 0px;
+        padding: 12px 5px 12px 15px;
+        color: $light_gray;
+        height: 47px;
+        &:-webkit-autofill {
+          -webkit-box-shadow: 0 0 0px 1000px $bg inset !important;
+          -webkit-text-fill-color: #fff !important;
+        }
       }
     }
+    .el-form-item {
+      border: 1px solid #dcdfe6;
+      background: #fff;
+      border-radius: 5px;
+      color: #454545;
+    }
+    .el-button--medium {
+      height: 50px;
+      line-height: 20px;
+      font-size: 22px;
+    }
   }
-  .el-form-item {
-    border: 1px solid #dcdfe6;
-    background: #fff;
-    border-radius: 5px;
-    color: #454545;
-  }
-  .el-button--medium {
-    height: 50px;
-    line-height: 20px;
-    font-size: 22px;
-  }
-}
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-$bg: #2d3a4b;
-$dark_gray: #889aa4;
-$light_gray: #333;
+  $bg: #2d3a4b;
+  $dark_gray: #889aa4;
+  $light_gray: #333;
 
-.login-container {
-  position: fixed;
-  height: 100%;
-  width: 100%;
-  background-color: $bg;
-
-  background: url('./../assets/bg.jpg');
-  -moz-background-size: 100% 100%;
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  .loginBox {
+  .login-container {
+    position: fixed;
     height: 100%;
     width: 100%;
-    background: url('./../assets/logingBg.png') no-repeat 100% 100%;
-    position: relative;
-  }
-  .login-form {
-    position: absolute;
-    left: 20%;
-    top: 50%;
-    width: 520px;
-    padding: 35px 35px 15px 35px;
-    margin: -200px 0 0 0;
-    background: #f5f5f5;
-  }
-  .tips {
-    font-size: 14px;
-    // color: #fff;
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
+    background-color: $bg;
+
+    background: url('./../assets/bg.jpg');
+    -moz-background-size: 100% 100%;
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    .loginBox {
+      height: 100%;
+      width: 100%;
+      background: url('./../assets/logingBg.png') no-repeat 100% 100%;
+      position: relative;
+    }
+    .login-form {
+      position: absolute;
+      left: 20%;
+      top: 50%;
+      width: 520px;
+      padding: 35px 35px 15px 35px;
+      margin: -200px 0 0 0;
+      background: #f5f5f5;
+    }
+    .tips {
+      font-size: 14px;
+      // color: #fff;
+      margin-bottom: 10px;
+      span {
+        &:first-of-type {
+          margin-right: 16px;
+        }
       }
     }
-  }
-  .svg-container {
-    padding: 6px 5px 6px 15px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-    &_login {
-      font-size: 20px;
+    .svg-container {
+      padding: 6px 5px 6px 15px;
+      color: $dark_gray;
+      vertical-align: middle;
+      width: 30px;
+      display: inline-block;
+      &_login {
+        font-size: 20px;
+      }
     }
-  }
-  .title-container {
-    position: relative;
-    .title {
-      font-size: 26px;
-      // font-weight: 400;
-      color: $light_gray;
-      margin: 0px auto 40px auto;
-      text-align: center;
-      font-weight: bold;
+    .title-container {
+      position: relative;
+      .title {
+        font-size: 26px;
+        // font-weight: 400;
+        color: $light_gray;
+        margin: 0px auto 40px auto;
+        text-align: center;
+        font-weight: bold;
+      }
+      .set-language {
+        // color: #fff;
+        position: absolute;
+        top: 5px;
+        right: 0px;
+      }
     }
-    .set-language {
-      // color: #fff;
+    .show-pwd {
       position: absolute;
-      top: 5px;
-      right: 0px;
+      right: 10px;
+      top: 7px;
+      font-size: 16px;
+      color: $dark_gray;
+      cursor: pointer;
+      user-select: none;
     }
+    .thirdparty-button {
+      position: absolute;
+      right: 35px;
+      bottom: 28px;
+    }
+  }
+  .logoInfo {
+    padding-bottom: 15px;
   }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
+  .logoInfo span {
+    font-size: 22px;
+    padding: 0 10px;
+    float: left;
   }
-  .thirdparty-button {
-    position: absolute;
-    right: 35px;
-    bottom: 28px;
+  .logoInfo .logo {
+    background: url(../assets/loginLogo.png) no-repeat;
+    display: inline-block;
+    width: 35px;
+    height: 26px;
+    float: left;
   }
-}
-.logoInfo {
-  padding-bottom: 15px;
-}
-.logoInfo span {
-  font-size: 22px;
-  padding: 0 10px;
-  float: left;
-}
-.logoInfo .logo {
-  background: url(../assets/loginLogo.png) no-repeat;
-  display: inline-block;
-  width: 35px;
-  height: 26px;
-  float: left;
-}
 </style>
diff --git a/src/module-hmmm/components/articles-add.vue b/src/module-hmmm/components/articles-add.vue
index b4dd113..6dfe99a 100644
--- a/src/module-hmmm/components/articles-add.vue
+++ b/src/module-hmmm/components/articles-add.vue
@@ -1,11 +1,9 @@
 <template>
-  <div class="container">
-    添加文章对话框
-  </div>
+  <div class="container">添加文章对话框</div>
 </template>
 
 <script>
-export default {}
+  export default {}
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/module-hmmm/components/articles-preview.vue b/src/module-hmmm/components/articles-preview.vue
index f85042f..af8542e 100644
--- a/src/module-hmmm/components/articles-preview.vue
+++ b/src/module-hmmm/components/articles-preview.vue
@@ -1,11 +1,9 @@
 <template>
-  <div class="container">
-    预览文章对话框
-  </div>
+  <div class="container">预览文章对话框</div>
 </template>
 
 <script>
-export default {}
+  export default {}
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/module-hmmm/components/companys-add.vue b/src/module-hmmm/components/companys-add.vue
index 7d899c0..f8f9e62 100644
--- a/src/module-hmmm/components/companys-add.vue
+++ b/src/module-hmmm/components/companys-add.vue
@@ -2,16 +2,16 @@
   <div class="headcontainer">
     <el-dialog :title="showtext" :visible="showDialog" @close="delbtn">
       <el-form
+        ref="perForm"
         label-width="120px"
         :rules="rules"
         :model="formData"
-        ref="perForm"
       >
         <el-form-item label="企业名称" prop="shortName">
-          <el-input style="width: 70%" v-model="formData.shortName" />
+          <el-input v-model="formData.shortName" style="width: 70%" />
         </el-form-item>
         <el-form-item label="所属公司" prop="company">
-          <el-input style="width: 70%" v-model="formData.company" />
+          <el-input v-model="formData.company" style="width: 70%" />
         </el-form-item>
         <el-form-item>
           <p class="companyprofile">
@@ -20,30 +20,30 @@
         </el-form-item>
         <el-form-item label="城市地区" prop="city">
           <el-select
+            v-model="formData.province"
             placeholder="请选择"
             style="width: 34%"
             class="cityselect"
-            v-model="formData.province"
           >
             <el-option value="123"></el-option>
           </el-select>
           <el-select
+            v-model="formData.city"
             placeholder="请选择"
             style="width: 34%"
-            v-model="formData.city"
           >
             <el-option value="123"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="方向(企业标签)" prop="tags">
-          <el-input style="width: 70%" v-model="formData.tags" />
+          <el-input v-model="formData.tags" style="width: 70%" />
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input
+            v-model="formData.remarks"
             type="textarea"
             style="width: 70%"
             placeholder="请输入"
-            v-model="formData.remarks"
           />
         </el-form-item>
       </el-form>
@@ -51,7 +51,9 @@
       <el-row slot="footer" type="flex" justify="center">
         <el-col :span="6">
           <el-button size="medium" @click="delbtn">取消</el-button>
-          <el-button size="medium" @click="addbtn" type="primary">确定</el-button>
+          <el-button size="medium" type="primary" @click="addbtn">
+            确定
+          </el-button>
         </el-col>
       </el-row>
     </el-dialog>
@@ -59,89 +61,88 @@
 </template>
 
 <script>
-import {add,update} from '@/api/hmmm/companys.js'
-export default {
-  computed: {
-    showtext() {
-      return this.formData.id ? '编辑用户' : '创建用户';
+  import { add, update } from '@/api/hmmm/companys.js'
+  export default {
+    props: {
+      showDialog: {
+        type: Boolean,
+        default: true
+      }
     },
-  },
-  created () {
-
-  },
-  methods: {
-    async addbtn(){
-      try{
-        await this.$refs.perForm.validate()
-        if(this.formData.id){
-          // let tid =  ':'+this.formData.id
-          await update(this.formData)
-        }else{
-          await add(this.formData)
+    data() {
+      return {
+        formData: {
+          city: '',
+          company: '',
+          isFamous: true,
+          province: '',
+          remarks: '',
+          shortName: '',
+          tags: ''
+        },
+        rules: {
+          shortName: [
+            { required: true, message: '企业简称不能为空', trigger: 'blur' }
+          ],
+          company: [
+            { required: true, message: '所属公司不能为空', trigger: 'blur' }
+          ],
+          tags: [{ required: true, message: '请输标签', trigger: 'blur' }],
+          remarks: [
+            { required: true, message: '备注不能为空', trigger: 'blur' }
+          ],
+          city: [{ required: true, message: '省市不能为空', trigger: 'change' }]
         }
-        this.$emit('update:showDialog', false)
-        this.$emit('addbtn')
-      }catch(err){
-        console.log(err);
       }
     },
-    delbtn(){
-      this.formData= {
-        city: '',
-        company: '',
-        isFamous: true,
-        province: '',
-        remarks: '',
-        shortName: '',
-        tags: ''
+    computed: {
+      showtext() {
+        return this.formData.id ? '编辑用户' : '创建用户'
       }
-      this.$refs.perForm.resetFields()
-			this.$emit('update:showDialog', false)
-    }
-  },
-  data() {
-    return {
-      formData: {
-        city: '',
-        company: '',
-        isFamous: true,
-        province: '',
-        remarks: '',
-        shortName: '',
-        tags: ''
-      },
-      rules: {
-        shortName: [
-          { required: true, message: '企业简称不能为空', trigger: 'blur' }
-        ],
-        company: [
-          { required: true, message: '所属公司不能为空', trigger: 'blur' }
-        ],
-        tags: [{ required: true, message: '请输标签', trigger: 'blur' }],
-        remarks: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
-        city: [{ required: true, message: '省市不能为空', trigger: 'change' }],
+    },
+    created() {},
+    methods: {
+      async addbtn() {
+        try {
+          await this.$refs.perForm.validate()
+          if (this.formData.id) {
+            // let tid =  ':'+this.formData.id
+            await update(this.formData)
+          } else {
+            await add(this.formData)
+          }
+          this.$emit('update:showDialog', false)
+          this.$emit('addbtn')
+        } catch (err) {
+          console.log(err)
+        }
       },
+      delbtn() {
+        this.formData = {
+          city: '',
+          company: '',
+          isFamous: true,
+          province: '',
+          remarks: '',
+          shortName: '',
+          tags: ''
+        }
+        this.$refs.perForm.resetFields()
+        this.$emit('update:showDialog', false)
+      }
     }
-  },
-  props: {
-    showDialog: {
-      type: Boolean,
-      default: true
-    },
-
   }
-}
 </script>
 
-<style  scoped>
-.companyprofile {
-  font-size: 15px;
-  width: 350px;
-}
-.el-form {
-  margin: 5px 0 50px 40px;
-}
-.cityselect {
-  margin-right: 10px;
-}
+<style scoped>
+  .companyprofile {
+    font-size: 15px;
+    width: 350px;
+  }
+  .el-form {
+    margin: 5px 0 50px 40px;
+  }
+  .cityselect {
+    margin-right: 10px;
+  }
 </style>
diff --git a/src/module-hmmm/components/questions-check.vue b/src/module-hmmm/components/questions-check.vue
index 286bc7f..0dc63e2 100644
--- a/src/module-hmmm/components/questions-check.vue
+++ b/src/module-hmmm/components/questions-check.vue
@@ -1,11 +1,9 @@
 <template>
-  <div class="container">
-    试题审核对话框
-  </div>
+  <div class="container">试题审核对话框</div>
 </template>
 
 <script>
-export default {}
+  export default {}
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/module-hmmm/components/questions-preview.vue b/src/module-hmmm/components/questions-preview.vue
index 254c8af..00c1a3b 100644
--- a/src/module-hmmm/components/questions-preview.vue
+++ b/src/module-hmmm/components/questions-preview.vue
@@ -1,11 +1,9 @@
 <template>
-  <div class="container">
-    试题预览对话框
-  </div>
+  <div class="container">试题预览对话框</div>
 </template>
 
 <script>
-export default {}
+  export default {}
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/module-hmmm/components/subjects-add.vue b/src/module-hmmm/components/subjects-add.vue
index 0f07c16..9dc7a11 100644
--- a/src/module-hmmm/components/subjects-add.vue
+++ b/src/module-hmmm/components/subjects-add.vue
@@ -1,11 +1,9 @@
 <template>
-  <div class="container">
-    添加学科对话框
-  </div>
+  <div class="container">添加学科对话框</div>
 </template>
 
 <script>
-export default {}
+  export default {}
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/module-hmmm/components/tags-add.vue b/src/module-hmmm/components/tags-add.vue
index 4b90a61..30241a7 100644
--- a/src/module-hmmm/components/tags-add.vue
+++ b/src/module-hmmm/components/tags-add.vue
@@ -1,145 +1,160 @@
 <template>
   <div class="container">
-    <el-dialog :title="title" :visible="dialogFormVisible" width="380px" @close="cancel">
+    <el-dialog
+      :title="title"
+      :visible="dialogFormVisible"
+      width="380px"
+      @close="cancel"
+    >
       <el-form ref="newDirectory" :model="form" :rules="rules">
-        <el-form-item v-if=" !labelshow" label="所属学科" prop="subjectID" :label-width="formLabelWidth">
+        <el-form-item
+          v-if="!labelshow"
+          label="所属学科"
+          prop="subjectID"
+          :label-width="formLabelWidth"
+        >
           <el-select v-model="form.subjectID" placeholder="请选择所属学科">
             <el-option
-              v-for="item,index in simplelist"
+              v-for="(item, index) in simplelist"
               :key="index"
               :label="item.label"
               :value="item.value"
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="目录名称" prop="tagName" :label-width="formLabelWidth">
+        <el-form-item
+          label="目录名称"
+          prop="tagName"
+          :label-width="formLabelWidth"
+        >
           <el-input v-model="form.tagName" autocomplete="off" />
         </el-form-item>
       </el-form>
       <div slot="footer">
-        <el-button @click="cancel">
-          取 消
-        </el-button>
-        <el-button type="primary" @click="btnok">
-          确 定
-        </el-button>
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="btnok">确 定</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { simple } from '@/api/hmmm/subjects'
-import { add, update } from '@/api/hmmm/tags'
-// import { number } from 'echarts/lib/export'
-export default {
-  name: 'Tagsadd',
-  props: {
-    dialogFormVisible: {
-      type: Boolean,
-      default: false
-    },
-    labelshow: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      required: true,
-      default: '新增学科'
-    }
-    // tagid: {
-    //   type: String
-    // }
-  },
-  data () {
-    return {
-      rules: {
-        subjectID: [
-          { required: true, message: '请选择活动学科', trigger: 'change' }
-        ],
-        tagName: [
-          { required: true, message: '请填写标签名称', trigger: 'blur' }
-        ]
+  import { simple } from '@/api/hmmm/subjects'
+  import { add, update } from '@/api/hmmm/tags'
+  // import { number } from 'echarts/lib/export'
+  export default {
+    name: 'Tagsadd',
+    props: {
+      dialogFormVisible: {
+        type: Boolean,
+        default: false
       },
-
-      form: {
-        id: null,
-        subjectID: '',
-        tagName: ''
+      labelshow: {
+        type: Boolean,
+        default: false
       },
-      state: null,
-      simplelist: {},
-      formLabelWidth: '80px'
-    }
-  },
-  created() {
-    this.simple()
-  },
-  methods: {
-    async simple() {
-      const { data } = await simple()
-      // console.log(obj)
-      this.simplelist = data
+      title: {
+        type: String,
+        required: true,
+        default: '新增学科'
+      }
+      // tagid: {
+      //   type: String
+      // }
     },
-    cancel() {
-      this.$emit('update:dialogFormVisible', false)
-      this.$refs.newDirectory.resetFields()
-      this.form = {
-        id: null,
-        subjectID: '',
-        tagName: ''
+    data() {
+      return {
+        rules: {
+          subjectID: [
+            { required: true, message: '请选择活动学科', trigger: 'change' }
+          ],
+          tagName: [
+            { required: true, message: '请填写标签名称', trigger: 'blur' }
+          ]
+        },
+
+        form: {
+          id: null,
+          subjectID: '',
+          tagName: ''
+        },
+        state: null,
+        simplelist: {},
+        formLabelWidth: '80px'
       }
     },
-    async btnok() {
-      if (this.state === 2) {
-        await update(this.form)
-        // console.log(this.form.subjectID)
-      } else if (this.state === 1) {
-        const data = { subjectID: this.form.subjectID, tagName: this.form.tagName }
-        try {
-          await add(data)
-        } catch (error) {
-          console.log(error)
+    created() {
+      this.simple()
+    },
+    methods: {
+      async simple() {
+        const { data } = await simple()
+        // console.log(obj)
+        this.simplelist = data
+      },
+      cancel() {
+        this.$emit('update:dialogFormVisible', false)
+        this.$refs.newDirectory.resetFields()
+        this.form = {
+          id: null,
+          subjectID: '',
+          tagName: ''
         }
-      } else {
-        try {
-          await add(this.form)
-        } catch (error) {
-          console.log(error)
+      },
+      async btnok() {
+        if (this.state === 2) {
+          await update(this.form)
+          // console.log(this.form.subjectID)
+        } else if (this.state === 1) {
+          const data = {
+            subjectID: this.form.subjectID,
+            tagName: this.form.tagName
+          }
+          try {
+            await add(data)
+          } catch (error) {
+            console.log(error)
+          }
+        } else {
+          try {
+            await add(this.form)
+          } catch (error) {
+            console.log(error)
+          }
+        }
+        this.$message.success('操作成功')
+        this.$emit('update:dialogFormVisible', false)
+        this.$refs.newDirectory.resetFields()
+        this.$parent.list()
+      },
+      dialog(row) {
+        this.state = typeof row
+        console.log(this.state)
+        if (this.state === 'string') {
+          this.state = 1
+          this.form.subjectID = parseInt(row)
+          console.log(this.form.subjectID)
+        } else if (this.state === 'object') {
+          this.state = 2
+          this.form.id = row.id
+          this.form.subjectID = row.subjectID
+          this.form.tagName = row.tagName
+        } else {
+          this.form = {}
         }
-      }
-      this.$message.success('操作成功')
-      this.$emit('update:dialogFormVisible', false)
-      this.$refs.newDirectory.resetFields()
-      this.$parent.list()
-    },
-    dialog(row) {
-      this.state = typeof (row)
-      console.log(this.state)
-      if (this.state === 'string') {
-        this.state = 1
-        this.form.subjectID = parseInt(row)
-        console.log(this.form.subjectID)
-      } else if (this.state === 'object') {
-        this.state = 2
-        this.form.id = row.id
-        this.form.subjectID = row.subjectID
-        this.form.tagName = row.tagName
-      } else {
-        this.form = {}
       }
     }
   }
-}
 </script>
 
 <style>
- .el-dialog__footer {
+  .el-dialog__footer {
     text-align: end;
-}
-.el-select {
-    width: 100%;}
-    .el-dialog__body {
-    padding: 30px 20px 0;}
+  }
+  .el-select {
+    width: 100%;
+  }
+  .el-dialog__body {
+    padding: 30px 20px 0;
+  }
 </style>
diff --git a/src/module-hmmm/pages/articles.vue b/src/module-hmmm/pages/articles.vue
index 3b9e481..f656610 100644
--- a/src/module-hmmm/pages/articles.vue
+++ b/src/module-hmmm/pages/articles.vue
@@ -1,11 +1,9 @@
 <template>
-  <div class="container">
-    面试技巧
-  </div>
+  <div class="container">面试技巧</div>
 </template>
 
 <script>
-export default {}
+  export default {}
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/module-hmmm/pages/companys.vue b/src/module-hmmm/pages/companys.vue
index 9ae01c1..97d4f36 100644
--- a/src/module-hmmm/pages/companys.vue
+++ b/src/module-hmmm/pages/companys.vue
@@ -2,7 +2,13 @@
   <div class="container">
     <el-card>
       <companys />
-      <el-alert :title="textnum" type="info" show-icon :closable="false" class="topalert"/>
+      <el-alert
+        :title="textnum"
+        type="info"
+        show-icon
+        :closable="false"
+        class="topalert"
+      />
       <el-table
         :loading="loading"
         :data="list"
@@ -51,11 +57,11 @@
         <el-table-column align="center" prop="address" label="操作" type="flex">
           <template v-slot="{ row }">
             <el-button
-              @click="revisebtn(row.id)"
               type="primary"
               icon="el-icon-edit"
               plain
               circle
+              @click="revisebtn(row.id)"
             />
             <el-tooltip
               class="item"
@@ -71,7 +77,6 @@
                 circle
                 @click="changestate(row.id, 0)"
               />
-
               <el-button
                 v-else
                 type="success"
@@ -103,113 +108,116 @@
         />
       </div>
     </el-card>
-    <companysadd :showDialog.sync="showDialog" @addbtn="addfn" ref="companysadd"/>
+    <companysadd
+      ref="companysadd"
+      :show-dialog.sync="showDialog"
+      @addbtn="addfn"
+    />
   </div>
 </template>
 
 <script>
-import companys from './companys/index.vue'
-import companysadd from '../components/companys-add.vue'
-import { list, remove, disabled, detail } from '@/api/hmmm/companys.js'
-export default {
-  components: {
-    companys,
-    companysadd
-  },
-  data() {
-    return {
-      showDialog: false,
-      btnstate: 1,
-      textnum: '',
-      currentPage4: 1,
-      list: [],
-      page: {
-        page: 1, // 当前页码
-        size: 10,
-        total: 0 // 总数
-      },
-      loading: false
-    }
-  },
-  created() {
-    this.getlist()
-
-  },
-  methods: {
-    addfn(){
-      this.getlist()
-    },
-    async revisebtn(id) {
-      try{
-      this.showDialog = true
-      let {data}= await detail(id)
-      this.$refs.companysadd.formData= data
-      }catch(err){
-        console.log(err);
-      }
+  import companys from './companys/index.vue'
+  import companysadd from '../components/companys-add.vue'
+  import { list, remove, disabled, detail } from '@/api/hmmm/companys.js'
+  export default {
+    components: {
+      companys,
+      companysadd
     },
-    async changestate(id, state) {
-      const confirmResult = await this.$confirm(
-        state == 1 ? '已成功启用, 是否继续?' : '已成功禁用, 是否继续?',
-        '提示',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).catch((error) => error)
-      if (confirmResult === 'confirm') {
-        const test = id + '/' + state
-        await disabled(test)
-        this.$message.success(state == 1 ? '已成功启用' : '已成功禁用')
-        this.getlist()
-      } else {
-        return this.$message.info('已取消删除')
+    data() {
+      return {
+        showDialog: false,
+        btnstate: 1,
+        textnum: '',
+        currentPage4: 1,
+        list: [],
+        page: {
+          page: 1, // 当前页码
+          size: 10,
+          total: 0 // 总数
+        },
+        loading: false
       }
     },
-    currentchange() {
+    created() {
       this.getlist()
     },
-    async getlist() {
-      this.loading = true
-      const { data } = await list(this.page)
-      this.textnum = `共 ${data.counts} 条记录`
-      this.page.total = data.counts
-      this.list = data.items
-      this.loading = false
-    },
-    async del(id) {
-      const confirmResult = await this.$confirm(
-        '此操作将永久删除用户 , 是否继续?',
-        '提示',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+    methods: {
+      addfn() {
+        this.getlist()
+      },
+      async revisebtn(id) {
+        try {
+          this.showDialog = true
+          const { data } = await detail(id)
+          this.$refs.companysadd.formData = data
+        } catch (err) {
+          console.log(err)
+        }
+      },
+      async changestate(id, state) {
+        const confirmResult = await this.$confirm(
+          state === 1 ? '已成功启用, 是否继续?' : '已成功禁用, 是否继续?',
+          '提示',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).catch((error) => error)
+        if (confirmResult === 'confirm') {
+          const test = id + '/' + state
+          await disabled(test)
+          this.$message.success(state === 1 ? '已成功启用' : '已成功禁用')
+          this.getlist()
+        } else {
+          return this.$message.info('已取消删除')
         }
-      ).catch((error) => error)
-      if (confirmResult === 'confirm') {
-        await remove(id)
-        this.$message.success('删除分类成功')
-        console.log(this.page.total)
+      },
+      currentchange() {
         this.getlist()
-      } else {
-        return this.$message.info('已取消删除')
+      },
+      async getlist() {
+        this.loading = true
+        const { data } = await list(this.page)
+        this.textnum = `共 ${data.counts} 条记录`
+        this.page.total = data.counts
+        this.list = data.items
+        this.loading = false
+      },
+      async del(id) {
+        const confirmResult = await this.$confirm(
+          '此操作将永久删除用户 , 是否继续?',
+          '提示',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).catch((error) => error)
+        if (confirmResult === 'confirm') {
+          await remove(id)
+          this.$message.success('删除分类成功')
+          console.log(this.page.total)
+          this.getlist()
+        } else {
+          return this.$message.info('已取消删除')
+        }
       }
     }
   }
-}
 </script>
 
 <style scoped>
-.container {
-  padding: 20px;
-}
-.topalert{
-  margin-bottom: 20px;
-}
-.pagination {
-  margin: 10px;
-  float: right;
-}
+  .container {
+    padding: 20px;
+  }
+  .topalert {
+    margin-bottom: 20px;
+  }
+  .pagination {
+    margin: 10px;
+    float: right;
+  }
 </style>
diff --git a/src/module-hmmm/pages/companys/index.vue b/src/module-hmmm/pages/companys/index.vue
index 6f43b51..65532bf 100644
--- a/src/module-hmmm/pages/companys/index.vue
+++ b/src/module-hmmm/pages/companys/index.vue
@@ -56,14 +56,10 @@
         </el-col>
         <el-col :span="14" class="btn">
           <el-button>清除</el-button>
-          <el-button type="primary">
-            搜索
-          </el-button>
+          <el-button type="primary">搜索</el-button>
         </el-col>
         <el-col :span="3" class="success">
-          <el-button type="success" @click="addbtn">
-            新增用户
-          </el-button>
+          <el-button type="success" @click="addbtn">新增用户</el-button>
         </el-col>
       </el-row>
     </el-form>
@@ -71,47 +67,41 @@
 </template>
 
 <script>
-import {provinces,citys} from '@/api/hmmm/citys.js'
-
-export default {
-  data () {
-    return {
-    }
-  },
-  methods: {
-    async addbtn(){
-      this.$parent.$parent.showDialog=true
-      try{
-        await add()
-      }catch(err){
+  import { provinces, citys } from '@/api/hmmm/citys.js'
 
+  export default {
+    data() {
+      return {
+        option: ['禁用', '启用'],
+        province: provinces(),
+        city: citys(),
+        form: {
+          name: ''
+        },
+        value: '',
+        value1: '',
+        value2: ''
+      }
+    },
+    created() {
+      console.log(this.city)
+    },
+    methods: {
+      async addbtn() {
+        this.$parent.$parent.showDialog = true
+        // try {
+        //   await add()
+        // } catch (err) {}
       }
-    }
-  },
-  created () {
-    console.log(this.city);
-  },
-  data() {
-    return {
-      option:['禁用','启用'],
-      province:provinces(),
-      city:citys(),
-      form: {
-        name: ''
-      },
-      value: '',
-      value1:'',
-      value2:''
     }
   }
-}
 </script>
 
-<style  scoped>
-.btn {
-  margin-left: 20px;
-}
-.headcontainer{
-  padding: 0;
-}
+<style scoped>
+  .btn {
+    margin-left: 20px;
+  }
+  .headcontainer {
+    padding: 0;
+  }
 </style>
diff --git a/src/module-hmmm/pages/questions.vue b/src/module-hmmm/pages/questions.vue
index aae2a67..27a8c9d 100644
--- a/src/module-hmmm/pages/questions.vue
+++ b/src/module-hmmm/pages/questions.vue
@@ -4,7 +4,9 @@
     <el-card shadow="never">
       <el-form ref="requestParameters" :model="requestParameters">
         <div class="filter-container">
-          <span style="font-size: 0.75rem; color: pink">说明：目前支持学科和关键字条件筛选</span>
+          <span style="font-size: 0.75rem; color: pink">
+            说明：目前支持学科和关键字条件筛选
+          </span>
           <el-button
             class="filter-item fr"
             type="success"
@@ -123,142 +125,142 @@
 </template>
 
 <script>
-// import PageTool from '@/module-dashboard/components/pageTool.vue'
-import PageTool from '@/module-manage/components/page-tool.vue'
-import { list, remove } from '@/api/hmmm/questions.js'
+  // import PageTool from '@/module-dashboard/components/pageTool.vue'
+  import PageTool from '@/module-manage/components/page-tool.vue'
+  import { list, remove } from '@/api/hmmm/questions.js'
 
-import tagsAdd from '@/module-hmmm/components/tags-add.vue'
-export default {
-  components: {
-    PageTool,
-    tagsAdd
-  },
-  data() {
-    return {
-      pagination: {
-        page: 1,
-        // pagesize: 10
-        total: 0,
-        pageSize: 20,
-        pageSizes: [20, 50, 80, 120],
-        currentPage: 1
-      },
-      list: [],
-      total: null,
-      tableData: [],
-      alertText: ''
-    }
-  },
-  created() {
-    this.list = list()
-    console.log(this.list)
-    this.getList()
-  },
-  methods: {
-    // 删除基础题库方法
-    async delques(id) {
-      try {
-        await this.$confirm('您确认删除该试题吗')
-        await remove(id)
-        this.getList()
-        this.$message.success('删除成功')
-      } catch (error) {
-        console.log(error)
-      }
+  import tagsAdd from '@/module-hmmm/components/tags-add.vue'
+  export default {
+    components: {
+      PageTool,
+      tagsAdd
     },
-    // 显示弹层
-    handleCreate() {
-      alert(123)
-      this.$refs.editUser.dialogFormV()
-    },
-    getquestype(str) {
-      if (str === 1) {
-        str = '单选'
-      } else if (str === 2) {
-        str = '多选'
-      } else if (str === 3) {
-        str = '简答'
+    data() {
+      return {
+        pagination: {
+          page: 1,
+          // pagesize: 10
+          total: 0,
+          pageSize: 20,
+          pageSizes: [20, 50, 80, 120],
+          currentPage: 1
+        },
+        list: [],
+        total: null,
+        tableData: [],
+        alertText: ''
       }
-      console.log(str)
-      return str
     },
-    getdifftype(str) {
-      if (str === 1) {
-        str = '简单'
-      } else if (str === 2) {
-        str = '一般'
-      } else if (str === 3) {
-        str = '困难'
-      }
-      return str
+    created() {
+      this.list = list()
+      console.log(this.list)
+      this.getList()
     },
-    async getList() {
-      const { data } = await list()
-      console.log(data)
-      this.tableData = data.items
-    },
-    formatDate(res) {
-      const date = new Date(res)
-      const formatObj = {
-        y: date.getFullYear(),
-        m: date.getMonth() + 1,
-        d: date.getDate(),
-        h: date.getHours(),
-        i: date.getMinutes(),
-        s: date.getSeconds(),
-        a: date.getDay()
-      }
-      if (formatObj.m < 10) {
-        formatObj.m = '0' + formatObj.m
-      }
-      if (formatObj.d < 10) {
-        formatObj.d = '0' + formatObj.d
-      }
-      if (formatObj.h < 10) {
-        formatObj.h = '0' + formatObj.h
-      }
-      if (formatObj.i < 10) {
-        formatObj.i = '0' + formatObj.i
-      }
-      if (formatObj.s < 10) {
-        formatObj.s = '0' + formatObj.s
+    methods: {
+      // 删除基础题库方法
+      async delques(id) {
+        try {
+          await this.$confirm('您确认删除该试题吗')
+          await remove(id)
+          this.getList()
+          this.$message.success('删除成功')
+        } catch (error) {
+          console.log(error)
+        }
+      },
+      // 显示弹层
+      handleCreate() {
+        alert(123)
+        this.$refs.editUser.dialogFormV()
+      },
+      getquestype(str) {
+        if (str === 1) {
+          str = '单选'
+        } else if (str === 2) {
+          str = '多选'
+        } else if (str === 3) {
+          str = '简答'
+        }
+        console.log(str)
+        return str
+      },
+      getdifftype(str) {
+        if (str === 1) {
+          str = '简单'
+        } else if (str === 2) {
+          str = '一般'
+        } else if (str === 3) {
+          str = '困难'
+        }
+        return str
+      },
+      async getList() {
+        const { data } = await list()
+        console.log(data)
+        this.tableData = data.items
+      },
+      formatDate(res) {
+        const date = new Date(res)
+        const formatObj = {
+          y: date.getFullYear(),
+          m: date.getMonth() + 1,
+          d: date.getDate(),
+          h: date.getHours(),
+          i: date.getMinutes(),
+          s: date.getSeconds(),
+          a: date.getDay()
+        }
+        if (formatObj.m < 10) {
+          formatObj.m = '0' + formatObj.m
+        }
+        if (formatObj.d < 10) {
+          formatObj.d = '0' + formatObj.d
+        }
+        if (formatObj.h < 10) {
+          formatObj.h = '0' + formatObj.h
+        }
+        if (formatObj.i < 10) {
+          formatObj.i = '0' + formatObj.i
+        }
+        if (formatObj.s < 10) {
+          formatObj.s = '0' + formatObj.s
+        }
+        return (
+          formatObj.y +
+          '-' +
+          formatObj.m +
+          '-' +
+          formatObj.d +
+          ' ' +
+          formatObj.h +
+          ':' +
+          formatObj.i +
+          ':' +
+          formatObj.s
+        )
       }
-      return (
-        formatObj.y +
-        '-' +
-        formatObj.m +
-        '-' +
-        formatObj.d +
-        ' ' +
-        formatObj.h +
-        ':' +
-        formatObj.i +
-        ':' +
-        formatObj.s
-      )
+      // // 每页显示信息条数
+      // handleSizeChange(val) {
+      //   this.requestParameters.pagesize = val
+      //   if (this.requestParameters.page ==== 1) {
+      //     this.getList(this.requestParameters)
+      //   }
+      // },
+      // // 进入某一页
+      // handleCurrentChange(val) {
+      //   this.requestParameters.page = val
+      //   this.getList()
+      // },
     }
-    // // 每页显示信息条数
-    // handleSizeChange(val) {
-    //   this.requestParameters.pagesize = val
-    //   if (this.requestParameters.page ==== 1) {
-    //     this.getList(this.requestParameters)
-    //   }
-    // },
-    // // 进入某一页
-    // handleCurrentChange(val) {
-    //   this.requestParameters.page = val
-    //   this.getList()
-    // },
   }
-}
 </script>
 
 <style scoped>
-.alert {
-  margin: 10px 0px;
-}
-.pagination-container {
-  margin-top: 10px;
-  text-align: right;
-}
+  .alert {
+    margin: 10px 0px;
+  }
+  .pagination-container {
+    margin-top: 10px;
+    text-align: right;
+  }
 </style>
diff --git a/src/module-hmmm/pages/subjects.vue b/src/module-hmmm/pages/subjects.vue
index 008ece2..978f95e 100644
--- a/src/module-hmmm/pages/subjects.vue
+++ b/src/module-hmmm/pages/subjects.vue
@@ -2,7 +2,7 @@
   <div class="container">
     学科管理
 
-    <hr>
+    <hr />
     <el-table :data="tableData" border style="width: 100%">
       <el-table-column type="index" label="序号" width="180" />
       <el-table-column prop="subjectName" label="学科名称" width="180" />
@@ -18,10 +18,8 @@
         </template>
       </el-table-column>
       <el-table-column prop="twoLevelDirectory" label="二级目录" />
-      <el-table-column prop="tags" label="标签" /><el-table-column
-        prop="totals"
-        label="题目数量"
-      />
+      <el-table-column prop="tags" label="标签" />
+      <el-table-column prop="totals" label="题目数量" />
       <el-table-column prop="address" label="操作">
         <template slot-scope="{ row }">
           <el-button type="text" size="medium " @click="disable(row)">
@@ -54,61 +52,60 @@
 </template>
 
 <script>
-import { list } from '@/api/hmmm/subjects'
-export default {
-  data() {
-    return {
-      tableData: [{}],
-      page: {
-        page: 1,
-        pagesize: 5,
-        total: null
-      }
-    }
-  },
-  created() {
-    this.list()
-  },
-  methods: {
-    subjectLabels(row) {
-      console.log(row)
-      this.$router.push({
-        path: '/subjects/tags',
-        query: {
-          id: row.id,
-          name: row.subjectName
-
-        }
-      })
-    },
-    disable(row) {
-      console.log(row)
-      this.$router.push({
-        path: '/subjects/directorys',
-        query: {
-          name: row.subjectName,
-          id: row.id
+  import { list } from '@/api/hmmm/subjects'
+  export default {
+    data() {
+      return {
+        tableData: [{}],
+        page: {
+          page: 1,
+          pagesize: 5,
+          total: null
         }
-      })
-    },
-    async list() {
-      const { data } = await list(this.page)
-      this.tableData = data.items
-      this.page.total = data.counts
-      console.log(data)
+      }
     },
-    SizeChange(pagesize) {
-      console.log(pagesize)
-      this.page.pagesize = pagesize
+    created() {
       this.list()
     },
-    CurrentChange(page) {
-      console.log(page)
-      this.page.page = page
-      this.list()
+    methods: {
+      subjectLabels(row) {
+        console.log(row)
+        this.$router.push({
+          path: '/subjects/tags',
+          query: {
+            id: row.id,
+            name: row.subjectName
+          }
+        })
+      },
+      disable(row) {
+        console.log(row)
+        this.$router.push({
+          path: '/subjects/directorys',
+          query: {
+            name: row.subjectName,
+            id: row.id
+          }
+        })
+      },
+      async list() {
+        const { data } = await list(this.page)
+        this.tableData = data.items
+        this.page.total = data.counts
+        console.log(data)
+      },
+      SizeChange(pagesize) {
+        console.log(pagesize)
+        this.page.pagesize = pagesize
+        this.list()
+      },
+      CurrentChange(page) {
+        console.log(page)
+        this.page.page = page
+        this.list()
+      }
     }
   }
-}
 </script>
 
 <style></style>
diff --git a/src/module-hmmm/pages/tags.vue b/src/module-hmmm/pages/tags.vue
index e2b62ad..fbdcd43 100644
--- a/src/module-hmmm/pages/tags.vue
+++ b/src/module-hmmm/pages/tags.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="tags">
     <div v-if="labelshow" class="titile">
-      <span>学科管理 </span>
-      <span class="el-icon-arrow-right"> {{ tagname }}</span>
+      <span>学科管理</span>
+      <span class="el-icon-arrow-right">{{ tagname }}</span>
       <span class="el-icon-arrow-right">标签管理</span>
-      <hr>
+      <hr />
     </div>
 
     <div id="all">
@@ -131,217 +131,218 @@
 </template>
 
 <script>
-import AlertShow from '@/base-ui/alert-show'
-import ZyForm from '@/base-ui/ZyForm'
-import tagsAdd from '../components/tags-add.vue'
-import { list, remove, changeState, simple } from '@/api/hmmm/tags'
-export default {
-  name: 'Tags',
-  components: {
-    tagsAdd,
-    AlertShow,
-    ZyForm
-  },
-  data() {
-    return {
-      search: {
-        tagName: '',
-        state: null,
-        page: 1,
-        pagesize: 5
-        // subjectID: 1
-      },
-      dialogFormVisible: false,
-      tagid: this.$route.query.id,
-      tagname: this.$route.query.name,
-      title: '新增学科',
-      tableData: [{}],
-      showdisable: null,
-      page: {
-        page: 1,
-        pagesize: 5,
-        total: null
-      },
-      formItems: [
-        {
-          field: 'tagName',
-          type: 'input',
-          label: '标签名称',
-          rules: []
+  import AlertShow from '@/base-ui/alert-show'
+  import ZyForm from '@/base-ui/ZyForm'
+  import tagsAdd from '../components/tags-add.vue'
+  import { list, remove, changeState, simple } from '@/api/hmmm/tags'
+  export default {
+    name: 'Tags',
+    components: {
+      tagsAdd,
+      AlertShow,
+      ZyForm
+    },
+    data() {
+      return {
+        search: {
+          tagName: '',
+          state: null,
+          page: 1,
+          pagesize: 5
+          // subjectID: 1
         },
-        {
-          field: 'state',
-          type: 'select',
-          label: '状态',
-          placeholder: '请选择',
-          options: [
-            { label: '启用', value: 1 },
-            { label: '禁用', value: 0 }
-          ]
-        }
-      ],
-      alertText: '',
-      labelshow: false
-    }
-  },
-  created() {
-    this.list()
-    this.simple()
-  },
-  methods: {
-    async remove(row) {
-      try {
-        await this.$confirm('确定要删除该数据吗')
-        await remove(row)
-        this.list()
-        this.$message.success('删除成功')
-      } catch (error) {
-        console.log(error)
+        dialogFormVisible: false,
+        tagid: this.$route.query.id,
+        tagname: this.$route.query.name,
+        title: '新增学科',
+        tableData: [{}],
+        showdisable: null,
+        page: {
+          page: 1,
+          pagesize: 5,
+          total: null
+        },
+        formItems: [
+          {
+            field: 'tagName',
+            type: 'input',
+            label: '标签名称',
+            rules: []
+          },
+          {
+            field: 'state',
+            type: 'select',
+            label: '状态',
+            placeholder: '请选择',
+            options: [
+              { label: '启用', value: 1 },
+              { label: '禁用', value: 0 }
+            ]
+          }
+        ],
+        alertText: '',
+        labelshow: false
       }
     },
-    state(flag) {
-      return Boolean(flag)
-    },
-    async simple() {
-      if (!this.tagid) {
-        const { data } = await simple()
-        this.page.total = data.length
-        this.alertText = `当前数据共${this.page.total}条`
-      }
+    created() {
+      this.list()
+      this.simple()
     },
-    async list() {
-      if (this.tagid) {
-        // 跳转并且搜索框为空
-        if (this.search.state == null && this.search.tagName === '') {
-          this.labelshow = true
-          const data1 = {
-            page: this.page.page,
-            pagesize: this.page.pagesize,
-            subjectID: this.tagid
+    methods: {
+      async remove(row) {
+        try {
+          await this.$confirm('确定要删除该数据吗')
+          await remove(row)
+          this.list()
+          this.$message.success('删除成功')
+        } catch (error) {
+          console.log(error)
+        }
+      },
+      state(flag) {
+        return Boolean(flag)
+      },
+      async simple() {
+        if (!this.tagid) {
+          const { data } = await simple()
+          this.page.total = data.length
+          this.alertText = `当前数据共${this.page.total}条`
+        }
+      },
+      async list() {
+        if (this.tagid) {
+          // 跳转并且搜索框为空
+          if (this.search.state == null && this.search.tagName === '') {
+            this.labelshow = true
+            const data1 = {
+              page: this.page.page,
+              pagesize: this.page.pagesize,
+              subjectID: this.tagid
+            }
+            const { data } = await list(data1)
+            this.page.total = null
+            this.page.total = data.counts
+            this.tableData = data.items
+            this.alertText = `当前数据共${data.counts}条`
+          } else {
+            // 跳转并且搜索框不为空
+            this.labelshow = true
+            const data1 = {
+              page: this.page.page,
+              pagesize: this.page.pagesize,
+              subjectID: this.tagid,
+              state: this.search.state,
+              tagName: this.search.tagName
+            }
+            const { data } = await list(data1)
+            this.page.total = null
+            this.page.total = data.counts
+            this.tableData = data.items
+            this.alertText = `当前数据共${data.counts}条`
           }
-          const { data } = await list(data1)
-          this.page.total = null
-          this.page.total = data.counts
-          this.tableData = data.items
-          this.alertText = `当前数据共${data.counts}条`
+        } else if (this.search.state == null && this.search.tagName === '') {
+          // 未跳转并且 搜索框为空的情况
+          const {
+            data: { items }
+          } = await list(this.page)
+          this.tableData = items
+          this.simple()
         } else {
-        // 跳转并且搜索框不为空
-        this.labelshow = true
-          const data1 = {
-            page: this.page.page,
-            pagesize: this.page.pagesize,
-            subjectID: this.tagid,
-            state: this.search.state,
-            tagName: this.search.tagName
-          }
-          const { data } = await list(data1)
-          this.page.total = null
+          const { data } = await list(this.search)
           this.page.total = data.counts
           this.tableData = data.items
           this.alertText = `当前数据共${data.counts}条`
         }
-      } else if (this.search.state == null && this.search.tagName === '') {
-        // 未跳转并且 搜索框为空的情况
-        const { data: { items } } = await list(this.page)
-        this.tableData = items
-        this.simple()
-      } else {
-        const { data } = await list(this.search)
-        this.page.total = data.counts
-        this.tableData = data.items
-        this.alertText = `当前数据共${data.counts}条`
-      }
-    },
-    async disable(id, state) {
-      // 标签状态
-      const data = { id: id, state: state }
-      try {
-        await changeState(data)
-      } catch (error) {
-        console.log(error)
-      }
-      this.list()
-      this.$message.success('操作成功')
-    },
-    SizeChange(pagesize) {
-      if (this.search.state == null && this.search.tagName === '') {
-        this.page.pagesize = pagesize
-      } else {
-        this.search.pagesize = pagesize
-      }
-      this.list()
-    },
-    CurrentChange(page) {
-      if (this.search.state == null && this.search.tagName === '') {
-        this.page.page = page
-      } else {
-        this.search.page = page
+      },
+      async disable(id, state) {
+        // 标签状态
+        const data = { id: id, state: state }
+        try {
+          await changeState(data)
+        } catch (error) {
+          console.log(error)
+        }
+        this.list()
+        this.$message.success('操作成功')
+      },
+      SizeChange(pagesize) {
+        if (this.search.state == null && this.search.tagName === '') {
+          this.page.pagesize = pagesize
+        } else {
+          this.search.pagesize = pagesize
+        }
+        this.list()
+      },
+      CurrentChange(page) {
+        if (this.search.state == null && this.search.tagName === '') {
+          this.page.page = page
+        } else {
+          this.search.page = page
+        }
+        this.list()
+      },
+      edit(row) {
+        this.$refs.dialog.dialog(row)
+        this.title = '编辑学科'
+        this.dialogFormVisible = true
+      },
+      addbtn() {
+        this.$refs.dialog.dialog(this.tagid)
+        this.title = '新增目录'
+        this.dialogFormVisible = true
+      },
+      removebtn() {
+        this.$refs.zychild.MyFormData = {}
+        this.search = {}
+        this.list()
+      },
+      searchbtn() {
+        this.search.state = this.$refs.zychild.MyFormData.state
+        this.search.tagName = this.$refs.zychild.MyFormData.tagName
+        this.list()
       }
-      this.list()
-    },
-    edit(row) {
-      this.$refs.dialog.dialog(row)
-      this.title = '编辑学科'
-      this.dialogFormVisible = true
-    },
-    addbtn() {
-      this.$refs.dialog.dialog(this.tagid)
-      this.title = '新增目录'
-      this.dialogFormVisible = true
-    },
-    removebtn() {
-      this.$refs.zychild.MyFormData = {}
-      this.search = {}
-      this.list()
-    },
-    searchbtn() {
-      this.search.state = this.$refs.zychild.MyFormData.state
-      this.search.tagName = this.$refs.zychild.MyFormData.tagName
-      this.list()
     }
   }
-}
 </script>
 <style>
-.tags {
-  margin: 10px;
-  padding: 15px;
-  border: 1px solid #ebeef5;
-  background-color: #fff;
-}
-.el-pagination {
-  text-align: end;
-}
-#all {
-  display: flex;
-  align-items: flex-start;
-}
-#left {
-  margin: 0 10px;
-  /* display: flex; */
-  flex: 4;
-  justify-content: space-around;
-  /* width: 60%; */
-}
-.el-col-lg-6 {
-  width: 49%;
-}
-/* .el-form--label-right{
+  .tags {
+    margin: 10px;
+    padding: 15px;
+    border: 1px solid #ebeef5;
+    background-color: #fff;
+  }
+  .el-pagination {
+    text-align: end;
+  }
+  #all {
+    display: flex;
+    align-items: flex-start;
+  }
+  #left {
+    margin: 0 10px;
+    /* display: flex; */
+    flex: 4;
+    justify-content: space-around;
+    /* width: 60%; */
+  }
+  .el-col-lg-6 {
+    width: 49%;
+  }
+  /* .el-form--label-right{
     width: 330%;
   } */
-#right {
-  text-align: end;
-  flex: 4;
-}
-.alert-show {
-  margin: 0 0 13px;
-}
-.titile{
-  margin-bottom: 10px;
-  color: #606266;
-}
-.titile span{
-
-  font-size: 14px;
-}
+  #right {
+    text-align: end;
+    flex: 4;
+  }
+  .alert-show {
+    margin: 0 0 13px;
+  }
+  .titile {
+    margin-bottom: 10px;
+    color: #606266;
+  }
+  .titile span {
+    font-size: 14px;
+  }
 </style>
diff --git a/src/module-manage/components/menu-add.vue b/src/module-manage/components/menu-add.vue
index 11b58b7..b8c07c7 100644
--- a/src/module-manage/components/menu-add.vue
+++ b/src/module-manage/components/menu-add.vue
@@ -67,401 +67,401 @@
   </div>
 </template>
 <script>
-import { list, detail, update, add } from '@/api/base/menus'
-// eslint-disable-next-line
-import Utils from '@/components/TreeTable/utils/dataTranslate.js'
-let _this = []
-export default {
-  name: 'Items',
-  // props: ['text', 'pageTitle', 'PermissionGroupsList',],
-  props: {
-    treeStructure: {
-      type: Boolean,
-      default: function () {
-        return false
+  import { list, detail, update, add } from '@/api/base/menus'
+  // eslint-disable-next-line
+  import Utils from '@/components/TreeTable/utils/dataTranslate.js'
+  let _this = []
+  export default {
+    name: 'Items',
+    // props: ['text', 'pageTitle', 'PermissionGroupsList',],
+    props: {
+      treeStructure: {
+        type: Boolean,
+        default: function () {
+          return false
+        }
+      },
+      // 这个是是否展示操作列
+      // eslint-disable-next-line
+      text: {
+        type: String
+      },
+      // eslint-disable-next-line
+      pageTitle: {
+        type: String
+      },
+      // eslint-disable-next-line
+      PermissionGroupsList: {
+        type: Array
       }
     },
-    // 这个是是否展示操作列
-    // eslint-disable-next-line
-    text: {
-      type: String
-    },
-    // eslint-disable-next-line
-    pageTitle: {
-      type: String
-    },
-    // eslint-disable-next-line
-    PermissionGroupsList: {
-      type: Array
-    }
-  },
-  data() {
-    const validateCode = (rule, value, callback) => {
-      var thisCode = _this.formMenu.code
-      if (value === '') {
-        callback(new Error('代码不能为空'))
-      } else {
-        validateCode.ifHave = false
-        var thisPid = _this.formMenu.pid
-        validateCode.ifHaveCodeExciting = function (oldList) {
-          for (var i = 0; i < oldList.length; i++) {
-            if (oldList[i].childs && oldList[i].childs.length > 0) {
-              validateCode.ifHaveCodeExciting(oldList[i].childs)
-            }
-            if (oldList[i].points && oldList[i].points.length > 0) {
-              if (oldList[i].id === thisPid) {
-                validateCode.doPoints(oldList[i].points)
+    data() {
+      const validateCode = (rule, value, callback) => {
+        var thisCode = _this.formMenu.code
+        if (value === '') {
+          callback(new Error('代码不能为空'))
+        } else {
+          validateCode.ifHave = false
+          var thisPid = _this.formMenu.pid
+          validateCode.ifHaveCodeExciting = function (oldList) {
+            for (var i = 0; i < oldList.length; i++) {
+              if (oldList[i].childs && oldList[i].childs.length > 0) {
+                validateCode.ifHaveCodeExciting(oldList[i].childs)
+              }
+              if (oldList[i].points && oldList[i].points.length > 0) {
+                if (oldList[i].id === thisPid) {
+                  validateCode.doPoints(oldList[i].points)
+                }
               }
             }
           }
-        }
-        validateCode.doPoints = function (points) {
-          for (var i = 0; i < points.length; i++) {
-            if (points[i].code && points[i].code === thisCode) {
-              validateCode.ifHave = true
+          validateCode.doPoints = function (points) {
+            for (var i = 0; i < points.length; i++) {
+              if (points[i].code && points[i].code === thisCode) {
+                validateCode.ifHave = true
+              }
             }
           }
+          validateCode.ifHaveCodeExciting(_this.parentDataList)
+          callback()
+          // if (validateCode.ifHave) {
+          //   callback(new Error('此代码已存在，不能添加相同的！！'))
+          // } else {
+          //   callback()
+          // }
         }
-        validateCode.ifHaveCodeExciting(_this.parentDataList)
-        callback()
-        // if (validateCode.ifHave) {
-        //   callback(new Error('此代码已存在，不能添加相同的！！'))
-        // } else {
-        //   callback()
-        // }
       }
-    }
-    return {
-      type: 'menu',
-      showMenuBlock: true,
-      showPointBlock: false,
-      dialogFormVisible: false,
-      typeStatus: false,
-      notPointDataList: [],
-      parentDataList: [],
-      formMenu: {
-        pid: '', // 父级Id
-        is_point: '', // 是否权限点
-        code: '', // 菜单代码
-        title: '' // 标题
-      },
-      formPoints: {
-        pid: '', // 父级Id
-        is_point: '', // 是否权限点
-        code: '', // 菜单代码
-        title: '' // 标题
-      },
-      codepast: '',
-      ruleInline: {
-        title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
-        code: [{ required: true, validator: validateCode, trigger: 'blur' }]
-      },
-      leafCount: []
-    }
-  },
-  computed: {},
-  // 挂载结束
-  mounted: function () {},
-  // 创建完毕状态
-  created() {
-    _this = this
-  },
-  // 组件更新
-  updated: function () {},
-  methods: {
-    // 弹层显示
-    dialogFormV() {
-      this.dialogFormVisible = true
-    },
-    // 弹层隐藏
-    dialogFormH() {
-      this.dialogFormVisible = false
-    },
-    handleChooseType() {
-      if (this.type === 'menu') {
-        _this.changeToMenu()
-      }
-      if (this.type === 'points') {
-        _this.changeToPoints()
+      return {
+        type: 'menu',
+        showMenuBlock: true,
+        showPointBlock: false,
+        dialogFormVisible: false,
+        typeStatus: false,
+        notPointDataList: [],
+        parentDataList: [],
+        formMenu: {
+          pid: '', // 父级Id
+          is_point: '', // 是否权限点
+          code: '', // 菜单代码
+          title: '' // 标题
+        },
+        formPoints: {
+          pid: '', // 父级Id
+          is_point: '', // 是否权限点
+          code: '', // 菜单代码
+          title: '' // 标题
+        },
+        codepast: '',
+        ruleInline: {
+          title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
+          code: [{ required: true, validator: validateCode, trigger: 'blur' }]
+        },
+        leafCount: []
       }
     },
-    changeType(flag) {
-      if (flag === 'menu') {
-        this.type = 'menu'
-        _this.changeToMenu()
-      }
-      if (flag === 'points') {
-        this.type = 'points'
-        _this.changeToPoints()
-      }
-      this.typeStatus = true
+    computed: {},
+    // 挂载结束
+    mounted: function () {},
+    // 创建完毕状态
+    created() {
+      _this = this
     },
-    changeArays() {
-      var changeAray = (oldArray) => {
-        for (var i = 0; i < oldArray.length; i++) {
-          // 数据没有code并且没有子元素时
-          if (oldArray[i].code !== undefined) {
-            _this.notPointDataList.push(oldArray[i])
-          }
-          // 数据有子元素时
-          if (oldArray[i].childs && oldArray[i].childs.length > 0) {
-            changeAray(oldArray[i].childs)
+    // 组件更新
+    updated: function () {},
+    methods: {
+      // 弹层显示
+      dialogFormV() {
+        this.dialogFormVisible = true
+      },
+      // 弹层隐藏
+      dialogFormH() {
+        this.dialogFormVisible = false
+      },
+      handleChooseType() {
+        if (this.type === 'menu') {
+          _this.changeToMenu()
+        }
+        if (this.type === 'points') {
+          _this.changeToPoints()
+        }
+      },
+      changeType(flag) {
+        if (flag === 'menu') {
+          this.type = 'menu'
+          _this.changeToMenu()
+        }
+        if (flag === 'points') {
+          this.type = 'points'
+          _this.changeToPoints()
+        }
+        this.typeStatus = true
+      },
+      changeArays() {
+        var changeAray = (oldArray) => {
+          for (var i = 0; i < oldArray.length; i++) {
+            // 数据没有code并且没有子元素时
+            if (oldArray[i].code !== undefined) {
+              _this.notPointDataList.push(oldArray[i])
+            }
+            // 数据有子元素时
+            if (oldArray[i].childs && oldArray[i].childs.length > 0) {
+              changeAray(oldArray[i].childs)
+            }
           }
         }
-      }
-      changeAray(_this.parentDataList)
-    },
-    changeToMenu() {
-      _this.showMenuBlock = true
-      _this.showPointBlock = false
-      _this.notPointDataList = []
-      this.changeArays()
-    },
-    changeToPoints() {
-      _this.showMenuBlock = false
-      _this.showPointBlock = true
-      _this.formMenu = _this.formPoints
-      _this.formMenu.pid = _this.formPoints.pid
-      _this.formMenu.code = _this.formPoints.code
-      _this.formMenu.title = _this.formPoints.title
-      _this.notPointDataList = []
-      this.changeArays()
-    },
-    // 退出
-    handleClose() {
-      this.$emit('handleCloseModal')
-    },
-    // 菜单和权限点选择：编辑
-    handle_Edit(object) {
-      update(this.formMenu).then(() => {
-        this.$emit('handleCloseModal')
-        this.$emit('newDataes', this.formMenu)
-      })
-    },
-    // 菜单和权限点选择：添加
-    select_Add() {
-      add(this.formMenu).then(() => {
-        _this.handleResetForm()
-        // _this.type = 'menu'
+        changeAray(_this.parentDataList)
+      },
+      changeToMenu() {
+        _this.showMenuBlock = true
+        _this.showPointBlock = false
+        _this.notPointDataList = []
+        this.changeArays()
+      },
+      changeToPoints() {
+        _this.showMenuBlock = false
+        _this.showPointBlock = true
+        _this.formMenu = _this.formPoints
+        _this.formMenu.pid = _this.formPoints.pid
+        _this.formMenu.code = _this.formPoints.code
+        _this.formMenu.title = _this.formPoints.title
+        _this.notPointDataList = []
+        this.changeArays()
+      },
+      // 退出
+      handleClose() {
         this.$emit('handleCloseModal')
-        this.$emit('newDataes', this.formMenu)
-      })
-    },
-    handle_Add(object) {
-      if (_this.type === 'points') {
-        this.formMenu.is_point = true
-        this.select_Add()
-      } else {
-        this.formMenu.is_point = false
-        this.select_Add()
-      }
-    },
-    // 表单提交
-    handleSubmit(object) {
-      _this.formMenu.pid = Number(_this.formMenu.pid)
-      if (_this.formMenu.id) {
-        var thisCode = _this.formMenu.code // 输入的code值
-        if (thisCode === this.codepast) {
-          // Code不变
-          this.$refs.formMenu.validateField('title')
-          _this.handle_Edit(object)
+      },
+      // 菜单和权限点选择：编辑
+      handle_Edit(object) {
+        update(this.formMenu).then(() => {
+          this.$emit('handleCloseModal')
+          this.$emit('newDataes', this.formMenu)
+        })
+      },
+      // 菜单和权限点选择：添加
+      select_Add() {
+        add(this.formMenu).then(() => {
+          _this.handleResetForm()
+          // _this.type = 'menu'
+          this.$emit('handleCloseModal')
+          this.$emit('newDataes', this.formMenu)
+        })
+      },
+      handle_Add(object) {
+        if (_this.type === 'points') {
+          this.formMenu.is_point = true
+          this.select_Add()
+        } else {
+          this.formMenu.is_point = false
+          this.select_Add()
+        }
+      },
+      // 表单提交
+      handleSubmit(object) {
+        _this.formMenu.pid = Number(_this.formMenu.pid)
+        if (_this.formMenu.id) {
+          var thisCode = _this.formMenu.code // 输入的code值
+          if (thisCode === this.codepast) {
+            // Code不变
+            this.$refs.formMenu.validateField('title')
+            _this.handle_Edit(object)
+          } else {
+            // Code变化
+            _this.$refs[object].validate((valid) => {
+              if (valid) {
+                _this.handle_Edit(object)
+              } else {
+                this.$Message.error('表单验证失败')
+              }
+            })
+          }
         } else {
-          // Code变化
           _this.$refs[object].validate((valid) => {
             if (valid) {
-              _this.handle_Edit(object)
+              _this.handle_Add(object)
             } else {
               this.$Message.error('表单验证失败')
             }
           })
         }
-      } else {
-        _this.$refs[object].validate((valid) => {
-          if (valid) {
-            _this.handle_Add(object)
-          } else {
-            this.$Message.error('表单验证失败')
+      },
+      // 表单详情
+      dataRest(obj) {
+        for (var i = 0; i < obj.length; i++) {
+          if (obj[i].childs && obj[i].childs.length > 0) {
+            for (var j = 0; j < obj[i].childs.length; j++) {
+              this.$set(obj[i].childs[j], 'layer', 1)
+            }
           }
+
+          this.$set(obj[i], 'layer', 0)
+        }
+      },
+      hanldeEditForm(objeditId) {
+        this.formMenu.id = objeditId
+        list().then((data) => {
+          _this.parentDataList = data.data
+          _this.notPointDataList = []
+          this.dataRest(data.data)
+          this.changeArays()
         })
-      }
-    },
-    // 表单详情
-    dataRest(obj) {
-      for (var i = 0; i < obj.length; i++) {
-        if (obj[i].childs && obj[i].childs.length > 0) {
-          for (var j = 0; j < obj[i].childs.length; j++) {
-            this.$set(obj[i].childs[j], 'layer', 1)
+        detail({ id: objeditId }).then((data) => {
+          this.formMenu.id = data.data.id
+          this.formMenu.pid = data.data.pid
+          this.formMenu.title = data.data.title
+          this.formMenu.code = data.data.code
+          this.formMenu.is_point = data.data.is_point
+          const responseData = data.data
+          const choose = this.type
+          if (choose === 'points') {
+            this.formMenu.code = data.data.code
           }
-        }
-
-        this.$set(obj[i], 'layer', 0)
+          if (responseData.pid === null) {
+            this.formMenu.pid = 0
+          }
+        })
+      },
+      // 表单重置
+      handleResetForm() {
+        this.formMenu.id = ''
+        this.formMenu.pid = 0
+        this.formMenu.title = ''
+        this.formMenu.code = ''
+        _this.typeStatus = false
+        _this.type = 'menu'
+        list().then((data) => {
+          _this.parentDataList = data.data
+          _this.notPointDataList = _this.parentDataList
+          this.dataRest(data.data)
+          _this.changeToMenu()
+        })
       }
-    },
-    hanldeEditForm(objeditId) {
-      this.formMenu.id = objeditId
-      list().then((data) => {
-        _this.parentDataList = data.data
-        _this.notPointDataList = []
-        this.dataRest(data.data)
-        this.changeArays()
-      })
-      detail({ id: objeditId }).then((data) => {
-        this.formMenu.id = data.data.id
-        this.formMenu.pid = data.data.pid
-        this.formMenu.title = data.data.title
-        this.formMenu.code = data.data.code
-        this.formMenu.is_point = data.data.is_point
-        const responseData = data.data
-        const choose = this.type
-        if (choose === 'points') {
-          this.formMenu.code = data.data.code
-        }
-        if (responseData.pid === null) {
-          this.formMenu.pid = 0
-        }
-      })
-    },
-    // 表单重置
-    handleResetForm() {
-      this.formMenu.id = ''
-      this.formMenu.pid = 0
-      this.formMenu.title = ''
-      this.formMenu.code = ''
-      _this.typeStatus = false
-      _this.type = 'menu'
-      list().then((data) => {
-        _this.parentDataList = data.data
-        _this.notPointDataList = _this.parentDataList
-        this.dataRest(data.data)
-        _this.changeToMenu()
-      })
     }
   }
-}
 </script>
 <style>
-.el-form--label-left .el-form-item__label {
-  text-align: right;
-}
-.el-dialog__footer {
-  text-align: right;
-}
-.moveIn0 {
-  text-indent: 14px;
-}
+  .el-form--label-left .el-form-item__label {
+    text-align: right;
+  }
+  .el-dialog__footer {
+    text-align: right;
+  }
+  .moveIn0 {
+    text-indent: 14px;
+  }
 
-.moveIn1 {
-  text-indent: 28px;
-}
+  .moveIn1 {
+    text-indent: 28px;
+  }
 </style>
 <style scoped lang="scss">
-.el-fade-in-linear-enter-active,
-.el-fade-in-linear-leave-active,
-.fade-in-linear-enter-active,
-.fade-in-linear-leave-active {
-  transition: opacity 0.2s linear;
-}
-
-.el-fade-in-enter,
-.el-fade-in-leave-active,
-.el-fade-in-linear-enter,
-.el-fade-in-linear-leave,
-.el-fade-in-linear-leave-active,
-.fade-in-linear-enter,
-.fade-in-linear-leave,
-.fade-in-linear-leave-active {
-  opacity: 0;
-}
+  .el-fade-in-linear-enter-active,
+  .el-fade-in-linear-leave-active,
+  .fade-in-linear-enter-active,
+  .fade-in-linear-leave-active {
+    transition: opacity 0.2s linear;
+  }
 
-.select-search {
-  a {
-    color: #333;
-    text-decoration: none;
-    padding: 5px;
+  .el-fade-in-enter,
+  .el-fade-in-leave-active,
+  .el-fade-in-linear-enter,
+  .el-fade-in-linear-leave,
+  .el-fade-in-linear-leave-active,
+  .fade-in-linear-enter,
+  .fade-in-linear-leave,
+  .fade-in-linear-leave-active {
+    opacity: 0;
   }
-  ul {
-    list-style: none;
-    padding: 6px 0;
-    margin: 0;
-    overflow: visible;
-    li {
-      display: block;
-      width: 100%;
+
+  .select-search {
+    a {
+      color: #333;
+      text-decoration: none;
       padding: 5px;
-      font-size: 14px;
-      padding: 8px 10px;
-      position: relative;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      color: #48576a;
-      height: 36px;
-      line-height: 1.5;
-      box-sizing: border-box;
-      cursor: pointer;
-      &.active {
-        background-color: #20a0ff;
-        a {
-          color: #fff;
+    }
+    ul {
+      list-style: none;
+      padding: 6px 0;
+      margin: 0;
+      overflow: visible;
+      li {
+        display: block;
+        width: 100%;
+        padding: 5px;
+        font-size: 14px;
+        padding: 8px 10px;
+        position: relative;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        color: #48576a;
+        height: 36px;
+        line-height: 1.5;
+        box-sizing: border-box;
+        cursor: pointer;
+        &.active {
+          background-color: #20a0ff;
+          a {
+            color: #fff;
+          }
         }
       }
     }
-  }
-  .select-header {
-    position: relative;
-    border-radius: 4px;
-    border: 1px solid #bfcbd9;
-    outline: 0;
-    padding: 0 8px;
-    > input {
-      border: none;
-      -webkit-appearance: none;
-      -moz-appearance: none;
-      appearance: none;
-      width: 100%;
+    .select-header {
+      position: relative;
+      border-radius: 4px;
+      border: 1px solid #bfcbd9;
       outline: 0;
-      box-sizing: border-box;
-      color: #1f2d3d;
-      font-size: inherit;
-      height: 36px;
-      line-height: 1;
-    }
-    > i {
-      transition: all 0.3s linear;
-      display: inline-block;
-      position: absolute;
-      right: 3%;
-      top: 50%;
-      transform: translateY(-50%);
+      padding: 0 8px;
+      > input {
+        border: none;
+        -webkit-appearance: none;
+        -moz-appearance: none;
+        appearance: none;
+        width: 100%;
+        outline: 0;
+        box-sizing: border-box;
+        color: #1f2d3d;
+        font-size: inherit;
+        height: 36px;
+        line-height: 1;
+      }
+      > i {
+        transition: all 0.3s linear;
+        display: inline-block;
+        position: absolute;
+        right: 3%;
+        top: 50%;
+        transform: translateY(-50%);
+      }
     }
-  }
-  .select-body {
-    z-index: 1000;
-    border-radius: 2px;
-    background-color: #fff;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
-    box-sizing: border-box;
-    margin: 5px 0;
-    padding: 8px;
-    > input {
-      -webkit-appearance: none;
-      -moz-appearance: none;
-      appearance: none;
+    .select-body {
+      z-index: 1000;
+      border-radius: 2px;
       background-color: #fff;
-      background-image: none;
-      border-radius: 4px;
-      border: 1px solid #bfcbd9;
+      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
       box-sizing: border-box;
-      color: #1f2d3d;
-      font-size: inherit;
-      height: 36px;
-      line-height: 1;
-      outline: 0;
-      padding: 3px 10px;
-      transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-      width: 100%;
-      display: inline-block;
+      margin: 5px 0;
+      padding: 8px;
+      > input {
+        -webkit-appearance: none;
+        -moz-appearance: none;
+        appearance: none;
+        background-color: #fff;
+        background-image: none;
+        border-radius: 4px;
+        border: 1px solid #bfcbd9;
+        box-sizing: border-box;
+        color: #1f2d3d;
+        font-size: inherit;
+        height: 36px;
+        line-height: 1;
+        outline: 0;
+        padding: 3px 10px;
+        transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+        width: 100%;
+        display: inline-block;
+      }
     }
   }
-}
 </style>
diff --git a/src/module-manage/components/page-tool.vue b/src/module-manage/components/page-tool.vue
index aa3243c..4992389 100644
--- a/src/module-manage/components/page-tool.vue
+++ b/src/module-manage/components/page-tool.vue
@@ -13,31 +13,31 @@
   </div>
 </template>
 <script>
-export default {
-  name: 'PageTool',
-  // eslint-disable-next-line
-  props: ['total', 'paginationPage', 'paginationPagesize'],
-  data() {
-    return {}
-  },
-  methods: {
-    // 进入某一页
-    onPageChange: function (pageNum) {
-      this.$emit('pageChange', pageNum)
+  export default {
+    name: 'PageTool',
+    // eslint-disable-next-line
+    props: ['total', 'paginationPage', 'paginationPagesize'],
+    data() {
+      return {}
     },
-    // 每页显示信息条数
-    onPageSizeChange: function (pageSize) {
-      this.$emit('pageSizeChange', pageSize)
+    methods: {
+      // 进入某一页
+      onPageChange: function (pageNum) {
+        this.$emit('pageChange', pageNum)
+      },
+      // 每页显示信息条数
+      onPageSizeChange: function (pageSize) {
+        this.$emit('pageSizeChange', pageSize)
+      }
     }
   }
-}
 </script>
 <style>
-.pages{
-  margin-top: 10px;
-  text-align: end;
-}
-.blue {
-  color: #409eff;
-}
+  .pages {
+    margin-top: 10px;
+    text-align: end;
+  }
+  .blue {
+    color: #409eff;
+  }
 </style>
diff --git a/src/module-manage/components/permissions-add.vue b/src/module-manage/components/permissions-add.vue
index 4293a8d..6e117c5 100644
--- a/src/module-manage/components/permissions-add.vue
+++ b/src/module-manage/components/permissions-add.vue
@@ -41,270 +41,279 @@
   </div>
 </template>
 <script>
-import { detail, update, add } from '@/api/base/permissions'
-import { list } from '@/api/base/menus.js'
-let _this = []
-export default {
-  name: 'UsersAdd',
-  // eslint-disable-next-line
-  props: {
-    obj: {
-      type: Object,
-      default: null
-    },
-    text: {
-      type: String,
-      default: null
-    },
-    pageTitle: {
-      type: String,
-      default: null
-    },
-    ruleInline: {
-      type: Object,
-      default: null
-    },
-    dialogFormVisible: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      // dialogFormVisible: true,
-      PermissionGroupsmenu: [],
-      defaultProps: {
-        label: 'title'
+  import { detail, update, add } from '@/api/base/permissions'
+  import { list } from '@/api/base/menus.js'
+  let _this = []
+  export default {
+    name: 'UsersAdd',
+    // eslint-disable-next-line
+    props: {
+      obj: {
+        type: Object,
+        default: null
       },
-      permissions: [],
-      treeCheckedNodes: [],
-      formBase: {
-        id: 0,
-        create_date: '',
-        title: '',
-        permissions: []
+      text: {
+        type: String,
+        default: null
       },
-      curPermissions: []
-    }
-  },
-  computed: {
-    treeData() {
-      function createNode(item) {
-        // 复选框选择
-        let checked = false
-        let selected = false
-        if (_this !== null && _this.formBase.permissions.length > 0) {
-          const per = _this.formBase.permissions.find(function (value, index) {
-            return value === item.id
-          })
-          selected = !!per
-        }
-        // 标记勾选
-        if (selected) {
-          const isPoint = item.childs === undefined && item.points === undefined
-          const hasChilds = item.childs !== undefined && item.childs.length > 0
-          const hasPoints = item.points !== undefined && item.points.length > 0
-          if (isPoint) {
-            checked = true
-          } else if (hasPoints) {
-            checked = false
-          } else if (hasChilds) {
-            checked = false
-          } else {
-            checked = true
-          }
-        }
-        return {
-          id: item.id === undefined ? 0 : item.id,
-          title: item.title,
-          children: [],
-          selected: selected,
-          checked: checked
-        }
+      pageTitle: {
+        type: String,
+        default: null
+      },
+      ruleInline: {
+        type: Object,
+        default: null
+      },
+      dialogFormVisible: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data() {
+      return {
+        // dialogFormVisible: true,
+        PermissionGroupsmenu: [],
+        defaultProps: {
+          label: 'title'
+        },
+        permissions: [],
+        treeCheckedNodes: [],
+        formBase: {
+          id: 0,
+          create_date: '',
+          title: '',
+          permissions: []
+        },
+        curPermissions: []
       }
-      function parseNodes(nodes, parentNode) {
-        for (const it of nodes) {
-          const node = createNode(it)
-          // 标记选中
-          // console.log(node.checked)
-          if (node.checked) {
-            parentNode.selected = true
+    },
+    computed: {
+      treeData() {
+        function createNode(item) {
+          // 复选框选择
+          let checked = false
+          let selected = false
+          if (_this !== null && _this.formBase.permissions.length > 0) {
+            const per = _this.formBase.permissions.find(function (
+              value,
+              index
+            ) {
+              return value === item.id
+            })
+            selected = !!per
+          }
+          // 标记勾选
+          if (selected) {
+            const isPoint =
+              item.childs === undefined && item.points === undefined
+            const hasChilds =
+              item.childs !== undefined && item.childs.length > 0
+            const hasPoints =
+              item.points !== undefined && item.points.length > 0
+            if (isPoint) {
+              checked = true
+            } else if (hasPoints) {
+              checked = false
+            } else if (hasChilds) {
+              checked = false
+            } else {
+              checked = true
+            }
+          }
+          return {
+            id: item.id === undefined ? 0 : item.id,
+            title: item.title,
+            children: [],
+            selected: selected,
+            checked: checked
           }
-          if (it.childs !== undefined && it.childs.length > 0) {
-            parseNodes(it.childs, node)
-          } else if (it.points !== undefined && it.points.length > 0) {
-            parseNodes(it.points, node)
+        }
+        function parseNodes(nodes, parentNode) {
+          for (const it of nodes) {
+            const node = createNode(it)
+            // 标记选中
+            // console.log(node.checked)
+            if (node.checked) {
+              parentNode.selected = true
+            }
+            if (it.childs !== undefined && it.childs.length > 0) {
+              parseNodes(it.childs, node)
+            } else if (it.points !== undefined && it.points.length > 0) {
+              parseNodes(it.points, node)
+            }
+            parentNode.children.push(node)
           }
-          parentNode.children.push(node)
         }
+        const nodes = createNode({
+          title: '系统菜单和页面权限点',
+          expand: true
+        })
+        parseNodes(this.PermissionGroupsmenu, nodes)
+        return [nodes]
       }
-      const nodes = createNode({ title: '系统菜单和页面权限点', expand: true })
-      parseNodes(this.PermissionGroupsmenu, nodes)
-      return [nodes]
-    }
-  },
-  // 挂载结束
-
-  mounted: function () {},
-  // 创建完毕状态
-  created() {
-    _this = this
-    this.setupData()
-  },
-  // 组件更新
-  updated: function () {},
-  methods: {
-    // 弹层显示
-    dialogFormV() {
-      this.$emit('update:dialogFormVisible', false)
-    },
-    // 弹层隐藏
-    dialogFormH() {
-      this.$emit('update:dialogFormVisible', false)
     },
-    // 退出
-    handleClose() {
-      this.$emit('update:dialogFormVisible')
-      this.handleResetForm()
-    },
-    // 表单重置
-    handleResetForm() {
-      this.formBase = {
-        id: 0,
-        title: '',
-        permissions: []
-      }
-      this.curPermissions = []
-      this.treeCheckedNodes = []
+    // 挂载结束
+
+    mounted: function () {},
+    // 创建完毕状态
+    created() {
+      _this = this
+      this.setupData()
     },
-    // 编辑详情数据加载
-    hanldeEditForm(id) {
-      this.formBase.id = id
-      var data = {
-        id: id
-      }
-      detail(data).then((ret, err) => {
-        if (err) {
-          return err
+    // 组件更新
+    updated: function () {},
+    methods: {
+      // 弹层显示
+      dialogFormV() {
+        this.$emit('update:dialogFormVisible', false)
+      },
+      // 弹层隐藏
+      dialogFormH() {
+        this.$emit('update:dialogFormVisible', false)
+      },
+      // 退出
+      handleClose() {
+        this.$emit('update:dialogFormVisible')
+        this.handleResetForm()
+      },
+      // 表单重置
+      handleResetForm() {
+        this.formBase = {
+          id: 0,
+          title: '',
+          permissions: []
         }
-        console.log(data)
-        this.formBase.id = ret.data.id
-        this.formBase.title = ret.data.title
-        this.formBase.permissions = ret.data.permissions
-      })
-    },
-    setupData() {
-      list().then((data) => {
-        this.PermissionGroupsmenu = data.data
-      })
-    },
+        this.curPermissions = []
+        this.treeCheckedNodes = []
+      },
+      // 编辑详情数据加载
+      hanldeEditForm(id) {
+        this.formBase.id = id
+        var data = {
+          id: id
+        }
+        detail(data).then((ret, err) => {
+          if (err) {
+            return err
+          }
+          console.log(data)
+          this.formBase.id = ret.data.id
+          this.formBase.title = ret.data.title
+          this.formBase.permissions = ret.data.permissions
+        })
+      },
+      setupData() {
+        list().then((data) => {
+          this.PermissionGroupsmenu = data.data
+        })
+      },
 
-    // 节点复选框被选中
-    handleCheckChange(data, checked, indeterminate) {
-      this.treeCheckedNodes = checked.checkedNodes
-    },
+      // 节点复选框被选中
+      handleCheckChange(data, checked, indeterminate) {
+        this.treeCheckedNodes = checked.checkedNodes
+      },
 
-    // 表单提交
-    handleAdd(object) {
-      // 读取完整节点
-      const curPermissions = new Set()
-      // function parse(nodes, selectedId) {
-      //   for (const it of nodes) {
-      //     let isFind = false
-      //     if (it.childs !== undefined) {
-      //       isFind = parse(it.childs, selectedId)
-      //     }
-      //     if (it.points !== undefined) {
-      //       isFind = parse(it.points, selectedId)
-      //     }
-      //     if (it.id === selectedId) {
-      //       isFind = true
-      //     }
-      //     if (isFind) {
-      //       curPermissions.add(it.id)
-      //       return true
-      //     }
-      //   }
-      //   return false
-      // }
-      // 已选中的控件节点
-      console.log(curPermissions)
-      if (this.treeCheckedNodes.length === 0) {
-        this.treeCheckedNodes = this.$refs.treeMenu.getCheckedNodes()
+      // 表单提交
+      handleAdd(object) {
+        // 读取完整节点
+        const curPermissions = new Set()
+        // function parse(nodes, selectedId) {
+        //   for (const it of nodes) {
+        //     let isFind = false
+        //     if (it.childs !== undefined) {
+        //       isFind = parse(it.childs, selectedId)
+        //     }
+        //     if (it.points !== undefined) {
+        //       isFind = parse(it.points, selectedId)
+        //     }
+        //     if (it.id === selectedId) {
+        //       isFind = true
+        //     }
+        //     if (isFind) {
+        //       curPermissions.add(it.id)
+        //       return true
+        //     }
+        //   }
+        //   return false
+        // }
+        // 已选中的控件节点
+        console.log(curPermissions)
         if (this.treeCheckedNodes.length === 0) {
-          return
+          this.treeCheckedNodes = this.$refs.treeMenu.getCheckedNodes()
+          if (this.treeCheckedNodes.length === 0) {
+            return
+          }
         }
-      }
-      // 读取
-      for (const it of this.treeCheckedNodes) {
-        // parse(this.PermissionGroupsmenu, it.id)
-        curPermissions.add(it.id)
-      }
-      this.curPermissions = Array.from(curPermissions)
-      console.log(this.curPermissions)
-      // 保存
-      if (this.curPermissions.length === 0) {
-        alert(11)
-        this.$message.success('请输入需要的权限点')
-      } else {
-        this.dataFormSub(this.curPermissions)
-      }
-      this.$emit('update:dialogFormVisible', false)
-      this.$parent.getlist()
-    },
-    nodeDate(nodesPath, curPermissions, findId) {
-      nodesPath.map(function (item, index) {
-        if (curPermissions.indexOf(item.id) === -1) {
-          curPermissions.push(findId)
+        // 读取
+        for (const it of this.treeCheckedNodes) {
+          // parse(this.PermissionGroupsmenu, it.id)
+          curPermissions.add(it.id)
         }
-      })
-    },
-    dataFormSub(curPermis) {
-      this.$refs.dataForm.validate((valid) => {
-        if (valid) {
-          this.$emit('handleCloseModal')
-          if (_this.formBase.id) {
-            // eslint-disable-next-line
-            const technologyTypes = []
-            var data = {
-              id: this.formBase.id,
-              title: this.formBase.title,
-              permissions: curPermis
+        this.curPermissions = Array.from(curPermissions)
+        console.log(this.curPermissions)
+        // 保存
+        if (this.curPermissions.length === 0) {
+          alert(11)
+          this.$message.success('请输入需要的权限点')
+        } else {
+          this.dataFormSub(this.curPermissions)
+        }
+        this.$emit('update:dialogFormVisible', false)
+        this.$parent.getlist()
+      },
+      nodeDate(nodesPath, curPermissions, findId) {
+        nodesPath.map(function (item, index) {
+          if (curPermissions.indexOf(item.id) === -1) {
+            curPermissions.push(findId)
+          }
+        })
+      },
+      dataFormSub(curPermis) {
+        this.$refs.dataForm.validate((valid) => {
+          if (valid) {
+            this.$emit('handleCloseModal')
+            if (_this.formBase.id) {
+              // eslint-disable-next-line
+              const technologyTypes = []
+              var data = {
+                id: this.formBase.id,
+                title: this.formBase.title,
+                permissions: curPermis
+              }
+              update(data).then(() => {
+                this.$emit('newDataes', this.formBase)
+                this.$parent.getlist()
+                this.handleResetForm()
+              })
+            } else {
+              add({
+                title: this.formBase.title,
+                permissions: curPermis
+              }).then(() => {
+                this.$emit('newDataes', this.formBase)
+                this.handleResetForm()
+                this.$parent.getlist()
+              })
             }
-            update(data).then(() => {
-              this.$emit('newDataes', this.formBase)
-              this.$parent.getlist()
-              this.handleResetForm()
-            })
           } else {
-            add({
-              title: this.formBase.title,
-              permissions: curPermis
-            }).then(() => {
-              this.$emit('newDataes', this.formBase)
-              this.handleResetForm()
-              this.$parent.getlist()
-            })
+            this.$Message.error('*号为必填项!')
           }
-        } else {
-          this.$Message.error('*号为必填项!')
-        }
-      })
+        })
+      }
     }
   }
-}
 </script>
 <style>
-.el-tree {
-  margin-top: 8px;
-}
-.el-tree-node__content {
-  height: auto;
-}
-.el-form--label-left .el-form-item__label {
-  text-align: right;
-}
-.el-dialog__footer {
-  text-align: right;
-}
+  .el-tree {
+    margin-top: 8px;
+  }
+  .el-tree-node__content {
+    height: auto;
+  }
+  .el-form--label-left .el-form-item__label {
+    text-align: right;
+  }
+  .el-dialog__footer {
+    text-align: right;
+  }
 </style>
diff --git a/src/module-manage/components/permissionsApi-add.vue b/src/module-manage/components/permissionsApi-add.vue
index 3519a07..fe0f4b7 100644
--- a/src/module-manage/components/permissionsApi-add.vue
+++ b/src/module-manage/components/permissionsApi-add.vue
@@ -36,147 +36,149 @@
   </div>
 </template>
 <script>
-// eslint-disable-next-line
-import { detail, update, add } from '@/api/base/permissions'
-import { list } from '@/api/base/menus.js'
-let _this = []
-export default {
-  name: 'PermissionGroupsApiAdd',
   // eslint-disable-next-line
-  props: ['apiTitle', 'ruleInline'],
-  data() {
-    return {
-      dialogFormVisible: false,
-      PermissionGroupsmenu: [],
-      defaultProps: {
-        label: 'title'
-      },
-      formBase: {
-        id: 0,
-        title: '',
-        apis: []
-      },
-      PermissionApiData: [],
-      checkedData: []
-    }
-  },
-  computed: {
-    // 菜单权限树
-    treeData() {
-      const checkedData = this.PermissionApiData
-      // eslint-disable-next-line
-      const checked = false
-      if (_this !== null && _this.formBase.apis.length > 0) {
-        const per = _this.formBase.apis.map((item) => {
-          return item
-        })
+  import { detail, update, add } from '@/api/base/permissions'
+  import { list } from '@/api/base/menus.js'
+  let _this = []
+  export default {
+    name: 'PermissionGroupsApiAdd',
+    // eslint-disable-next-line
+    props: ['apiTitle', 'ruleInline'],
+    data() {
+      return {
+        dialogFormVisible: false,
+        PermissionGroupsmenu: [],
+        defaultProps: {
+          label: 'title'
+        },
+        formBase: {
+          id: 0,
+          title: '',
+          apis: []
+        },
+        PermissionApiData: [],
+        checkedData: []
+      }
+    },
+    computed: {
+      // 菜单权限树
+      treeData() {
+        const checkedData = this.PermissionApiData
         // eslint-disable-next-line
-        const use = per.map((item) => {
-          checkedData.filter((mini) => {
-            if (mini.id === item) {
-              mini.checked = true
-            }
+        const checked = false
+        if (_this !== null && _this.formBase.apis.length > 0) {
+          const per = _this.formBase.apis.map((item) => {
+            return item
           })
-        })
+          // eslint-disable-next-line
+          const use = per.map((item) => {
+            checkedData.filter((mini) => {
+              if (mini.id === item) {
+                mini.checked = true
+              }
+            })
+          })
+        }
+        return checkedData
       }
-      return checkedData
-    }
-  },
-  // 挂载结束
-  mounted: function () {},
-  // 创建完毕状态
-  created() {
-    _this = this
-  },
-  // 组件更新
-  updated: function () {},
-  methods: {
-    // 逻辑业务
-    // **********************************
-    // **********************************
-    // 弹层显示
-    dialogFormV() {
-      this.dialogFormVisible = true
-    },
-    // 弹层隐藏
-    dialogFormH() {
-      this.dialogFormVisible = false
     },
-    // 退出
-    handleClose() {
-      this.$emit('handleCloseModal')
+    // 挂载结束
+    mounted: function () {},
+    // 创建完毕状态
+    created() {
+      _this = this
     },
-    // 节点复选框被选中
-    handleCheckChange(nodes) {
-      var checkedData = []
-      checkedData.push(nodes)
-    },
-    // 高级接口数据列表
-    loadApiPermissionData() {
-      list().then((ret, err) => {
-        if (err) {
-          return err
-        }
-        _this.PermissionApiData = ret.data
-      })
-    },
-    // 高级接口表单详情数据加载
-    hanldeEditApiForm(objeditId) {
-      // 获取权限标题
-      this.formBase.id = objeditId
-      // eslint-disable-next-line
-      details({ id: objeditId }).then((ret, err) => {
-        if (err) {
-          return err
-        }
-        this.formBase.id = ret.data.id
-        this.formBase.title = ret.data.title
-      })
-      _this.loadApiPermissionData()
-      // 读取授权
-      // eslint-disable-next-line
-      apiread({ id: objeditId }).then((ret, err) => {
-        if (err) {
-          return err
+    // 组件更新
+    updated: function () {},
+    methods: {
+      // 逻辑业务
+      // **********************************
+      // **********************************
+      // 弹层显示
+      dialogFormV() {
+        this.dialogFormVisible = true
+      },
+      // 弹层隐藏
+      dialogFormH() {
+        this.dialogFormVisible = false
+      },
+      // 退出
+      handleClose() {
+        this.$emit('handleCloseModal')
+      },
+      // 节点复选框被选中
+      handleCheckChange(nodes) {
+        var checkedData = []
+        checkedData.push(nodes)
+      },
+      // 高级接口数据列表
+      loadApiPermissionData() {
+        list().then((ret, err) => {
+          if (err) {
+            return err
+          }
+          _this.PermissionApiData = ret.data
+        })
+      },
+      // 高级接口表单详情数据加载
+      hanldeEditApiForm(objeditId) {
+        // 获取权限标题
+        this.formBase.id = objeditId
+        // eslint-disable-next-line
+        details({ id: objeditId }).then((ret, err) => {
+          if (err) {
+            return err
+          }
+          this.formBase.id = ret.data.id
+          this.formBase.title = ret.data.title
+        })
+        _this.loadApiPermissionData()
+        // 读取授权
+        // eslint-disable-next-line
+        apiread({ id: objeditId }).then((ret, err) => {
+          if (err) {
+            return err
+          }
+          this.formBase.apis = ret.data.apis
+        })
+      },
+      // 表单提交
+      handleSave(object) {
+        const curApis = []
+        for (const it of _this.checkedData) {
+          curApis.push(it.id)
         }
-        this.formBase.apis = ret.data.apis
-      })
-    },
-    // 表单提交
-    handleSave(object) {
-      const curApis = []
-      for (const it of _this.checkedData) {
-        curApis.push(it.id)
+        this.$refs[object].validate((valid) => {
+          if (valid) {
+            this.$emit('handleCloseModal')
+            // eslint-disable-next-line
+            apiadd({ id: _this.formBase.id, apis: curApis }).then(
+              (ret, err) => {
+                if (err) {
+                  return err
+                }
+                this.$emit('newDataes', this.formBase)
+              }
+            )
+          } else {
+            this.$Message.error('*号为必填项!')
+          }
+        })
       }
-      this.$refs[object].validate((valid) => {
-        if (valid) {
-          this.$emit('handleCloseModal')
-          // eslint-disable-next-line
-          apiadd({ id: _this.formBase.id, apis: curApis }).then((ret, err) => {
-            if (err) {
-              return err
-            }
-            this.$emit('newDataes', this.formBase)
-          })
-        } else {
-          this.$Message.error('*号为必填项!')
-        }
-      })
     }
   }
-}
 </script>
 <style>
-.el-tree {
-  margin-top: 8px;
-}
-.el-tree-node__content {
-  height: auto;
-}
-.el-form--label-left .el-form-item__label {
-  text-align: right;
-}
-.el-dialog__footer {
-  text-align: right;
-}
+  .el-tree {
+    margin-top: 8px;
+  }
+  .el-tree-node__content {
+    height: auto;
+  }
+  .el-form--label-left .el-form-item__label {
+    text-align: right;
+  }
+  .el-dialog__footer {
+    text-align: right;
+  }
 </style>
diff --git a/src/module-manage/components/user-add.vue b/src/module-manage/components/user-add.vue
index 78cf640..137df57 100644
--- a/src/module-manage/components/user-add.vue
+++ b/src/module-manage/components/user-add.vue
@@ -80,80 +80,80 @@
 </template>
 
 <script>
-/* eslint-disable */
-import { detail, update, add } from '@/api/base/users'
-export default {
-  name: 'UsersAdd',
+  /* eslint-disable */
+  import { detail, update, add } from '@/api/base/users'
+  export default {
+    name: 'UsersAdd',
 
-  props: [
-    'text',
-    'pageTitle',
-    'PermissionGroupsList',
-    'formBase',
-    'ruleInline'
-  ],
-  data() {
-    return {
-      dialogFormVisible: false
-      // fileList: [],
-      // importFileUrl: 'https://jsonplaceholder.typicode.com/posts/',
-    }
-  },
-  computed: {},
-  // 挂载结束
-
-  mounted: function () {},
-  // 创建完毕状态
-  created() {},
-  // 组件更新
-  updated: function () {},
-  methods: {
-    // 弹层显示
-    dialogFormV() {
-      this.dialogFormVisible = true
-    },
-    // 弹层隐藏
-    dialogFormH() {
-      this.dialogFormVisible = false
-    },
-    // 退出
-    handleClose() {
-      this.$emit('handleCloseModal')
+    props: [
+      'text',
+      'pageTitle',
+      'PermissionGroupsList',
+      'formBase',
+      'ruleInline'
+    ],
+    data() {
+      return {
+        dialogFormVisible: false
+        // fileList: [],
+        // importFileUrl: 'https://jsonplaceholder.typicode.com/posts/',
+      }
     },
+    computed: {},
+    // 挂载结束
 
-    // 表单提交
-    createData() {
-      this.$refs.dataForm.validate((valid) => {
-        if (valid) {
-          this.$emit('handleCloseModal')
-          const data = {
-            ...this.formBase
-          }
-          if (this.formBase.id) {
-            update(data).then(() => {
-              this.$emit('newDataes', this.formBase)
-            })
+    mounted: function () {},
+    // 创建完毕状态
+    created() {},
+    // 组件更新
+    updated: function () {},
+    methods: {
+      // 弹层显示
+      dialogFormV() {
+        this.dialogFormVisible = true
+      },
+      // 弹层隐藏
+      dialogFormH() {
+        this.dialogFormVisible = false
+      },
+      // 退出
+      handleClose() {
+        this.$emit('handleCloseModal')
+      },
+
+      // 表单提交
+      createData() {
+        this.$refs.dataForm.validate((valid) => {
+          if (valid) {
+            this.$emit('handleCloseModal')
+            const data = {
+              ...this.formBase
+            }
+            if (this.formBase.id) {
+              update(data).then(() => {
+                this.$emit('newDataes', this.formBase)
+              })
+            } else {
+              add(this.formBase).then(() => {
+                this.$emit('newDataes', this.formBase)
+              })
+            }
           } else {
-            add(this.formBase).then(() => {
-              this.$emit('newDataes', this.formBase)
-            })
+            this.$Message.error('*号为必填项!')
           }
-        } else {
-          this.$Message.error('*号为必填项!')
-        }
-      })
+        })
+      }
     }
   }
-}
 </script>
 <style>
-.el-form--label-left .el-form-item__label {
-  text-align: right;
-}
-.el-form-item--medium {
-  margin-bottom: 22px;
-}
-.el-dialog__footer {
-  text-align: center;
-}
+  .el-form--label-left .el-form-item__label {
+    text-align: right;
+  }
+  .el-form-item--medium {
+    margin-bottom: 22px;
+  }
+  .el-dialog__footer {
+    text-align: center;
+  }
 </style>
diff --git a/src/module-manage/pages/logs.vue b/src/module-manage/pages/logs.vue
index 4c484ae..aebb1ba 100644
--- a/src/module-manage/pages/logs.vue
+++ b/src/module-manage/pages/logs.vue
@@ -1,8 +1,5 @@
 <template>
-  <div
-    v-loading="loading"
-    class="dashboard-container"
-  >
+  <div v-loading="loading" class="dashboard-container">
     <div class="app-container">
       <el-card shadow="never">
         <el-alert
@@ -22,18 +19,12 @@
           style="width: 100%"
           border
         >
-          <el-table-column
-            align="center"
-            :label="$t('table.operationType')"
-          >
+          <el-table-column align="center" :label="$t('table.operationType')">
             <template slot-scope="scope">
               <span>{{ scope.row.type }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            :label="$t('table.operator')"
-          >
+          <el-table-column align="center" :label="$t('table.operator')">
             <template slot-scope="scope">
               <span>{{ scope.row.author }}</span>
             </template>
@@ -43,18 +34,12 @@
               <span>{{ scope.row.title }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            :label="$t('table.operationDate')"
-          >
+          <el-table-column align="center" :label="$t('table.operationDate')">
             <template slot-scope="scope">
               <span>{{ scope.row.display_time }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            :label="$t('table.describe')"
-          >
+          <el-table-column align="center" :label="$t('table.describe')">
             <template slot-scope="scope">
               <span>{{ scope.row.forecast }}</span>
             </template>
@@ -77,103 +62,103 @@
   </div>
 </template>
 <style rel="stylesheet/scss" lang="scss" scoped>
-.alert {
-  margin: 10px 0px;
-}
-.pagination {
-  margin-top: 10px;
-  text-align: right;
-}
+  .alert {
+    margin: 10px 0px;
+  }
+  .pagination {
+    margin-top: 10px;
+    text-align: right;
+  }
 </style>
 
 <style>
-.el-table th {
-  background-color: #fafafa;
-}
-.el-table th.is-leaf {
-  border-bottom: 2px solid #e8e8e8;
-}
+  .el-table th {
+    background-color: #fafafa;
+  }
+  .el-table th.is-leaf {
+    border-bottom: 2px solid #e8e8e8;
+  }
 </style>
 <script>
-// import { list } from '@/api/base/logs'
-import PageTool from './../components/page-tool'
-import { list } from '@/api/example/table'
-export default {
-  name: 'BaseLogs',
-  components: {
-    PageTool
-  },
-  data() {
-    return {
-      dataList: [],
-      tableKey: 0,
-      total: null,
-      listLoading: true,
-      dialogStatus: '',
-      alertText: '',
-      pagination: {
-        page: 1,
-        // pagesize: 10
-        total: 0,
-        pageSize: 20,
-        pageSizes: [20, 50, 80, 120],
-        currentPage: 1
-      }
-    }
-  },
-  computed: {},
-  // 挂载结束
-  mounted: function () {},
-  // 创建完毕状态
-  created() {
-    this.getList()
-  },
-  // 组件更新
-  updated: function () {},
-  methods: {
-    // 获取列表数据
-    getList(page = 1, limit = 20) {
-      this.listLoading = true
-      // list(this.requestParameters)
-      //   .then(data => {
-      //     this.dataList = data.data.list
-      //     this.total = data.data.counts
-      //     this.alertText = `共 ${this.total} 条记录`
-      //     this.listLoading = false
-      //   })
-      //   .catch(e => {
-      //     this.$message.e('错了哦，这是一条错误消息')
-      //   })
-      this.pagination.currentPage = page
-      this.pagination.pageSize = limit
-      this.loading = true
-      this.alertText = ''
-      this.dataList = []
-      list({ page, limit })
-        .then((res) => {
-          // console.log(res.data)
-          this.dataList = res.data.items
-          this.pagination.total = res.data.total
-          this.alertText = `共 ${this.pagination.total} 条记录`
-          this.loading = false
-        })
-        .catch((e) => {
-          this.$message.e('错了哦，这是一条错误消息')
-          this.loading = false
-        })
+  // import { list } from '@/api/base/logs'
+  import PageTool from './../components/page-tool'
+  import { list } from '@/api/example/table'
+  export default {
+    name: 'BaseLogs',
+    components: {
+      PageTool
     },
-    // 每页显示信息条数
-    handleSizeChange(val) {
-      this.pagination.pagesize = val
-      if (this.pagination.page === 1) {
-        this.getList(this.pagination)
+    data() {
+      return {
+        dataList: [],
+        tableKey: 0,
+        total: null,
+        listLoading: true,
+        dialogStatus: '',
+        alertText: '',
+        pagination: {
+          page: 1,
+          // pagesize: 10
+          total: 0,
+          pageSize: 20,
+          pageSizes: [20, 50, 80, 120],
+          currentPage: 1
+        }
       }
     },
-    // 进入某一页
-    handleCurrentChange(val) {
-      this.pagination.page = val
+    computed: {},
+    // 挂载结束
+    mounted: function () {},
+    // 创建完毕状态
+    created() {
       this.getList()
+    },
+    // 组件更新
+    updated: function () {},
+    methods: {
+      // 获取列表数据
+      getList(page = 1, limit = 20) {
+        this.listLoading = true
+        // list(this.requestParameters)
+        //   .then(data => {
+        //     this.dataList = data.data.list
+        //     this.total = data.data.counts
+        //     this.alertText = `共 ${this.total} 条记录`
+        //     this.listLoading = false
+        //   })
+        //   .catch(e => {
+        //     this.$message.e('错了哦，这是一条错误消息')
+        //   })
+        this.pagination.currentPage = page
+        this.pagination.pageSize = limit
+        this.loading = true
+        this.alertText = ''
+        this.dataList = []
+        list({ page, limit })
+          .then((res) => {
+            // console.log(res.data)
+            this.dataList = res.data.items
+            this.pagination.total = res.data.total
+            this.alertText = `共 ${this.pagination.total} 条记录`
+            this.loading = false
+          })
+          .catch((e) => {
+            this.$message.e('错了哦，这是一条错误消息')
+            this.loading = false
+          })
+      },
+      // 每页显示信息条数
+      handleSizeChange(val) {
+        this.pagination.pagesize = val
+        if (this.pagination.page === 1) {
+          this.getList(this.pagination)
+        }
+      },
+      // 进入某一页
+      handleCurrentChange(val) {
+        this.pagination.page = val
+        this.getList()
+      }
     }
   }
-}
 </script>
diff --git a/src/module-manage/pages/menus.vue b/src/module-manage/pages/menus.vue
index 8dfe995..5d0d48d 100644
--- a/src/module-manage/pages/menus.vue
+++ b/src/module-manage/pages/menus.vue
@@ -1,16 +1,14 @@
 <template>
   <div class="dashboard-container">
     <div class="app-container">
-      <el-card shadow="never">
-        菜单
-      </el-card>
+      <el-card shadow="never">菜单</el-card>
     </div>
   </div>
 </template>
 
 <script>
-export default {
-  name: 'TreeTableDemo'
-}
+  export default {
+    name: 'TreeTableDemo'
+  }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped></style>
diff --git a/src/module-manage/pages/permissions.vue b/src/module-manage/pages/permissions.vue
index 98cd732..b34e25e 100644
--- a/src/module-manage/pages/permissions.vue
+++ b/src/module-manage/pages/permissions.vue
@@ -2,32 +2,27 @@
   <div class="dashboard-container">
     <div class="app-container">
       <el-card shadow="never">
-        <el-form :inline="true" :model="requestParameters" class="demo-form-inline">
+        <el-form
+          :inline="true"
+          :model="requestParameters"
+          class="demo-form-inline"
+        >
           <el-form-item size="small">
-            <el-input v-model="requestParameters.title" placeholder="根据用户名搜索" style="width: 200px;" />
+            <el-input
+              v-model="requestParameters.title"
+              placeholder="根据用户名搜索"
+              style="width: 200px"
+            />
           </el-form-item>
           <el-form-item>
-            <el-button
-              size="small"
-              @click="eliminate"
-            >
-              清除
-            </el-button>
-            <el-button
-              type="primary"
-              size="small"
-              @click="search"
-            >
+            <el-button size="small" @click="eliminate">清除</el-button>
+            <el-button type="primary" size="small" @click="search">
               搜索
             </el-button>
           </el-form-item>
-          <el-button
-            type="success"
-            size="small"
-            class="btn"
-            @click="add"
-          >
-            <i class="el-icon-edit" />新增权限组
+          <el-button type="success" size="small" class="btn" @click="add">
+            <i class="el-icon-edit" />
+            新增权限组
           </el-button>
         </el-form>
         <el-alert
@@ -39,31 +34,24 @@
         />
         <el-table
           ref="multipleTable"
-          :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+          :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
           highlight-current-row
           tooltip-effect="dark"
           :data="list"
           fit
           style="width: 100%"
-          :default-sort="{prop: 'date', order: 'descending'}"
+          :default-sort="{ prop: 'date', order: 'descending' }"
         >
-          <el-table-column
-            type="selection"
-            width="55"
-          />
+          <el-table-column type="selection" width="55" />
           <el-table-column
             label="用户名"
             width="“380"
             align="center"
             prop="title"
           />
-          <el-table-column
-            sortable
-            width="350"
-            label="日期"
-          >
+          <el-table-column sortable width="350" label="日期">
             <template slot-scope="scope">
-              {{ scope.row.create_date | parseTimeByString("{y}-{m}-{d}") }}
+              {{ scope.row.create_date | parseTimeByString('{y}-{m}-{d}') }}
             </template>
           </el-table-column>
           <el-table-column
@@ -73,8 +61,20 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-button type="primary" icon="el-icon-edit" circle plain @click="amend(scope.row)" />
-              <el-button type="danger" icon="el-icon-delete" circle plain @click="detel(scope.row)" />
+              <el-button
+                type="primary"
+                icon="el-icon-edit"
+                circle
+                plain
+                @click="amend(scope.row)"
+              />
+              <el-button
+                type="danger"
+                icon="el-icon-delete"
+                circle
+                plain
+                @click="detel(scope.row)"
+              />
             </template>
           </el-table-column>
         </el-table>
@@ -83,7 +83,6 @@
           :pagination-page="currentPage"
           :pagination-pagesize="pageSize"
           :total="total"
-
           @pageChange="handleCurrentChange"
           @pageSizeChange="handleSizeChange"
         />
@@ -101,106 +100,103 @@
 </template>
 <style rel="stylesheet/scss" lang="scss" scoped></style>
 <script>
-import pageTool from '../components/page-tool.vue'
-import { list, remove } from '@/api/base/permissions'
-import permissionsAdd from '../components/permissions-add.vue'
-export default {
-  name: 'BasePermissions',
-  components: {
-    pageTool,
-    permissionsAdd
-  },
-  data() {
-    return {
-      list: [], // 列表
-      currentPage: '',
-      pageSize: 10,
-      total: '',
-      title: '',
-      text: '',
-      pageTitle: '权限组',
-      dialogFormVisible: false,
-      id: null,
-      requestParameters: {
-        page: 1,
-        pagesize: 10,
-        title: this.title
-      },
-      ruleInline: {
-        // 表单验证
-        title: [{ required: true, message: '用户名不能为空', trigger: 'blur' }]
-      }
-    }
-  },
-  created () {
-    this.getlist()
-  },
-  methods: {
-    async getlist() {
-      const res = await list(this.requestParameters)
-      console.log(res)
-      this.list = res.data.list
-      this.currentPage = res.data.page
-      this.total = res.data.counts
-      this.title = `共 ${this.total} 条记录`
+  import pageTool from '../components/page-tool.vue'
+  import { list, remove } from '@/api/base/permissions'
+  import permissionsAdd from '../components/permissions-add.vue'
+  export default {
+    name: 'BasePermissions',
+    components: {
+      pageTool,
+      permissionsAdd
     },
-    onSubmit() {
-
-    },
-    add() {
-      console.log(this.dialogFormVisible)
-      this.dialogFormVisible = true
-      this.text = '添加'
+    data() {
+      return {
+        list: [], // 列表
+        currentPage: '',
+        pageSize: 10,
+        total: '',
+        title: '',
+        text: '',
+        pageTitle: '权限组',
+        dialogFormVisible: false,
+        id: null,
+        requestParameters: {
+          page: 1,
+          pagesize: 10,
+          title: this.title
+        },
+        ruleInline: {
+          // 表单验证
+          title: [
+            { required: true, message: '用户名不能为空', trigger: 'blur' }
+          ]
+        }
+      }
     },
-    amend(row) {
-      this.text = '修改'
-      this.$refs.myamend.hanldeEditForm(row.id)
-      this.dialogFormVisible = true
+    created() {
+      this.getlist()
     },
-    async detel(row) {
-      console.log(row)
-      try {
-        await this.$confirm('你确定删除该员工')
-        await remove(row)
+    methods: {
+      async getlist() {
+        const res = await list(this.requestParameters)
+        console.log(res)
+        this.list = res.data.list
+        this.currentPage = res.data.page
+        this.total = res.data.counts
+        this.title = `共 ${this.total} 条记录`
+      },
+      onSubmit() {},
+      add() {
+        console.log(this.dialogFormVisible)
+        this.dialogFormVisible = true
+        this.text = '添加'
+      },
+      amend(row) {
+        this.text = '修改'
+        this.$refs.myamend.hanldeEditForm(row.id)
+        this.dialogFormVisible = true
+      },
+      async detel(row) {
+        console.log(row)
+        try {
+          await this.$confirm('你确定删除该员工')
+          await remove(row)
+          this.getlist()
+          this.$message.success('操作成功')
+        } catch (error) {
+          console.log(error)
+        }
+      },
+      handleSizeChange(val) {
+        this.requestParameters.pagesize = val
+        if (this.requestParameters.page === 1) {
+          this.getlist(this.requestParameters)
+        }
+      },
+      // 进入某一页
+      handleCurrentChange(val) {
+        this.requestParameters.page = val
         this.getlist()
-        this.$message.success('操作成功')
-      } catch (error) {
-        console.log(error)
-      }
-    },
-    handleSizeChange (val) {
-      this.requestParameters.pagesize = val
-      if (this.requestParameters.page === 1) {
+      },
+      // 搜索
+      search() {
+        this.requestParameters.page = 1
+        this.getlist(this.requestParameters)
+      },
+      // 清除
+      eliminate() {
+        this.requestParameters.title = ''
         this.getlist(this.requestParameters)
       }
-    },
-    // 进入某一页
-    handleCurrentChange (val) {
-      this.requestParameters.page = val
-      this.getlist()
-    },
-    // 搜索
-    search() {
-      this.requestParameters.page = 1
-      this.getlist(this.requestParameters)
-    },
-    // 清除
-    eliminate() {
-      this.requestParameters.title = ''
-      this.getlist(this.requestParameters)
     }
-
   }
-
-}
 </script>
 <style scoped>
-.btn{
-  position: absolute;
-  right: 50px;
-}
-.alert{
-  margin-bottom: 20px;
-}
-
+  .btn {
+    position: absolute;
+    right: 50px;
+  }
+  .alert {
+    margin-bottom: 20px;
+  }
 </style>
diff --git a/src/module-manage/pages/users.vue b/src/module-manage/pages/users.vue
index 33f4d41..e58b82f 100644
--- a/src/module-manage/pages/users.vue
+++ b/src/module-manage/pages/users.vue
@@ -176,249 +176,251 @@
   </div>
 </template>
 <style rel="stylesheet/scss" lang="scss" scoped>
-.alert {
-  margin: 10px 0px;
-}
-.pagination {
-  margin-top: 10px;
-  // text-align: right;
-}
+  .alert {
+    margin: 10px 0px;
+  }
+  .pagination {
+    margin-top: 10px;
+    // text-align: right;
+  }
 </style>
 
 <style>
-.el-table th {
-  background-color: #fafafa;
-}
-.el-table th.is-leaf {
-  border-bottom: 2px solid #e8e8e8;
-}
-/* .el-form-item {
+  .el-table th {
+    background-color: #fafafa;
+  }
+  .el-table th.is-leaf {
+    border-bottom: 2px solid #e8e8e8;
+  }
+  /* .el-form-item {
   margin-bottom: 0;
 } */
-.disabled td {
-  background-color: #f9f9f9;
-  color: #c1c1c1;
-}
-.disabled .el-button--primary,
-.disabled .el-button--danger {
-  background-color: #dbdada;
-  border: 1px solid #dbdada;
-  color: #999;
-  cursor: not-allowed;
-}
+  .disabled td {
+    background-color: #f9f9f9;
+    color: #c1c1c1;
+  }
+  .disabled .el-button--primary,
+  .disabled .el-button--danger {
+    background-color: #dbdada;
+    border: 1px solid #dbdada;
+    color: #999;
+    cursor: not-allowed;
+  }
 </style>
 <script>
-import { simple } from '@/api/base/permissions'
-// eslint-disable-next-line
-import { list, remove, detail, update, add } from '@/api/base/users'
-import PageTool from './../components/page-tool'
-import UserAdd from './../components/user-add'
-import AlertShow from '@/base-ui/alert-show'
-export default {
-  name: 'BaseUsers',
-  components: {
-    UserAdd,
-    PageTool,
-    AlertShow
-  },
-  data() {
-    return {
-      UserAdd: 'userAdd',
-      pageTitle: '用户', // 页面标题
-      text: '', // 新增、编辑文本
-      tableKey: 0,
-      deletedDate: false,
-      showDate: true,
-      dataList: [],
-      PermissionGroupsList: [], // 权限组加载
-      total: null,
-      listLoading: true,
-      dialogStatus: '',
-      alertText: '',
-      requestParameters: {
-        page: 1,
-        pagesize: 10
-        // username: this.username
-      },
-      formData: {
-        email: '',
-        phone: '',
-        username: '',
-        password: '',
-        role: '',
-        permission_group_id: '',
-        permission_group_title: '',
-        avatar: '',
-        introduction: ''
-      },
-      ruleInline: {
-        // 表单验证
-        username: [
-          { required: true, message: '用户名不能为空', trigger: 'blur' }
-        ],
-        email: [{ required: true, message: '邮箱不能为空', trigger: 'blur' }],
-        password: [{ required: true, message: '密码不能为空', trigger: 'blur' }]
-        // role: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
-        // permission_group_id: [
-        //   {
-        //     type: 'number',
-        //     required: true,
-        //     message: '权限组名称不能为空',
-        //     trigger: 'blur'
-        //   }
-        // ]
-      }
-    }
-  },
-  computed: {},
-  // 挂载结束
-  mounted: function () {},
-  // 创建完毕状态
-  created() {
-    // 读取数据
-    this.getList()
-    // 键盘enter操作
-    var lett = this
-    document.onkeydown = function (e) {
-      var key = window.event.keyCode
-      if (key === 13) {
-        lett.handleFilter(this.requestParameters)
-      }
-    }
-  },
-  // 组件更新
-  updated: function () {},
-  methods: {
-    // 获取列表数据
-    getList(params) {
-      this.listLoading = true
-      list(this.requestParameters)
-        .then((data) => {
-          this.dataList = data.data.list
-          this.total = data.data.counts
-          this.alertText = `共 ${this.total} 条记录`
-          this.listLoading = false
-        })
-        .catch((e) => {
-          this.$message.e('错了哦，这是一条错误消息')
-        })
-    },
-    // 权限列表
-    setupData() {
-      simple().then((data) => {
-        this.PermissionGroupsList = data.data
-      })
+  import { simple } from '@/api/base/permissions'
+  // eslint-disable-next-line
+  import { list, remove, detail, update, add } from '@/api/base/users'
+  import PageTool from './../components/page-tool'
+  import UserAdd from './../components/user-add'
+  import AlertShow from '@/base-ui/alert-show'
+  export default {
+    name: 'BaseUsers',
+    components: {
+      UserAdd,
+      PageTool,
+      AlertShow
     },
-    // 重置
-    resetForm() {
-      this.$refs.requestParameters.resetFields()
-    },
-    // 搜索信息
-    handleFilter() {
-      this.requestParameters.page = 1
-      this.getList(this.requestParameters)
-    },
-    // 每页显示信息条数
-    handleSizeChange(val) {
-      this.requestParameters.pagesize = val
-      if (this.requestParameters.page === 1) {
-        this.getList(this.requestParameters)
+    data() {
+      return {
+        UserAdd: 'userAdd',
+        pageTitle: '用户', // 页面标题
+        text: '', // 新增、编辑文本
+        tableKey: 0,
+        deletedDate: false,
+        showDate: true,
+        dataList: [],
+        PermissionGroupsList: [], // 权限组加载
+        total: null,
+        listLoading: true,
+        dialogStatus: '',
+        alertText: '',
+        requestParameters: {
+          page: 1,
+          pagesize: 10
+          // username: this.username
+        },
+        formData: {
+          email: '',
+          phone: '',
+          username: '',
+          password: '',
+          role: '',
+          permission_group_id: '',
+          permission_group_title: '',
+          avatar: '',
+          introduction: ''
+        },
+        ruleInline: {
+          // 表单验证
+          username: [
+            { required: true, message: '用户名不能为空', trigger: 'blur' }
+          ],
+          email: [{ required: true, message: '邮箱不能为空', trigger: 'blur' }],
+          password: [
+            { required: true, message: '密码不能为空', trigger: 'blur' }
+          ]
+          // role: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
+          // permission_group_id: [
+          //   {
+          //     type: 'number',
+          //     required: true,
+          //     message: '权限组名称不能为空',
+          //     trigger: 'blur'
+          //   }
+          // ]
+        }
       }
     },
-    // 进入某一页
-    handleCurrentChange(val) {
-      this.requestParameters.page = val
-      this.getList()
-    },
-    // 新增用户刷新列表
-    handleLoadDataList() {
+    computed: {},
+    // 挂载结束
+    mounted: function () {},
+    // 创建完毕状态
+    created() {
+      // 读取数据
       this.getList()
-    },
-    // 数据删除后显示样式
-    rowClassStatus(row) {
-      if (row.row.is_deleted === 1) {
-        this.deletedDate = true
-        this.showDate = false
-        return 'disabled'
-      } else {
-        return ''
-      }
-    },
-    // **********************************
-    // 搜索的项目
-    query() {
-      this.formData = {
-        email: '',
-        phone: '',
-        username: '',
-        role: '',
-        password: '',
-        permission_group_id: '',
-        avatar: '',
-        introduction: ''
+      // 键盘enter操作
+      var lett = this
+      document.onkeydown = function (e) {
+        var key = window.event.keyCode
+        if (key === 13) {
+          lett.handleFilter(this.requestParameters)
+        }
       }
     },
-    // 新增用户
-    handleCreate() {
-      this.query()
-      this.text = '创建'
-      this.$refs.editUser.dialogFormV()
-      this.setupData()
-    },
-    // 窗口操作**********************************
-    // 弹框关闭
-    handleCloseModal() {
-      this.$refs.editUser.dialogFormH()
-    },
-    // 编辑
-    // 表单详情数据加载
-    hanldeEditForm(objeditId) {
-      this.formData.id = objeditId
-      this.setupData()
-      detail({ id: objeditId }).then((data, err) => {
-        var datalist = data.data
-        if (err) {
-          return err
+    // 组件更新
+    updated: function () {},
+    methods: {
+      // 获取列表数据
+      getList(params) {
+        this.listLoading = true
+        list(this.requestParameters)
+          .then((data) => {
+            this.dataList = data.data.list
+            this.total = data.data.counts
+            this.alertText = `共 ${this.total} 条记录`
+            this.listLoading = false
+          })
+          .catch((e) => {
+            this.$message.e('错了哦，这是一条错误消息')
+          })
+      },
+      // 权限列表
+      setupData() {
+        simple().then((data) => {
+          this.PermissionGroupsList = data.data
+        })
+      },
+      // 重置
+      resetForm() {
+        this.$refs.requestParameters.resetFields()
+      },
+      // 搜索信息
+      handleFilter() {
+        this.requestParameters.page = 1
+        this.getList(this.requestParameters)
+      },
+      // 每页显示信息条数
+      handleSizeChange(val) {
+        this.requestParameters.pagesize = val
+        if (this.requestParameters.page === 1) {
+          this.getList(this.requestParameters)
         }
-        this.formData.id = datalist.id
-        this.formData.email = datalist.email
-        this.formData.phone = datalist.phone
-        this.formData.username = datalist.username
-        this.formData.role = datalist.role
-        this.formData.password = datalist.password
-        this.formData.avatar = datalist.avatar
-        this.formData.introduction = datalist.introduction
-        this.formData.permission_group_id = datalist.permission_group_id
-        this.formData.permission_group_title = datalist.permission_group_title
-      })
-    },
-    handleUpdate(objeditId) {
-      this.query()
-      var _this = this
-      this.text = '编辑'
-      this.$refs.editUser.dialogFormV()
-      _this.hanldeEditForm(objeditId)
-    },
-    // 删除
-    removeUser(user) {
-      this.$confirm('此操作将永久删除用户 ' + ', 是否继续?', '提示', {
-        type: 'warning'
-      })
-        .then(() => {
-          remove({ id: user })
-            .then((response) => {
-              this.$message.success('成功删除了用户' + '!')
-              this.dataList.splice(user, 1)
-              this.getList(this.requestParameters)
-            })
-            .catch((response) => {
-              this.$message.error('删除失败!')
-            })
+      },
+      // 进入某一页
+      handleCurrentChange(val) {
+        this.requestParameters.page = val
+        this.getList()
+      },
+      // 新增用户刷新列表
+      handleLoadDataList() {
+        this.getList()
+      },
+      // 数据删除后显示样式
+      rowClassStatus(row) {
+        if (row.row.is_deleted === 1) {
+          this.deletedDate = true
+          this.showDate = false
+          return 'disabled'
+        } else {
+          return ''
+        }
+      },
+      // **********************************
+      // 搜索的项目
+      query() {
+        this.formData = {
+          email: '',
+          phone: '',
+          username: '',
+          role: '',
+          password: '',
+          permission_group_id: '',
+          avatar: '',
+          introduction: ''
+        }
+      },
+      // 新增用户
+      handleCreate() {
+        this.query()
+        this.text = '创建'
+        this.$refs.editUser.dialogFormV()
+        this.setupData()
+      },
+      // 窗口操作**********************************
+      // 弹框关闭
+      handleCloseModal() {
+        this.$refs.editUser.dialogFormH()
+      },
+      // 编辑
+      // 表单详情数据加载
+      hanldeEditForm(objeditId) {
+        this.formData.id = objeditId
+        this.setupData()
+        detail({ id: objeditId }).then((data, err) => {
+          var datalist = data.data
+          if (err) {
+            return err
+          }
+          this.formData.id = datalist.id
+          this.formData.email = datalist.email
+          this.formData.phone = datalist.phone
+          this.formData.username = datalist.username
+          this.formData.role = datalist.role
+          this.formData.password = datalist.password
+          this.formData.avatar = datalist.avatar
+          this.formData.introduction = datalist.introduction
+          this.formData.permission_group_id = datalist.permission_group_id
+          this.formData.permission_group_title = datalist.permission_group_title
         })
-        .catch(() => {
-          this.$message.info('已取消操作!')
+      },
+      handleUpdate(objeditId) {
+        this.query()
+        var _this = this
+        this.text = '编辑'
+        this.$refs.editUser.dialogFormV()
+        _this.hanldeEditForm(objeditId)
+      },
+      // 删除
+      removeUser(user) {
+        this.$confirm('此操作将永久删除用户 ' + ', 是否继续?', '提示', {
+          type: 'warning'
         })
+          .then(() => {
+            remove({ id: user })
+              .then((response) => {
+                this.$message.success('成功删除了用户' + '!')
+                this.dataList.splice(user, 1)
+                this.getList(this.requestParameters)
+              })
+              .catch((response) => {
+                this.$message.error('删除失败!')
+              })
+          })
+          .catch(() => {
+            this.$message.info('已取消操作!')
+          })
+      }
     }
   }
-}
 </script>
diff --git a/src/utils/openWindow.js b/src/utils/openWindow.js
index 2611118..895f74d 100644
--- a/src/utils/openWindow.js
+++ b/src/utils/openWindow.js
@@ -16,13 +16,13 @@ export default function openWindow(url, title, w, h) {
   const width = window.innerWidth
     ? window.innerWidth
     : document.documentElement.clientWidth
-      ? document.documentElement.clientWidth
-      : screen.width
+    ? document.documentElement.clientWidth
+    : screen.width
   const height = window.innerHeight
     ? window.innerHeight
     : document.documentElement.clientHeight
-      ? document.documentElement.clientHeight
-      : screen.height
+    ? document.documentElement.clientHeight
+    : screen.height
 
   const left = width / 2 - w / 2 + dualScreenLeft
   const top = height / 2 - h / 2 + dualScreenTop
-- 
Gitee