diff --git a/package.json b/package.json index f6dcfb44ba61dc4bee2dd2b72d619f272ff8641f..328b30ea0e63d3958519248287b17e6ef1e9eec8 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "@antv/g6": "^3.4.8", "@fortawesome/fontawesome-free": "^5.8.0", "ace-builds": "^1.4.11", + "axios": "^0.19.2", "babel-polyfill": "^6.26.0", "codemirror": "^5.45.0", "echarts": "^4.2.1", @@ -20,6 +21,7 @@ "js-yaml": "^3.13.1", "json2yaml": "^1.1.0", "material-design-icons-iconfont": "^4.0.5", + "qs": "^6.9.4", "string-format": "^2.0.0", "svg-sprite-loader": "^4.2.6", "vue": "^2.6.10", diff --git a/src/assets/css/index.css b/src/assets/css/index.css index 449dea62b0134ffacefd29a31078238d59544fcf..022de203bf3254b54eca77f0dcf31cada5e8d63c 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -471,6 +471,9 @@ width: 620px!important; .el-radio__input.is-checked .el-radio__inner::after { background-color: #e56600; } +.el-radio__inner:hover { + border-color: #e56600; +} /* 面包屑样式 */ .bread_crumb { margin: 20px; diff --git a/src/assets/imgs/bg_xlblock.png b/src/assets/imgs/bg_xlblock.png new file mode 100644 index 0000000000000000000000000000000000000000..f9f602f91ec8a23f50510eed280118abae748d69 Binary files /dev/null and b/src/assets/imgs/bg_xlblock.png differ diff --git a/src/assets/imgs/bg_xlblock_hov.png b/src/assets/imgs/bg_xlblock_hov.png new file mode 100644 index 0000000000000000000000000000000000000000..b2702e66bb66c5533d51ba592d4bfbe495ff48b4 Binary files /dev/null and b/src/assets/imgs/bg_xlblock_hov.png differ diff --git a/src/assets/imgs/ic_guanliyuan.png b/src/assets/imgs/ic_guanliyuan.png new file mode 100644 index 0000000000000000000000000000000000000000..7849f7755e35d3deec8a081427d062eb00de0a3f Binary files /dev/null and b/src/assets/imgs/ic_guanliyuan.png differ diff --git a/src/assets/imgs/ic_shijian.png b/src/assets/imgs/ic_shijian.png new file mode 100644 index 0000000000000000000000000000000000000000..37f53b1342b9d294293d20675281d6ea1007579f Binary files /dev/null and b/src/assets/imgs/ic_shijian.png differ diff --git a/src/assets/imgs/ic_tishi.png b/src/assets/imgs/ic_tishi.png new file mode 100644 index 0000000000000000000000000000000000000000..f1c223fae2aec966fb61f8b4a785f25c2b01aeca Binary files /dev/null and b/src/assets/imgs/ic_tishi.png differ diff --git a/src/assets/imgs/ic_xitong.png b/src/assets/imgs/ic_xitong.png new file mode 100644 index 0000000000000000000000000000000000000000..f03d86264f40198869675c461d733c04de01e637 Binary files /dev/null and b/src/assets/imgs/ic_xitong.png differ diff --git a/src/assets/imgs/title_ic_zuzhi.png b/src/assets/imgs/title_ic_zuzhi.png new file mode 100644 index 0000000000000000000000000000000000000000..d1b0343ec8243caed98b96a1ee084c66e70505cd Binary files /dev/null and b/src/assets/imgs/title_ic_zuzhi.png differ diff --git a/src/components/app-build-step.vue b/src/components/app-build-steps/app-build-step.vue similarity index 100% rename from src/components/app-build-step.vue rename to src/components/app-build-steps/app-build-step.vue diff --git a/src/components/app-build-steps.vue b/src/components/app-build-steps/app-build-steps.vue similarity index 100% rename from src/components/app-build-steps.vue rename to src/components/app-build-steps/app-build-steps.vue diff --git a/src/components/service-tabs/service-tabs.vue b/src/components/service-tabs/service-tabs.vue index e6bedb4a8bde6dfc96851d6b0dae160d26247531..974bfa43f4e72b27be01707025c2295329c46ed9 100644 --- a/src/components/service-tabs/service-tabs.vue +++ b/src/components/service-tabs/service-tabs.vue @@ -5,30 +5,39 @@ v-model="tabName" :stretch="true" > + + + + + + + + + diff --git a/src/components/service_shop_menu.vue b/src/components/service_shop_menu.vue index 7035f89dc1596fee2b61c556804265d7c644261b..f3a878e43fd2bd312a0e6416c2cc8e672b53138d 100644 --- a/src/components/service_shop_menu.vue +++ b/src/components/service_shop_menu.vue @@ -51,7 +51,7 @@ export default { }, { id: 4, - label: "综合应用服务", + label: "综合服务", router: "/shop/comprehensive_app_list", active: "tool_ic_zongheyyfw_sel", default: "tool_ic_zongheyyfw" diff --git a/src/components/table-input.vue b/src/components/table-input.vue index 482758730dcf40adb46ab9b36e8c44e0711a51fc..9779b4ef70006b56780282f12c508b424db2eb5d 100644 --- a/src/components/table-input.vue +++ b/src/components/table-input.vue @@ -1,13 +1,44 @@ @@ -28,8 +59,7 @@ export default { default: "" }, name: { - type: String, - default: "" + type: String }, rowId: { type: Number, @@ -38,15 +68,29 @@ export default { couldNotEdit: { type: Boolean, default: false + }, + type: { + type: String, + default: "" + }, + typeHead: { + type: String, + default: "" } }, data: () => ({ - inputText: "" + inputText: "", + fileArray: [], + anotherData: { + directory: "file" + }, + inputTextUp: "" }), mounted() { this.inputText = this.item; }, methods: { + // input changeValue() { this.$emit("changeInputValue", { rowId: this.rowId, @@ -54,7 +98,31 @@ export default { inputValue: this.inputText, id: this.id }); - } + }, + // upload + beforeUpload(file) {}, + handleSuccess(response, file, fileList) { + if (response.success == 1) { + this.fileArray.push({ + url: response.data, + name: response.data + }); + this.inputTextUp = file.name; + this.$emit("changeUpFile", { + rowId: this.rowId, + header: this.header, + inputValue: this.inputTextUp, + id: this.id, + fileUrl: response.data + }); + } else { + this.$message.error("上传文件失败，请重试"); + } + }, + handleError(err, file, fileList) { + this.$message.error("上传文件失败，请重试"); + }, + handleRemove(file, fileList) {} } }; @@ -62,7 +130,9 @@ export default { .text-xs-center { height: 32px; } - +.table_upload { + height: 32px; +} .table_in_input { text-align: center; font-size: 14px; @@ -75,6 +145,22 @@ export default { border-radius: 4px; } .text-xs-center .el-input.is-disabled .el-input__inner { - color: #70747C; + color: #70747c; +} +.table_upload input { + width: 100%; + background-color: #f7f8f9; + border-radius: 4px; +} +.table_upload .el-input.is-disabled .el-input__inner { + color: #70747c; +} +.table_upload .el-button { + background-color: #0f2683 !important; + color: #ffffff !important; + border-radius: 0 4px 4px 0; +} +.table_upload .el-input-group__append ul { + display: none; } \ No newline at end of file diff --git a/src/components/table-select.vue b/src/components/table-select.vue index 3e92e50fa08ba85cf5dac7af2831aeedec9dac3b..04c5a32526e883ff9def77e107d3b6627d637834 100644 --- a/src/components/table-select.vue +++ b/src/components/table-select.vue @@ -11,10 +11,10 @@ > @@ -44,12 +44,10 @@ export default { default: "" }, name: { - type: String, - default: "" + type: String }, rowId: { - type: Number, - default: 0 + type: Number }, couldNotEdit: { type: Boolean, @@ -57,12 +55,16 @@ export default { } }, data: () => ({ - selectValue: "1" + selectValue: "0" }), mounted() { this.selectValue = this.item; - if (!this.selectValue || this.selectValue == "") { - this.selectValue = this.selectArr[0].value; + if (this.selectValue == null || !this.selectValue || this.selectValue == "") { + if (this.selectArr && this.selectArr.length != 0) { + this.selectValue = this.selectArr[0].value; + } else { + this.selectValue = ""; + } } }, methods: { diff --git a/src/components/table-um.vue b/src/components/table-um.vue index 3b592fbca72adb9290042b4ec43182c69b3ada74..dbbfdf210d6f060acce3a2e886c1e375511e85ea 100644 --- a/src/components/table-um.vue +++ b/src/components/table-um.vue @@ -144,21 +144,24 @@ > - - + + {{ scope.row[item.prop] }} @@ -243,19 +249,19 @@ diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue index 64bb3fb383590a667d5205ce011e8198027b335e..33de0421ebb576a45b6fa2f06e3294e22d7691a5 100644 --- a/src/pages/workbench/fwzc_fwcs.vue +++ b/src/pages/workbench/fwzc_fwcs.vue @@ -19,7 +19,7 @@
服务类型：
- +
- JSON + + JSON +
@@ -118,15 +119,99 @@ 服务测试
+
+ + + + + +
+ + JSON + form-data + x-www-form-urlencoded + +
+
+ +
+
+ +
+
+ +
+ + +
- -
+ +
请求参数信息填写：
返回参数信息填写：
-
+
测试服务信息：
-
+
 测试成功
-
-  测试失败 +
+
测试服务信息：
+
+
+  测试失败 +
+
重置 @@ -280,10 +372,13 @@ export default { select: "GET", optionType: [ { label: "GET", value: "GET" }, - { label: "POST", value: "POST" } + { label: "POST", value: "POST" }, + { label: "PUT", value: "PUT" }, + { label: "DELETE", value: "DELETE" } ], activeName: 0, - sjfw_qqcs: [ + activeZh: 0, + sjfwQqcs: [ { label: "请求字段编码", prop: "requestEncoding", @@ -292,7 +387,7 @@ export default { }, { label: "请求值", prop: "requestValue", type: "input", align: "left" } ], - sjfw_qqcstx: [ + sjfwQqcstx: [ { label: "字段编码", prop: "name", type: "", align: "left" }, { label: "示例值", prop: "example", type: "input", align: "left" }, { @@ -315,13 +410,25 @@ export default { align: "left", width: 100, selectArr: [ - { label: "是", value: 1 }, - { label: "否", value: 0 } + { label: "是", value: "1" }, + { label: "否", value: "0" } ] }, - { label: "字段说明", prop: "descript", type: "input", align: "left" } + { label: "字段说明", prop: "descript", type: "input", align: "left" }, + { + label: "操作", + type: "Button", + align: "center", + width: 100, + btnList: [ + { + type: "primary-del", + label: "删除" + } + ] + } ], - sjfw_fhcstx: [ + sjfwFhcstx: [ { label: "字段编码", prop: "name", type: "", align: "left" }, { label: "示例值", prop: "example", type: "input", align: "left" }, { label: "字段类型", prop: "show_type", type: "", align: "left" }, @@ -331,8 +438,49 @@ export default { type: "input", align: "left" }, - { label: "字段说明", prop: "descript", type: "input", align: "left" } + { label: "字段说明", prop: "descript", type: "input", align: "left" }, + { + label: "操作", + type: "Button", + align: "center", + width: 100, + btnList: [ + { + type: "primary-del", + label: "删除" + } + ] + } + ], + zhfwQqcsForm: [ + { label: "请求字段编码", prop: "key", type: "input", align: "left" }, + { + label: "参数类型", + prop: "field_type", + type: "select", + align: "center", + width: 100, + selectArr: [ + { label: "Text", value: "text" }, + { label: "File", value: "file" } + ] + }, + { label: "请求值", prop: "val", type: "upload", align: "center" }, + { + label: "操作", + type: "Button", + align: "center", + width: 100, + btnList: [ + { + type: "primary-del", + label: "删除" + } + ] + } ], + datasZhForm: [], + datasZhwww: [], emptyText: "暂无数据", resultShow: false, resSuccess: false, @@ -340,6 +488,7 @@ export default { sqfsVal: "", tokenVal: "", sjfwQqt: "JSON", + zhfwQqt: "JSON", skfwRadios: [ "ArcGIS Server Web", "文档", @@ -349,7 +498,6 @@ export default { "OGS(WFS)", "OGS(WCS)" ], - skfwResult: false, optionsZhyy: [ { label: "模型算法类", value: 0 }, { label: "查询验证类", value: 1 }, @@ -381,7 +529,8 @@ export default { { label: "其他", value: 10 } ], optionsOrganization: [], - datasFw: [], + datasSj: [], + datasZh: [], datasQqcs: [], datasFhcs: [], request_fields: [], @@ -399,6 +548,7 @@ export default { this.activeBtn = val; this.select = "GET"; this.serviceUrl = ""; + this.noSearchUrl = ""; }, getUrl(enUrl) { let url = decodeURI(enUrl); @@ -415,9 +565,15 @@ export default { arr[i].requestValue = pair[1] ? pair[1] : ""; } } + } else { + this.noSearchUrl = enUrl; } this.serviceUrl = url; - this.datasFw = arr; + if (this.activeBtn == 0) { + this.datasSj = arr; + } else if (this.activeBtn == 4) { + this.datasZh = arr; + } }, clickFwcs() { let headers = {}; @@ -428,7 +584,30 @@ export default { headers.Authorization[0] = this.sqfsVal + " " + this.tokenVal; } let request = this.$refs.fwcs_sjfw_qq.getTableData(); - console.log(request); + for (let i = 0; i < request.length; i++) { + if ( + request[i] && + request[i].requestEncoding && + request[i].requestValue && + request[i].requestEncoding != "" && + request[i].requestValue != "" + ) { + if ( + Object.keys(requestData).indexOf(request[i].requestEncoding) == -1 + ) { + requestData[request[i].requestEncoding] = []; + requestData[request[i].requestEncoding][0] = + request[i].requestValue; + } else { + requestData[request[i].requestEncoding].push( + request[i].requestValue + ); + } + } + } + } else if (this.activeBtn == 1) { + } else if (this.activeBtn == 4) { + let request = this.$refs.fwcs_zhfw_qq.getTableData(); for (let i = 0; i < request.length; i++) { if ( request[i] && @@ -451,42 +630,56 @@ export default { } } } - let url = `/apaas/service/v3/service/manager/test`; + let bodys = ""; + let contentType = ""; + if (this.activeBtn == 0) { + bodys = this.$refs.jsonCodes.getCodesVal(); + contentType = this.sjfwQqt; + } else if (this.activeBtn == 4) { + if (this.activeZh == 1) { + contentType = this.zhfwQqt; + if (this.zhfwQqt == "JSON") { + bodys = this.$refs.zhfwJsonCodes.getCodesVal(); + } else if (this.zhfwQqt == "form-data") { + let request = this.$refs.fwcs_zhfw_qq_form.getTableData(); + bodys = JSON.stringify(request); + } else if (this.zhfwQqt == "x-www-form-urlencoded") { + let request = this.$refs.fwcs_zhfw_www.getTableData(); + bodys = JSON.stringify(request); + } + } + } let query = { method: this.select, url: this.serviceUrl, headers: headers, params: requestData, - body: this.$refs.jsonCodes.getCodesVal() + body: bodys, + content_type: contentType }; - this.$http - .post(url, query) - .then(response => { - if (response.data.success == 1) { - let data = response.data.data; - if (this.activeBtn == 0 && this.activeName == 1) { - this.datasQqcs = data.body_fields; - } else if (this.activeBtn == 0) { - this.datasQqcs = data.param_fields; - } - this.datasFhcs = data.response_fields; - this.resSuccess = true; - this.resultShow = true; - } else { - this.resSuccess = false; - this.resultShow = true; - console.log(response.data.console.error); + this.$api.workbench.fwzcFwcs(query).then(response => { + console.log(response); + if (response.data.success == 1) { + let data = response.data.data; + if (this.activeBtn == 0 && this.activeName == 1) { + this.datasQqcs = data.body_fields; + } else if (this.activeBtn == 0) { + this.datasQqcs = data.param_fields; } - }) - .catch(function(response) { - console.log("unkonw error"); - }); + this.datasFhcs = data.response_fields; + this.resSuccess = true; + this.resultShow = true; + } else { + this.resSuccess = false; + this.resultShow = true; + console.log(response.data.console.error); + } + }); }, clickTab() {}, - clickNext() { - console.log(this.$refs.fwcs_sjfw_qq.getTableData()); + resetSjfw() { + this.clickFwcs(); }, - resetSjfw() {}, nextJcxx() { let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData(); let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData(); @@ -509,7 +702,6 @@ export default { for (let i = 0; i < arr.length; i++) { if (arr[i].name && arr[i].name != "") { if (!arr[i].label || arr[i].label == "") { - console.log(arr[i]); if (rule == 0) { this.requestRules = 1; } else if (rule == 1) { @@ -528,6 +720,8 @@ export default { this.cover = val; }, previous() { + this.datasQqcs = this.request_fields; + this.datasFhcs = this.response_fields; this.jcxxtx = false; }, registe() { @@ -552,31 +746,55 @@ export default { response_fields: this.response_fields }; let url = `/apaas/service/v3/service/manager`; - this.$http - .post(url, query) - .then(response => { - if (response.data.success == 1) { - this.$message.success("服务注册成功"); - } else { - console.log(response.data.errMsg); - this.$message.success(response.data.errMsg); - } - }) - .catch(function(response) { - console.log("unkonw error"); - }); + this.$api.workbench.serviceAdd(query).then(response => { + if (response.data.success == 1) { + this.$message.success("服务注册成功"); + } else { + console.log(response.data.errMsg); + this.$message.success(response.data.errMsg); + } + }); }, changeTable(val) { let search = "?"; for (let i = 0; i < val.length; i++) { if (val[i].requestEncoding != "") { search = - search + val[i].requestEncoding + "=" + val[i].requestValue + "&"; + search + + val[i].requestEncoding + + "=" + + (val[i].requestValue ? val[i].requestValue : "") + + "&"; } } let searchDel = search.substring(0, search.length - 1); this.serviceUrl = this.noSearchUrl + searchDel; - } + }, + delItemQq(val) { + let arr = this.$refs.fwcs_sjfw_qqcs.getTableData(); + this.delById(arr, val.id); + }, + delItemFh(val) { + let arr = this.$refs.fwcs_sjfw_fhcs.getTableData(); + this.delById(arr, val.id); + }, + delById(arr, id) { + let self = this; + for (let i = 0; i < arr.length; i++) { + if (arr[i].id == id) { + arr.splice(i, 1); + return false; + } + if (arr[i].children && arr[i].children.length != 0) { + self.delById(arr[i].children, id); + } + } + }, + changeZhType(val) { + this.resultShow = false; + this.resSuccess = false; + }, + changeZhfwQqt() {} }, mounted() {} }; diff --git a/src/request/api.js b/src/request/api.js new file mode 100644 index 0000000000000000000000000000000000000000..b8ef9ac9995c0f25fba1483e5a915a22d2e805fb --- /dev/null +++ b/src/request/api.js @@ -0,0 +1,9 @@ +import workbench from '@/request/api/workbench'; +import serviceShop from '@/request/api/service_shop'; +import user from '@/request/api/user'; + +export default { + workbench, + serviceShop, + user +} \ No newline at end of file diff --git a/src/request/api/service_shop.js b/src/request/api/service_shop.js new file mode 100644 index 0000000000000000000000000000000000000000..0baf0e9838a91e304a97ab0ea3a46c05b7842c2d --- /dev/null +++ b/src/request/api/service_shop.js @@ -0,0 +1,8 @@ +import axios from '@/request/http'; // 导入http中创建的axios实例 +import qs from 'qs'; // 根据需求是否导入qs模块 + +const serviceShop = { + +} + +export default serviceShop; diff --git a/src/request/api/user.js b/src/request/api/user.js new file mode 100644 index 0000000000000000000000000000000000000000..bff624a22b6c9924df3c0e7d9d442e072489b69b --- /dev/null +++ b/src/request/api/user.js @@ -0,0 +1,8 @@ +import axios from '@/request/http'; // 导入http中创建的axios实例 +import qs from 'qs'; // 根据需求是否导入qs模块 + +const user = { + +} + +export default user; diff --git a/src/request/api/workbench.js b/src/request/api/workbench.js new file mode 100644 index 0000000000000000000000000000000000000000..d6dbf1057e50e8c9465c89798cb817b80851daa3 --- /dev/null +++ b/src/request/api/workbench.js @@ -0,0 +1,13 @@ +import axios from '@/request/http'; // 导入http中创建的axios实例 +import qs from 'qs'; // 根据需求是否导入qs模块 + +const workbench = { + fwzcFwcs(params) { + return axios.post(`/apaas/service/v3/service/manager/test`, params); + }, + serviceAdd(params) { + return axios.post(`/apaas/service/v3/service/manager`, params) + } +} + +export default workbench; diff --git a/src/request/http.js b/src/request/http.js new file mode 100644 index 0000000000000000000000000000000000000000..edd951683c0917fb3097032d88e785227d192172 --- /dev/null +++ b/src/request/http.js @@ -0,0 +1,86 @@ +/** + * axios封装 + * 请求拦截、响应拦截、错误统一处理 + */ +import axios from 'axios'; +import router from '../router'; +import store from '../store/index'; + +const tip = msg => { + console.log(msg) +} + +/** + * 跳转登录页 + * 携带当前页面路由，以期在登录页面完成登录后返回当前页面 + */ +const toLogin = () => { + router.replace({ + path: '/login', + query: { + redirect: router.currentRoute.fullPath + } + }); +} + +/** + * 请求失败后的错误统一处理 + * @param {Number} status 请求失败的状态码 + */ +const errorHandle = (status, other) => { + // 状态码判断 + switch (status) { + // 401: 未登录状态，跳转登录页 + case 401: + toLogin(); + break; + // 403 token过期 + // 清除token并跳转登录页 + case 403: + tip('登录过期，请重新登录'); + localStorage.removeItem('token'); + store.commit('loginSuccess', null); + setTimeout(() => { + toLogin(); + }, 1000); + break; + // 404请求不存在 + case 404: + tip('请求的资源不存在'); + break; + default: + console.log(other); + } +} + +// 创建axios实例 +var instance = axios.create({ timeout: 1000 * 12 }); +// 设置post请求头 +instance.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'; +/** + * 请求拦截器 + * 每次请求前，如果存在token则在请求头中携带token + */ +instance.interceptors.request.use( + config => { + const token = store.state.token; + token && (config.headers.Authorization = token); + return config; + }, + error => Promise.error(error)) + +// 响应拦截器 +instance.interceptors.response.use( + // 请求成功 + res => res.status === 200 ? Promise.resolve(res) : Promise.reject(res), + // 请求失败 + error => { + const { response } = error; + if (response) { + // 请求已发出，但是不在2xx的范围 + errorHandle(response.status, response.data.message); + return Promise.reject(response); + } + }); + +export default instance; diff --git a/src/router/index.js b/src/router/index.js index 9034bc5897b6885200b98261ba33b4ac121d9212..c3303715a898133c04c5c0bbd6e96ea0cf773d24 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -170,10 +170,10 @@ export default new Router({ component: () => import("@/pages/service_shop/skfwDetail"), }, // 服务超市 - 时空服务详情 { - path: "/shop/zhyyfwDetail/:id", - name: "zhyyfwDetail", - component: () => import("@/pages/service_shop/zhyyfwDetail"), - }, // 服务超市 - 综合应用服务详情 + path: "/shop/zhfwDetail/:id", + name: "zhfwDetail", + component: () => import("@/pages/service_shop/zhfwDetail"), + }, // 服务超市 - 综合服务详情 { path: "/shop/yysdDetail/:id", name: "yysdDetail", diff --git a/static/data.json b/static/data.json index cb094b13818094b701cb0c655f439556c834b583..7220e83ed022d1cd97a2912644b24fa951e0c680 100644 --- a/static/data.json +++ b/static/data.json @@ -4,28 +4,28 @@ { "date": "2016-05-02", "name": "王小虎", - "address": "0", + "type": "File", "id": "ssss2722", "state": 0 }, { "date": "2016-05-04", "name": "王小虎", - "address": "0", + "type": "Text", "id": "ssss2224", "state": 0 }, { "date": "2016-05-01", "name": "王小虎", - "address": "0", + "type": "Text", "id": "ssss222", "state": 1 }, { "date": "2016-05-03", "name": "王小虎", - "address": "0", + "type": "File", "id": "ssss22", "state": 2 } diff --git a/static/serviceBaseInfo.json b/static/serviceBaseInfo.json index 02e66c9e2eb697ac10fd69a9062b7d8e76eb04db..d1164314f1200ad60228d3d4e66f6ff597794e94 100644 --- a/static/serviceBaseInfo.json +++ b/static/serviceBaseInfo.json @@ -89,7 +89,7 @@ "publishTime": "2020-03-12 18:31:12", "updatedTime": "2020-03-12 18:31:12", "dataField": "经济建设", - "serviceType": "综合应用服务", + "serviceType": "综合服务", "resourceSummary": "提供视频监控的空间分布展示和视频监控直播的服务，MOUMOU监控服务和直播服务的新服务。", "specifications": [ { @@ -125,7 +125,7 @@ "providedBy": "北京比格数据", "publishTime": "2020-03-12 18:31:12", "acquireCount": "9999", - "serviceType": "综合应用服务", + "serviceType": "综合服务", "dataField": "经济建设", "specifications": [ { diff --git a/static/serviceInfo.json b/static/serviceInfo.json index cf9655bd67609e4e96ba0536469fa2bf979b6e89..cb3fe9b9fe28efdabc5f78f33b98517b862c33df 100644 --- a/static/serviceInfo.json +++ b/static/serviceInfo.json @@ -72,13 +72,13 @@ "align": "center" }, { - "prop": "zdlx", - "label": "字段类型", + "prop": "zdmc", + "label": "字段名称", "align": "center" }, { - "prop": "zdmc", - "label": "字段名称", + "prop": "zdlx", + "label": "字段类型", "align": "center" }, { @@ -186,15 +186,15 @@ "label": "字段编码", "align": "center" }, + { + "prop": "zdmc", + "label": "字段名称" + }, { "prop": "zdlx", "label": "字段类型", "align": "center" }, - { - "prop": "zdmc", - "label": "字段名称" - }, { "prop": "zdsm", "label": "字段说明" diff --git a/yarn.lock b/yarn.lock index 5a9211c012f597a94466a1cb685807ebc8df5ca8..a5ac9ff6201b12f4aa2bfff07c4a4f5a854c759c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1362,6 +1362,13 @@ axios@^0.15.3: dependencies: follow-redirects "1.0.0" +axios@^0.19.2: + version "0.19.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27" + integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA== + dependencies: + follow-redirects "1.5.10" + babel-helper-vue-jsx-merge-props@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6" @@ -2418,6 +2425,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3: dependencies: ms "2.0.0" +debug@=3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" @@ -3136,6 +3150,13 @@ follow-redirects@1.0.0: dependencies: debug "^2.2.0" +follow-redirects@1.5.10: + version "1.5.10" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" + integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== + dependencies: + debug "=3.1.0" + follow-redirects@^1.0.0: version "1.10.0" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.10.0.tgz#01f5263aee921c6a54fb91667f08f4155ce169eb" @@ -5777,6 +5798,11 @@ qs@6.7.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== +qs@^6.9.4: + version "6.9.4" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687" + integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ== + query-string@^4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"