github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 22:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

Browse Source 
# Conflicts:
#	template/admin/src/pages/system/backendRouting/index.vue
This commit is contained in:
From-wh 2023-05-08 14:13:20 +08:00
commit c2548445d0
4 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
template/admin/src/pages/setting/systemMenus/components/menusFrom.vue
View File

@ -12,25 +12,12 @@
@on-visible-change="visible"
>
<Form ref="formValidate" :model="formValidate" :label-width="110" @submit.native.prevent>
<!-- <Row type="flex" :gutter="24">
<Col span="24">
<FormItem label="类型：">
<RadioGroup v-model="formValidate.auth_type" @on-change="changeRadio">
<Radio :label="item.value" v-for="(item, i) in optionsRadio" :key="i">
<Icon type="social-apple"></Icon>
<span>{{ item.label }}</span>
</Radio>
</RadioGroup>
</FormItem>
</Col>
</Row> -->
<Row type="flex" :gutter="24">
<Col v-bind="grid">
<FormItem :label="!authType ? '接口名称：' : '按钮名称：'" prop="menu_name">
<div class="add">
<Input v-model="formValidate.menu_name" :placeholder="!authType ? '请输入接口名称' : '请输入按钮名称'">
</Input>
<!-- <Button class="ml10 df" v-show="!authType" @click="getRuleList()" icon="ios-apps"></Button> -->
</div>
</FormItem>
</Col>
@ -49,7 +36,6 @@
></Input>
</FormItem>
</Col>
<Col v-bind="grid" v-if="authType">
<FormItem label="排序：">
<Input type="number" v-model="formValidate.sort" placeholder="请输入排序" number></Input>

2
template/admin/src/pages/setting/systemMenus/index.vue
View File

@ -44,7 +44,7 @@
<vxe-table-column field="menu_name" tree-node title="按钮名称" min-width="100"></vxe-table-column>
<vxe-table-column field="menu_path" title="路径" min-width="240" tooltip="true">
<template v-slot="{ row }">
<span v-if="row.auth_type == 1">页面：{{ row.menu_path }}</span>
<span v-if="row.auth_type == 1">页面路径：{{ row.menu_path }}</span>
<span v-if="row.auth_type == 2">按钮：[{{ row.methods }}]{{ row.api_url }}</span>
</template>
</vxe-table-column>

2
template/admin/src/pages/system/backendRouting/index.vue
View File

@ -5,7 +5,7 @@
<Tabs v-model="apiType">
<TabPane label="管理端接口" name="adminapi"></TabPane>
<TabPane label="用户端接口" name="api"></TabPane>
<TabPane label="客服接口" name="kefuapi"></TabPane>
<TabPane label="客服端接口" name="kefuapi"></TabPane>
<TabPane label="对外接口" name="outapi"></TabPane>
</Tabs>
</Card>

18
template/admin/src/pages/system/codeGeneration/components/StorageLoc.vue
View File

@ -12,39 +12,39 @@
</Alert>
<Form ref="foundation" :model="storage" :rules="storageRules" :label-width="130">
<FormItem label="生成controller位置">
<Input class="form-width" v-model="storage.controller" readonly placeholder="请输入"></Input>
<Input class="form-width" v-model="storage.controller" disabled placeholder="请输入"></Input>
<div class="tip">生成后端控制器文件存放位置</div>
</FormItem>
<FormItem label="生成service位置">
<Input class="form-width" v-model="storage.service" readonly placeholder="请输入"></Input>
<Input class="form-width" v-model="storage.service" disabled placeholder="请输入"></Input>
<div class="tip">生成后端service文件存放位置</div>
</FormItem>
<FormItem label="生成dao位置">
<Input class="form-width" v-model="storage.dao" readonly placeholder="请输入"></Input>
<Input class="form-width" v-model="storage.dao" disabled placeholder="请输入"></Input>
<div class="tip">生成后端dao文件存放位置</div>
</FormItem>
<FormItem label="生成model位置">
<Input class="form-width" v-model="storage.model" readonly placeholder="请输入"></Input>
<Input class="form-width" v-model="storage.model" disabled placeholder="请输入"></Input>
<div class="tip">生成后端model文件存放位置</div>
</FormItem>
<FormItem label="生成route位置">
<Input class="form-width" v-model="storage.route" readonly placeholder="请输入"></Input>
<Input class="form-width" v-model="storage.route" disabled placeholder="请输入"></Input>
<div class="tip">生成后端路由存放位置</div>
</FormItem>
<FormItem label="生成validate位置">
<Input class="form-width" v-model="storage.validate" readonly placeholder="请输入"></Input>
<Input class="form-width" v-model="storage.validate" disabled placeholder="请输入"></Input>
<div class="tip">生成后端验证器存放位置</div>
</FormItem>
<FormItem label="生成pages位置">
<Input class="form-width" v-model="storage.pages" readonly placeholder="请输入"></Input>
<Input class="form-width" v-model="storage.pages" disabled placeholder="请输入"></Input>
<div class="tip">生成前端页面文件存放位置</div>
</FormItem>
<FormItem label="生成api位置">
<Input class="form-width" v-model="storage.api" readonly placeholder="请输入"></Input>
<Input class="form-width" v-model="storage.api" disabled placeholder="请输入"></Input>
<div class="tip">生成前端api接口文件存放位置</div>
</FormItem>
<FormItem label="生成router位置">
<Input class="form-width" v-model="storage.router" readonly placeholder="请输入"></Input>
<Input class="form-width" v-model="storage.router" disabled placeholder="请输入"></Input>
<div class="tip">生成前端路由存放位置</div>
</FormItem>
</Form>