diff --git a/package.json b/package.json index 754374ed3fa37e598ce39a8e79cba8ab1b8e28ca..0affe91488e91b6a3a67fb796c9f99f5549b01ca 100644 --- a/package.json +++ b/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", diff --git a/src/main.js b/src/main.js index 428e4b6a7a7d15e0b5fc5b44a144ae780a2fcad6..6d666418d8452389b883fe77956087b67284b20e 100644 --- a/src/main.js +++ b/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; diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue index 16dc33590207985b382b0c6a52d8f5fe12f71513..9f30f6262730aebdc83da362763d5cd0debe2638 100644 --- a/src/pages/workbench/fwzc_fwcs.vue +++ b/src/pages/workbench/fwzc_fwcs.vue @@ -995,101 +995,55 @@ 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: { - token: self.portalUser.token, - f: "json", - }, - success: function (data) { - var sectors = ""; - $(data.item.tags).each(function (i, tag) { - if (!!industryTree_apaas_Config[tag]) { - sectors = industryTree_apaas_Config[tag]; - return; - } - }); - - var item = { - url: data.item.url, - itemid: data.item.id, - name: data.item.title, - descript: data.item.description, - cover: + 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=" + - 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); + }); }, }, mounted() { diff --git a/yarn.lock b/yarn.lock index 40da280b7fbab4c786c36af3050b30338b5c6929..c5d7cbb8e75215d0c663f7fd7fdbf311508dd30f 100644 --- a/yarn.lock +++ b/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"