Browse Source

10-11 bug修改

allen 2 years ago
parent
commit
677b242ca7

+ 3 - 0
src/views/modules/snoop/home.vue

@@ -239,6 +239,8 @@ export default {
         url: this.$http.adornUrl('/v1/measures/owner/') + this.userName,
         methods: 'get'
       }).then((datas) => {
+        this.measureListAll = []
+        this.measureList = []
         if (datas && datas.status === 200) {
           var res = datas.data.reverse()
           // console.log(res)
@@ -280,6 +282,7 @@ export default {
         methods: 'get'
       }).then((datas) => {
         if (datas && datas.status === 200) {
+          this.jobListAll = []
           var data = datas.data
           const trans = Object.keys(data).map(function (index) {
             const job = self.swapJson(data[index])

+ 38 - 53
src/views/modules/snoop/measure.vue

@@ -777,21 +777,17 @@ export default {
         method: 'post',
         data: this.$http.adornData(coalData, false)
       }).then(({data}) => {
-        if (!(data && data.code === 0)) {
-          Message.error(data.msg)
-        } else {
-          const coalContent = data.info
-          for (let sign = 0; sign < coalContent.length; sign++) {
-            var coal = {
-              name: coalContent[sign].name,
-              coalid: coalContent[sign].id,
-              limit: 'coal',
-              hbaseTableName: '',
-              icon: 'iconfont icon-xitongfuwu',
-              leaf: false
-            }
-            coalAll.push(coal)
+        const coalContent = data.info
+        for (let sign = 0; sign < coalContent.length; sign++) {
+          var coal = {
+            name: coalContent[sign].name,
+            coalid: coalContent[sign].id,
+            limit: 'coal',
+            hbaseTableName: '',
+            icon: 'iconfont icon-xitongfuwu',
+            leaf: false
           }
+          coalAll.push(coal)
         }
         return resolve(coalAll)
         // console.log('***************')
@@ -809,21 +805,17 @@ export default {
         data: this.$http.adornData(coalData, false)
       }).then(systemRespond => {
         let systemAll = []
-        if (systemRespond.data.length <= 0) {
-          Message.error(systemRespond.msg)
-        } else {
-          const systemContent = systemRespond.data
-          for (let i = 0; i < systemContent.length; i++) {
-            var system = {
-              name: systemContent[i].name,
-              systemid: systemContent[i].id,
-              limit: 'system',
-              icon: 'icon iconfont icon-xitongfuwu',
-              hbaseTableName: '',
-              leaf: false
-            }
-            systemAll.push(system)
+        const systemContent = systemRespond.data
+        for (let i = 0; i < systemContent.length; i++) {
+          var system = {
+            name: systemContent[i].name,
+            systemid: systemContent[i].id,
+            limit: 'system',
+            icon: 'icon iconfont icon-xitongfuwu',
+            hbaseTableName: '',
+            leaf: false
           }
+          systemAll.push(system)
         }
         return resolve(systemAll)
       })
@@ -840,19 +832,16 @@ export default {
       }).then(subrespond => {
         let subSystemAll = []
         let subSystemContent = subrespond.data
-        if (subSystemContent.length === 0) {
-          Message.error(subrespond.msg)
-        } else {
-          for (let j = 0; j < subSystemContent.length; j++) {
-            var subSystem = {
-              name: subSystemContent[j].name,
-              subSustemid: subSystemContent[j].id,
-              limit: 'subSystem',
-              icon: 'iconfont icon-xitongfuwu',
-              leaf: false
-            }
-            subSystemAll.push(subSystem)
+
+        for (let j = 0; j < subSystemContent.length; j++) {
+          var subSystem = {
+            name: subSystemContent[j].name,
+            subSustemid: subSystemContent[j].id,
+            limit: 'subSystem',
+            icon: 'iconfont icon-xitongfuwu',
+            leaf: false
           }
+          subSystemAll.push(subSystem)
         }
         return resolve(subSystemAll)
       })
@@ -897,20 +886,16 @@ export default {
       }).then(subEqpRespond => {
         let subEquimentAll = []
         const subEqpSystemContent = subEqpRespond.data
-        if (subEqpSystemContent.length === 0) {
-          Message.error(subEqpRespond.msg)
-        } else {
-          for (let m = 0; m < subEqpSystemContent.length; m++) {
-            var subEquiment = {
-              name: subEqpSystemContent[m].name,
-              subEquipmentid: subEqpSystemContent[m].id,
-              hbaseTableName: subEqpSystemContent[m].hbaseTableName,
-              limit: 'children',
-              icon: 'iconfont icon-xitong3',
-              leaf: true
-            }
-            subEquimentAll.push(subEquiment)
+        for (let m = 0; m < subEqpSystemContent.length; m++) {
+          var subEquiment = {
+            name: subEqpSystemContent[m].name,
+            subEquipmentid: subEqpSystemContent[m].id,
+            hbaseTableName: subEqpSystemContent[m].hbaseTableName,
+            limit: 'children',
+            icon: 'iconfont icon-xitong3',
+            leaf: true
           }
+          subEquimentAll.push(subEquiment)
         }
         return resolve(subEquimentAll)
       })

+ 1 - 0
src/views/modules/visi/dataset.vue

@@ -247,6 +247,7 @@ export default {
     // 筛选查询
     getDataList2 () {
       this.dataListLoading = true
+      this.dataForm.datasetName = ''
       if (this.classificationtag === '') {
         this.classificationtag = null
       }

+ 4 - 2
src/views/modules/visi/stdataset-updata.vue

@@ -36,7 +36,7 @@ export default {
   data () {
     return {
       visible: false,
-
+      oldDataSetName: '',
       dataForm: {
         id: 0,
         datasetName: '',
@@ -62,6 +62,7 @@ export default {
       // console.log(info)
 
       this.dataForm.datasetName = info.datasetName
+      this.oldDataSetName = info.datasetName
       this.dataForm.params = info.categoryId
       this.dataForm.remark = info.remark
       this.dataForm.status = info.status
@@ -109,7 +110,8 @@ export default {
                   'datasetId': this.dataForm.id,
                   'datasetName': this.dataForm.datasetName,
                   'categoryId': this.dataForm.params, // 分类对应的ID
-                  'remark': this.dataForm.remark
+                  'remark': this.dataForm.remark,
+                  'dfsUrl': this.oldDataSetName // 旧的文件名
                 })
               }).then(({data}) => {
                 if (data && data.code === 0) {