From 9c3deb02e6a39c008ffd8e445511dfcfe85c5702 Mon Sep 17 00:00:00 2001
From: yuan <yuanliye@joylink.club>
Date: Thu, 15 Jul 2021 11:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=A8=A1=E5=9E=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/management/model.js                   |  38 ++++++-
 src/i18n/langs/en/router.js                   |   1 +
 src/i18n/langs/zh/router.js                   |   1 +
 src/router/index.js                           |  15 +++
 src/views/publish/publishMap/list.vue         |   1 -
 .../publish/userModel/components/editInfo.vue |  75 +++++++++++++
 src/views/publish/userModel/history.vue       |  95 ++++++++++++++++
 src/views/publish/userModel/index.vue         | 105 ++++++++++++++++++
 8 files changed, 326 insertions(+), 5 deletions(-)
 create mode 100644 src/views/publish/userModel/components/editInfo.vue
 create mode 100644 src/views/publish/userModel/history.vue
 create mode 100644 src/views/publish/userModel/index.vue

diff --git a/src/api/management/model.js b/src/api/management/model.js
index 8f77b519f..449b4406e 100644
--- a/src/api/management/model.js
+++ b/src/api/management/model.js
@@ -60,19 +60,49 @@ export function deleteModelDraft(id) {
     })
 }
 
-/** 查询模型数据 */
+/** 分页查询模型数据 */
 export function getModelList() {
     return request({
-        url: `/api/model2d/list`,
+        url: `/api/model2d/paging`,
         method: 'get',
     })
 }
 
+/** 查询某个模型所有历史版本数据 */
+export function getModelVersions(code) {
+    return request({
+        url: `/api/model2d/${code}/versions`,
+        method: 'get'
+    })
+}
+
+/** 分页查询模型历史版本 */
+export function getModelVersionsPaging(code) {
+    return request({
+        url: `/api/model2d/${code}/versions/paging`,
+        method: 'get'
+    })
+}
+
+/** 更新2d模型基础信息 */
+export function updateModelBasicInfo(id) {
+    return request({
+        url: `/api/model2d/{id}/basic`,
+        method: 'put'
+    })
+}
+
+/** 回滚版本 */
+export function setModelVersion(code, version) {
+    return request({
+        url: `/api/model2d/${code}/version/${version}`,
+        method: 'put'
+    })
+}
+
 
 
 
 
 
 
-
-
diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js
index dbec19a6c..03d61ca86 100644
--- a/src/i18n/langs/en/router.js
+++ b/src/i18n/langs/en/router.js
@@ -100,6 +100,7 @@ export default {
     publishISCSManage:'publish ISCS Manage',
     voiceTraining: 'Voice Training',
     mapGroup: 'Map Group',
+    userModel: 'User Model',
     drawingMange:'Drawing Mange',
     newDraw: 'New Draw'
 };
diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js
index 94b24a50f..e67ba3a08 100644
--- a/src/i18n/langs/zh/router.js
+++ b/src/i18n/langs/zh/router.js
@@ -104,6 +104,7 @@ export default {
     publishISCSManage:'发布ISCS管理',
     voiceTraining: '语音训练',
     mapGroup: '地图分组',
+    userModel: '模型管理',
     drawingMange:'图纸管理',
     newDraw: '新版绘制'
 };
diff --git a/src/router/index.js b/src/router/index.js
index cea6f628b..b0e11153c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -125,6 +125,8 @@ const PublishExamRule = () => import('@/views/publish/examRule/index');
 const PublishExamRuleDraft = () => import('@/views/publish/examRule/draft/index');
 const PublishIBP = () => import('@/views/publish/publishIBP/index');
 const PublishISCS = () => import('@/views/publish/publishISCS/index');
+const PublishModel = () => import('@/views/publish/userModel/index');
+const PublishModelHistory = () => import('@/views/publish/userModel/history');
 
 const TrainingPlatform = () => import('@/views/trainingPlatform/index');
 
@@ -916,6 +918,19 @@ export const asyncRouter = [
                 meta: {
                     i18n: 'router.mapGroup'
                 }
+            },
+            {   //发布模型管理
+                path: 'userModel',
+                component: PublishModel,
+                meta: {
+                    i18n: 'router.userModel'
+                },
+            },
+            {   //模型历史版本
+                path: 'userModel/history',
+                name: 'modelHistory',
+                component: PublishModelHistory,
+                hidden: true
             }
         ]
     },
diff --git a/src/views/publish/publishMap/list.vue b/src/views/publish/publishMap/list.vue
index d72438a40..a0bb65620 100644
--- a/src/views/publish/publishMap/list.vue
+++ b/src/views/publish/publishMap/list.vue
@@ -26,7 +26,6 @@ export default {
                 reset: false,
                 show: false,
                 queryObject: {}
-
             },
             queryList: {
                 query: this.queryFunction,
diff --git a/src/views/publish/userModel/components/editInfo.vue b/src/views/publish/userModel/components/editInfo.vue
new file mode 100644
index 000000000..372cc628a
--- /dev/null
+++ b/src/views/publish/userModel/components/editInfo.vue
@@ -0,0 +1,75 @@
+<template>
+    <el-dialog v-dialogDrag :visible.sync="visible" :title="title" center :destroy-on-close="true">
+        <el-form :model="formData" :rules="formRules" ref="form">
+            <!-- <el-form-item label="模型编号" prop="code">
+                <el-input v-model="formData.code"></el-input>
+            </el-form-item> -->
+            <el-form-item label="模型名称" prop="name">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item label="版本" prop="version">
+                <el-select v-model="formData.version">
+                    <el-option
+                        v-for="item in versionOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    />
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="close">取 消</el-button>
+            <el-button type="primary" @click="confirmHandler">确 定</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { getModelVersions } from "@/api/management/model";
+export default {
+    name: "EditModelInfo",
+    data() {
+        return {
+            visible: false,
+            title: "编辑模型",
+            formData: { code: "", name: "", type: "", version: "" },
+            versionOptions: [
+                {
+                    label: "",
+                    value: ""
+                }
+            ],
+            formRules: {
+                // code: [{ required: true, message: "请输入模型编号", trigger: "blur" }],
+                name: [{ required: true, message: "请输入模型名称", trigger: "blur" }]
+            }
+        };
+    },
+    mounted() {},
+    methods: {
+        initVersionInfo(code) {
+            getModelVersions(code).then(res => {
+                this.versionOptions = res.data.map(e => {
+                    return {
+                        label: e.version,
+                        value: e.version
+                    };
+                });
+            });
+        },
+        show(data) {
+            this.formData = data;
+            this.initVersionInfo(data.code);
+            this.visible = true;
+        },
+        close() {
+            this.visible = false;
+            this.$emit("close");
+        },
+        confirmHandler() {}
+    }
+};
+</script>
+
+<style></style>
diff --git a/src/views/publish/userModel/history.vue b/src/views/publish/userModel/history.vue
new file mode 100644
index 000000000..5341c3c6e
--- /dev/null
+++ b/src/views/publish/userModel/history.vue
@@ -0,0 +1,95 @@
+<template>
+    <div class="container">
+        <QueryListPage :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+        <div class="btn-area">
+            <el-button type="primary" @click="goBack">返回</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import { getModelVersionsPaging, setModelVersion } from "@/api/management/model";
+export default {
+    name: "ModelHistory",
+    data() {
+        return {
+            pagerConfig: {
+                pageSize: "pageSize",
+                pageIndex: "pageNum"
+            },
+            queryForm: {
+                labelWidth: "80px",
+                reset: false,
+                show: false,
+                queryObject: {}
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: "模型编号",
+                        prop: "code"
+                        // width:'300px'
+                    },
+                    {
+                        title: "模型名称",
+                        prop: "name"
+                        // width:'200px'
+                    },
+                    {
+                        title: "版本",
+                        prop: "version"
+                        // width:'200px'
+                    },
+                    {
+                        title: "创建人ID",
+                        prop: "createUserId"
+                    },
+                    {
+                        title: "修改时间",
+                        prop: "updateTime"
+                    },
+                    {
+                        type: "button",
+                        title: this.$t("global.operate"),
+                        width: "100",
+                        buttons: [
+                            {
+                                name: "应用",
+                                handleClick: this.handleApply
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    methods: {
+        queryFunction() {
+            return getModelVersionsPaging(this.$route.query.code);
+        },
+        goBack() {
+            this.$router.go(-1)
+        },
+        handleApply(row, data) {
+            const {code, version} = {...data}
+            setModelVersion(code, version).then(resp=>{
+                this.$message.success(`成功切换为${version}版本`)
+            })
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.container {
+    padding: 10px;
+    .btn-area {
+        display: flex;
+        padding: 10px;
+        justify-content: center;
+    }
+}
+</style>
diff --git a/src/views/publish/userModel/index.vue b/src/views/publish/userModel/index.vue
new file mode 100644
index 000000000..eb08ce4dc
--- /dev/null
+++ b/src/views/publish/userModel/index.vue
@@ -0,0 +1,105 @@
+<template>
+    <div class="container">
+        <QueryListPage :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+        <edit-model-info ref="editDialog" @close="reloadTable" />
+    </div>
+</template>
+
+<script>
+import { getModelList } from "@/api/management/model";
+import EditModelInfo from "./components/editInfo";
+export default {
+    name: "publishModel",
+    components: { EditModelInfo },
+    data() {
+        return {
+            pagerConfig: {
+                pageSize: "pageSize",
+                pageIndex: "pageNum"
+            },
+            queryForm: {
+                labelWidth: "80px",
+                reset: true,
+                queryObject: {
+                    code: {
+                        type: "text",
+                        label: "模型编号"
+                    },
+                    name: {
+                        type: "text",
+                        label: "模型名称"
+                    },
+                    type: {
+                        type: "text",
+                        label: "模型类型"
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryPublishedModelList,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: "模型编号",
+                        prop: "code"
+                    },
+                    {
+                        title: "模型名称",
+                        prop: "name"
+                    },{
+                        title: '当前版本',
+                        prop: "version"
+                    },
+                    {
+                        title: "创建时间",
+                        prop: "createTime"
+                    },
+                    {
+                        title: "修改时间",
+                        prop: "updateTime"
+                    },
+                    {
+                        type: "button",
+                        title: this.$t("global.operate"),
+                        width: "350",
+                        buttons: [
+                            // {
+                            //     name: "编辑信息",
+                            //     handleClick: this.handleEdit
+                            // },
+                            {
+                                name: "发布历史",
+                                handleClick: this.handleHistory
+                            },
+                            {
+                                name: this.$t("global.delete"),
+                                handleClick: this.handleDelete,
+                                type: "danger"
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    methods: {
+        queryPublishedModelList(params) {
+            return getModelList(params);
+        },
+        reloadTable() {
+            this.queryList.reload();
+        },
+        handleEdit(row, data) {
+            this.$refs.editDialog.show(data);
+        },
+        handleDelete(row, data) {},
+        handleHistory(row, data) {
+            console.log(data.code);
+            this.$router.push({ name: `modelHistory`, query: { code: data.code } });
+        }
+    }
+};
+</script>
+
+<style lang="sass" scoped></style>