Merge remote-tracking branch 'origin/master'

 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionDTO.java

@@ -67,4 +67,8 @@
     * çˆ¶èŠ‚点id
     */
    private String plActionCls;
    /**
     * å›¾æ ‡
     */
    private String plImage;
}

 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OperateVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@

package com.vci.pagemodel;


import lombok.Data;

import java.io.Serializable;

/**
 * æ“ä½œç±»åž‹å±žæ€§
 */
@Data
public class OperateVO implements Serializable {
    private static final long serialVersionUID = 1L;

    private String id;
    private String name;// åç§°
    private String identify;// æ ‡è¯†
    private String alias;//别名
    private String desc;// æè¿°
    private long seq;//顺序
    private String source;//图标
}

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java

@@ -8,6 +8,7 @@
import com.vci.dto.RoleInfoDTO;
import com.vci.dto.RoleRightParamDTO;
import com.vci.dto.RoleRightParamDTOS;
import com.vci.pagemodel.OperateVO;
import com.vci.web.service.ISmFunctionQueryService;
import com.vci.web.service.SmHMSysModConfigServiceI;
import com.vci.pagemodel.AppConfigDetailInfoVO;
@@ -253,13 +254,13 @@

    /**
     * æ·»åŠ æ“ä½œç±»åž‹
     * @param operateInfo
     * @param operateVO
     * @return
     */
    @PostMapping("/addOperationType")
    public BaseResult addOperationType(@RequestBody OperateInfo operateInfo) {
    public BaseResult addOperationType(@RequestBody OperateVO operateVO) {
        try {
            return BaseResult.success(hmSysModConfigService.addOperationType(operateInfo),"添加操作类型成功");
            return BaseResult.success(hmSysModConfigService.addOperationType(operateVO),"添加操作类型成功");
        }catch (Exception e){
            e.printStackTrace();
            String errorMsg = "添加操作类型时出现错误，原因："+ VciBaseUtil.getExceptionMessage(e);
@@ -270,13 +271,13 @@

    /**
     * ä¿®æ”¹æ“ä½œç±»åž‹
     * @param operateInfo
     * @param operateVO
     * @return
     */
    @PutMapping("/updateOperationType")
    public BaseResult updateOperationType(@RequestBody OperateInfo operateInfo) {
    public BaseResult updateOperationType(@RequestBody OperateVO operateVO) {
        try {
            return BaseResult.success(hmSysModConfigService.updateOperationType(operateInfo),"修改操作类型成功");
            return BaseResult.success(hmSysModConfigService.updateOperationType(operateVO),"修改操作类型成功");
        }catch (Exception e){
            e.printStackTrace();
            String errorMsg = "修改操作类型时出现错误，原因："+ VciBaseUtil.getExceptionMessage(e);

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java

@@ -5,6 +5,7 @@
import com.vci.corba.framework.data.*;
import com.vci.pagemodel.ExpExcelConditionVO;
import com.vci.pagemodel.MenuVO;
import com.vci.pagemodel.OperateVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;

@@ -59,14 +60,14 @@
     * å¢žåŠ æ“ä½œç±»åž‹
     * @return
     */
    OperateInfo addOperationType(OperateInfo operateInfo);
    OperateInfo addOperationType(OperateVO operateVO);

    /**
     * ä¿®æ”¹æ“ä½œç±»åž‹
     * @param operateInfo
     * @param operateVO
     * @return
     */
    OperateInfo updateOperationType(OperateInfo operateInfo) throws VciBaseException;
    OperateInfo updateOperationType(OperateVO operateVO) throws VciBaseException;

    /**
     * åˆ é™¤æ“ä½œç±»åž‹

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java

@@ -241,6 +241,7 @@
        plAction.plModifyUser = WebUtil.getCurrentUserId();
        plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
        plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
        plAction.plImage = StringUtils.defaultString(dto.getPlImage());
        boolean b = platformClientUtil.getUIService().savePLAction(plAction);
        if(!b){
            throw new PLException("500", new String[]{"保存失败！！"});
@@ -274,6 +275,7 @@
        plAction.plModifyUser = WebUtil.getCurrentUserId();
        plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
        plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
        plAction.plImage = StringUtils.defaultString(dto.getPlImage());
        boolean b = platformClientUtil.getUIService().updatePLAction(plAction);
        if(!b){
            throw new PLException("500", new String[]{"修改失败！！"});
@@ -299,6 +301,7 @@
        plAction.plModifyUser = WebUtil.getCurrentUserId();
        plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
        plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
        plAction.plImage = StringUtils.defaultString(dto.getPlImage());
        boolean b = platformClientUtil.getUIService().deletePLAction(plAction);
        if(!b){
            throw new PLException("500", new String[]{"删除失败！！"});

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java

@@ -575,6 +575,7 @@
                    menuVO.setSort((int) operateInfo.seq);
                    menuVO.setModeType("operateObject");
                    menuVO.setHasChildren(false);
                    menuVO.setSource(operateInfo.image);
                    menuVOList.add(menuVO);
                }
            }catch (PLException e) {

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java

@@ -7,6 +7,7 @@
import com.vci.corba.framework.data.*;
import com.vci.pagemodel.ExpExcelConditionVO;
import com.vci.pagemodel.MenuVO;
import com.vci.pagemodel.OperateVO;
import com.vci.starter.poi.bo.SheetDataSet;
import com.vci.starter.poi.bo.SheetRowData;
import com.vci.starter.poi.bo.WriteExcelData;
@@ -25,6 +26,7 @@
import com.vci.web.util.PlatformClientUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -116,6 +118,9 @@
        VciBaseUtil.alertNotNull(menuVO,"修改的模块对象");
        try {
            String res = "";
            if(!menuVO.getAlias().matches("[a-z A-Z \\p{Punct}+]*")){
                throw new VciBaseException("注意：属性名只能为英文字母!");
            }
            //更新数据库
            res = foDelegate.updateMod(menuVO);
            /**
@@ -224,12 +229,30 @@
    }

    /**
     * æ“ä½œå¯¹è±¡å¤åˆ¶
     * @param operateVO æ“ä½œä¼ è¾“对象
     * @param operateInfo æ“ä½œä¿¡æ¯
     */
    private void copyOperationProperties(OperateVO operateVO, OperateInfo operateInfo){
        operateInfo.id = operateVO.getId();
        operateInfo.name = operateVO.getName();
        operateInfo.alias = operateVO.getAlias();
        operateInfo.image = operateVO.getSource();
        operateInfo.desc = operateVO.getDesc();
        operateInfo.identify = operateVO.getIdentify();
        operateInfo.seq = operateVO.getSeq();
    }

    /**
     * å¢žåŠ æ“ä½œç±»åž‹
     * @return
     */
    @Override
    public OperateInfo addOperationType(OperateInfo operateInfo) throws VciBaseException {
    public OperateInfo addOperationType(OperateVO operateVO) throws VciBaseException {
        try {
            OperateInfo operateInfo = new OperateInfo();
            copyOperationProperties(operateVO,operateInfo);
            operateInfo.image = operateVO.getSource();
            //校验
            this.checkItem(operateInfo);
            String s = foDelegate.saveOperate(operateInfo);
@@ -253,13 +276,16 @@

    /**
     * ä¿®æ”¹æ“ä½œç±»åž‹
     * @param operateInfo
     * @param operateVO
     * @return
     */
    @Override
    public OperateInfo updateOperationType(OperateInfo operateInfo) throws VciBaseException {
    public OperateInfo updateOperationType(OperateVO operateVO) throws VciBaseException {
        try {
            OperateInfo operateInfo = new OperateInfo();
            copyOperationProperties(operateVO, operateInfo);
            this.checkItem(operateInfo);
            operateInfo.image = operateVO.getSource();
            String res = foDelegate.updateOperate(operateInfo);
            /**返回1表示名称有重复，返回2表示标识有重复,返回3表示顺序有重复**/
            if (res.equals("1")) {
@@ -329,7 +355,7 @@
        if (operateInfo.name.length() > 128) {
            throw new VciBaseException("名称长度不能超过128！");
        }
        if (operateInfo.desc.length() > 255) {
        if (operateInfo.desc != null &&operateInfo.desc.length() > 255) {
            throw new VciBaseException("描述长度不能超过255！");
        }
        if (operateInfo.alias.length() > 128) {

 Source/plt-web/plt-web-ui/src/components/PLT-basic-component/iconShow.vue

@@ -39,7 +39,7 @@
  svg{
    font-size: inherit;
    height: 100%;
    width:auto;
    width:100%;
  }
}
</style>

 Source/plt-web/plt-web-ui/src/components/PLT-basic-component/input-icon.vue

@@ -2,7 +2,7 @@
  <div>
    <el-input :width="width" :class="inputClass" :style="inputStyle" :clearable="true" :value="value"
              :disabled="disabled" :placeholder="placeholder" type="text" :size="size" @clear="clearValue" @focus="handleFocus">
      <span slot="append" v-html="svgHtml" style="font-size: 20px;padding:3px 10px;width:20px;height:20px;display: block" @click="handleFocus"></span>
      <span slot="append" v-html="svgHtml" style="font-size: 18px;padding:3px 10px;width:18px;height:18px;display: block" @click="handleFocus"></span>
    </el-input>
    <el-dialog v-dialogDrag
               v-dialog-resize
@@ -205,6 +205,11 @@
  .el-input-group__append, .el-input-group__prepend{
    padding: 0;
  }
  svg{
    font-size: inherit;
    height: 100%;
    width:100%;
  }
}
.tag-group{font-size: 14px;}
.el-tag{
@@ -223,6 +228,9 @@
}
.iconList .iconItem .svgContent{
  font-size: 24px;
  width: 24px;
  height: 24px;
  margin: 0 auto;
}
.iconList .iconItem .svgContent:hover{
  transform: scale(1.5);

 Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue

@@ -8,7 +8,7 @@
                    @click="open(item)">
        <div style="display: flex">
          <icon-show :name="item[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
          <span slot="title"
          <span slot="title"  style="margin-left: 8px;"
                :alt="item[pathKey]"
                :class="{'el-menu--display':collapse && first}">{{ generateTitle(item) }}</span>
        </div>
@@ -19,7 +19,7 @@
        <template slot="title">
          <div style="display: flex">
            <icon-show :name="item[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
            <span slot="title"
            <span slot="title"  style="margin-left: 8px;"
                  :class="{'el-menu--display':collapse && first}">{{ generateTitle(item) }}</span>
          </div>
        </template>
@@ -31,7 +31,7 @@
                        @click="open(child)">
            <div style="display: flex">
              <icon-show :name="child[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
              <span slot="title">{{ generateTitle(child) }}</span>
              <span slot="title" style="margin-left: 8px;">{{ generateTitle(child) }}</span>
            </div>
          </el-menu-item>
          <sidebar-item v-else
@@ -137,7 +137,8 @@
    open(item) {
      const query = {
        ...item.query,
        id:item.id
        id:item.id,
        name:item.name
      }
      if (this.screen <= 1) this.$store.commit("SET_COLLAPSE");
      if (this.validIsOpen(item)) {
@@ -162,13 +163,13 @@
  outline: 0;
  background-color: #060708;
}

.iconShowSpan{
  display: inline-block;
  margin-top: -2px;
  margin-right: 10px;
  color: rgba(255, 255, 255, 0.7);
}
.el-menu-item .iconShowSpan,.el-submenu__title .iconShowSpan{
  margin-top: -2px;
}
.el-submenu__title:hover .iconShowSpan{
  color: #ffffff;
}

 Source/plt-web/plt-web-ui/src/router/avue-router.js

@@ -150,6 +150,7 @@
          icon = oMenu[propsDefault.icon],
          children = oMenu[propsDefault.children],
          meta = oMenu[propsDefault.meta] || {};
        meta.keepAlive=true;
        // meta中 keepalive çš„处理
        meta = Object.assign(meta, (function () {
          if (option.keepAlive === true) {

 Source/plt-web/plt-web-ui/src/styles/ui.scss

@@ -560,6 +560,7 @@
  height: 16px !important;
  margin-right: 6px;
}

/*
  æ ‘
 */
@@ -575,7 +576,7 @@
  margin-right: 3px;
}
.el-tree-node__label [class*=" el-icon-"],.el-tree-node__label [class^=el-icon-]{
  font-size: 14px;margin-top: 3px;
  font-size: 14px;margin-top: 4px; margin-right: 3px;
}

.el-select{

 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue

@@ -49,6 +49,11 @@
                  {{ row.plTypeType === 'business' ? '业务类型' : '链接类型' }}
                </el-tag>
              </template>
              <template slot="plImage" slot-scope="{row}">
                <span class="avue-icon">
                  <icon-show :name="row.plImage"></icon-show>
                </span>
              </template>
            </avue-crud>
          </div>
        </basic-container>
@@ -102,8 +107,8 @@
            search: true
          },
          {
            label: 'C/S类路径',
            prop: 'plCSClass',
            label: '图标',
            prop: 'plImage',
            search: true,
            searchLabelWidth:120,
            overHidden: true,

 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue

@@ -71,13 +71,13 @@
            @refresh-change="handleRefresh"
            @selection-change="selectChangeHandler"
            @row-click="rowClickHandler">
            <template slot="plCSClass" slot-scope="{row}">
            <template slot="plImage" slot-scope="{row}">
              <span class="avue-icon">
                <icon-show :name="row.plCSClass"></icon-show>
                <icon-show :name="row.plImage"></icon-show>
              </span>
            </template>
            <template slot-scope="{type,disabled}" slot="plCSClassForm">
              <input-icon :disabled="disabled" v-model="form.plCSClass"></input-icon>
            <template slot-scope="{type,disabled}" slot="plImageForm">
              <input-icon :disabled="disabled" v-model="form.plImage"></input-icon>
            </template>
            <template slot="plTypeType" slot-scope="{row}">
              <el-tag :type="row.plTypeType === 'business' ? '' : 'success'">
@@ -298,7 +298,7 @@
          },
          {
            label: '图标',
            prop: 'plCSClass',
            prop: 'plImage',
            width: 80,
            rules: [
              {

 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue

@@ -1349,7 +1349,7 @@
    actionSaveHandler(val) {
      this.$set(this.basicForm, 'actionName', val.plName);
      this.$set(this.basicForm, 'actionOId', val.plOId);
      this.$set(this.basicForm, 'iconPath', val.plCSClass);//图标
      this.$set(this.basicForm, 'iconPath', val.plImage);//图标
      this.$refs.form.clearValidate('Action')
    },
    // action选择弹窗直接关闭

 Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue

@@ -7,7 +7,8 @@
                     @node-click="nodeClick">
          <span slot-scope="{ node, data }" class="el-tree-node__label">
            <span style="display: flex">
              <icon-show :name="data.icon"></icon-show>
              <icon-show v-if="data.iconType=='svg'" :name="data.icon"></icon-show>
              <i v-else :class="data.icon"></i>
                {{ (node || {}).label }}
            </span>
          </span>
@@ -72,32 +73,18 @@
        <el-form ref="form" :model="form" label-width="100px" size="small"
                 style="max-height: calc(100vh - 200px);overflow: auto;">
          <span v-if="form.category !== 1">
            <el-form-item>
               <span slot="label" style="display:inline-block;">
                èœå•æ ‡è¯†ï¼š
                 <el-tooltip class="item" content="请输入英文字符，并保证唯一性！" effect="dark" placement="top-start">
                   <i class='el-icon-star-on' style="color: #F56C6C"/>
                </el-tooltip>
               </span>
              <el-input v-model="form.alias" :disabled="!editStatus && !addStatus"
                        placeholder="请输入英文字符，并保证唯一性！"></el-input>
            <el-form-item class="is-required">
              <span slot="label">模块名：</span>
              <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="请输入模块名"></el-input>
            </el-form-item>
               <el-form-item>
               <span slot="label" style="display:inline-block;">
                æ¨¡å—名：
                 <i class='el-icon-star-on' style="color: #F56C6C"/>
               </span>
            <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="请输入模块名"></el-input>
            <el-form-item class="is-required">
              <span slot="label">模块别名：</span>
              <el-input v-model="form.alias" :disabled="!editStatus && !addStatus"  placeholder="请输入模块别名"></el-input>
            </el-form-item>
            <el-form-item>
               <span slot="label" style="display:inline-block;">
                åºå·ï¼š
                  <el-tooltip class="item" content="数字，描述该模块在其父模块下的显示顺序" effect="dark" placement="top-start">
                   <i class='el-icon-star-on' style="color: #F56C6C"/>
                </el-tooltip>
               </span>
            <el-input v-model="form.sort" :disabled="!editStatus && !addStatus"
                      placeholder="数字，描述该模块在其父模块下的显示顺序"></el-input>
           <el-form-item class="is-required">
              <span slot="label">序号：</span>
              <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus"></el-input-number>
              <el-link :underline="false" style="margin-left: 20px" type="danger">数字，描述该模块在其父模块下的显示顺序</el-link>
            </el-form-item>
            <el-form-item v-if="form.functionType === 0" label="C/S：">
            <el-input v-model="form.pathC" :disabled="!editStatus && !addStatus" :rows="2" placeholder="请输入C/S路径"
@@ -140,28 +127,27 @@
          </el-form-item>
          </span>
          <span v-if="form.category === 1">
            <el-form-item label="名称：">
            <el-input v-model="form.name" :disabled="form.category === 1" placeholder="请输入名称"></el-input>
            <el-form-item label="名称：" class="is-required">
              <el-input v-model="form.name" :disabled="form.category === 1" placeholder="请输入名称"></el-input>
            </el-form-item>
            <el-form-item label="标识：">
            <el-input v-model="form.code" :disabled="form.category === 1" placeholder="请输入标识"></el-input>
            <el-form-item label="标识：" class="is-required">
              <el-input v-model="form.code" :disabled="form.category === 1" placeholder="请输入标识"></el-input>
            </el-form-item>
            <el-form-item label="别名：">
            <el-input v-model="form.alias" placeholder="请输入别名"></el-input>
            <el-form-item label="别名：" class="is-required">
              <el-input v-model="form.alias" placeholder="请输入别名"></el-input>
            </el-form-item>
            <el-form-item label="编号：">
            <el-input v-model="form.sort" :disabled="form.category === 1" placeholder="请输入编号"></el-input>
            <el-form-item label="编号：" class="is-required">
              <el-input-number v-model="form.sort" :disabled="form.category === 1" :max="63" :min="1"></el-input-number>
            </el-form-item>
            <el-form-item label="描述：">
            <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="请输入描述"></el-input>
              <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="请输入描述"></el-input>
            </el-form-item>
            <el-form-item label="是否有效：">
            <el-switch
              v-model="form.isValid"
              active-color="#13ce66"
              inactive-color="#ff4949">
            </el-switch>

              <el-switch
                v-model="form.isValid"
                active-color="#13ce66"
                inactive-color="#ff4949">
              </el-switch>
          </el-form-item>
          </span>
        </el-form>
@@ -173,7 +159,7 @@
      append-to-body="true"
      class="avue-dialog"
      title="操作分类"
      width="500px"
      width="900px"
    >
      <avue-crud
        ref="methodsCrud"
@@ -227,13 +213,19 @@
        menu: false,
        height: 500,
        header: false,
        column: [
          {
            label: '操作分类',
            prop: 'name',
            sortable: true,
          }
        ]
        column: [{
          label: '名称',
          prop: 'name',
          width:180,
          sortable: true,
        }, {
          label: '标识',
          prop: 'code',
          width:180,
        }, {
          label: '描述',
          prop: 'remark'
        }]
      },
      methodsLoading: false,
      methodsVisble: false,
@@ -250,8 +242,9 @@
        menu: false,
        addBtn: false,
        defaultExpandAll: false,
        defaultExpandedKeys:['business'],
        props: {
          label: 'name',
          label: 'label',
          value: 'id',
          children: 'children',
        },
@@ -265,10 +258,10 @@
            resolve(res.data.data.map(item => {
              return {
                ...item,
                id: item.id,
                name: item.name,
                label: item.category!=1?item.name:item.alias,
                leaf: !item.hasChildren,
                icon: item.source || 'iconoir:home'
                icon: item.source || (node.level === 0?'el-icon-s-home':'el-icon-s-tools'),
                iconType:item.source?'svg':'iconfont'
              }
            }))
          })

 Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue

@@ -7,7 +7,8 @@
                     @node-click="nodeClick">
          <span slot-scope="{ node, data }" class="el-tree-node__label">
            <span style="display: flex">
              <icon-show :name="data.icon"></icon-show>
              <icon-show v-if="data.iconType=='svg'" :name="data.icon"></icon-show>
              <i v-else :class="data.icon"></i>
                {{ (node || {}).label }}
            </span>
          </span>
@@ -71,32 +72,18 @@
        </div>
        <el-form ref="form" :model="form" label-width="100px" style="max-height: calc(100vh - 200px);overflow: auto;">
          <span v-if="form.category !== 1">
            <el-form-item>
               <span slot="label" style="display:inline-block;">
                èœå•æ ‡è¯†ï¼š
                 <el-tooltip class="item" effect="dark" content="请输入英文字符，并保证唯一性！" placement="top-start">
                   <i class='el-icon-star-on' style="color: #F56C6C"/>
                </el-tooltip>
               </span>
              <el-input v-model="form.alias" :disabled="!editStatus && !addStatus"
                      placeholder="请输入英文字符，并保证唯一性！"></el-input>
            <el-form-item class="is-required">
              <span slot="label">模块名：</span>
              <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="请输入模块名"></el-input>
            </el-form-item>
            <el-form-item>
               <span slot="label" style="display:inline-block;">
                æ¨¡å—名：
                 <i class='el-icon-star-on' style="color: #F56C6C"/>
               </span>
            <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="请输入模块名"></el-input>
            <el-form-item class="is-required">
              <span slot="label">模块别名：</span>
              <el-input v-model="form.alias" :disabled="!editStatus && !addStatus"  placeholder="请输入模块别名"></el-input>
            </el-form-item>
           <el-form-item>
               <span slot="label" style="display:inline-block;">
                åºå·ï¼š
                  <el-tooltip class="item" content="数字，描述该模块在其父模块下的显示顺序" effect="dark" placement="top-start">
                   <i class='el-icon-star-on' style="color: #F56C6C"/>
                </el-tooltip>
               </span>
            <el-input v-model="form.sort" :disabled="!editStatus && !addStatus"
                      placeholder="数字，描述该模块在其父模块下的显示顺序"></el-input>
           <el-form-item class="is-required">
              <span slot="label">序号：</span>
              <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus"></el-input-number>
              <el-link :underline="false" style="margin-left: 20px" type="danger">数字，描述该模块在其父模块下的显示顺序</el-link>
            </el-form-item>
            <el-form-item v-if="form.functionType === 0" label="C/S：">
            <el-input v-model="form.pathC" :disabled="!editStatus && !addStatus" :rows="2" placeholder="请输入C/S路径"
@@ -139,28 +126,27 @@
          </el-form-item>
          </span>
          <span v-if="form.category === 1">
            <el-form-item label="名称：">
            <el-input v-model="form.name" :disabled="form.category === 1" placeholder="请输入名称"></el-input>
            <el-form-item label="名称：" class="is-required">
              <el-input v-model="form.name" :disabled="form.category === 1" placeholder="请输入名称"></el-input>
            </el-form-item>
            <el-form-item label="标识：">
            <el-input v-model="form.code" :disabled="form.category === 1" placeholder="请输入标识"></el-input>
            <el-form-item label="标识：" class="is-required">
              <el-input v-model="form.code" :disabled="form.category === 1" placeholder="请输入标识"></el-input>
            </el-form-item>
            <el-form-item label="别名：">
            <el-input v-model="form.alias" placeholder="请输入别名"></el-input>
            <el-form-item label="别名：" class="is-required">
              <el-input v-model="form.alias" placeholder="请输入别名"></el-input>
            </el-form-item>
            <el-form-item label="编号：">
            <el-input v-model="form.sort" :disabled="form.category === 1" placeholder="请输入编号"></el-input>
            <el-form-item label="编号：" class="is-required">
              <el-input-number v-model="form.sort" :disabled="form.category === 1" :max="63" :min="1"></el-input-number>
            </el-form-item>
            <el-form-item label="描述：">
            <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="请输入描述"></el-input>
              <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="请输入描述"></el-input>
            </el-form-item>
            <el-form-item label="是否有效：">
            <el-switch
              v-model="form.isValid"
              active-color="#13ce66"
              inactive-color="#ff4949">
            </el-switch>

              <el-switch
                v-model="form.isValid"
                active-color="#13ce66"
                inactive-color="#ff4949">
              </el-switch>
          </el-form-item>
          </span>
        </el-form>
@@ -172,7 +158,7 @@
      append-to-body="true"
      class="avue-dialog"
      title="操作分类"
      width="500px"
      width="900px"
    >
      <avue-crud
        ref="methodsCrud"
@@ -226,13 +212,19 @@
        menu: false,
        height: 500,
        header: false,
        column: [
          {
            label: '操作分类',
            prop: 'name',
            sortable: true,
          }
        ]
        column: [{
          label: '名称',
          prop: 'name',
          width:180,
          sortable: true,
        }, {
          label: '标识',
          prop: 'code',
          width:180,
        }, {
          label: '描述',
          prop: 'remark'
        }]
      },
      methodsLoading: false,
      methodsVisble: false,
@@ -249,8 +241,9 @@
        menu: false,
        addBtn: false,
        defaultExpandAll: false,
        defaultExpandedKeys:['system'],
        props: {
          label: 'name',
          label: 'label',
          value: 'id',
          children: 'children',
        },
@@ -264,10 +257,10 @@
            resolve(res.data.data.map(item => {
              return {
                ...item,
                id: item.id,
                name: item.name,
                label: item.category!=1?item.name:item.alias,
                leaf: !item.hasChildren,
                icon: item.source || 'iconoir:home'
                icon: item.source || (node.level === 0?'el-icon-s-home':'el-icon-s-tools'),
                iconType:item.source?'svg':'iconfont'
              }
            }))
          })
@@ -476,7 +469,6 @@
        }
      })
      addOperationType(list).then(res => {
        console.log(res)
        if (res.data.code === 200) {
          this.methodsVisble = false;
          this.$message.success(res.data.msg);

 Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue

@@ -7,7 +7,8 @@
                     @node-click="nodeClick">
          <span slot-scope="{ node, data }" class="el-tree-node__label">
           <span style="display: flex">
              <icon-show :name="data.icon"></icon-show>
              <icon-show v-if="data.iconType=='svg'" :name="data.icon"></icon-show>
              <i v-else :class="data.icon"></i>
                {{ (node || {}).label }}
            </span>
          </span>
@@ -45,21 +46,21 @@
          </el-button>
        </div>
        <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 180px);overflow: auto;">
          <el-form-item label="名称：">
          <el-form-item label="名称：" class="is-required">
            <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="请输入名称"></el-input>
          </el-form-item>
          <el-form-item label="标识：">
          <el-form-item label="标识：" class="is-required">
            <el-input v-model.trim="form.code" :disabled="!editStatus && !addStatus" placeholder="请输入标识"></el-input>
          </el-form-item>
          <el-form-item label="别名：">
          <el-form-item label="别名：" class="is-required">
            <el-input v-model="form.alias" :disabled="!editStatus && !addStatus" placeholder="请输入别名"></el-input>
          </el-form-item>
          <el-form-item label="图标：">
          <el-form-item label="图标：" class="is-required">
            <input-icon v-model="form.source" :disabled="!editStatus && !addStatus" placeholder="请选择图标">
            </input-icon>
          </el-form-item>
          <el-form-item label="顺序：">
            <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus" :max="9999" :min="0"
            <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus" :max="63" :min="1"
                             label="顺序"></el-input-number>
          </el-form-item>
          <el-form-item label="描述：">
@@ -93,6 +94,7 @@
        menu: false,
        addBtn: false,
        defaultExpandAll: false,
        defaultExpandedKeys:['operateNode'],
        props: {
          label: 'name',
          value: 'id',
@@ -111,7 +113,8 @@
                id: item.id,
                name: item.name,
                leaf: !item.hasChildren,
                icon: item.source || 'iconoir:home'
                icon: item.source || (node.level === 0?'el-icon-s-home':'el-icon-s-tools'),
                iconType:item.source?'svg':'iconfont'
              }
            }))
          })