From 4f9c70f3cb683e8339bbd0e31223ce63622a6ae1 Mon Sep 17 00:00:00 2001
From: yuan <yuanliye@joylink.club>
Date: Wed, 7 Jul 2021 10:25:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83&=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/management/model.js                   |  4 +-
 .../draftList/components/create.vue           | 11 +---
 src/views/userModelDesign/draftList/index.vue | 53 ++++++++++++++-----
 src/views/userModelDesign/edit/index.vue      |  2 +-
 4 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/api/management/model.js b/src/api/management/model.js
index 4c59844fc..602d9e8c0 100644
--- a/src/api/management/model.js
+++ b/src/api/management/model.js
@@ -3,7 +3,7 @@ import request from '@/utils/request';
 /** 新建用户草稿2d模型*/
 export function createModelDraft(data) {
     return request({
-        url: `draft/model2d/`,
+        url: `/draft/model2d/`,
         method: 'post',
         data
     })
@@ -12,7 +12,7 @@ export function createModelDraft(data) {
 /** 分页查询用户2d模型草稿*/
 export function getModelDraftList(params) {
     return request({
-        url: `draft/model2d/paging`,
+        url: `/draft/model2d/paging`,
         method: 'get',
         params
     })
diff --git a/src/views/userModelDesign/draftList/components/create.vue b/src/views/userModelDesign/draftList/components/create.vue
index 16b632aaa..3ef8c1be3 100644
--- a/src/views/userModelDesign/draftList/components/create.vue
+++ b/src/views/userModelDesign/draftList/components/create.vue
@@ -7,12 +7,6 @@
             <el-form-item label="模型名称" prop="name">
                 <el-input v-model="formData.name"></el-input>
             </el-form-item>
-            <el-form-item label="模型类型" prop="type">
-                <el-input v-model="formData.type"></el-input>
-            </el-form-item>
-            <el-form-item label="模型版本" prop="version">
-                <el-input v-model="formData.version"></el-input>
-            </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
             <el-button @click="close">取 消</el-button>
@@ -32,9 +26,7 @@ export default {
             formData: { code: "", name: "", type: "", version: "" },
             formRules: {
                 code: [{ required: true, message: "请输入模型编号", trigger: "blur" }],
-                name: [{ required: true, message: "请输入模型名称", trigger: "blur" }],
-                type: [{ required: true, message: "请输入模型类型", trigger: "blur" }],
-                version: [{ required: true, message: "请输入模型类型", trigger: "blur" }]
+                name: [{ required: true, message: "请输入模型名称", trigger: "blur" }]
             }
         };
     },
@@ -67,7 +59,6 @@ export default {
             this.$refs.form.validate(valid => {
                 if (valid) {
                     this.submit(this.formData).then(resp => {
-                        console.log(resp);
                         this.close();
                     });
                 }
diff --git a/src/views/userModelDesign/draftList/index.vue b/src/views/userModelDesign/draftList/index.vue
index 5eb5d0302..37deebd43 100644
--- a/src/views/userModelDesign/draftList/index.vue
+++ b/src/views/userModelDesign/draftList/index.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { createModelDraft, getModelDraftList } from "@/api/management/model";
+import { getModelDraftList, publishModelDraft, deleteModelDraft } from "@/api/management/model";
 import createModelDraftDialog from "./components/create";
 
 export default {
@@ -49,18 +49,14 @@ export default {
                         title: "模型名称",
                         prop: "name"
                     },
-                    {
-                        title: "类型",
-                        prop: "type"
-                    },
-                    {
-                        title: "版本",
-                        prop: "version"
-                    },
                     {
                         title: "创建时间",
                         prop: "createTime"
                     },
+                    {
+                        title: "修改时间",
+                        prop: "updateTime"
+                    },
                     {
                         type: "button",
                         title: this.$t("global.operate"),
@@ -101,7 +97,6 @@ export default {
         },
 
         closeCreate(e) {
-            console.log(e);
             this.reloadTable();
         },
 
@@ -109,15 +104,47 @@ export default {
             this.$refs.createDialog.show("edit", data);
         },
 
-        handleDelete(a, b, c, d, e) {
-            console.log("delete");
+        handleDelete(idx, data) {
+            this.$confirm("确认删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                center: true
+            })
+                .then(
+                    () => {
+                        deleteModelDraft(data.id).then(() => {
+                            this.reloadTable();
+                        });
+                    },
+                    () => {}
+                )
+                .catch(e => {
+                    this.$message(e);
+                });
         },
 
         handleDraw(idx, data) {
             this.$router.push({ path: `usermodel/${data.id}/edit` });
         },
 
-        handlePublish() {},
+        handlePublish(idx, data) {
+            this.$confirm("确认发布?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                center: true
+            })
+                .then(
+                    () => {
+                        publishModelDraft(data.id).then(() => {
+                            this.reloadTable();
+                        });
+                    },
+                    () => {}
+                )
+                .catch(e => {
+                    this.$message(e);
+                });
+        },
 
         reloadTable() {
             this.queryList.reload();
diff --git a/src/views/userModelDesign/edit/index.vue b/src/views/userModelDesign/edit/index.vue
index b52f87341..24a939886 100644
--- a/src/views/userModelDesign/edit/index.vue
+++ b/src/views/userModelDesign/edit/index.vue
@@ -24,7 +24,7 @@ export default {
                 const data = res.data;
                 this.name = data.name;
                 this.type = data.type || "";
-                this.model = JSON.parse(data.jsonData || "");
+                this.model = data.jsonData ? JSON.parse(data.jsonData) : {};
             });
         },
         onSave(payload) {