【修改】nacos启动类名称修改,Banner修改
【修改】字典多选组件回显Bug修改,调整用户模块的edit方法,确保数据逻辑
This commit is contained in:
@@ -1,14 +1,13 @@
|
|||||||
${AnsiColor.BRIGHT_BLUE}
|
${AnsiColor.BRIGHT_BLUE}
|
||||||
(_) | | | |
|
____. __________ __
|
||||||
_ ___ ___ ___ __ _ ______| |__ ___ ___ | |_
|
| | ___________ ____ \______ \ ____ _____/ |_
|
||||||
| |/ _ \/ _ \/ __/ _` |______| '_ \ / _ \ / _ \| __|
|
| |/ __ \_ __ \/ _ \ ______ | | _// _ \ / _ \ __\
|
||||||
| | __/ __/ (_| (_| | | |_) | (_) | (_) | |_
|
/\__| \ ___/| | \( <_> ) /_____/ | | ( <_> | <_> ) |
|
||||||
| |\___|\___|\___\__, | |_.__/ \___/ \___/ \__|
|
\________|\___ >__| \____/ |______ /\____/ \____/|__|
|
||||||
_/ | __/ |
|
\/ \/
|
||||||
|__/ |___/
|
|
||||||
|
|
||||||
|
|
||||||
${AnsiColor.BRIGHT_GREEN}
|
${AnsiColor.BRIGHT_GREEN}
|
||||||
jero Boot Version: 2.4.6
|
Jero Boot Version: 2.4.6
|
||||||
Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
|
Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
|
||||||
${AnsiColor.BLACK}
|
${AnsiColor.BLACK}
|
||||||
|
|||||||
+2
-2
@@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
|
|||||||
@SpringBootApplication(scanBasePackages = "com.alibaba.nacos")
|
@SpringBootApplication(scanBasePackages = "com.alibaba.nacos")
|
||||||
@ServletComponentScan
|
@ServletComponentScan
|
||||||
@EnableScheduling
|
@EnableScheduling
|
||||||
public class JeecgNacosApplication {
|
public class JeroNacosApplication {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 是否单机模式启动
|
* 是否单机模式启动
|
||||||
@@ -32,6 +32,6 @@ public class JeecgNacosApplication {
|
|||||||
System.setProperty("server.tomcat.basedir","logs");
|
System.setProperty("server.tomcat.basedir","logs");
|
||||||
//自定义启动端口号
|
//自定义启动端口号
|
||||||
System.setProperty("server.port","8848");
|
System.setProperty("server.port","8848");
|
||||||
SpringApplication.run(JeecgNacosApplication.class, args);
|
SpringApplication.run(JeroNacosApplication.class, args);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -103,7 +103,8 @@
|
|||||||
|
|
||||||
},
|
},
|
||||||
onChange (selectedValue) {
|
onChange (selectedValue) {
|
||||||
this.$emit('change', selectedValue.join(this.spliter));
|
this.value = selectedValue.join(this.spliter);
|
||||||
|
this.$emit('change', this.value);
|
||||||
},
|
},
|
||||||
setCurrentDictOptions(dictOptions){
|
setCurrentDictOptions(dictOptions){
|
||||||
this.dictOptions = dictOptions
|
this.dictOptions = dictOptions
|
||||||
|
|||||||
@@ -84,7 +84,6 @@
|
|||||||
:disabled="disableSubmit"
|
:disabled="disableSubmit"
|
||||||
v-model="model.departIds"
|
v-model="model.departIds"
|
||||||
:options="nextDepartOptions"
|
:options="nextDepartOptions"
|
||||||
@change="nextDepartChange"
|
|
||||||
placeholder="请选择负责部门">
|
placeholder="请选择负责部门">
|
||||||
</j-multi-select-tag>
|
</j-multi-select-tag>
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
@@ -108,11 +107,9 @@
|
|||||||
<a-input placeholder="请输入手机号码" :disabled="isDisabledAuth('user:form:phone')" v-model="model.phone" />
|
<a-input placeholder="请输入手机号码" :disabled="isDisabledAuth('user:form:phone')" v-model="model.phone" />
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
|
|
||||||
<!--
|
<!-- <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
|
||||||
<a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<!-- <j-dict-select-tag v-model="model.activitiSync" placeholder="请选择是否同步工作流引擎" :type="'radio'" dictCode="activiti_sync"/>-->
|
||||||
<j-dict-select-tag v-model="model.activitiSync" placeholder="请选择是否同步工作流引擎" :type="'radio'" dictCode="activiti_sync"/>
|
<!-- </a-form-model-item>-->
|
||||||
</a-form-model-item>
|
|
||||||
-->
|
|
||||||
|
|
||||||
</a-form-model>
|
</a-form-model>
|
||||||
</a-spin>
|
</a-spin>
|
||||||
@@ -216,7 +213,6 @@ import { JSEncrypt } from 'jsencrypt'
|
|||||||
that.visible = true;
|
that.visible = true;
|
||||||
//根据屏幕宽度自适应抽屉宽度
|
//根据屏幕宽度自适应抽屉宽度
|
||||||
this.resetScreenSize();
|
this.resetScreenSize();
|
||||||
that.userId = record.id;
|
|
||||||
that.model = Object.assign({},{selectedroles:'',selecteddeparts:''}, record);
|
that.model = Object.assign({},{selectedroles:'',selecteddeparts:''}, record);
|
||||||
//身份为上级显示负责部门,否则不显示
|
//身份为上级显示负责部门,否则不显示
|
||||||
if(this.model.userIdentity==2){
|
if(this.model.userIdentity==2){
|
||||||
@@ -226,6 +222,7 @@ import { JSEncrypt } from 'jsencrypt'
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(record.hasOwnProperty("id")){
|
if(record.hasOwnProperty("id")){
|
||||||
|
that.userId = record.id;
|
||||||
that.getUserRoles(record.id);
|
that.getUserRoles(record.id);
|
||||||
that.getUserDeparts(record.id);
|
that.getUserDeparts(record.id);
|
||||||
}
|
}
|
||||||
@@ -504,11 +501,7 @@ import { JSEncrypt } from 'jsencrypt'
|
|||||||
}else{
|
}else{
|
||||||
this.departIdShow=true;
|
this.departIdShow=true;
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
nextDepartChange(e){
|
|
||||||
console.log("11", e)
|
|
||||||
console.log("22", this.model.departIds)
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user