Merge pull request 'fix : 修复细节' (#181) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/181
This commit is contained in:
2024-05-15 05:25:16 +00:00
4 changed files with 8 additions and 8 deletions

View File

@@ -9,7 +9,7 @@
@cancel="handleCancel" @cancel="handleCancel"
> >
<template #reference> <template #reference>
<el-button :type="btnType" size="mini" v-perm="perm" :disabled="isDisabled" :icon="btnIcon" :plain="isPlain"> <el-button :type="btnType" size="mini" :disabled="isDisabled" :icon="btnIcon" :plain="isPlain">
{{ btnText }} {{ btnText }}
</el-button> </el-button>
</template> </template>

View File

@@ -40,10 +40,10 @@
<el-table-column prop="updateTime" label="更新时间" align="center"/> <el-table-column prop="updateTime" label="更新时间" align="center"/>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="mini" v-perm="['rapid:regular:edit']" <el-button type="primary" size="mini"
@click="handleApprove(scope.row)" link>发起流程 @click="handleApprove(scope.row)" link>发起流程
</el-button> </el-button>
<popover-delete :name="scope.row.deploymentName" :type="'流程'" :perm="['rapid:regular:del']" <popover-delete :name="scope.row.deploymentName" :type="'流程'"
@delete="handleDelete(scope.row.id)"/> @delete="handleDelete(scope.row.id)"/>
</template> </template>
</el-table-column> </el-table-column>

View File

@@ -50,13 +50,13 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="mini" v-perm="['rapid:regular:edit']" <el-button type="primary" size="mini"
@click="handleEdit(scope.row.deploymentId)" link>编辑 @click="handleEdit(scope.row.deploymentId)" link>编辑
</el-button> </el-button>
<el-button type="primary" size="mini" v-perm="['rapid:regular:edit']" <el-button type="primary" size="mini"
@click="viewHistoricalVersion(scope.row)" link>历史 @click="viewHistoricalVersion(scope.row)" link>历史
</el-button> </el-button>
<popover-delete :name="scope.row.version" :type="'版本'" :perm="['rapid:regular:del']" <popover-delete :name="scope.row.version" :type="'版本'"
@delete="handleDelete(scope.row.deploymentId)"/> @delete="handleDelete(scope.row.deploymentId)"/>
</template> </template>
</el-table-column> </el-table-column>

View File

@@ -69,8 +69,8 @@ export default defineConfig({
open: true, open: true,
proxy: { proxy: {
'/api/workflow': { '/api/workflow': {
target: 'http://frp.feashow.cn:31800/', // target: 'http://frp.feashow.cn:31800/',
// target: 'http://clay.frp.feashow.cn/', target: 'http://clay.frp.feashow.cn/',
// target: 'http://192.168.31.175:8000', // target: 'http://192.168.31.175:8000',
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '') rewrite: (path) => path.replace(/^\/api/, '')