修改数据分类

.eslintrc.js

@@ -67,27 +67,18 @@ module.exports = {
             'after': true
         }],
         'handle-callback-err': [2, '^(err|error)$'],
-        // 'indent': ["off", 2, {
-        //     'SwitchCase': 1
+        'indent': [2, 4, {
+            'SwitchCase': 1
+        }],
+        // "vue/script-indent": [2, 4, {
+        //     "baseIndent": 1,
+        //     "switchCase": 1
         // }],
-        "vue/script-indent": [
-            2,
-            4,
-            {
-                "baseIndent": 1,
-                "switchCase": 1,
-                "MemberExpression": 1
-            }
-        ],
-        "vue/html-indent": [
-            2,
-            4,
-            {
-                "attribute": 1,
-                "closeBracket": 0,
-                "alignAttributesVertically": true
-            }
-        ],
+        "vue/html-indent": [2, 4, {
+            "attribute": 1,
+            "closeBracket": 0,
+            "alignAttributesVertically": true
+        }],
         'jsx-quotes': [2, 'prefer-single'],
         'key-spacing': [2, {
             'beforeColon': false,
@@ -174,13 +165,7 @@ module.exports = {
         }],
         'no-unreachable': 2,
         'no-unsafe-finally': 2,
-        // 'no-unused-vars': [2, {
-        //     'vars': 'all',
-        //     'args': 'none'
-        // }],
-        // 当存在定义而未使用的组件时，关闭报错
         'vue/no-unused-components': 'off',
-        // 当存在定义而未使用的变量时，关闭报错
         'no-unused-vars': 'off',
         'no-useless-call': 2,
         'no-useless-computed-key': 2,
@@ -208,7 +193,7 @@ module.exports = {
             'after': true
         }],
         'space-before-blocks': [2, 'always'],
-        'space-before-function-paren': [2, 'never'],
+        'space-before-function-paren': [2, 'always'],
         'space-in-parens': [2, 'never'],
         'space-infix-ops': 2,
         'space-unary-ops': [2, {
@@ -235,4 +220,4 @@ module.exports = {
         'no-prototype-builtins': 'off',
         'no-irregular-whitespace': 'off'
     }
-}
+}

src/business/platform/auth/api/dialog.vue

@@ -1,150 +1,150 @@
 <template>
-  <ibps-selector-dialog
-    :value="selectedValue"
-    :visible="selectorVisible"
-    :is-disabled="isDisabled"
-    v-bind="$props"
-    class="selector-dialog"
-    @input="value => selectedValue = value"
-    @remove-select="setSelectRow"
-    @close="handleClose"
-    @action-event="handleActionEvent"
-  >
-    <template slot-scope="scope">
-      <ibps-selector-panel
-        ref="panel"
-        v-bind="scope"
-        :default-params="defaultParams"
-        :grant-type="grantType"
-        @selected="value => selectedValue = value"
-        @closeAll="closeAll"
-      />
-    </template>
-  </ibps-selector-dialog>
+    <ibps-selector-dialog
+        :value="selectedValue"
+        :visible="selectorVisible"
+        :is-disabled="isDisabled"
+        v-bind="$props"
+        class="selector-dialog"
+        @input="value => selectedValue = value"
+        @remove-select="setSelectRow"
+        @close="handleClose"
+        @action-event="handleActionEvent"
+    >
+        <template slot-scope="scope">
+            <ibps-selector-panel
+                ref="panel"
+                v-bind="scope"
+                :default-params="defaultParams"
+                :grant-type="grantType"
+                @selected="value => selectedValue = value"
+                @closeAll="closeAll"
+            />
+        </template>
+    </ibps-selector-dialog>
 </template>
 <script>
 import IbpsSelectorDialog from '@/components/ibps-selector/dialog'
 import IbpsSelectorPanel from './panel'
 export default {
-  components: {
-    IbpsSelectorDialog,
-    IbpsSelectorPanel
-  },
-  props: {
-    isDisabled: { // 是否多选
-      type: Boolean,
-      default: false
-    },
-    visible: Boolean, // 是否可见
-    title: { // 标题
-      type: String,
-      default: '接口选择器'
-    },
-    marginTop: { // Dialog CSS 中的 margin-top 值
-      type: String,
-      default: '5vh'
-    },
-    width: { // 宽
-      type: String,
-      default: '60%'
-    },
-    height: { // 高
-      type: String,
-      default: '415px'
-    },
-    closeOnClickModal: { // 是否可以通过点击 modal 关闭 Dialog
-      type: Boolean,
-      default: false
-    },
-    closeOnPressEscape: { // 是否可以通过按下 ESC 关闭 Dialog
-      type: Boolean,
-      default: false
-    },
-    showClose: { // 是否显示关闭按钮
-      type: Boolean,
-      default: true
-    },
-    beforeClose: { // 关闭前的回调，会暂停 Dialog 的关闭
-      type: Function
-    },
-    fullscreen: { // 是否为全屏 Dialog
-      type: Boolean,
-      default: false
-    },
-    labelKey: { // 展示的值
-      type: String,
-      default: 'apiName'
-    },
-    value: { // value
-      type: [Object, Array],
-      default() { return this.multiple ? [] : {} }
-    },
-    cleanClose: { // 按钮清空并关闭
-      type: Boolean,
-      default: false
-    },
-    buttons: { // 按钮组
-      type: Array
-    },
-    confirmButtonText: {
-      type: String,
-      default: '选择'
-    },
-    cleanButtonText: String,
-    cancelButtonText: String,
-    multiple: { // 是否多选
-      type: Boolean,
-      default: false
-    },
-    defaultParams: Object
-  },
-  data() {
-    return {
-      selectorVisible: false,
-      selectedValue: this.multiple ? [] : {},
-      grantType: ''
-    }
-  },
-  watch: {
-    visible: {
-      handler: function(val, oldVal) {
-        this.selectorVisible = this.visible
-      },
-      immediate: true
-    },
-    value() {
-      this.selectedValue = this.value
-    },
-    defaultParams: {
-      handler: function(val, oldVal) {
-        if (val.grantType === 'user') {
-          this.grantType = val.grantType
+    components: {
+        IbpsSelectorDialog,
+        IbpsSelectorPanel
+    },
+    props: {
+        isDisabled: { // 是否多选
+            type: Boolean,
+            default: false
+        },
+        visible: Boolean, // 是否可见
+        title: { // 标题
+            type: String,
+            default: '接口选择器'
+        },
+        marginTop: { // Dialog CSS 中的 margin-top 值
+            type: String,
+            default: '5vh'
+        },
+        width: { // 宽
+            type: String,
+            default: '60%'
+        },
+        height: { // 高
+            type: String,
+            default: '415px'
+        },
+        closeOnClickModal: { // 是否可以通过点击 modal 关闭 Dialog
+            type: Boolean,
+            default: false
+        },
+        closeOnPressEscape: { // 是否可以通过按下 ESC 关闭 Dialog
+            type: Boolean,
+            default: false
+        },
+        showClose: { // 是否显示关闭按钮
+            type: Boolean,
+            default: true
+        },
+        beforeClose: { // 关闭前的回调，会暂停 Dialog 的关闭
+            type: Function
+        },
+        fullscreen: { // 是否为全屏 Dialog
+            type: Boolean,
+            default: false
+        },
+        labelKey: { // 展示的值
+            type: String,
+            default: 'apiName'
+        },
+        value: { // value
+            type: [Object, Array],
+            default () { return this.multiple ? [] : {} }
+        },
+        cleanClose: { // 按钮清空并关闭
+            type: Boolean,
+            default: false
+        },
+        buttons: { // 按钮组
+            type: Array
+        },
+        confirmButtonText: {
+            type: String,
+            default: '选择'
+        },
+        cleanButtonText: String,
+        cancelButtonText: String,
+        multiple: { // 是否多选
+            type: Boolean,
+            default: false
+        },
+        defaultParams: Object
+    },
+    data () {
+        return {
+            selectorVisible: false,
+            selectedValue: this.multiple ? [] : {},
+            grantType: ''
         }
-      },
-      deep: true
-    }
-  },
-  methods: {
-    setSelectRow() {
-      this.$refs['panel'].setSelectRow()
-    },
-    handleClose(visible) {
-      this.$emit('close', visible)
-    },
-    handleActionEvent(key, data) {
-      if (key === 'clean') {
-        this.setSelectRow()
-      }
-      this.$emit('action-event', key, data)
     },
-    handlerListData() {
-      this.$refs['panel'].loadListData()
+    watch: {
+        visible: {
+            handler: function (val, oldVal) {
+                this.selectorVisible = this.visible
+            },
+            immediate: true
+        },
+        value () {
+            this.selectedValue = this.value
+        },
+        defaultParams: {
+            handler: function (val, oldVal) {
+                if (val.grantType === 'user') {
+                    this.grantType = val.grantType
+                }
+            },
+            deep: true
+        }
     },
-    closeAll() {
-      this.selectorVisible = false
-      this.$emit('closeAll')
+    methods: {
+        setSelectRow () {
+            this.$refs['panel'].setSelectRow()
+        },
+        handleClose (visible) {
+            this.$emit('close', visible)
+        },
+        handleActionEvent (key, data) {
+            if (key === 'clean') {
+                this.setSelectRow()
+            }
+            this.$emit('action-event', key, data)
+        },
+        handlerListData () {
+            this.$refs['panel'].loadListData()
+        },
+        closeAll () {
+            this.selectorVisible = false
+            this.$emit('closeAll')
+        }
     }
-  }
 }
 </script>
 <style lang="scss">

src/business/platform/data/templatebuilder/right-aside/propertys/index.vue

@@ -31,7 +31,7 @@
           <el-form-item label="模版分类" prop="typeId">
             <ibps-type-select
               v-model="dataTemplate.typeId"
-              category-key="DATA_TEMPLATE_TYPE"
+              category-key="BO_TYPE"
               clearable
               @input="(val)=>handleInput('typeId',val)"
             />

src/business/platform/form/formbuilder/right-aside/propertys/index.vue

@@ -25,7 +25,7 @@
           <el-form-item label="表单分类">
             <ibps-type-select
               v-model="formDef.typeId"
-              category-key="FORM_TYPE"
+              category-key="BO_TYPE"
               placeholder="请选择表单分类"
               clearable
             />

src/views/platform/bo/boDef/list.vue

@@ -1,92 +1,92 @@
 <template>
-  <ibps-layout ref="layout">
-    <div slot="west">
-      <ibps-type-tree
-        :width="width"
-        :height="height"
-        :has-contextmenu="true"
-        category-key="BO_TYPE"
-        title="业务对象分类"
-        @treeData="treeData"
-        @node-click="handleNodeClick"
-        @expand-collapse="handleExpandCollapse"
-      />
-    </div>
-    <ibps-crud
-      ref="crud"
-      :style="{ marginLeft: width+'px' }"
-      :height="height"
-      :data="listData"
-      :toolbars="listConfig.toolbars"
-      :search-form="listConfig.searchForm"
-      :pk-key="pkKey"
-      :columns="listConfig.columns"
-      :row-handle="listConfig.rowHandle"
-      :pagination="pagination"
-      :loading="loading"
-      :index-row="false"
-      @row-click="handleRowClick"
-      @action-event="handleAction"
-      @sort-change="handleSortChange"
-      @pagination-change="handlePaginationChange"
-    >
-    <!--    @column-link-click="handleLinkClick"-->
-      <div slot="versionCount" slot-scope="scope">
-        默认：
-        <el-link type="primary" @click="handleVersion(scope.row.id)">版本({{ scope.row.version }})</el-link>
-        <el-link class="ibps-ml-5" type="primary" @click="handleVersionCount(scope.row.code)">更多版本({{ scope.row.versionCount }})</el-link>
-      </div>
-    </ibps-crud>
-    <!-- 添加编辑明细 -->
-    <edit
-      :id="editId"
-      :code="code"
-      :type-id="typeId"
-      :visible="dialogFormVisible"
-      :readonly="readonly"
-      title="业务对象添加"
-      @callback="search"
-      @close="visible => dialogFormVisible = visible"
-    />
-    <!-- 设置分类 -->
-    <setting-type
-      :visible="settingTypeFormVisible"
-      title="设置业务对象分类"
-      category-key="BO_TYPE"
-      @save="saveSettingType"
-      @close="visible => settingTypeFormVisible = visible"
-    />
-    <!-- 导入 -->
-    <import-bo
-      :id="editId"
-      :visible="importFormVisible"
-      @callback="search"
-      @close="visible => importFormVisible = visible"
-    />
-    <!-- 导出 -->
-    <export-bo
-      :id="editId"
-      title="导出业务对象数据配置"
-      :visible="exportVisible"
-      @callback="search"
-      @close="visible => exportVisible = visible"
-    />
-    <!-- 更多版本 -->
-    <more-versions
-      :code="code"
-      :visible="versionsFormVisible"
-      @callback="search"
-      @close="visible => versionsFormVisible = visible"
-    />
-    <!-- 复制 -->
-    <copy
-      :id="editId"
-      :copy-data="copyData"
-      :visible="copyFormVisible"
-      @callback="search"
-      @close="visible => copyFormVisible = visible"
-    />
-  </ibps-layout>
+    <ibps-layout ref="layout">
+        <div slot="west">
+            <ibps-type-tree
+                :width="width"
+                :height="height"
+                :has-contextmenu="true"
+                category-key="BO_TYPE"
+                title="业务对象分类"
+                @treeData="treeData"
+                @node-click="handleNodeClick"
+                @expand-collapse="handleExpandCollapse"
+            />
+        </div>
+        <ibps-crud
+            ref="crud"
+            :style="{ marginLeft: width+'px' }"
+            :height="height"
+            :data="listData"
+            :toolbars="listConfig.toolbars"
+            :search-form="listConfig.searchForm"
+            :pk-key="pkKey"
+            :columns="listConfig.columns"
+            :row-handle="listConfig.rowHandle"
+            :pagination="pagination"
+            :loading="loading"
+            :index-row="false"
+            @row-click="handleRowClick"
+            @action-event="handleAction"
+            @sort-change="handleSortChange"
+            @pagination-change="handlePaginationChange"
+        >
+            <!--    @column-link-click="handleLinkClick"-->
+            <div slot="versionCount" slot-scope="scope">
+                默认：
+                <el-link type="primary" @click="handleVersion(scope.row.id)">版本({{ scope.row.version }})</el-link>
+                <el-link class="ibps-ml-5" type="primary" @click="handleVersionCount(scope.row.code)">更多版本({{ scope.row.versionCount }})</el-link>
+            </div>
+        </ibps-crud>
+        <!-- 添加编辑明细 -->
+        <edit
+            :id="editId"
+            :code="code"
+            :type-id="typeId"
+            :visible="dialogFormVisible"
+            :readonly="readonly"
+            title="业务对象添加"
+            @callback="search"
+            @close="visible => dialogFormVisible = visible"
+        />
+        <!-- 设置分类 -->
+        <setting-type
+            :visible="settingTypeFormVisible"
+            title="设置业务对象分类"
+            category-key="BO_TYPE"
+            @save="saveSettingType"
+            @close="visible => settingTypeFormVisible = visible"
+        />
+        <!-- 导入 -->
+        <import-bo
+            :id="editId"
+            :visible="importFormVisible"
+            @callback="search"
+            @close="visible => importFormVisible = visible"
+        />
+        <!-- 导出 -->
+        <export-bo
+            :id="editId"
+            title="导出业务对象数据配置"
+            :visible="exportVisible"
+            @callback="search"
+            @close="visible => exportVisible = visible"
+        />
+        <!-- 更多版本 -->
+        <more-versions
+            :code="code"
+            :visible="versionsFormVisible"
+            @callback="search"
+            @close="visible => versionsFormVisible = visible"
+        />
+        <!-- 复制 -->
+        <copy
+            :id="editId"
+            :copy-data="copyData"
+            :visible="copyFormVisible"
+            @callback="search"
+            @close="visible => copyFormVisible = visible"
+        />
+    </ibps-layout>
 </template>
 <script>
 import { queryPageList, remove, synBoTable, genBoTable, setCategory, exportFile, getTableProfix } from '@/api/platform/bo/boDef'
@@ -104,367 +104,366 @@ import exportBo from './export'
 import MoreVersions from './more-versions'
 
 export default {
-  components: {
-    IbpsTypeTree,
-    SettingType,
-    MoreVersions,
-    Edit,
-    exportBo,
-    importBo,
-    Copy
-  },
-  mixins: [FixHeight],
-  data() {
-    return {
-      width: 200,
-      height: document.clientHeight,
-      settingTypeFormVisible: false, // 弹窗
-      dialogFormVisible: false,
-      versionsFormVisible: false,
-      importFormVisible: false,
-      exportVisible: false,
-      copyFormVisible: false,
-      readonly: false,
-      editId: '', // 编辑dialog需要使用
-      code: '',
-      typeId: '',
-      prefix: '',
-      copyData: {},
-      pkKey: 'id', // 主键  如果主键不是pk需要传主键
-      loading: false,
-      listData: [],
-      typeFiler:[],//类型过滤
-      listConfig: {
-        // 工具栏
-        toolbars: [
-          { key: 'search' },
-          { key: 'add' },
-          { key: 'edit' },
-          { key: 'remove' },
-          {
-            key: 'setCategory',
-            label: '设置分类',
-            icon: 'ibps-icon-cog'
-          },
-          {
-            key: 'export'
-          },
-          {
-            key: 'import'
-          }
-        ],
-        // 查询条件
-        searchForm: {
-          forms: [
-            { prop: 'Q^NAME_^SL', label: '名称' },
-            { prop: 'Q^CODE_^SL', label: '编码' },
-           /* {
+    components: {
+        IbpsTypeTree,
+        SettingType,
+        MoreVersions,
+        Edit,
+        exportBo,
+        importBo,
+        Copy
+    },
+    mixins: [FixHeight],
+    data () {
+        return {
+            width: 200,
+            height: document.clientHeight,
+            settingTypeFormVisible: false, // 弹窗
+            dialogFormVisible: false,
+            versionsFormVisible: false,
+            importFormVisible: false,
+            exportVisible: false,
+            copyFormVisible: false,
+            readonly: false,
+            editId: '', // 编辑dialog需要使用
+            code: '',
+            typeId: '',
+            prefix: '',
+            copyData: {},
+            pkKey: 'id', // 主键  如果主键不是pk需要传主键
+            loading: false,
+            listData: [],
+            typeFiler: [], // 类型过滤
+            listConfig: {
+                // 工具栏
+                toolbars: [
+                    { key: 'search' },
+                    { key: 'add' },
+                    { key: 'edit' },
+                    { key: 'remove' },
+                    {
+                        key: 'setCategory',
+                        label: '设置分类',
+                        icon: 'ibps-icon-cog'
+                    },
+                    {
+                        key: 'export'
+                    },
+                    {
+                        key: 'import'
+                    }
+                ],
+                // 查询条件
+                searchForm: {
+                    forms: [
+                        { prop: 'Q^NAME_^SL', label: '名称' },
+                        { prop: 'Q^CODE_^SL', label: '编码' }
+                        /* {
               prop: 'Q^IS_CREATE_TABLE_^S',
               label: '是否生成表',
               fieldType: 'select',
               options: createTabelOptions
             } */
-          ]
-        },
-        // 表格字段配置
-        columns: [
-          { prop: 'name', label: '名称', sortable: true, width: 150 },
-          { prop: 'code', label: '编码', sortable: true, width: 150 },
-          { prop: 'versionCount', label: '版本信息', fieldType: 'slot', slotName: 'versionCount' },
-          {prop:'typeId',label:'归分类型', sortable: true, width: 120 },
-          { prop: 'status', label: '状态', sortable: true, width: 100, tags: statusOptions },
-          { prop: 'boType', label: '对象类型', sortable: true, width: 100, tags: boTypeOptions },
-          { prop: 'isCreateTable', label: '生成表', sortable: true, tags: createTabelOptions, width: 80 },
-          {prop:'createTime',label:'创建时间', sortable: true, width: 150 }
-        ],
-        // 管理列
-        rowHandle: {
-          actions: [
-            {
-              key: 'genBoTable',
-              label: '生成表',
-              icon: 'ibps-icon-cog',
-              hidden: (row, index) => {
-                return !(row.boType === 'object' && row.isCreateTable === 'N')
-              }
-            },
-            {
-              key: 'synBoTable',
-              label: '同步表结构',
-              icon: 'ibps-icon-exchange',
-              hidden: (row, index) => {
-                return row.boType !== 'out'
-              }
+                    ]
+                },
+                // 表格字段配置
+                columns: [
+                    { prop: 'name', label: '名称', sortable: true, minWidth: 250 },
+                    { prop: 'code', label: '编码', sortable: true, width: 100 },
+                    { prop: 'versionCount', label: '版本信息', fieldType: 'slot', slotName: 'versionCount', width: 180 },
+                    { prop: 'typeId', label: '归分类型', sortable: true, width: 120 },
+                    { prop: 'status', label: '状态', sortable: true, width: 100, tags: statusOptions },
+                    { prop: 'boType', label: '对象类型', sortable: true, width: 100, tags: boTypeOptions },
+                    { prop: 'isCreateTable', label: '生成表', sortable: true, tags: createTabelOptions, width: 80 },
+                    { prop: 'createTime', label: '创建时间', sortable: true, width: 150 }
+                ],
+                // 管理列
+                rowHandle: {
+                    actions: [
+                        {
+                            key: 'genBoTable',
+                            label: '生成表',
+                            icon: 'ibps-icon-cog',
+                            hidden: (row, index) => {
+                                return !(row.boType === 'object' && row.isCreateTable === 'N')
+                            }
+                        },
+                        {
+                            key: 'synBoTable',
+                            label: '同步表结构',
+                            icon: 'ibps-icon-exchange'
+                            //   hidden: (row, index) => {
+                            //     return row.boType === 'out'
+                            //   }
+                        },
+                        {
+                            key: 'copy',
+                            label: '复制',
+                            icon: 'ibps-icon-copy',
+                            hidden: (row, index) => {
+                                return row.boType === 'out'
+                            }
+                        },
+                        { key: 'edit' },
+                        { key: 'remove' },
+                        { key: 'detail' }
+                    ]
+                }
             },
-            {
-              key: 'copy',
-              label: '复制',
-              icon: 'ibps-icon-copy',
-              hidden: (row, index) => {
-                return row.boType === 'out'
-              }
-            },
-            { key: 'edit' },
-            { key: 'remove' },
-            { key: 'detail' }
-          ]
-        }
-      },
-      pagination: {},
-      sorts: {}
+            pagination: {},
+            sorts: {}
 
-    }
-  },
-  created() {
-    this.loadData()
-  },
-  methods: {
+        }
+    },
+    created () {
+        this.loadData()
+    },
+    methods: {
     /**
      * 加载数据
      */
-    loadData(id = '') {
-      this.loading = true
-      queryPageList(this.getFormatParams(id)).then(response => {
-        response.data.dataResult.forEach((item)=>{
-            if(item.typeId && this.typeFiler.length){
-                let temp = this.typeFiler.find(i => i.id === item.typeId)
-                item.typeId = temp ? temp.name : '未分类'
-            } else {
-                item.typeId = item.typeId ? '分类被删除': '未分类'
-            }
-        })
-        ActionUtils.handleListData(this, response.data)
-        this.loading = false
-      }).catch(() => {
-        this.loading = false
-      })
-
-    },
-    /**
+        loadData (id = '') {
+            this.loading = true
+            queryPageList(this.getFormatParams(id)).then(response => {
+                response.data.dataResult.forEach((item) => {
+                    if (item.typeId && this.typeFiler.length) {
+                        const temp = this.typeFiler.find(i => i.id === item.typeId)
+                        item.typeId = temp ? temp.name : '未分类'
+                    } else {
+                        item.typeId = item.typeId ? 'a0分类被删除' : 'z9未分类'
+                    }
+                })
+                ActionUtils.handleListData(this, response.data)
+                this.loading = false
+            }).catch(() => {
+                this.loading = false
+            })
+        },
+        /**
      * 获取格式化参数
      */
-    getFormatParams() {
-      const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
-      params['Q^TYPE_ID_^S'] = this.typeId
-      return ActionUtils.formatParams(
-        params,
-        this.pagination,
-        this.sorts)
-    },
-    /**
+        getFormatParams () {
+            const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
+            params['Q^TYPE_ID_^S'] = this.typeId
+            return ActionUtils.formatParams(
+                params,
+                this.pagination,
+                this.sorts)
+        },
+        /**
      * 处理分页事件
      */
-    handlePaginationChange(page) {
-      ActionUtils.setPagination(this.pagination, page)
-      this.loadData()
-    },
-    /**
+        handlePaginationChange (page) {
+            ActionUtils.setPagination(this.pagination, page)
+            this.loadData()
+        },
+        /**
      * 处理排序
      */
-    handleSortChange(sort) {
-      ActionUtils.setSorts(this.sorts, sort)
-      this.loadData()
-    },
-    search() {
-      this.loadData()
-    },
-    /**
+        handleSortChange (sort) {
+            ActionUtils.setSorts(this.sorts, sort)
+            this.loadData()
+        },
+        search () {
+            this.loadData()
+        },
+        /**
      * 设置分类
      */
-    handleSetCategory(editId) {
-      this.editId = editId || ''
-      this.settingTypeFormVisible = true
-    },
-    /**
+        handleSetCategory (editId) {
+            this.editId = editId || ''
+            this.settingTypeFormVisible = true
+        },
+        /**
      * 保存分类
      */
-    saveSettingType(typeId) {
-      setCategory({
-        boDefIds: this.editId,
-        typeId: typeId
-      }).then(response => {
-        ActionUtils.successMessage('保存成功')
-        this.settingTypeFormVisible = false
-        this.search()
-      }).catch((err) => {
-        console.error(err)
-      })
-    },
-    /**
+        saveSettingType (typeId) {
+            setCategory({
+                boDefIds: this.editId,
+                typeId: typeId
+            }).then(response => {
+                ActionUtils.successMessage('保存成功')
+                this.settingTypeFormVisible = false
+                this.search()
+            }).catch((err) => {
+                console.error(err)
+            })
+        },
+        /**
      * 添加
      */
-    handleEdit(editId = '', readonly = false) {
-      this.editId = editId || ''
-      this.readonly = readonly
-      this.dialogFormVisible = true
-    },
-    /**
+        handleEdit (editId = '', readonly = false) {
+            this.editId = editId || ''
+            this.readonly = readonly
+            this.dialogFormVisible = true
+        },
+        /**
      * 更多版本
      */
-    handleVersions(code = '') {
-      this.code = code || ''
-      this.versionsFormVisible = true
-    },
-    // 获取code
-    handleRowClick(row, event, column) {
-      this.code = row.code
-    },
-    /**
+        handleVersions (code = '') {
+            this.code = code || ''
+            this.versionsFormVisible = true
+        },
+        // 获取code
+        handleRowClick (row, event, column) {
+            this.code = row.code
+        },
+        /**
      * 点击表格
      */
-   /* handleLinkClick(data, columns) {
+        /* handleLinkClick(data, columns) {
       console.log(data.id)
     }, */
-    /**
+        /**
      * 复制
      */
-    handleCopy(editId = '') {
-      this.editId = editId || ''
-      this.copyFormVisible = true
-    },
-    /* 左侧列表参数*/
-    treeData(data){
-      this.typeFiler = data
-    },
-    /**
+        handleCopy (editId = '') {
+            this.editId = editId || ''
+            this.copyFormVisible = true
+        },
+        /* 左侧列表参数*/
+        treeData (data) {
+            this.typeFiler = data
+        },
+        /**
      * 处理按钮事件
      */
-    handleAction(command, position, selection, data) {
-      switch (command) {
-        case 'search':// 查询
-          ActionUtils.setFirstPagination(this.pagination)
-          this.search()
-          break
-        case 'add':// 添加
-          this.handleEdit()
-          break
-        case 'edit': // 编辑
-          ActionUtils.selectedRecord(selection).then((id) => {
-            this.handleEdit(id)
-            this.code = data.code
-          }).catch(() => { })
-          break
-        case 'remove': // 删除
-          ActionUtils.removeRecord(selection).then((ids) => {
-            this.handleRemove(ids)
-          }).catch(() => { })
-          break
-        case 'detail': // 明细
-          ActionUtils.selectedRecord(selection).then((ids) => {
-            this.handleEdit(ids, true)
-          }).catch(() => { })
-          break
-        case 'setCategory': // 设置分类
-          ActionUtils.selectedMultiRecord(selection).then((id) => {
-            this.handleSetCategory(id)
-          }).catch(() => { })
-          break
-        case 'export': // 导出
-          ActionUtils.selectedMultiRecord(selection).then((ids) => {
-            this.handleExport(ids)
-          }).catch(() => { })
-          break
-        case 'import': // 导入
-          this.handleImport()
-          break
-        case 'copy': // 复制
-          ActionUtils.selectedRecord(selection).then((id) => {
-            this.handleCopy(id)
-            this.copyData = data
-          }).catch(() => { })
-          break
-        case 'genBoTable': // 生成表
-          getTableProfix().then(res => {
-            ActionUtils.selectedRecord(selection).then((id) => {
-              this.$confirm('确定生成表吗？表名自动添加【' + res.data + '】业务前缀。', '消息', {
+        handleAction (command, position, selection, data) {
+            switch (command) {
+                case 'search':// 查询
+                    ActionUtils.setFirstPagination(this.pagination)
+                    this.search()
+                    break
+                case 'add':// 添加
+                    this.handleEdit()
+                    break
+                case 'edit': // 编辑
+                    ActionUtils.selectedRecord(selection).then((id) => {
+                        this.handleEdit(id)
+                        this.code = data.code
+                    }).catch(() => { })
+                    break
+                case 'remove': // 删除
+                    ActionUtils.removeRecord(selection).then((ids) => {
+                        this.handleRemove(ids)
+                    }).catch(() => { })
+                    break
+                case 'detail': // 明细
+                    ActionUtils.selectedRecord(selection).then((ids) => {
+                        this.handleEdit(ids, true)
+                    }).catch(() => { })
+                    break
+                case 'setCategory': // 设置分类
+                    ActionUtils.selectedMultiRecord(selection).then((id) => {
+                        this.handleSetCategory(id)
+                    }).catch(() => { })
+                    break
+                case 'export': // 导出
+                    ActionUtils.selectedMultiRecord(selection).then((ids) => {
+                        this.handleExport(ids)
+                    }).catch(() => { })
+                    break
+                case 'import': // 导入
+                    this.handleImport()
+                    break
+                case 'copy': // 复制
+                    ActionUtils.selectedRecord(selection).then((id) => {
+                        this.handleCopy(id)
+                        this.copyData = data
+                    }).catch(() => { })
+                    break
+                case 'genBoTable': // 生成表
+                    getTableProfix().then(res => {
+                        ActionUtils.selectedRecord(selection).then((id) => {
+                            this.$confirm('确定生成表吗？表名自动添加【' + res.data + '】业务前缀。', '消息', {
+                                confirmButtonText: '确定',
+                                cancelButtonText: '取消',
+                                type: 'warning'
+                            }).then(() => {
+                                this.handleGenBoTable(id)
+                                ActionUtils.success('生成表成功！')
+                            }).catch(() => {})
+                        }).catch(() => { })
+                    })
+                    break
+                case 'synBoTable': // 同步表结构
+                    ActionUtils.selectedRecord(selection).then((id) => {
+                        this.$confirm('是否同步表结构?', '消息', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                        }).then(() => {
+                            this.handlesynBoTable(id)
+                        }).catch(() => {})
+                    }).catch(() => {})
+                    break
+                default:
+                    break
+            }
+        },
+        handleExport (ids) {
+            this.$confirm('是否进一步配置导出数据？否，则直接导出当前业务对象。', '业务导出', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
-              }).then(() => {
-                this.handleGenBoTable(id)
-                ActionUtils.success('生成表成功！')
-              }).catch(() => {})
-            }).catch(() => { })
-          })
-          break
-        case 'synBoTable': // 同步表结构
-          ActionUtils.selectedRecord(selection).then((id) => {
-            this.$confirm('是否同步表结构?', '消息', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
             }).then(() => {
-              this.handlesynBoTable(id)
-            }).catch(() => {})
-          }).catch(() => {})
-          break
-        default:
-          break
-      }
-    },
-    handleExport(ids) {
-      this.$confirm('是否进一步配置导出数据？否，则直接导出当前业务对象。', '业务导出', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.editId = ids
-        this.exportVisible = true
-      }).catch(() => {
-        exportFile({ boDefIds: ids }).then((response) => {
-          if (!response) {
-            return
-          }
-          ActionUtils.exportFile(
-            response.data,
-            'boDef_' + fecha.formatDate('yyyyMMddHHmmss') + '.zip'
-          )
-        })
-      })
-    },
-    handleImport() {
-      this.importFormVisible = true
-    },
-    handleRemove(id) {
-      remove({
-        boDefIds: id,
-        rmType: 'all',
-        clean: true
-      }).then(response => {
-        this.loadData()
-      })
-    },
-    handlesynBoTable(id) {
-      synBoTable({
-        boDefId: id
-      }).then(response => {
-        this.$message({
-          type: 'success',
-          message: '同步外部数据表结构成功！'
-        })
-        this.loadData()
-      })
-    },
-    handleGenBoTable(id) {
-      genBoTable({
-        boDefId: id
-      }).then(response => {
-        this.loadData()
-      })
-    },
-    handleVersion(id) {
-      this.handleEdit(id, true)
-    },
-    handleVersionCount(code) {
-      this.handleVersions(code)
-    },
-    handleNodeClick(id) {
-      this.typeId = id
-      this.loadData(id)
-    },
-    handleExpandCollapse(isExpand) {
-      this.width = isExpand ? 230 : 30
+                this.editId = ids
+                this.exportVisible = true
+            }).catch(() => {
+                exportFile({ boDefIds: ids }).then((response) => {
+                    if (!response) {
+                        return
+                    }
+                    ActionUtils.exportFile(
+                        response.data,
+                        'boDef_' + fecha.formatDate('yyyyMMddHHmmss') + '.zip'
+                    )
+                })
+            })
+        },
+        handleImport () {
+            this.importFormVisible = true
+        },
+        handleRemove (id) {
+            remove({
+                boDefIds: id,
+                rmType: 'all',
+                clean: true
+            }).then(response => {
+                this.loadData()
+            })
+        },
+        handlesynBoTable (id) {
+            synBoTable({
+                boDefId: id
+            }).then(response => {
+                this.$message({
+                    type: 'success',
+                    message: '同步外部数据表结构成功！'
+                })
+                this.loadData()
+            })
+        },
+        handleGenBoTable (id) {
+            genBoTable({
+                boDefId: id
+            }).then(response => {
+                this.loadData()
+            })
+        },
+        handleVersion (id) {
+            this.handleEdit(id, true)
+        },
+        handleVersionCount (code) {
+            this.handleVersions(code)
+        },
+        handleNodeClick (id) {
+            this.typeId = id
+            this.loadData(id)
+        },
+        handleExpandCollapse (isExpand) {
+            this.width = isExpand ? 230 : 30
+        }
     }
-  }
 }
 </script>

src/views/platform/data/dataTemplate/create.vue

@@ -28,7 +28,7 @@
         <ibps-type-select
           ref="typeSelect"
           v-model="dataTemplate.typeId"
-          category-key="DATA_TEMPLATE_TYPE"
+          category-key="BO_TYPE"
           clearable
         />
       </el-form-item>

src/views/platform/data/dataTemplate/list.vue

@@ -165,7 +165,7 @@ export default {
       height: 500,
       title: '创建页面、对话框管理',
       createText: '创建数据模版',
-      categoryKey: 'DATA_TEMPLATE_TYPE',
+      categoryKey: 'BO_TYPE',
       typeId: '',
       pkKey: 'id', // 主键  如果主键不是pk需要传主键
       loading: false,

src/views/platform/data/dataset/edit.vue

@@ -39,7 +39,7 @@
               ref="ibpsType"
               v-model="form.typeId"
               :readonly="readonly"
-              category-key="DATASET_TYPE"
+              category-key="BO_TYPE"
               class="type"
             />
           </el-form-item>

src/views/platform/data/dataset/list.vue

@@ -7,7 +7,7 @@ y
         :height="height"
         :has-contextmenu="true"
         title="数据集分类"
-        category-key="DATASET_TYPE"
+        category-key="BO_TYPE"
         @treeData="treeData"
         @node-click="handleNodeClick"
         @expand-collapse="handleExpandCollapse"
@@ -34,7 +34,7 @@ y
     <setting-type
       :visible="settingTypeFormVisible"
       title="设置数据集分类"
-      category-key="DATASET_TYPE"
+      category-key="BO_TYPE"
       @save="saveSettingType"
       @close="visible => settingTypeFormVisible = visible"
     />

src/views/platform/form/formDef/create.vue

@@ -37,7 +37,7 @@
       <el-form-item label="分类:" prop="typeId">
         <ibps-type-select
           v-model="formDef.typeId"
-          category-key="FORM_TYPE"
+          category-key="BO_TYPE"
           clearable
         />
       </el-form-item>

src/views/platform/form/formDef/list.vue

@@ -23,7 +23,7 @@
           :height="treeHeight"
           title="表单分类"
           position="east"
-          category-key="FORM_TYPE"
+          category-key="BO_TYPE"
           :has-contextmenu="true"
           @node-click="handleNodeClick"
           @expand-collapse="handleExpandCollapse"

src/views/platform/form/formTemplate/create.vue

@@ -27,7 +27,7 @@
       <el-form-item label="分类:" prop="typeId">
         <ibps-type-select
           v-model="formTemplate.typeId"
-          category-key="FORM_TYPE"
+          category-key="BO_TYPE"
           clearable
         />
       </el-form-item>

src/views/platform/form/formTemplate/list.vue

@@ -23,7 +23,7 @@
           :height="treeHeight"
           title="表单分类"
           position="east"
-          category-key="FORM_TYPE"
+          category-key="BO_TYPE"
           :has-contextmenu="true"
           @node-click="handleNodeClick"
           @expand-collapse="handleExpandCollapse"

src/views/system/login/page.vue

@@ -1,19 +1,20 @@
 <template>
     <div class="jbd-login-page-bg">
         <el-container class="login-container" @keyup.enter="handleLogin">
-            <el-main style="width: 100%; height: 100%; overflow: hidden; border: 0; display: flex; justify-content: right">
+            <el-main style="width: 100%; height: 100%; overflow: hidden;border: 0;">
                 <div class="">
                     <div class="logoTitle">
-                        <h1 class="login-title">
-                            <img src="@/assets/images/login/logo.jpg" class="logoImg" />
-                            <span style="font-size: 24px; margin-left: 5px">金源信通</span>
+                        <h1 class="login-title1">
+                            <!-- <img src="../../../assets/images/login/logo.jpg" class="logoImg" />
+                            金源信通 -->
+                            <img src="~@/assets/images/login/company.png" class="logo" />
                         </h1>
-                        <h1 class="login-title">金通医学实验室管理系统</h1>
+                        <h1 class="login-title">医学实验室管理系统</h1>
                     </div>
 
                     <div class="jbd-login-page-main">
-                        <h3 class="Loginh3">
-                            <span class="loginTong">{{ $t('login.userLogin') }}</span>
+                        <h3>
+                            <span>{{ $t('login.userLogin') }}</span>
                             <ibps-api-base-url-controller v-if="$nodeEnv === 'development'">
                                 <el-tooltip effect="dark" :content="$t('navbar.switchEnvironment')" placement="bottom">
                                     <el-button type="text" class="ibps-fr ibps-mr-5 btn-text can-hover">
@@ -27,14 +28,10 @@
                     </div>
                 </div>
             </el-main>
-            <el-footer style="width: 100%">
-                <hr style="color: #aaaaaa" />
-                <div class="centerCox">
-                    <div class="footerLeft"></div>
-                    <div class="footerCenter">推荐使用IE 11、Chrome 69、Firefox 65及以上版本的浏览器，推荐显示分辨率：1920 * 1080</div>
-                    <div class="footerRight">
-                        <div><i class="el-icon-s-platform" /> 深圳市金源信通科技有限公司开发</div>
-                    </div>
+            <el-footer style="width: 80%">
+                <div style="font-size: 12px; text-align: right">
+                    <hr />
+                    <div><i class="el-icon-s-platform" /> 深圳市金源信通科技有限公司开发</div>
                 </div>
             </el-footer>
         </el-container>
@@ -65,92 +62,44 @@ export default {
     }
 }
 </script>
-<style>
-.jbd-login-page-bg {
-    background-image: url('~@/assets/images/login/bgImg.jpg');
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-}
-
-.jbd-login-page-main {
-    margin: 80px auto 0;
-    margin-bottom: 20px;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-    padding: 20px;
-    /* height: 340px; */
-    width: 300px;
-    background-repeat: no-repeat;
-    border-radius: 5%;
-    box-sizing: border-box;
-    background: #fff;
-}
-
-.login-title {
-    font-size: 52px;
-    color: #01a39e;
-}
-.logoImg {
-    width: 30px;
-    height: 30px;
-    position: relative;
-    top: 5px;
-}
-</style>
-
 <style lang="scss" scoped>
-.logoTitle {
-    margin: 30px;
-}
-
-.centerCox {
-    color: #4f4f4f;
-    display: flex;
-    justify-content: space-between;
-    align-content: center;
-    .footerLeft {
-        width: 280px;
+    h1{
+        margin: 0 !important;
     }
-
-    .footerCenter {
-        font-size: 12px;
-        text-align: center;
+    .jbd-login-page-bg {
+        background-image: url('~@/assets/images/login/bgImg.png');
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
     }
 
-    .footerRight {
-        width: 280px;
-        font-size: 14px;
-    }
-}
-hr {
-    border: 1px solid white;
-}
-
-.el-footer {
-    padding: 0;
-}
-
-@media (min-width: 1350px) and (max-width: 1900px) {
     .jbd-login-page-main {
-        margin: 0 auto;
-        width: 260px;
-    }
-    .Loginh3{
-        margin: 0 !important;
-    }
-    .login-form{
-        margin: 0 !important;
+        margin-top: 0px;
+        margin-left: 3%;
+        margin-bottom: 20px;
+        box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+        padding: 10px 20px;
+        margin-left: 50px;
+        height: 340px;
+        width: 280px;
+        background-repeat: no-repeat;
+        border-radius: 5%;
+        box-sizing: border-box;
     }
 
-    .loginTong{
-        font-size: 14px !important;
-    }
     .login-title {
-        font-size: 32px;
+        font-size: 40px;
+        color: #01a39e;
+        margin: 0 0 40px !important;
+    }
+    .logo {
+        width: 200px;
+        position: relative;
+        top: 5px;
+        margin: 20px 0 20px;
     }
-}
 </style>