diff --git a/README.md b/README.md index 2ef3e4e..62ff129 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,4 @@ ## 项目启动 node-v10版本即可 -## 项目适配 使用postcss-px2rem px2rem-loader进行rem适配 -https://blog.csdn.net/Refuelefforts/article/details/113933784 -实现原理：每次打包，webpack通过使用插件postcss-px2rem，帮我们自动将px单位转换成rem单位 -前方有坑：UI框架部分组件使用JavaScript将css作为内联样式直接写在html标签内，打包适配时不会读取相关css,所以要配置相关样式，在style中需要" !important "进行样式覆盖。 + -## rem作为单位 元素是根据根元素字体大小来计算 rem高度不适配解决方案 媒体查询 vw vh +## /home/project/nginx/html/dist_0228 diff --git a/public/images/pdf.png b/public/images/pdf.png new file mode 100644 index 0000000..8c7a69b Binary files /dev/null and b/public/images/pdf.png differ diff --git a/public/images/pdfbg.png b/public/images/pdfbg.png new file mode 100644 index 0000000..63fd3af Binary files /dev/null and b/public/images/pdfbg.png differ diff --git a/src/App.vue b/src/App.vue index 6c9a592..fe83075 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,6 +9,7 @@ box-sizing: border-box; // user-select: none; } + // 修改滚动条样式 * { scrollbar-color: rgb(13, 43, 85) transparent; @@ -37,6 +38,10 @@ } } +//去除el-dialog append-to-body 设置为false的暗色背景 +.v-modal { + background: transparent !important; +} @font-face { font-family: YouSheBiaoTiHei; diff --git a/src/api/bztx/index.js b/src/api/bztx/index.js index cd236b8..420c8bd 100644 --- a/src/api/bztx/index.js +++ b/src/api/bztx/index.js @@ -24,3 +24,12 @@ export function getSchemeTree(params) { params, }); } +// 标准体系查询 +export function standardSystemQuery(params) { + return request({ + url: "/standard/system/standardSystemQuery", + method: "post", + params, + }); +} +// diff --git a/src/views/bztx/index.vue b/src/views/bztx/index.vue index c17aa99..2d4289f 100644 --- a/src/views/bztx/index.vue +++ b/src/views/bztx/index.vue @@ -7,7 +7,7 @@ 硒产业标准体系统计
+ @click="ckickItem(item.parentId, item.schemeName)">
{{ item.schemeName }}
@@ -18,7 +18,7 @@
+ @click="ckickItem(item.parentId, item.schemeName)">
{{ item.schemeName }} @@ -32,140 +32,237 @@
-
+
标准统计
-
+
- {{ gjLIst.name }} + {{ countryList.key }}
-
{{ gjLIst.num }}
+
{{ countryList.value }}
-
+
- {{ hyList.name }} + {{ hyList.key }}
-
{{ hyList.num }}
+
{{ hyList.value }}
-
+
- {{ sjList.name }} + {{ sjList.key }}
-
{{ sjList.num }}
+
{{ sjList.value }}
-
+
- {{ dbzList.name }} + {{ dbzList.key }}
-
{{ dbzList.num }}
+
{{ dbzList.value }}
+
+
+
+ {{ allList.key }} +
+
{{ allList.value }}
本地标准 -
+
- {{ bdList.name }} + {{ bdList.key }}
- {{ bdList.num }} + {{ bdList.value }}
-
+
+
- +
-
+
+
+ + + +
+
- + + +
@@ -398,7 +433,6 @@ export default { position: relative; top: 7.8vh; height: calc(100% - 7.8vh); - // border: 1px solid red; box-sizing: border-box; padding: 0 10px; display: flex; @@ -462,7 +496,7 @@ export default { .bztj-card { width: 100%; - height: 240px; + height: 26.086vh; background-image: url('../../../public/images/bztxcard.png'); background-size: 99% 100%; background-repeat: no-repeat; @@ -486,42 +520,65 @@ export default { .gj, .hy, .sj, - .dbz { + .dbz, + .all { width: 100px; text-align: center; position: absolute; - // border: 1px solid red; } .gj { left: 0; top: -10px; - // border: 1px solid red; } + .gj:hover { + cursor: pointer; + } + .hy { right: 0; top: -10px; } + .hy:hover { + cursor: pointer; + } + .sj { left: 0; bottom: 35px; } + .sj:hover { + cursor: pointer; + } + .dbz { right: 0; bottom: 35px; } + + .dbz:hover { + cursor: pointer; + } + + .all { + left: 150px; + top:5.978vh; + } + + .all:hover { + cursor: pointer; + } } .bd { .item { margin: auto; - height: 100px; + height: 10.87vh; width: 40%; - // border: 1px solid red; background-image: url('../../../public/images/xcybg.png'); background-size: 100% 100%; background-position-y: 15px; @@ -562,13 +619,18 @@ export default { .search-wrap { display: flex; - justify-content: flex-end; + justify-content: space-between; align-items: center; - height: 50px; + height: 5.435vh; width: 100%; box-sizing: border-box; padding-right: 20px; + .imgs { + width: 30px; + margin-left: 20px; + } + .search { width: 150px; width: 100%; @@ -579,18 +641,97 @@ export default { border: 1px solid; border-image: linear-gradient(124deg, rgb(119, 194, 251), rgb(43, 101, 215), rgb(43, 101, 215)) 1 1; background: none; - height: 30px; + height: 3.261vh; color: #fff; } } - .charts { + .flexs { + justify-content: flex-end; + } + + .charts, + .contents { width: 100%; - height: calc(100% - 50px); + height: calc(100% - 3.261vh); + } + + .contents { + box-sizing: border-box; + padding: 20px 0 0 20px; + display: flex; + flex-wrap: wrap; + + .item { + width: 200px; + height: 21.74vh; + margin: 0 20px 2.174vh 0; + + .imgWrap { + margin: 20px auto; + width: 100px; + height: 10.87vh; + } + + .title { + font-size: 14px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + } + + .item:hover { + background-image: url('../../../public/images/pdfbg.png'); + background-size: 100% 100%; + cursor: pointer; + } + + .nodata { + width: 100%; + height: 650px; + line-height: 650px; + text-align: center; + font-size: 20px; + opacity: 0.7; + } + + } + } } + /deep/ .el-dialog__title { + color: #fff; + font-size: 16px; + } + + /deep/ .el-dialog__body { + padding: 0 20px 20px; + height: 69.565vh; + } + + /deep/.el-dialog__wrapper { + // position: absolute !important; + margin: auto; + height: 86.956vh; + width: 60%; + background-image: url('../../../public/images/vediobg.png'); + background-size: 100% 100%; + + } + + /deep/ .el-dialog { + + background: none; + height: 100%; + width: 100%; + margin: 0; + margin-top: 0 !important; + } + } \ No newline at end of file diff --git a/src/views/scgl/components/cpcl.vue b/src/views/scgl/components/cpcl.vue index 40eab05..68539eb 100644 --- a/src/views/scgl/components/cpcl.vue +++ b/src/views/scgl/components/cpcl.vue @@ -20,14 +20,17 @@ export default { }, mounted() { productOutput().then(res => { - var xAxisData = res.data.map(item => { - return item.productName - }) - var seriesData = res.data.map(item => { - return item.productQuantity - }) - this.$refs.cpcl.option.grid.left = 8+"%" - this.$refs.cpcl.getInitEcharts(xAxisData, seriesData) + if (res.code == 200) { + var xAxisData = res.data.map(item => { + return item.productName + }) + var seriesData = res.data.map(item => { + return item.productQuantity + }) + this.$refs.cpcl.option.grid.left = 8 + "%" + this.$refs.cpcl.getInitEcharts(xAxisData, seriesData) + } + }) }, diff --git a/src/views/scgl/components/nySuggest.vue b/src/views/scgl/components/nySuggest.vue index 109c497..7e49683 100644 --- a/src/views/scgl/components/nySuggest.vue +++ b/src/views/scgl/components/nySuggest.vue @@ -36,7 +36,11 @@ export default { font-family: SourceHanSansCN, SourceHanSansCN; font-weight: 400; color: #ECF4F9; - overflow: scroll; + .content{ + height: 12vh; + overflow: scroll; + } + } \ No newline at end of file diff --git a/src/views/zygk/components/dsj.vue b/src/views/zygk/components/dsj.vue index 4c561b8..79c6f75 100644 --- a/src/views/zygk/components/dsj.vue +++ b/src/views/zygk/components/dsj.vue @@ -19,7 +19,7 @@

- {{ itemContent.eventTitle }} + {{ itemContent.eventContent }}

diff --git a/src/views/zygk/components/fwfb.vue b/src/views/zygk/components/fwfb.vue index 203dc2d..018abf0 100644 --- a/src/views/zygk/components/fwfb.vue +++ b/src/views/zygk/components/fwfb.vue @@ -1,6 +1,6 @@