Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

src/components/apass-list.vue

@@ -181,6 +181,7 @@ export default {
       }
     },
     searchAction(value) {
+      this.currentPage = 1;
       this.listAction();
     },
     filterChange(filter) {

src/components/super-flow.vue

@@ -5,109 +5,14 @@
 -->
 <template>
   <div>
-    <div>
-      <el-form
-        class="link-base-style-form"
-        ref="linkBaseStyle"
-        label-width="100px"
-        :model="linkBaseStyle">
-        <h4>linkBaseStyle</h4>
-        <el-row :gutter="10">
-          <el-col :span="12">
-            <el-form-item label="color">
-              <el-color-picker
-                v-model="linkBaseStyle.color">
-              </el-color-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="hover">
-              <el-color-picker
-                v-model="linkBaseStyle.hover">
-              </el-color-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="textColor">
-              <el-color-picker
-                v-model="linkBaseStyle.textColor">
-              </el-color-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="textHover">
-              <el-color-picker
-                v-model="linkBaseStyle.textHover">
-              </el-color-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="font">
-              <el-select
-                size="medium"
-                v-model="linkBaseStyle.font">
-                <el-option
-                  v-for="item in fontList"
-                  :key="item"
-                  :label="item"
-                  :value="item">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="dotted">
-              <el-switch
-                v-model="linkBaseStyle.dotted"
-                active-color="#13ce66"
-                inactive-color="#ff4949">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="lineDash">
-              <el-select
-                size="medium"
-                style="width: 80px"
-                v-model="linkBaseStyle.lineDash[0]">
-                <el-option
-                  v-for="item in [1,2,3,4,5,6,7,8]"
-                  :key="item"
-                  :label="item"
-                  :value="item">
-                </el-option>
-              </el-select>
-              <el-select
-                size="medium"
-                style="width: 80px"
-                v-model="linkBaseStyle.lineDash[1]">
-                <el-option
-                  v-for="item in [1,2,3,4,5,6,7,8]"
-                  :key="item"
-                  :label="item"
-                  :value="item">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="background">
-              <el-color-picker
-                v-model="linkBaseStyle.background">
-              </el-color-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-
     <div class="super-flow-demo1">
       <div class="node-container">
         <span
           class="node-item"
           v-for="(item, index) in nodeItemList"
           :key="index"
-          @mousedown="evt => nodeItemMouseDown(evt, item.value)">
+          @mousedown="evt => nodeItemMouseDown(evt, item.value)"
+          @click="clickItem">
           {{item.label}}
         </span>
       </div>
@@ -521,11 +426,15 @@
           ele,
           isDown: true
         })
+        ele.id = Math.random()
         ele.style.position = 'fixed'
         ele.style.margin = '0'
         ele.style.top = clientY - conf.offsetTop + 'px'
         ele.style.left = clientX - conf.offsetLeft + 'px'
         this.$el.appendChild(this.dragConf.ele)
+      },
+      clickItem(item) {
+        console.log(item)
       }
     }
   }

src/pages/workbench/fwgl/fwglList.vue

@@ -106,6 +106,7 @@
       :title="dialogInfo.title"
       :msg="dialogInfo.msg"
       :submit="dialogInfo.submit"
+      :sunbmitText="dialogInfo.sunbmitText"
     ></apass-dialog>
 
     <allot-info-confirm

src/pages/workbench/fwzc_fwcs.vue

@@ -546,7 +546,7 @@ export default {
       dialogInfo: {
         title: "时空服务参数已修改",
         msg: "",
-        submit: "",
+        submit: null,
       },
       is_portal: false,
       portal_id: "",
@@ -1002,6 +1002,12 @@ export default {
       }
     },
     goBack() {
+      let self = this;
+      self.$store.commit("setZnztDetailsParams", {
+        type: "",
+        queryType: "webmap",
+        id: self.portal_id,
+      });
       this.$router.go(-1);
     },
     addPortalItem() {
@@ -1031,12 +1037,9 @@ export default {
         "*"
       );
     },
-  },
-  mounted() {
-    let self = this;
-    window.addEventListener("message", function (event) {
+    listeners(event) {
       console.log(event);
-      if (event.origin == "https://apaasgis.wodcloud.com" && event.data) {
+      if (event && event.origin == "https://apaasgis.wodcloud.com" && event.data) {
         if (event.data.cmd == "getPortalItemInfo") {
           console.log(event.data.params);
           let data = event.data.params;
@@ -1077,7 +1080,11 @@ export default {
           self.is_portal = false;
         }
       }
-    });
+    },
+  },
+  mounted() {
+    let self = this;
+    window.addEventListener("message", self.listeners(), false);
     self.judgeMap();
     self.getArea();
   },