fix: Configuration picture is missing

dgiot · Aug 29, 2022 · 72efcfc · 72efcfc
1 parent 0d68db5
commit 72efcfc
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 3 deletions.
diff --git a/public/assets/images/topo/screen/card.png b/public/assets/images/topo/screen/card.png
diff --git a/public/index.html b/public/index.html
@@ -4,6 +4,7 @@
     <title><%= VUE_APP_TITLE %></title>
     <meta charset="utf-8" />
     <meta content="IE=edge" http-equiv="X-UA-Compatible" />
+    <meta name="referrer" content="no-referrer" /> 
     <meta content="width=device-width,initial-scale=1.0" name="viewport" />
     <meta content="<%= VUE_APP_Keywords %>" name="keywords" />
     <meta content="<%= VUE_APP_Description %>" name="description" />

diff --git a/src/store/modules/topo.js b/src/store/modules/topo.js
@@ -211,6 +211,7 @@ const mutations = {
       if (
         canvas.contextmenu.attrs.name == 'evidence' ||
         canvas.contextmenu.attrs.name == 'konvaimage' ||
+        canvas.contextmenu.attrs.name == 'staticimage' ||
         canvas.contextmenu.attrs.name == 'sprite' ||
         canvas.contextmenu.attrs.name == 'vuecomponent'
       ) {
@@ -290,6 +291,7 @@ const mutations = {
     console.log('thing内容', thing, x, y)
     if (
       thing.type == 'knovaimage' ||
+      thing.type == 'staticimage' ||
       thing.type == 'gifimage' ||
       thing.type == 'vuecomponent'
     ) {
@@ -306,6 +308,14 @@ const mutations = {
             productid: thing.productid,
           })
         )
+      } else if (thing.type == 'staticimage') {
+        simpleImage = addNodeEvent(
+          _.merge(canvas.handlerArgs, {
+            type: 'createStaticImage',
+            image: thing.image,
+            productid: thing.productid,
+          })
+        )
       } else if (thing.type == 'vuecomponent') {
         simpleImage = addNodeEvent(
           _.merge(canvas.handlerArgs, {

diff --git a/src/utils/konva/common.js b/src/utils/konva/common.js
@@ -101,6 +101,9 @@ function addNodeEvent(args) {
       case 'createImage':
         return topoBasic.createImage(args)
         break
+      case 'createStaticImage':
+        return topoBasic.createStaticImage(args)
+        break
       case 'gifImage':
         return topoBasic.createGifImage(args)
         break

diff --git a/src/utils/konva/core/topoBasic.js b/src/utils/konva/core/topoBasic.js
@@ -278,6 +278,44 @@ const topoBasic = {
 
     return simpleImage
   },
+  createStaticImage(args) {
+    console.info(
+      'src/utils/konva/core/topoBasic.js',
+      'createdEvidence',
+      // args.path,
+      args
+    )
+    const Axis = {
+      x: 10 + args.path.index * 100 + canvas.randomXy(60, 10),
+      y: 400 + canvas.randomXy(40, 10),
+    }
+    let simpleImage = ''
+    const topoId = uuid(5)
+    // if (args.type == 'createImage') {
+    var imageObj = new Image()
+    imageObj.src = args.image
+    // imageObj.onload = () => {
+    simpleImage = new Konva.Image({
+      name: 'staticimage',
+      id: args.productid + '_staticimage' + topoId,
+      x: Axis.x,
+      y: Axis.y,
+      image: imageObj,
+      width: 106,
+      height: 118,
+      type: 'staticimage',
+      // handler: 'dblclick',
+      draggable: true,
+    })
+    simpleImage.setAttrs({
+      src: args.image,
+    })
+    // } else if (args.type == 'gifimage') {
+
+    // }
+
+    return simpleImage
+  },
   createGifImage(args) {
     console.info(
       'src/utils/konva/core/topoBasic.js',

diff --git a/src/utils/konva/core/topoStage.js b/src/utils/konva/core/topoStage.js
@@ -331,6 +331,13 @@ const topoStage = {
         // layer.batchDraw()
         // stage.batchDraw()
       }
+      if (node.attrs.type == 'staticimage') {
+        let image = new Image()
+        node.setAttrs({
+          image: image,
+        })
+        image.src = node.attrs.src
+      }
       node.on('contextmenu', (e) => {
         canvas.contextmenu = e.target
         console.log('contextmenu', e.target)

diff --git a/src/views/CloudFunction/topo/components/TopoTabs.vue b/src/views/CloudFunction/topo/components/TopoTabs.vue
@@ -100,17 +100,18 @@
           静态文本框
         </el-button>
         <el-divider />
+        <div style="text-align: left; margin: 10px; font-weight: 600">动图</div>
         <img
           draggable="true"
           size="mini"
-          src="http://dev.iotn2n.com/dgiot_file/topo/png/pump.gif"
+          src="https://prod.dgiotcloud.cn/dgiot_file/topo/png/pump.gif"
           style="width: 40px; height: 40px; display: inline-block"
           type="primary"
           @click="
             createBasicThing({
               productid: $route.query.productid,
               type: 'knovaimage',
-              image: 'http://dev.iotn2n.com/dgiot_file/topo/png/pump.gif',
+              image: 'https://prod.dgiotcloud.cn/dgiot_file/topo/png/pump.gif',
               hidden: false,
             })
           "
@@ -137,6 +138,31 @@
           "
         />
         <el-divider />
+        <div style="text-align: left; margin: 10px; font-weight: 600">
+          静态图
+        </div>
+        <img
+          draggable="true"
+          size="mini"
+          src="https://mp0.usr.cn/uploads/drawimg/1612317616625_0334.png"
+          style="
+            width: 40px;
+            height: 40px;
+            display: inline-block;
+            margin-left: 20px;
+          "
+          type="primary"
+          @click="
+            createBasicThing({
+              productid: $route.query.productid,
+              type: 'staticimage',
+              image:
+                'https://mp0.usr.cn/uploads/drawimg/1612317616625_0334.png',
+              hidden: false,
+            })
+          "
+        />
+        <el-divider />
         <el-button
           draggable="true"
           size="mini"

diff --git a/src/views/DeviceCloud/manage/home_index.vue b/src/views/DeviceCloud/manage/home_index.vue
@@ -6,7 +6,7 @@
         class="wrap_konva"
         footer-hide
         :query="routerInfo.query"
-        width="1400"
+        width="1200"
         @on-cancel="closeModal"
       >
         <span slot="title" v-if="false"></span>