From 298d18ee58418f2da579e2ed72f58fbab87c9efe Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 09 Jan 2024 10:46:49 +0800
Subject: [PATCH] 研发工具---内容管理,等页面整改

---
 src/views/article/publicSignUp.vue     | 1316 ++++++++++++++++++++++----------------------
 src/views/article/discussionManage.vue |    3 
 src/views/article/rotation.vue         |   15 
 src/const/tool/model.js                |  321 ++++++-----
 src/views/tool/code.vue                |   24 
 src/views/tool/datasource.vue          |    9 
 src/views/tool/model.vue               |    7 
 7 files changed, 873 insertions(+), 822 deletions(-)

diff --git a/src/const/tool/model.js b/src/const/tool/model.js
index f252fc3..21be0e2 100644
--- a/src/const/tool/model.js
+++ b/src/const/tool/model.js
@@ -1,144 +1,144 @@
 export const switchDic = [
   {
     label: "",
-    value: 0
+    value: 0,
   },
   {
     label: "",
-    value: 1
-  }
+    value: 1,
+  },
 ];
 
 export const entityDic = [
   {
     label: "String",
-    value: "java.lang.String"
+    value: "java.lang.String",
   },
   {
     label: "Integer",
-    value: "java.lang.Integer"
+    value: "java.lang.Integer",
   },
   {
     label: "Long",
-    value: "java.lang.Long"
+    value: "java.lang.Long",
   },
   {
     label: "Double",
-    value: "java.lang.Double"
+    value: "java.lang.Double",
   },
   {
     label: "BigDecimal",
-    value: "java.math.BigDecimal"
+    value: "java.math.BigDecimal",
   },
   {
     label: "Boolean",
-    value: "java.lang.Boolean"
+    value: "java.lang.Boolean",
   },
   {
     label: "Date",
-    value: "java.util.Date"
-  }
+    value: "java.util.Date",
+  },
 ];
 
 export const componentDic = [
   {
     label: "单行文本",
-    value: "input"
+    value: "input",
   },
   {
     label: "多行文本",
-    value: "textarea"
+    value: "textarea",
   },
   {
     label: "富文本",
-    value: "editor"
+    value: "editor",
   },
   {
     label: "下拉选项",
-    value: "select"
+    value: "select",
   },
   {
     label: "树形下拉选项",
-    value: "tree"
+    value: "tree",
   },
   {
     label: "单选框",
-    value: "radio"
+    value: "radio",
   },
   {
     label: "多选框",
-    value: "checkbox"
+    value: "checkbox",
   },
   {
     label: "开关框",
-    value: "switch"
+    value: "switch",
   },
   {
     label: "日期框",
-    value: "date"
-  }
+    value: "date",
+  },
 ];
 
 export const queryDic = [
   {
     label: "等于",
-    value: "equal"
+    value: "equal",
   },
   {
     label: "不等于",
-    value: "notequal"
+    value: "notequal",
   },
   {
     label: "大于",
-    value: "gt"
+    value: "gt",
   },
   {
     label: "大于等于",
-    value: "ge"
+    value: "ge",
   },
   {
     label: "小于",
-    value: "lt"
+    value: "lt",
   },
   {
     label: "小于等于",
-    value: "le"
+    value: "le",
   },
   {
     label: "区间",
-    value: "between"
+    value: "between",
   },
   {
     label: "模糊",
-    value: "like"
+    value: "like",
   },
   {
     label: "左模糊",
-    value: "likeleft"
+    value: "likeleft",
   },
   {
     label: "右模糊",
-    value: "likeright"
-  }
+    value: "likeright",
+  },
 ];
 
 export const templateDic = [
   {
     label: "单表",
-    value: "crud"
+    value: "crud",
   },
   {
     label: "主子表",
-    value: "sub"
+    value: "sub",
   },
   {
     label: "树表",
-    value: "tree"
-  }
+    value: "tree",
+  },
 ];
 
 export const option = {
-  height: 'auto',
+  height: "auto",
   searchShow: true,
   searchMenuSpan: 6,
   tip: false,
@@ -151,19 +151,22 @@
     {
       label: "数据源",
       prop: "datasourceId",
+      searchSpan: 4,
       search: true,
       span: 24,
       type: "select",
       dicUrl: "/api/blade-develop/datasource/select",
       props: {
         label: "name",
-        value: "id"
+        value: "id",
       },
-      rules: [{
-        required: true,
-        message: "请选择数据源",
-        trigger: "blur"
-      }]
+      rules: [
+        {
+          required: true,
+          message: "请选择数据源",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "物理表名",
@@ -173,42 +176,52 @@
       dicData: [],
       props: {
         label: "comment",
-        value: "name"
+        value: "name",
       },
-      rules: [{
-        required: true,
-        message: "请输入数据库表名",
-        trigger: "blur"
-      }]
+      rules: [
+        {
+          required: true,
+          message: "请输入数据库表名",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "模型类名",
       prop: "modelClass",
-      rules: [{
-        required: true,
-        message: "请输入模型类名",
-        trigger: "blur"
-      }]
+      rules: [
+        {
+          required: true,
+          message: "请输入模型类名",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "模型名称",
       prop: "modelName",
+      searchSpan: 4,
       search: true,
-      rules: [{
-        required: true,
-        message: "请输入模型名称",
-        trigger: "blur"
-      }]
+      rules: [
+        {
+          required: true,
+          message: "请输入模型名称",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "模型编号",
       prop: "modelCode",
+      searchSpan: 4,
       search: true,
-      rules: [{
-        required: true,
-        message: "请输入模型编号",
-        trigger: "blur"
-      }]
+      rules: [
+        {
+          required: true,
+          message: "请输入模型编号",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "模型备注",
@@ -216,7 +229,7 @@
       hide: true,
       span: 24,
     },
-  ]
+  ],
 };
 
 export const optionModel = {
@@ -230,87 +243,101 @@
   tip: false,
   menu: false,
   selection: true,
-  column: [{
-    label: '物理列名',
-    prop: 'jdbcName',
-  }, {
-    label: '物理类型',
-    prop: 'jdbcType',
-  }, {
-    label: '实体列名',
-    prop: 'propertyName',
-    cell: true,
-  }, {
-    label: '实体类型',
-    prop: 'propertyEntity',
-    type: "select",
-    dicData: entityDic,
-    cell: true,
-  }, {
-    label: '字段说明',
-    prop: 'jdbcComment',
-    cell: true,
-  }, {
-    label: '列表显示',
-    prop: 'isList',
-    type: 'switch',
-    dicData: switchDic,
-    align: 'center',
-    width: 80,
-    cell: true,
-  }, {
-    label: '表单显示',
-    prop: 'isForm',
-    type: 'switch',
-    dicData: switchDic,
-    align: 'center',
-    width: 80,
-    cell: true,
-  }, {
-    label: '独占一行',
-    prop: 'isRow',
-    type: 'switch',
-    dicData: switchDic,
-    align: 'center',
-    width: 80,
-    cell: true,
-  }, {
-    label: '必填',
-    prop: 'isRequired',
-    type: 'switch',
-    dicData: switchDic,
-    align: 'center',
-    width: 80,
-    cell: true,
-  }, {
-    label: '组件类型',
-    prop: 'componentType',
-    type: "select",
-    dicData: componentDic,
-    cell: true,
-  }, {
-    label: '字典编码',
-    prop: 'dictCode',
-    type: "select",
-    dicUrl: "/api/blade-system/dict/select",
-    props: {
-      label: "dictValue",
-      value: "code"
+  column: [
+    {
+      label: "物理列名",
+      prop: "jdbcName",
     },
-    cell: true,
-  }, {
-    label: '查询配置',
-    prop: 'isQuery',
-    type: 'switch',
-    dicData: switchDic,
-    align: 'center',
-    width: 80,
-    cell: true,
-  }, {
-    label: '查询类型',
-    prop: 'queryType',
-    type: "select",
-    dicData: queryDic,
-    cell: true,
-  }]
+    {
+      label: "物理类型",
+      prop: "jdbcType",
+    },
+    {
+      label: "实体列名",
+      prop: "propertyName",
+      cell: true,
+    },
+    {
+      label: "实体类型",
+      prop: "propertyEntity",
+      type: "select",
+      dicData: entityDic,
+      cell: true,
+    },
+    {
+      label: "字段说明",
+      prop: "jdbcComment",
+      cell: true,
+    },
+    {
+      label: "列表显示",
+      prop: "isList",
+      type: "switch",
+      dicData: switchDic,
+      align: "center",
+      width: 80,
+      cell: true,
+    },
+    {
+      label: "表单显示",
+      prop: "isForm",
+      type: "switch",
+      dicData: switchDic,
+      align: "center",
+      width: 80,
+      cell: true,
+    },
+    {
+      label: "独占一行",
+      prop: "isRow",
+      type: "switch",
+      dicData: switchDic,
+      align: "center",
+      width: 80,
+      cell: true,
+    },
+    {
+      label: "必填",
+      prop: "isRequired",
+      type: "switch",
+      dicData: switchDic,
+      align: "center",
+      width: 80,
+      cell: true,
+    },
+    {
+      label: "组件类型",
+      prop: "componentType",
+      type: "select",
+      dicData: componentDic,
+      cell: true,
+    },
+    {
+      label: "字典编码",
+      prop: "dictCode",
+      type: "select",
+      dicUrl: "/api/blade-system/dict/select",
+      props: {
+        label: "dictValue",
+        value: "code",
+      },
+      cell: true,
+    },
+    {
+      label: "查询配置",
+      prop: "isQuery",
+      type: "switch",
+      dicData: switchDic,
+      align: "center",
+      width: 80,
+      cell: true,
+    },
+    {
+      label: "查询类型",
+      prop: "queryType",
+      type: "select",
+      dicData: queryDic,
+      cell: true,
+    },
+  ],
 };
diff --git a/src/views/article/discussionManage.vue b/src/views/article/discussionManage.vue
index 22f26bc..de2dfd7 100644
--- a/src/views/article/discussionManage.vue
+++ b/src/views/article/discussionManage.vue
@@ -41,7 +41,7 @@
             </template>
 
             <template slot-scope="{ row, size }" slot="iscomment">
-                <el-tag :size="size" :type="showStatus(row.publish, 2).type" v-text="showStatus(row.publish, 2).text">
+                <el-tag :size="size" :type="showStatus(row.iscomment, 2).type" v-text="showStatus(row.iscomment, 2).text">
                 </el-tag>
             </template>
         </avue-crud>
@@ -441,6 +441,7 @@
                 editBtn: this.vaildData(this.permission.article_edit, true),
             }
         },
+
         ids () {
             let ids = []
             this.selectionList.forEach((ele) => {
diff --git a/src/views/article/publicSignUp.vue b/src/views/article/publicSignUp.vue
index e23b6b1..d544ca5 100644
--- a/src/views/article/publicSignUp.vue
+++ b/src/views/article/publicSignUp.vue
@@ -1,716 +1,716 @@
 <template>
-  <basic-container>
-    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
-      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
-      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删 除
-        </el-button>
-      </template>
+    <basic-container>
+        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
+            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
+            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
+            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+            @refresh-change="refreshChange" @on-load="onLoad">
+            <template slot="menuLeft">
+                <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
+                    除
+                </el-button>
+            </template>
 
-      <template slot-scope="{type,size,row }" slot="menu">
-        <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row)">
-          公益报名
-        </el-button>
-        <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row)">
-          参与用户
-        </el-button>
-        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
-          撤销
-        </el-button>
-        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
-          发布
-        </el-button>
-      </template>
+            <template slot-scope="{ type, size, row }" slot="menu">
+                <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row)">
+                    公益报名
+                </el-button>
+                <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row)">
+                    参与用户
+                </el-button>
+                <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type"
+                    @click.stop="updateFb(row)">
+                    撤销
+                </el-button>
+                <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
+                    @click.stop="updateFb(row)">
+                    发布
+                </el-button>
+            </template>
 
-      <template slot-scope="{ row }" slot="publish">
-        <el-tag>{{
-          row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"
-          }}
-        </el-tag>
-      </template>
+            <template slot-scope="{ row, size }" slot="publish">
+                <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
+                </el-tag>
+            </template>
 
-      <template slot-scope="{ row }" slot="iscomment">
-        <el-tag>{{
-          row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"
-          }}
-        </el-tag>
-      </template>
-    </avue-crud>
+            <template slot-scope="{ row, size }" slot="iscomment">
+                <el-tag :size="size" :type="showStatus(row.iscomment, 2).type" v-text="showStatus(row.iscomment, 2).text">
+                </el-tag>
+            </template>
+        </avue-crud>
 
-    <publicSignUpChild ref="publicSignUpChild"></publicSignUpChild>
+        <publicSignUpChild ref="publicSignUpChild"></publicSignUpChild>
 
-    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
-      <span slot="title" class="dialog-footer">
-        {{discussForm.ontitle}}
-      </span>
-      <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm"></avue-form>
-    </el-dialog>
-
-  </basic-container>
+        <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
+            <span slot="title" class="dialog-footer">
+                {{ discussForm.ontitle }}
+            </span>
+            <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm"></avue-form>
+        </el-dialog>
+    </basic-container>
 </template>
 
 <script>
-  import {
+import {
     getList,
     remove,
     update,
     add,
     getNotice,
     upcomment
-  } from "@/api/article/article";
+} from "@/api/article/article"
 
-  import {
+import {
     getListPd,
     removePd,
     updatePd,
     addPd,
     getDetailPd,
     upcommentPd
-  } from "@/api/discuss/publicDiscuss";
+} from "@/api/discuss/publicDiscuss"
 
-  import website from '@/config/website';
+import website from '@/config/website'
 
-
-  import {
+import {
     getDistrictTree
-  } from "@/api/district/index";
+} from "@/api/district/index"
 
-  import {
+import {
     mapGetters
-  } from "vuex";
-  import publicSignUpChild from "./components/publicSignUpChild"
+} from "vuex"
+import publicSignUpChild from "./components/publicSignUpChild"
 
-  export default {
+export default {
     components: {
-      publicSignUpChild
+        publicSignUpChild
     },
-    data() {
-      return {
-        discussForm: {
-          ontitle: '',
-          title: '',
-          openFlag: 0,
-          numberRestrictions: 0,
-          voteRestrictions: 0,
-          userRestrictions: 0,
-          endTime: '',
-          articleId: '',
-          createTime: '',
-          updateTime: '',
-          deleteFlag: '',
-          repeatVote: 0,
-          voteNumberPublic: 0,
-          appointUser: '',
-          userIds: '',
-          eventType: 0,
-        },
-        dialogVisibles: false,
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0,
-        },
-        datetime: "",
-        selectionList: [],
-        option: {
-          height: "auto",
-          calcHeight: 54,
-          dialogWidth: 950,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 3,
-          menuWidth: 450,
-          border: false,
-          //stripe:true,
-          index: true,
-          viewBtn: false,
-          selection: true,
-          excelBtn: true,
-          dialogClickModal: false,
-          column: [{
-              label: "文章标题",
-              prop: "title",
-              span: 24,
-              row: true,
-              searchSpan: 4,
-              search: true,
-              rules: [{
-                required: true,
-                message: "请输入文章标题",
-                trigger: "blur",
-              }, ],
+    data () {
+        return {
+            discussForm: {
+                ontitle: '',
+                title: '',
+                openFlag: 0,
+                numberRestrictions: 0,
+                voteRestrictions: 0,
+                userRestrictions: 0,
+                endTime: '',
+                articleId: '',
+                createTime: '',
+                updateTime: '',
+                deleteFlag: '',
+                repeatVote: 0,
+                voteNumberPublic: 0,
+                appointUser: '',
+                userIds: '',
+                eventType: 0,
             },
-            {
-              label: "文章封面",
-              prop: "url",
-              // align:'center',
-              width: 80,
-              type: "upload",
-              listType: "picture-img",
-              action: "/api/blade-resource/oss/endpoint/put-file",
-              propsHttp: {
-                res: "data",
-                url: "link",
-              },
-              // hide: true,
-              span: 24,
+            dialogVisibles: false,
+            form: {},
+            query: {},
+            loading: true,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
             },
-            {
-              label: "文章范围",
-              prop: "articleList",
-              span: 12,
-              minRows: 2,
-              type: "cascader",
-              multiple: true,
-              tags: true,
-              dicData: [],
-              rules: [{
-                required: true,
-                message: "请选择文章范围",
-                trigger: "blur",
-              }, ],
-              props: {
-                label: "name",
-                value: 'id'
-              },
-              hide: true,
+            datetime: "",
+            selectionList: [],
+            option: {
+                labelWidth: 96,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 500,
+
+                height: "auto",
+                calcHeight: 54,
+                dialogWidth: 950,
+                tip: false,
+                border: false,
+                //stripe:true,
+                index: true,
+                viewBtn: false,
+                selection: true,
+                excelBtn: true,
+                dialogClickModal: false,
+                column: [
+                    {
+                        label: "文章标题",
+                        prop: "title",
+                        span: 24,
+                        row: true,
+                        searchSpan: 4,
+                        search: true,
+                        rules: [{
+                            required: true,
+                            message: "请输入文章标题",
+                            trigger: "blur",
+                        },],
+                    },
+                    {
+                        width: 110,
+                        label: "文章封面",
+                        prop: "url",
+                        // align:'center',
+                        type: "upload",
+                        listType: "picture-img",
+                        action: "/api/blade-resource/oss/endpoint/put-file",
+                        propsHttp: {
+                            res: "data",
+                            url: "link",
+                        },
+                        // hide: true,
+                        span: 24,
+                    },
+                    {
+                        label: "文章范围",
+                        prop: "articleList",
+                        span: 12,
+                        minRows: 2,
+                        type: "cascader",
+                        multiple: true,
+                        tags: true,
+                        dicData: [],
+                        rules: [{
+                            required: true,
+                            message: "请选择文章范围",
+                            trigger: "blur",
+                        },],
+                        props: {
+                            label: "name",
+                            value: 'id'
+                        },
+                        hide: true,
+                    },
+                    {
+                        width: 110,
+                        label: "文章类型",
+                        prop: "type",
+                        searchSpan: 4,
+                        value: 3,
+                        slot: true,
+                        search: true,
+                        type: "select",
+                        rules: [{
+                            required: true,
+                            message: "请选择文章类型",
+                            trigger: "blur",
+                        },],
+                        dicData: [{
+                            label: "公益报名",
+                            value: 3, //  // 类型  0:文章 1经营性收支,2:物业招标 3:公益报名 4:选举调查
+                        }],
+                    },
+                    {
+                        width: 100,
+                        label: "发布时间",
+                        prop: "createTime",
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd HH:mm:ss",
+                    },
+                    {
+                        width: 100,
+                        label: "发布状态",
+                        prop: "publish",
+                        searchSpan: 4,
+                        value: "0",
+                        slot: true,
+                        search: true,
+                        type: "select",
+                        rules: [{
+                            required: true,
+                            message: "请选择发布状态",
+                            trigger: "blur",
+                        },],
+                        dicData: [{
+                            label: "未发布",
+                            value: "0",
+                        },
+                        {
+                            label: "已发布",
+                            value: "1",
+                        }
+                        ],
+                    },
+                    {
+                        width: 80,
+                        label: "评论区",
+                        prop: "iscomment",
+                        slot: true,
+                        type: "select",
+                        dicData: [{
+                            label: "关闭",
+                            value: "0",
+                        },
+                        {
+                            label: "开启",
+                            value: "1",
+                        }
+                        ],
+                    },
+                    {
+                        label: "文章内容",
+                        prop: "content",
+                        component: "AvueUeditor",
+                        options: {
+                            action: "/api/blade-resource/oss/endpoint/put-file",
+                            props: {
+                                res: "data",
+                                url: "link",
+                            },
+                        },
+                        hide: true,
+                        minRows: 6,
+                        span: 24,
+                    },
+                ],
             },
-            {
-              label: "文章类型",
-              prop: "type",
-              searchSpan: 3,
-              width: 80,
-              value: 3,
-              slot: true,
-              search: true,
-              type: "select",
-              rules: [{
-                required: true,
-                message: "请选择文章类型",
-                trigger: "blur",
-              }, ],
-              dicData: [{
-                label: "公益报名",
-                value: 3, //  // 类型  0:文章 1经营性收支,2:物业招标 3:公益报名 4:选举调查
-              }],
-            },
-            {
-              label: "发布时间",
-              prop: "dateTime",
-              type: "datetime",
-              format: "yyyy-MM-dd",
-              valueFormat: "yyyy-MM-dd",
-              searchSpan: 5,
-              searchRange: true,
-              hide: true,
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              search: true,
-              rules: [{
-                required: true,
-                message: "请选择发布时间",
-                trigger: "blur",
-              }, ],
-            },
-            {
-              label: "发布时间",
-              prop: "createTime",
-              type: "date",
-              format: "yyyy-MM-dd",
-              valueFormat: "yyyy-MM-dd HH:mm:ss",
-            },
-            {
-              label: "发布状态",
-              prop: "publish",
-              searchSpan: 3,
-              width: 80,
-              value: "0",
-              slot: true,
-              search: true,
-              type: "select",
-              rules: [{
-                required: true,
-                message: "请选择发布状态",
-                trigger: "blur",
-              }, ],
-              dicData: [{
-                  label: "未发布",
-                  value: "0",
+            data: [],
+            optionEnroll: {
+                column: [{
+                    label: "",
+                    type: 'title',
+                    prop: "title",
+                    span: 24,
+                    row: true,
+                    offset: 2,
+                    styles: {
+                        fontSize: '24px'
+                    }
+                }, {
+                    labelWidth: 100,
+                    label: '开启',
+                    prop: 'openFlag',
+                    type: 'radio',
+                    button: true,
+                    row: true,
+                    offset: 6,
+                    dicData: [{
+                        label: '开启',
+                        value: 0
+                    }, {
+                        label: '不开启',
+                        value: 1
+                    }],
+                    rules: [{
+                        required: true,
+                        message: "请选开启状态",
+                        trigger: "blur",
+                    },],
+                }, {
+                    labelWidth: 100,
+                    label: '投票限制',
+                    prop: 'voteRestrictions',
+                    type: 'radio',
+                    button: true,
+                    row: true,
+                    offset: 6,
+                    dicData: [{
+                        label: '一人一票',
+                        value: 0
+                    }, {
+                        label: '一户一票',
+                        value: 1
+                    }],
+                    rules: [{
+                        required: true,
+                        message: "请选投票限制",
+                        trigger: "blur",
+                    },],
                 },
                 {
-                  label: "已发布",
-                  value: "1",
-                }
-              ],
-            },
-            {
-              label: "评论区",
-              prop: "iscomment",
-              width: 80,
-              slot: true,
-              type: "select",
-              dicData: [{
-                  label: "关闭",
-                  value: "0",
+                    label: "截止时间",
+                    row: true,
+                    offset: 6,
+                    prop: "endTime",
+                    type: "datetime",
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd HH:mm:ss",
+                    rules: [{
+                        required: true,
+                        message: "请选截止时间",
+                        trigger: "blur",
+                    },],
                 },
-                {
-                  label: "开启",
-                  value: "1",
-                }
-              ],
+                ]
             },
-            {
-              label: "文章内容",
-              prop: "content",
-              component: "AvueUeditor",
-              options: {
-                action: "/api/blade-resource/oss/endpoint/put-file",
-                props: {
-                  res: "data",
-                  url: "link",
-                },
-              },
-              hide: true,
-              minRows: 6,
-              span: 24,
-            },
-          ],
-        },
-        data: [],
-        optionEnroll: {
-          column: [{
-              label: "",
-              type: 'title',
-              prop: "title",
-              span: 24,
-              row: true,
-              offset: 2,
-              styles: {
-                fontSize: '24px'
-              }
-            }, {
-              labelWidth: 100,
-              label: '开启',
-              prop: 'openFlag',
-              type: 'radio',
-              button: true,
-              row: true,
-              offset: 6,
-              dicData: [{
-                label: '开启',
-                value: 0
-              }, {
-                label: '不开启',
-                value: 1
-              }],
-              rules: [{
-                required: true,
-                message: "请选开启状态",
-                trigger: "blur",
-              }, ],
-            }, {
-              labelWidth: 100,
-              label: '投票限制',
-              prop: 'voteRestrictions',
-              type: 'radio',
-              button: true,
-              row: true,
-              offset: 6,
-              dicData: [{
-                label: '一人一票',
-                value: 0
-              }, {
-                label: '一户一票',
-                value: 1
-              }],
-              rules: [{
-                required: true,
-                message: "请选投票限制",
-                trigger: "blur",
-              }, ],
-            },
-            {
-              label: "截止时间",
-              row: true,
-              offset: 6,
-              prop: "endTime",
-              type: "datetime",
-              format: "yyyy-MM-dd",
-              valueFormat: "yyyy-MM-dd HH:mm:ss",
-              rules: [{
-                required: true,
-                message: "请选截止时间",
-                trigger: "blur",
-              }, ],
-            },
-          ]
-        },
-        districtTree: [],
-      };
+            districtTree: [],
+        }
     },
     watch: {
-      "form.articleType": {
-        handler(val) {
-          if (val) {
-            var videoUrl = this.findObject(this.option.column, "videoUrl");
-            var content = this.findObject(this.option.column, "content");
-            if (val.indexOf('ksp') != -1) {
-              videoUrl.display = true;
-              content.display = false;
-              videoUrl.rules = [{
-                required: false,
-                message: "请选择视频",
-                trigger: "blur",
-              }, ];
-            } else {
-              videoUrl.display = false;
-              content.display = true;
-              videoUrl.rules = "";
-            }
-          }
-        },
-        immediate: true,
-      }
+        "form.articleType": {
+            handler (val) {
+                if (val) {
+                    var videoUrl = this.findObject(this.option.column, "videoUrl")
+                    var content = this.findObject(this.option.column, "content")
+                    if (val.indexOf('ksp') != -1) {
+                        videoUrl.display = true
+                        content.display = false
+                        videoUrl.rules = [{
+                            required: false,
+                            message: "请选择视频",
+                            trigger: "blur",
+                        },]
+                    } else {
+                        videoUrl.display = false
+                        content.display = true
+                        videoUrl.rules = ""
+                    }
+                }
+            },
+            immediate: true,
+        }
     },
     computed: {
-      ...mapGetters(["permission", "userInfo"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.article_add, true),
-          viewBtn: this.vaildData(this.permission.article_view, true),
-          delBtn: this.vaildData(this.permission.article_delete, true),
-          editBtn: this.vaildData(this.permission.article_edit, true),
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach((ele) => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      },
+        ...mapGetters(["permission", "userInfo"]),
+        permissionList () {
+            return {
+                addBtn: this.vaildData(this.permission.article_add, true),
+                viewBtn: this.vaildData(this.permission.article_view, true),
+                delBtn: this.vaildData(this.permission.article_delete, true),
+                editBtn: this.vaildData(this.permission.article_edit, true),
+            }
+        },
+        ids () {
+            let ids = []
+            this.selectionList.forEach((ele) => {
+                ids.push(ele.id)
+            })
+            return ids.join(",")
+        },
+
+        showStatus () {
+            return (data, type) => {
+                if (data == 0) {
+                    return {
+                        text: type == 1 ? '未发布' : '关闭',
+                        type: 'info'
+                    }
+                } else if (data == 1) {
+                    return {
+                        text: type == 1 ? '已发布' : '开启',
+                        type: 'success'
+                    }
+                }
+            }
+        }
     },
     methods: {
 
 
-      openUserPopup(row) {
-        this.$refs.publicSignUpChild.openUser(row)
-      },
+        openUserPopup (row) {
+            this.$refs.publicSignUpChild.openUser(row)
+        },
 
-      openDilog(row, type) {
-        this.dialogVisibles = true
-        this.discussForm.eventType = type
-        this.discussForm.articleId = row.id
-        this.discussForm.title = row.title
-        this.discussForm.ontitle = '公益报名'
-        this.getpunlicDiscussDetail(row)
-      },
+        openDilog (row, type) {
+            this.dialogVisibles = true
+            this.discussForm.eventType = type
+            this.discussForm.articleId = row.id
+            this.discussForm.title = row.title
+            this.discussForm.ontitle = '公益报名'
+            this.getpunlicDiscussDetail(row)
+        },
 
-      getpunlicDiscussDetail(row) {
-        getDetailPd({
-          articleId: row.id
-        }).then((res) => {
-          if (res.data.data) {
-            let data = res.data.data
-            this.discussForm = data;
-          }
-        });
-      },
+        getpunlicDiscussDetail (row) {
+            getDetailPd({
+                articleId: row.id
+            }).then((res) => {
+                if (res.data.data) {
+                    let data = res.data.data
+                    this.discussForm = data
+                }
+            })
+        },
 
-      handleSubmit(form, done) {
-        done();
-        addPd(form).then(
-          () => {
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-            this.dialogVisibles = false
-            done();
-          },
-          (error) => {
-            window.console.log(error);
-            // loading();
-          }
-        );
-      },
+        handleSubmit (form, done) {
+            done()
+            addPd(form).then(
+                () => {
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    this.dialogVisibles = false
+                    done()
+                },
+                (error) => {
+                    window.console.log(error)
+                    // loading();
+                }
+            )
+        },
 
-      handleClose(done) {
-        done();
-        // this.$confirm('确认关闭?')
-        //   .then(_ => {
-        //     done();
-        //   })
-        //   .catch(_ => {});
-      },
-      rowSave(row, done, loading) {
-        // if (row.videoUrl.length == 0) {
-        //   row.videoUrl = "";
-        // }
-        row.userid = this.userInfo.user_id;
-        row.articleRange = JSON.stringify(row.articleList)
-        if (row.url.length > 0) {
-          var urls = []
-          var split = row.url.split(",");
-          split.forEach(url => {
-            var names = url.split("jczz/");
-            urls.push(names[1])
-          })
-          row.url = urls.join(",")
-        }
-        add(row).then(
-          () => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-            done();
-          },
-          (error) => {
-            window.console.log(error);
-            loading();
-          }
-        );
-      },
-      rowUpdate(row, index, done, loading) {
-        row.articleRange = JSON.stringify(row.articleList)
-        if (row.url.length > 0) {
-          var urls = []
-          var split = row.url.split(",");
-          split.forEach(url => {
-            var names = url.split("jczz/");
-            urls.push(names[1])
-          })
-          row.url = urls.join(",")
-        }
-
-        update(row).then(
-          () => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-            done();
-          },
-          (error) => {
-            window.console.log(error);
-            loading();
-          }
-        );
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-          });
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getNotice(this.form.id).then((res) => {
-            let data = res.data.data
-            if (data.url.length > 0) {
-              var urls = []
-              var names = data.url.split(",");
-              names.forEach(name => {
-                urls.push(website.minioUrl + name)
-              })
-              data.url = urls.join(",")
+        handleClose (done) {
+            done()
+            // this.$confirm('确认关闭?')
+            //   .then(_ => {
+            //     done();
+            //   })
+            //   .catch(_ => {});
+        },
+        rowSave (row, done, loading) {
+            // if (row.videoUrl.length == 0) {
+            //   row.videoUrl = "";
+            // }
+            row.userid = this.userInfo.user_id
+            row.articleRange = JSON.stringify(row.articleList)
+            if (row.url.length > 0) {
+                var urls = []
+                var split = row.url.split(",")
+                split.forEach(url => {
+                    var names = url.split("jczz/")
+                    urls.push(names[1])
+                })
+                row.url = urls.join(",")
             }
-            data.articleList = JSON.parse(data.articleRange)
-            this.form = data;
-          });
-        }
-        done();
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        const {
-          dateTime
-        } = this.query;
-        let values = {
-          ...params,
-        };
-        if (dateTime) {
-          values = {
-            ...params,
-            startTime: dateTime[0],
-            endTime: dateTime[1],
-            ...this.query,
-          };
-          values.dateTime = null;
-        }
-        values.type = 3
-        this.loading = true;
-        console.log(values)
-        getList(page.currentPage, page.pageSize, values).then((res) => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.data.forEach(item => {
-            if (item.url.length > 0) {
-              var urls = []
-              var names = item.url.split(",");
-              names.forEach(name => {
-                urls.push(website.minioUrl + name)
-              })
-              item.url = urls.join(",")
+            add(row).then(
+                () => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    done()
+                },
+                (error) => {
+                    window.console.log(error)
+                    loading()
+                }
+            )
+        },
+        rowUpdate (row, index, done, loading) {
+            row.articleRange = JSON.stringify(row.articleList)
+            if (row.url.length > 0) {
+                var urls = []
+                var split = row.url.split(",")
+                split.forEach(url => {
+                    var names = url.split("jczz/")
+                    urls.push(names[1])
+                })
+                row.url = urls.join(",")
             }
-          })
-          this.loading = false;
-          this.selectionClear();
-        });
-        getDistrictTree(params = {}).then((res) => {
-          const data = res.data.data;
-          this.districtTree = data;
-          const column = this.findObject(this.option.column, "articleList");
-          column.dicData = res.data.data;
-          this.loading = false;
-        });
-      },
-      updateFb(row) {
-        if (row.publish == "0") {
-          row.publish = "1";
-        } else {
-          row.publish = "0";
+
+            update(row).then(
+                () => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    done()
+                },
+                (error) => {
+                    window.console.log(error)
+                    loading()
+                }
+            )
+        },
+        rowDel (row) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    return remove(row.id)
+                })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                })
+        },
+        searchReset () {
+            this.query = {}
+            this.onLoad(this.page)
+        },
+        searchChange (params, done) {
+            this.query = params
+            this.page.currentPage = 1
+            this.onLoad(this.page, params)
+            done()
+        },
+        selectionChange (list) {
+            this.selectionList = list
+        },
+        selectionClear () {
+            this.selectionList = []
+            this.$refs.crud.toggleSelection()
+        },
+        handleDelete () {
+            if (this.selectionList.length === 0) {
+                this.$message.warning("请选择至少一条数据")
+                return
+            }
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    return remove(this.ids)
+                })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    this.$refs.crud.toggleSelection()
+                })
+        },
+        beforeOpen (done, type) {
+            if (["edit", "view"].includes(type)) {
+                getNotice(this.form.id).then((res) => {
+                    let data = res.data.data
+                    if (data.url.length > 0) {
+                        var urls = []
+                        var names = data.url.split(",")
+                        names.forEach(name => {
+                            urls.push(website.minioUrl + name)
+                        })
+                        data.url = urls.join(",")
+                    }
+                    data.articleList = JSON.parse(data.articleRange)
+                    this.form = data
+                })
+            }
+            done()
+        },
+        currentChange (currentPage) {
+            this.page.currentPage = currentPage
+        },
+        sizeChange (pageSize) {
+            this.page.pageSize = pageSize
+        },
+        refreshChange () {
+            this.onLoad(this.page, this.query)
+        },
+        onLoad (page, params = {}) {
+            const {
+                dateTime
+            } = this.query
+            let values = {
+                ...params,
+            }
+            if (dateTime) {
+                values = {
+                    ...params,
+                    startTime: dateTime[0],
+                    endTime: dateTime[1],
+                    ...this.query,
+                }
+                values.dateTime = null
+            }
+            values.type = 3
+            this.loading = true
+            console.log(values)
+            getList(page.currentPage, page.pageSize, values).then((res) => {
+                const data = res.data.data
+                this.page.total = data.total
+                this.data = data.records
+                this.data.forEach(item => {
+                    if (item.url.length > 0) {
+                        var urls = []
+                        var names = item.url.split(",")
+                        names.forEach(name => {
+                            urls.push(website.minioUrl + name)
+                        })
+                        item.url = urls.join(",")
+                    }
+                })
+                this.loading = false
+                this.selectionClear()
+            })
+            getDistrictTree(params = {}).then((res) => {
+                const data = res.data.data
+                this.districtTree = data
+                const column = this.findObject(this.option.column, "articleList")
+                column.dicData = res.data.data
+                this.loading = false
+            })
+        },
+        updateFb (row) {
+            if (row.publish == "0") {
+                row.publish = "1"
+            } else {
+                row.publish = "0"
+            }
+            if (row.url.length > 0) {
+                var urls = []
+                var split = row.url.split(",")
+                split.forEach(url => {
+                    var names = url.split("jczz/")
+                    urls.push(names[1])
+                })
+                row.url = urls.join(",")
+            }
+            update(row).then(
+                () => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    done()
+                },
+                (error) => {
+                    window.console.log(error)
+                    loading()
+                }
+            )
+        },
+        kqcomment () {
+            if (this.selectionList.length === 0) {
+                this.$message.warning("请选择至少一条数据")
+                return
+            }
+            this.$confirm("确定将选择数据开启评论?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                return upcomment(this.ids, "1")
+            })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    this.$refs.crud.toggleSelection()
+                })
+        },
+        gbcomment () {
+            if (this.selectionList.length === 0) {
+                this.$message.warning("请选择至少一条数据")
+                return
+            }
+            this.$confirm("确定将选择数据开启评论?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                return upcomment(this.ids, "0")
+            })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    this.$refs.crud.toggleSelection()
+                })
         }
-        if (row.url.length > 0) {
-          var urls = []
-          var split = row.url.split(",");
-          split.forEach(url => {
-            var names = url.split("jczz/");
-            urls.push(names[1])
-          })
-          row.url = urls.join(",")
-        }
-        update(row).then(
-          () => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-            done();
-          },
-          (error) => {
-            window.console.log(error);
-            loading();
-          }
-        );
-      },
-      kqcomment() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据开启评论?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          }).then(() => {
-            return upcomment(this.ids, "1");
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      gbcomment() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据开启评论?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          }).then(() => {
-            return upcomment(this.ids, "0");
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      }
     },
-  };
+}
 </script>
 
 <style>
-  .avue-upload__icon {
+.avue-upload__icon {
     line-height: 6;
-  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/article/rotation.vue b/src/views/article/rotation.vue
index 6194d08..40b0be7 100644
--- a/src/views/article/rotation.vue
+++ b/src/views/article/rotation.vue
@@ -34,13 +34,16 @@
             datetime: "",
             selectionList: [],
             option: {
+                labelWidth: 66,
+                searchLabelWidth: 66,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 210,
+
                 height: "auto",
                 calcHeight: 54,
                 dialogWidth: 950,
                 tip: false,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 350,
                 border: false,
                 //stripe:true,
                 index: true,
@@ -57,6 +60,7 @@
                         search: true,
                     },
                     {
+                        width: 110,
                         label: "类型",
                         prop: "type",
                         span: 12,
@@ -80,8 +84,9 @@
                         label: "所属社区",
                         parent: false,
                         prop: "communityCode",
-                        search: true,
                         searchSpan: 4,
+                        searchLabelWidth: 96,
+                        search: true,
                         searchType: 'input',
                         type: "tree",
                         dicUrl: "/api/blade-system/region/tree",
@@ -117,9 +122,9 @@
                         span: 24,
                     },
                     {
+                        width: 144,
                         label: "时间",
                         prop: "createTime",
-                        width: 160,
                         addDisplay: false,
                         editDisplay: false,
                         type: "date",
diff --git a/src/views/tool/code.vue b/src/views/tool/code.vue
index 694309b..bde1845 100644
--- a/src/views/tool/code.vue
+++ b/src/views/tool/code.vue
@@ -9,12 +9,14 @@
                 <el-button type="danger" size="small" icon="el-icon-delete" v-if="permission.code_delete" plain
                     @click="handleDelete">删 除
                 </el-button>
+
                 <el-button type="primary" size="small" plain icon="el-icon-refresh" @click="handleBuild">代码生成
                 </el-button>
             </template>
-            <template slot-scope="scope" slot="menu">
-                <el-button type="text" size="small" icon="el-icon-document-copy" v-if="permission.code_edit"
-                    class="none-border" @click.stop="handleCopy(scope.row)">复制
+
+            <template slot-scope="{row, size}" slot="menu">
+                <el-button type="text" :size="size" icon="el-icon-document-copy" v-if="permission.code_edit"
+                    class="none-border" @click.stop="handleCopy(row)">复制
                 </el-button>
             </template>
         </avue-crud>
@@ -41,17 +43,19 @@
                 total: 0
             },
             option: {
+                labelWidth: 120,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 280,
+
                 height: 'auto',
                 calcHeight: 30,
                 dialogWidth: 900,
                 tip: false,
-                searchShow: true,
-                searchMenuSpan: 6,
                 border: true,
                 index: true,
                 selection: true,
-                labelWidth: 120,
-                menuWidth: 280,
                 viewBtn: true,
                 dialogClickModal: false,
                 tabs: true,
@@ -59,6 +63,8 @@
                     {
                         label: "模块名",
                         prop: "codeName",
+                        searchLabelWidth: 80,
+                        searchSpan: 4,
                         search: true,
                         display: false,
                     },
@@ -72,12 +78,16 @@
                     {
                         label: "表名",
                         prop: "tableName",
+                        searchLabelWidth: 66,
+                        searchSpan: 4,
                         search: true,
                         display: false,
                     },
                     {
                         label: "服务名",
                         prop: "serviceName",
+                        searchLabelWidth: 80,
+                        searchSpan: 4,
                         search: true,
                         display: false,
                     },
diff --git a/src/views/tool/datasource.vue b/src/views/tool/datasource.vue
index 75b1d8d..276aef6 100644
--- a/src/views/tool/datasource.vue
+++ b/src/views/tool/datasource.vue
@@ -30,18 +30,21 @@
             },
             selectionList: [],
             option: {
+                labelWidth: 96,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 210,
+
                 height: 'auto',
                 calcHeight: 30,
                 dialogWidth: 900,
                 tip: false,
-                searchShow: true,
-                searchMenuSpan: 6,
                 border: true,
                 index: true,
                 viewBtn: true,
                 selection: true,
                 dialogClickModal: false,
-                menuWidth: 280,
                 column: [
                     {
                         label: "名称",
diff --git a/src/views/tool/model.vue b/src/views/tool/model.vue
index 6c8800f..a723f26 100644
--- a/src/views/tool/model.vue
+++ b/src/views/tool/model.vue
@@ -72,8 +72,13 @@
             stepEnd: 4,
             data: [],
             option: {
-                menuWidth: 280,
                 ...option,
+
+                labelWidth: 120,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 240,
             },
             optionModel: optionModel,
             formStep: {},

--
Gitblit v1.9.3