فهرست منبع

Merge branch 'dev' of http://39.106.8.246:3003/web/persagy-plan-editer into dev

YaolongHan 4 سال پیش
والد
کامیت
1aa53426eb

+ 8 - 1
src/App.vue

@@ -9,4 +9,11 @@ export default {
     return {};
   },
 };
-</script>
+</script>
+<style lang="less">
+.el-color-dropdown__btns {
+  .el-color-dropdown__link-btn {
+    display: none;
+  }
+}
+</style>

+ 5 - 3
src/components/editview/basePlanEditer.vue

@@ -350,7 +350,7 @@ export default {
             bus.$on("savePlanImg", () => {
                 // 隐藏选择器
                 this.scene.selectContainer.clear();
-                this.view.saveImageSize(`${this.planContent.name}.png`, "png", this.canvasWidth, this.canvasHeight);
+                this.view.saveImageSize(`${this.planContent.name}.png`, "png", this.canvasWidth, this.canvasHeight, this.view.backgroundColor.value);
             });
             // 发布图片
             bus.$off("issuePlan");
@@ -783,7 +783,8 @@ export default {
                     // 重设版本号
                     if (vals[1].version && vals[1].id && vals[1].graphId) {
                         this.SETPROJECT(vals[1]);
-                        this.$message.success(`保存成功${vals[1].version}`);
+                        this.$message.success(`保存成功`);
+                        // ${vals[1].version}
                         const { folderId, folderName, buildingId, floorId, floorLocalName, name, floorMap } = this.$route.query;
                         this.$router.replace({
                             name: "Editer",
@@ -868,6 +869,7 @@ export default {
                 ruleList: this.ruleList, // 实例数据获取规则
                 pic: `${uuid}.png`, // 图快照
                 version: this.version, // 版本号
+                viewBackground: this.view.backgroundColor.value, //视图背景色
             };
             // 区域显示时,上送区域显示的outline点坐标数组
             if (outline) {
@@ -900,7 +902,7 @@ export default {
             planerPublish(pa)
                 .then((res) => {
                     if (res.result === "success") {
-                        this.$message.success("发布成功");
+                        this.$message.success(`发布成功${res.entityList[0].version}`);
                         console.log(this.folderId);
                         this.$router.push({ name: "Home", params: { folderId: this.folderId } });
                     } else {

+ 4 - 1
src/components/homeView/createPlanarDialog.vue

@@ -22,7 +22,7 @@
                     ></el-cascader>
                 </el-form-item>
                 <el-form-item label="名称" prop="name">
-                    <el-input v-model="ruleForm.name" placeholder="请输入名称" size="small" :maxlength="10"></el-input>
+                    <el-input v-model="ruleForm.name" placeholder="请输入名称" size="small" :maxlength="10" @blur="nameBlur"></el-input>
                 </el-form-item>
                 <el-form-item label="标签" prop="resource">
                     <div class="tagContainer">
@@ -105,6 +105,9 @@ export default {
         };
     },
     methods: {
+        nameBlur() {
+            this.ruleForm.name = this.ruleForm.name.trim()
+        },
         // 显示创建平面图弹窗
         showDialog() {
             this.outerVisible = true;

+ 4 - 0
src/components/homeView/move.vue

@@ -96,6 +96,10 @@ export default {
             if (!this.value.length || !this.data.length) {
                 return;
             }
+            if (this.value == this.data[0].folderId) {
+                this.$message.warning('目标位置与当前位置一致')
+                return
+            }
             const postParams = {
                 content: [],
                 projection: ["folderId"],

+ 1 - 1
src/components/homeView/planImageCard.vue

@@ -113,7 +113,7 @@ export default {
                 case "publish":
                     res = await planerPublish(postParams);
                     if (res.result == "success") {
-                        this.$message.success("发布成功");
+                        this.$message.success(`发布成功${res.entityList[0].version}`);
                         this.$emit("publishSuc");
                     } else {
                         this.$message.error("发布失败");

+ 7 - 5
src/views/home.vue

@@ -569,11 +569,13 @@ export default {
      * 点击已发布,最终跳转编辑器
      */
     finalToEdit(query) {
-      let routeUrl = this.$router.resolve({
-        name: "Editer",
-        query,
-      });
-      window.open(routeUrl.href, "_blank");
+      setTimeout(() => {
+        let routeUrl = this.$router.resolve({
+          name: "Editer",
+          query,
+        });
+        window.open(routeUrl.href, "_blank");
+      }, 500)
     },
     /**
      * 查询图形信息