Merge branch 'ldx' into dev

package.json

@@ -19,7 +19,6 @@
     "echarts": "^4.8.0",
     "echarts-liquidfill": "^2.0.6",
     "element-ui": "^2.11.1",
-    "jquery": "^3.5.1",
     "js-yaml": "^3.13.1",
     "json2yaml": "^1.1.0",
     "material-design-icons-iconfont": "^4.0.5",

src/main.js

@@ -60,8 +60,6 @@ import SuperFlow from 'vue-super-flow'
 import 'vue-super-flow/lib/index.css'
 Vue.use(SuperFlow)
 
-import 'jquery'
-
 import api from './request/api'
 Vue.prototype.$api = api;
 

src/pages/workbench/fwzc_fwcs.vue

@@ -995,100 +995,54 @@ export default {
           console.log(error);
         });
     },
-    // getItemInfo(itemid) {
-    //   console.log(`获取portal参数${itemid}`);
-    //   let self = this;
-    //   console.log(self.portalUser);
-    //   let searchUrl =
-    //     "https://apaasgis.wodcloud.com/portal//portal/sharing/rest/content/users/" +
-    //     self.portalUser.username +
-    //     "/items/" +
-    //     itemid;
-    //   let data = {
-    //     token: self.portalUser.token,
-    //     f: "json",
-    //   };
-    //   self.$http
-    //     .post(searchUrl, data, { emulateJSON: true })
-    //     .then((response) => {
-    //       console.log(response);
-    //       if (response.data.success == 1) {
-    //         var sectors = "";
-    //         $(data.item.tags).each(function (i, tag) {
-    //           if (!!self.industryTree_apaas_Config[tag]) {
-    //             sectors = self.industryTree_apaas_Config[tag];
-    //             return;
-    //           }
-    //         });
-    //         self.form = {
-    //           name: data.item.title,
-    //           desc: data.item.description,
-    //           area: sectors,
-    //           origin: "",
-    //           code: "自动生成",
-    //           resource: 1,
-    //         };
-    //         self.cover =
-    //           "https://apaasgis.wodcloud.com/portal/sharing/rest/content/items/" +
-    //           data.item.id +
-    //           "/info/" +
-    //           data.item.thumbnail +
-    //           "?token=" +
-    //           self.portalUser.token;
-    //         self.iportal_id = data.item.id;
-    //         self.serviceUrl = data.item.url;
-    //         self.portal_data_service_type_2 =
-    //           self.dataTree_apaas_config[data.item.type];
-    //       }
-    //     })
-    //     .catch((error) => {
-    //       console.log(error);
-    //     });
-    // },
     getItemInfo(itemid) {
+      console.log(`获取portal参数${itemid}`);
       let self = this;
-      var searchUrl =
-        "https://apaasgis.wodcloud.com/portal/sharing/rest/content/users/" +
+      console.log(self.portalUser);
+      let searchUrl =
+        "https://apaasgis.wodcloud.com/portal//portal/sharing/rest/content/users/" +
         self.portalUser.username +
         "/items/" +
         itemid;
-      $.ajax({
-        url: searchUrl,
-        dataType: "json",
-        method: "POST",
-        data: {
+      let data = {
         token: self.portalUser.token,
         f: "json",
-        },
-        success: function (data) {
+      };
+      self.$http
+        .post(searchUrl, data, { emulateJSON: true })
+        .then((response) => {
+          console.log(response);
+          if (response.data.success == 1) {
             var sectors = "";
             $(data.item.tags).each(function (i, tag) {
-            if (!!industryTree_apaas_Config[tag]) {
-              sectors = industryTree_apaas_Config[tag];
+              if (!!self.industryTree_apaas_Config[tag]) {
+                sectors = self.industryTree_apaas_Config[tag];
                 return;
               }
             });
-
-          var item = {
-            url: data.item.url,
-            itemid: data.item.id,
+            self.form = {
               name: data.item.title,
-            descript: data.item.description,
-            cover:
+              desc: data.item.description,
+              area: sectors,
+              origin: "",
+              code: "自动生成",
+              resource: 1,
+            };
+            self.cover =
               "https://apaasgis.wodcloud.com/portal/sharing/rest/content/items/" +
               data.item.id +
               "/info/" +
               data.item.thumbnail +
               "?token=" +
-              portalUser.token,
-            sectors: sectors,
-            data_service_type2: dataTree_apaas_config[data.item.type],
-          };
-          console.log(item);
-        },
-        error: function (err) {
-          alert(err);
-        },
+              self.portalUser.token;
+            self.iportal_id = data.item.id;
+            self.serviceUrl = data.item.url;
+            self.portal_data_service_type_2 =
+              self.dataTree_apaas_config[data.item.type];
+          }
+        })
+        .catch((error) => {
+          console.log(error);
         });
     },
   },

yarn.lock

@@ -4287,11 +4287,6 @@ isurl@^1.0.0-alpha5:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
 
-jquery@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.npm.taobao.org/jquery/download/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
-  integrity sha1-17TQjhv9uGrS8aPQOeoXMEcXq7U=
-
 js-base64@^2.1.9:
   version "2.6.3"
   resolved "https://registry.npm.taobao.org/js-base64/download/js-base64-2.6.3.tgz#7afdb9b57aa7717e15d370b66e8f36a9cb835dc3"