nqm-target

cepave-f2e · Mar 21, 2017 · fb4c4c8 · fb4c4c8
1 parent b5d0124
commit fb4c4c8
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 52 deletions.
diff --git a/src/containers/nqm-target/index.js b/src/containers/nqm-target/index.js
@@ -170,12 +170,11 @@ module.exports = {
           : this.$refs.createTargetGroupTags.labelData.map((label, idx) => {
             return label.name
           }),
-        },
-        targetHeaders: {
-          headers: this.targetHeaders,
-          params : this.targetParams
         }
       })
+      .then(() => {
+        this.getTargets()
+      })
     },
     editTargetInfo(e) {
       const { currentTargetInfo } = this.$store.state.nqmTarget
@@ -202,13 +201,12 @@ module.exports = {
         editTarget: {
           targetId: this.currentTargetId,
           data
-        },
-        targetHeaders: {
-          headers: this.targetHeaders,
-          params : this.targetParams
         }
       })
-      this.currentTargetId = -1
+      .then(() => {
+        this.getTargets()
+        this.currentTargetId = -1
+      })
     },
     selectIsp(data) {
       if (data.value) {

diff --git a/src/store/nqm-target/actions.js b/src/store/nqm-target/actions.js
@@ -104,25 +104,28 @@ module.exports = {
     })
   },
 
-  'createTarget'({ commit, state, dispatch }, n) {
-    const opts = {
-      method: 'POST',
-      url: 'http://localhost:6040/api/v1/nqm/target',
-      data: {
-        ...n.createTarget
+  'createTarget'({ commit, state }, n) {
+    return new Promise((resolve, reject) => {
+      const opts = {
+        method: 'POST',
+        url: 'http://localhost:6040/api/v1/nqm/target',
+        data: {
+          ...n.createTarget
+        }
       }
-    }
 
-    fetch(opts)
-    .then((res) => {
-      commit('createTarget.success', {
-        data: res.data
+      fetch(opts)
+      .then((res) => {
+        commit('createTarget.success', {
+          data: res.data
+        })
+        resolve()
       })
-      dispatch('getTargets', n.targetHeaders)
-    })
-    .catch((err) => {
-      commit('createTarget.fail', {
-        err
+      .catch((err) => {
+        commit('createTarget.fail', {
+          err
+        })
+        reject()
       })
     })
   },
@@ -151,34 +154,37 @@ module.exports = {
     })
   },
 
-  'editTarget'({ commit, state, dispatch }, n) {
-    const data = {
-      status: 1,
-      name: null,
-      comment: null,
-      isp_id: -1,
-      province_id: -1,
-      city_id: -1,
-      name_tag: null,
-      group_tag: [],
-      ...n.editTarget.data
-    }
-    const opts = {
-      method: 'PUT',
-      url: `http://localhost:6040/api/v1/nqm/target/${n.editTarget.targetId}`,
-      data,
-    }
-    debugger
-    fetch(opts)
-    .then((res) => {
-      commit('editAgent.success', {
-        data: res.data
+  'editTarget'({ commit, state }, n) {
+    return new Promise((resolve, reject) => {
+      const data = {
+        status: 1,
+        name: null,
+        comment: null,
+        isp_id: -1,
+        province_id: -1,
+        city_id: -1,
+        name_tag: null,
+        group_tag: [],
+        ...n.editTarget.data
+      }
+      const opts = {
+        method: 'PUT',
+        url: `http://localhost:6040/api/v1/nqm/target/${n.editTarget.targetId}`,
+        data,
+      }
+
+      fetch(opts)
+      .then((res) => {
+        commit('editAgent.success', {
+          data: res.data
+        })
+        resolve()
       })
-      dispatch('getTargets', n.targetHeaders)
-    })
-    .catch((err) => {
-      commit('editAgent.fail', {
-        err
+      .catch((err) => {
+        commit('editAgent.fail', {
+          err
+        })
+        reject()
       })
     })
   }