Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts: bin/clean.bat bin/run.bat ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java ruoyi-ui/bin/run-web.bat ruoyi-ui/src/components/ImageUpload/index.vue ruoyi-ui/src/router/index.js ruoyi-ui/src/views/index.vue
This commit is contained in:
commit
6473d4d8be
|
@ -108,7 +108,7 @@
|
||||||
plain
|
plain
|
||||||
icon="el-icon-download"
|
icon="el-icon-download"
|
||||||
size="mini"
|
size="mini"
|
||||||
:loading="exportLoading"
|
:loading="exportLoading"
|
||||||
@click="handleExport"
|
@click="handleExport"
|
||||||
v-hasPermi="['${moduleName}:${businessName}:export']"
|
v-hasPermi="['${moduleName}:${businessName}:export']"
|
||||||
>导出</el-button>
|
>导出</el-button>
|
||||||
|
@ -585,19 +585,18 @@ export default {
|
||||||
/** ${subTable.functionName}删除按钮操作 */
|
/** ${subTable.functionName}删除按钮操作 */
|
||||||
handleDelete${subClassName}() {
|
handleDelete${subClassName}() {
|
||||||
if (this.checked${subClassName}.length == 0) {
|
if (this.checked${subClassName}.length == 0) {
|
||||||
this.$alert("请先选择要删除的${subTable.functionName}数据", "提示", { confirmButtonText: "确定", });
|
this.msgError("请先选择要删除的${subTable.functionName}数据");
|
||||||
} else {
|
} else {
|
||||||
this.${subclassName}List.splice(this.checked${subClassName}[0].index - 1, 1);
|
const ${subclassName}List = this.${subclassName}List;
|
||||||
|
const checked${subClassName} = this.checked${subClassName};
|
||||||
|
this.${subclassName}List = ${subclassName}List.filter(function(item) {
|
||||||
|
return checked${subClassName}.indexOf(item.index) == -1
|
||||||
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/** 单选框选中数据 */
|
/** 复选框选中数据 */
|
||||||
handle${subClassName}SelectionChange(selection) {
|
handle${subClassName}SelectionChange(selection) {
|
||||||
if (selection.length > 1) {
|
this.checked${subClassName} = selection.map(item => item.index)
|
||||||
this.$refs.${subclassName}.clearSelection();
|
|
||||||
this.$refs.${subclassName}.toggleRowSelection(selection.pop());
|
|
||||||
} else {
|
|
||||||
this.checked${subClassName} = selection;
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
#end
|
#end
|
||||||
/** 导出按钮操作 */
|
/** 导出按钮操作 */
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
@echo off
|
@echo off
|
||||||
echo.
|
echo.
|
||||||
echo [信息] 使用 Vue 运行 Web 工程。
|
echo [<EFBFBD><EFBFBD>Ϣ] ʹ<><CAB9> Vue CLI <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Web <20><><EFBFBD>̡<EFBFBD>
|
||||||
echo.
|
echo.
|
||||||
|
|
||||||
%~d0
|
%~d0
|
||||||
|
@ -9,4 +9,4 @@ cd %~dp0
|
||||||
cd ..
|
cd ..
|
||||||
npm run dev
|
npm run dev
|
||||||
|
|
||||||
pause
|
pause
|
||||||
|
|
|
@ -66,8 +66,8 @@ export const constantRoutes = [
|
||||||
{
|
{
|
||||||
path: 'index',
|
path: 'index',
|
||||||
component: (resolve) => require(['@/views/index'], resolve),
|
component: (resolve) => require(['@/views/index'], resolve),
|
||||||
name: '首页',
|
name: 'Index',
|
||||||
meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
|
meta: { title: '首页', icon: 'dashboard', affix: true }
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
|
@ -64,7 +64,7 @@ service.interceptors.response.use(res => {
|
||||||
location.href = '/index';
|
location.href = '/index';
|
||||||
})
|
})
|
||||||
}).catch(() => {});
|
}).catch(() => {});
|
||||||
return Promise.reject()
|
return Promise.reject('令牌验证失败')
|
||||||
} else if (code === 500) {
|
} else if (code === 500) {
|
||||||
Message({
|
Message({
|
||||||
message: msg,
|
message: msg,
|
||||||
|
|
|
@ -336,7 +336,7 @@
|
||||||
import config from '../../package.json'
|
import config from '../../package.json'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "index",
|
name: "Index",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
// 版本号
|
// 版本号
|
||||||
|
|
|
@ -64,7 +64,7 @@ export default {
|
||||||
props: {
|
props: {
|
||||||
// 角色编号
|
// 角色编号
|
||||||
roleId: {
|
roleId: {
|
||||||
type: Number
|
type: [Number, String]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
|
|
Loading…
Reference in New Issue