diff --git a/package-lock.json b/package-lock.json
index 310cf6c..058c362 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1834,7 +1834,7 @@
},
"async-foreach": {
"version": "0.1.3",
- "resolved": "https://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz",
+ "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
"integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
},
"async-limiter": {
@@ -2137,7 +2137,7 @@
},
"block-stream": {
"version": "0.0.9",
- "resolved": "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz",
+ "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
"requires": {
"inherits": "~2.0.0"
@@ -2931,7 +2931,7 @@
},
"console-control-strings": {
"version": "1.1.0",
- "resolved": "https://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
},
"consolidate": {
@@ -3806,7 +3806,7 @@
},
"delegates": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
},
"depd": {
@@ -5483,7 +5483,7 @@
},
"gauge": {
"version": "2.7.4",
- "resolved": "https://registry.nlark.com/gauge/download/gauge-2.7.4.tgz",
+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"requires": {
"aproba": "^1.0.3",
@@ -5498,12 +5498,12 @@
"dependencies": {
"ansi-regex": {
"version": "2.1.1",
- "resolved": "https://registry.nlark.com/ansi-regex/download/ansi-regex-2.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
},
"is-fullwidth-code-point": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz?cache=0&sync_timestamp=1618552489864&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-fullwidth-code-point%2Fdownload%2Fis-fullwidth-code-point-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"requires": {
"number-is-nan": "^1.0.0"
@@ -5511,7 +5511,7 @@
},
"string-width": {
"version": "1.0.2",
- "resolved": "https://registry.nlark.com/string-width/download/string-width-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": {
"code-point-at": "^1.0.0",
@@ -5521,7 +5521,7 @@
},
"strip-ansi": {
"version": "3.0.1",
- "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz?cache=0&sync_timestamp=1618553320591&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-3.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": {
"ansi-regex": "^2.0.0"
@@ -6499,7 +6499,7 @@
},
"has-unicode": {
"version": "2.0.1",
- "resolved": "https://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
},
"has-value": {
@@ -8548,7 +8548,7 @@
},
"nopt": {
"version": "3.0.6",
- "resolved": "https://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz?cache=0&sync_timestamp=1597649905420&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnopt%2Fdownload%2Fnopt-3.0.6.tgz",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
"requires": {
"abbrev": "1"
@@ -8897,7 +8897,7 @@
},
"os-tmpdir": {
"version": "1.0.2",
- "resolved": "https://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
},
"osenv": {
@@ -10951,7 +10951,7 @@
},
"scss-tokenizer": {
"version": "0.2.3",
- "resolved": "https://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz",
+ "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
"integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
"requires": {
"js-base64": "^2.1.8",
@@ -10960,7 +10960,7 @@
"dependencies": {
"source-map": {
"version": "0.4.4",
- "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz?cache=0&sync_timestamp=1589682764497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.4.4.tgz",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"requires": {
"amdefine": ">=0.0.4"
diff --git a/src/pages/data/list/index.vue b/src/pages/data/list/index.vue
index ebf4546..790f46d 100644
--- a/src/pages/data/list/index.vue
+++ b/src/pages/data/list/index.vue
@@ -38,7 +38,21 @@
{{ subItem3.categoryName }}
- {{ fiveItem.categoryName }}
+
+
+
+
+
+
+
+ {{ subItem4.categoryName }}
+
+ {{ fiveItem.categoryName }}
+
+
+
+ {{ subItem4.categoryName }}
+
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index dadc33d..0355999 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -27,6 +27,7 @@
+
@@ -36,6 +37,7 @@
+ 预览
下载
@@ -85,8 +87,8 @@ export default {
methods: {
getData(){
this.$post(`${this.api.getTableByCondition}?showName=${this.keyword}&pageNum=${this.page}&pageSize=${this.pageSize}`).then(res => {
- this.listData = res.list
- this.total = res.totalCount
+ this.listData = res.data.records
+ this.total = res.data.total
}).catch(res => {})
},
// 获取热门下载数据
@@ -111,6 +113,9 @@ export default {
this.$refs.table.clearSelection()
this.getData()
},
+ preview(row) {
+ this.$router.push(`/data?preview=true&id=${row.id}&name=${row.name}`)
+ },
download(row){
// 登录了才能下载,否则直接跳转到登录页
if(this.token){
diff --git a/src/setting.js b/src/setting.js
index 209a159..2e8c6c3 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -16,8 +16,7 @@ const Setting = {
showProgressBar: true,
// 接口请求地址
// apiBaseURL: env === 'development' ? 'http://192.168.31.125:9000' : 'http://39.108.250.202:9000',// 佳坤
- apiBaseURL:'http://39.108.250.202:9000' ,// 测试服务器
- // apiBaseURL: env === 'development' ? 'http://192.168.31.151:9000' : 'http://192.168.31.151:9000',
+ apiBaseURL: env === 'development' ? 'http://39.108.250.202:9000' : 'http://39.108.250.202:9000',
// 接口请求返回错误时,弹窗的持续时间,单位:秒
modalDuration: 3,
// 接口请求返回错误时,弹窗的类型,可选值为 Message 或 Notice