Merge branch 'master' of http://42.193.1.25:9521/r/project_management-vue

zh

2024-11-25 fa69c4fed092597de0d7e6bb522942da847bb641

Merge branch 'master' of http://42.193.1.25:9521/r/project_management-vue

 .env.development

@@ -12,3 +12,6 @@

# 开打新的tab的url前缀
VUE_APP_TAB_URL_PREFIX = http://127.0.0.1:8080

# flowable设计页面前缀
VUE_APP_FLOWABLE_PREFIX = http://127.0.0.1:10076

 .env.production

@@ -9,3 +9,6 @@

# 开打新的tab的url前缀
VUE_APP_TAB_URL_PREFIX = http://127.0.0.1:9999

# flowable设计页面前缀
VUE_APP_FLOWABLE_PREFIX = http://127.0.0.1:10076

 src/views/process/api/deployService.js

@@ -4,12 +4,12 @@
import commonUtil from "@/utils/common";

// 获取模型数据
export const getProcesslists = (data) => {
    const fd = commonUtil.objectToFormData(data);
export const getProcesslists = (params) => {
    // const fd = commonUtil.objectToFormData(data);
    return request({
      url: '/flow/manage/getprocesslists?pageNum=1&pageSize=10',
      method: 'post',
      data: fd
      url: '/flow/manage/getprocesslists',
      method: 'get',
      params: params
    })
}


 src/views/process/api/model.js

@@ -4,11 +4,11 @@
import commonUtil from "@/utils/common"

// 获取模型数据
export const getModelLists = (data) => {
export const getModelLists = (parmas) => {
    return request({
      url: '/model/manage/modelLists',
      method: 'post',
      data: commonUtil.objectToFormData(data)
      method: 'get',
      params: parmas
    })
}


 src/views/process/deployManagement.vue

@@ -12,8 +12,8 @@
            <div>
                <label>版本</label>
                <el-select v-model="searchParams.latest" size="small">
                    <el-option label="只看新版本" value="true"></el-option>
                    <el-option label="全部版本" value="false"></el-option>
                    <el-option label="只看新版本" :value="true"></el-option>
                    <el-option label="全部版本" :value="false"></el-option>
                </el-select>
            </div>
            <div>
@@ -153,7 +153,7 @@
            searchParams: {
                key: "",
                name: "",
                latest: "true",
                latest: true,
                orderByColumn: "processSort",
                isAsc: "asc",
                pageNum: 1,
@@ -199,7 +199,7 @@
        reset() {
            this.searchParams.key = "";
            this.searchParams.name = "";
            this.searchParams.latest = "true";
            this.searchParams.latest = true;
            this.getListAndRenderByParams(this.searchParams)
        },
        handleDefinition(index, row) {

 src/views/process/modelManagement.vue

@@ -57,20 +57,24 @@
                        <el-button
                        size="mini"
                        type="text"
                        @click="handleDesign(scope.$index, scope.row)">设计</el-button>
                @click="handleDesign(scope.$index, scope.row)">设计
              </el-button>
                        <el-button
                        v-if="!scope.row.deploymentId"
                        size="mini"
                        type="text"
                        @click="handlePublish(scope.$index, scope.row)">发布</el-button>
                @click="handlePublish(scope.$index, scope.row)">发布
              </el-button>
                        <el-button
                        size="mini"
                        type="text"
                        @click="handleExport(scope.$index, scope.row)">导出</el-button>
                @click="handleExport(scope.$index, scope.row)">导出
              </el-button>
                        <el-button
                        size="mini"
                        type="text"
                        @click="handleDelete(scope.$index, scope.row)">删除</el-button>
                @click="handleDelete(scope.$index, scope.row)">删除
              </el-button>
                    </template>
                </el-table-column>
                </template>
@@ -106,6 +110,7 @@
import {getModelLists, addModel, publishModelById, deleteModelById} from "./api/model.js";
import commonHelper from "@/utils/common.js"
import TableTemplate from "@/components/TableTemplate";

export default {
    name: "ModelManagement",
    components: {
@@ -166,9 +171,9 @@
        },
        handleDesign(index, row) {
            // flowable改变设计的路径
            const path = "/designer/index.html#/editor/" + row.id;
      const path = process.env.VUE_APP_FLOWABLE_PREFIX + "/designer/index.html#/editor/" + row.id;
            // const path = "/editor?modelId=" + row.id;
            commonHelper.openWindow(path);
      window.open(path, '')
        },
        handlePublish(index, row) {
            const id = row.id;
@@ -180,7 +185,7 @@
        handleExport(index, row) {
            const {key ,id} = row;
            const a = document.createElement("a");
            const url = process.env.VUE_APP_TAB_URL_PREFIX + "/model/manage/export/" + id;
      const url = process.env.VUE_APP_FLOWABLE_PREFIX + "/model/manage/export/" + id;
            a.href = url;
            a.click();
        },
@@ -221,16 +226,19 @@
    color: #606266;
    margin-right: 8px;
}

.search-bar {
    display: flex;
    margin-top: 8px;
    margin-left: 8px;
}

.el-input {
    display: inline-block;
    width: 300px;
    margin-right: 10px;
}

.el-textarea {
    width: 300px;
}