diff --git a/package-lock.json b/package-lock.json index 7ba2362..4c996ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3385,6 +3385,11 @@ } } }, + "claygl": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/claygl/-/claygl-1.3.0.tgz", + "integrity": "sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ==" + }, "clean-css": { "version": "5.3.2", "resolved": "https://registry.npmmirror.com/clean-css/-/clean-css-5.3.2.tgz", @@ -4367,6 +4372,31 @@ "safer-buffer": "^2.1.0" } }, + "echarts": { + "version": "5.4.3", + "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz", + "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==", + "requires": { + "tslib": "2.3.0", + "zrender": "5.4.4" + }, + "dependencies": { + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + } + } + }, + "echarts-gl": { + "version": "2.0.9", + "resolved": "https://registry.npmmirror.com/echarts-gl/-/echarts-gl-2.0.9.tgz", + "integrity": "sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA==", + "requires": { + "claygl": "^1.2.1", + "zrender": "^5.1.1" + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz", @@ -11898,6 +11928,21 @@ "dev": true } } + }, + "zrender": { + "version": "5.4.4", + "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz", + "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==", + "requires": { + "tslib": "2.3.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + } + } } } } diff --git a/package.json b/package.json index ff31042..8e0e2a9 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,8 @@ "dependencies": { "axios": "^1.4.0", "core-js": "^3.8.3", + "echarts": "^5.4.3", + "echarts-gl": "^2.0.9", "element-ui": "^2.15.13", "js-cookie": "^3.0.5", "node-gyp": "^9.4.0", diff --git a/src/assets/icon/chartBg.png b/src/assets/icon/chartBg.png new file mode 100644 index 0000000..619e393 Binary files /dev/null and b/src/assets/icon/chartBg.png differ diff --git a/src/assets/icon/dyxf-bg.png b/src/assets/icon/dyxf-bg.png new file mode 100644 index 0000000..d694839 Binary files /dev/null and b/src/assets/icon/dyxf-bg.png differ diff --git a/src/assets/icon/headerBg.png b/src/assets/icon/headerBg.png new file mode 100644 index 0000000..1406b79 Binary files /dev/null and b/src/assets/icon/headerBg.png differ diff --git a/src/assets/icon/提出议题@2x.png b/src/assets/icon/qzys-1.png similarity index 100% rename from src/assets/icon/提出议题@2x.png rename to src/assets/icon/qzys-1.png diff --git a/src/assets/icon/线上讨论@2x.png b/src/assets/icon/qzys-2.png similarity index 100% rename from src/assets/icon/线上讨论@2x.png rename to src/assets/icon/qzys-2.png diff --git a/src/assets/icon/形成诉求@2x.png b/src/assets/icon/qzys-3.png similarity index 100% rename from src/assets/icon/形成诉求@2x.png rename to src/assets/icon/qzys-3.png diff --git a/src/assets/icon/推动实施@2x.png b/src/assets/icon/qzys-4.png similarity index 100% rename from src/assets/icon/推动实施@2x.png rename to src/assets/icon/qzys-4.png diff --git a/src/assets/icon/效果评估@2x.png b/src/assets/icon/qzys-5.png similarity index 100% rename from src/assets/icon/效果评估@2x.png rename to src/assets/icon/qzys-5.png diff --git a/src/assets/icon/箭头@2x.png b/src/assets/icon/qzys-arrow.png similarity index 100% rename from src/assets/icon/箭头@2x.png rename to src/assets/icon/qzys-arrow.png diff --git a/src/assets/icon/台@2x.png b/src/assets/icon/qzys-bg.png similarity index 100% rename from src/assets/icon/台@2x.png rename to src/assets/icon/qzys-bg.png diff --git a/src/assets/icon/低@2x.png b/src/assets/icon/tableTdBg.png similarity index 100% rename from src/assets/icon/低@2x.png rename to src/assets/icon/tableTdBg.png diff --git a/src/components/screen-custom-table/index.vue b/src/components/screen-custom-table/index.vue new file mode 100644 index 0000000..c24279a --- /dev/null +++ b/src/components/screen-custom-table/index.vue @@ -0,0 +1,308 @@ + + + + + diff --git a/src/components/screen-loading/index.vue b/src/components/screen-loading/index.vue new file mode 100644 index 0000000..cc8bda6 --- /dev/null +++ b/src/components/screen-loading/index.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/src/data/index.js b/src/data/index.js new file mode 100644 index 0000000..afbc848 --- /dev/null +++ b/src/data/index.js @@ -0,0 +1,198 @@ +export function loadLjhdList() { + let ljhdList = [ + { + gridName: '第一网格', + title: '标题标题标题标题标题标题标题标题标题标题', + unitName: '单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第二网格第二网格第二网格第二网格第二网格第二网格', + title: '标题', + unitName: '单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第三网格', + title: '标题', + unitName: '单位单位单位单位单位单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第四网格', + title: '标题', + unitName: '单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第一网格', + title: '标题标题标题标题标题标题标题标题标题标题', + unitName: '单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第二网格第二网格第二网格第二网格第二网格第二网格', + title: '标题', + unitName: '单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第三网格', + title: '标题', + unitName: '单位单位单位单位单位单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第四网格', + title: '标题', + unitName: '单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第二页-01', + title: '标题标题标题标题标题标题标题标题标题标题', + unitName: '单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第二页-02', + title: '标题', + unitName: '单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第二页-03', + title: '标题', + unitName: '单位单位单位单位单位单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第二页-04', + title: '标题', + unitName: '单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第二页-05', + title: '标题标题标题标题标题标题标题标题标题标题', + unitName: '单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第二页-06', + title: '标题', + unitName: '单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第二页-07', + title: '标题', + unitName: '单位单位单位单位单位单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第二页-08', + title: '标题', + unitName: '单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第三页-01', + title: '标题', + unitName: '单位单位单位单位单位单位', + member: 10, + data: '2023-03-22' + }, + { + gridName: '第三页-02', + title: '标题', + unitName: '单位', + member: 10, + data: '2023-03-22' + } + ] + + return ljhdList +} + +export function loadYtalList() { + let ytalList = [ + { + detail: + '1-1小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + }, + { + detail: '1-2很多烟头,看到很多吸烟人员都不往垃圾桶里投放,请尽快处理。' + }, + { + detail: + '1-3小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + }, + { + detail: + '1-4小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + }, + { + detail: + '1-5小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + }, + { + detail: + '1-6小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + }, + { + detail: + '1-7小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + }, + { + detail: + '2-1小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + }, + { + detail: + '2-2小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + }, + { + detail: + '2-3小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + }, + { + detail: + '2-4小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + }, + { + detail: + '2-5小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + }, + { + detail: + '2-6小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + }, + { + detail: + '2-7小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + }, + { + detail: + '3-1小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的小区4号楼3单元房顶漏水很严重,目前还是没有相关人员去治理,楼下水淹的' + } + ] + + return ytalList +} diff --git a/src/style/left3.scss b/src/style/left3.scss new file mode 100644 index 0000000..822b25d --- /dev/null +++ b/src/style/left3.scss @@ -0,0 +1,136 @@ +.left3 { + margin-right: 12px; +} + +.b-ljdw { + height: 461px; +} + +//饼图(外面的容器) +.container { + position: relative; + // width: 100%; + // height: 100%; + + //饼图的大小 + .chartsGl { + position: absolute; + top: 59px; + left: 130px; + // margin-top: -150px; + // margin-left: 18%; + height: 370px; + width: 450px; + } + //饼图底座(我也想给你们底座图片 可是我不知道咋给) + .buttomCharts { + background: center top url(/src/assets/icon/chartBg.png) no-repeat; + background-size: cover; + height: 172px; + width: 402px; + // margin-top: -150px; + // margin-left: 18%; + position: absolute; + top: 149px; + left: 80px; + } + .legend { + position: absolute; + left: 110px; + top: 340px; + display: flex; + flex-wrap: wrap; + width: 450px; + + .legend-item { + display: flex; + margin-top: 12px; + width: 142px; + + .item-icon { + width: 10px; + height: 10px; + border-radius: 2px; + } + + .item-name { + flex: 0 0 122px; + margin-left: 2px; + font-size: 14px; + font-family: Alibaba PuHuiTi; + font-weight: 400; + color: #ffffff; + line-height: 10px; + } + } + } + + .static { + position: absolute; + top: 33px; + left: 32px; + + &-num { + font-size: 32px; + font-family: Arial; + font-weight: bold; + color: #ffffff; + } + &-title { + font-size: 18px; + font-family: Alibaba PuHuiTi; + font-weight: 400; + color: #ffffff; + } + } +} +.b-ljhd { + height: 461px; + + .table { + box-sizing: border-box; + padding: 17px 11px; + width: 100%; + height: 100%; + box-sizing: border-box; + .screen-custom-table { + ::v-deep ul { + .table-body .scroll-view .table-tr + .table-tr { + border: none; + } + .table-header { + font-size: 16px; + font-family: PingFang-SC-Bold; + } + .table-body { + .table-tr { + background-image: url('./../assets/icon/tableTdBg.png'); + background-size: 100% 100%; + } + // .table-tr:nth-child(2n) { + // background: rgba(11, 68, 135, 0.1); + // &:hover { + // .table-td { + // color: #fff !important; + // } + // } + // } + // .table-tr:nth-child(2n + 1) { + // &:hover { + // .table-td { + // color: #fff !important; + // } + // } + // } + // .table-tr { + // .table-td:nth-child(2) { + // white-space: nowrap; + // overflow: hidden; + // text-overflow: ellipsis; + // } + // } + } + } + } + } +} diff --git a/src/style/right1.scss b/src/style/right1.scss new file mode 100644 index 0000000..5e2feb9 --- /dev/null +++ b/src/style/right1.scss @@ -0,0 +1,116 @@ +.right1 { + margin-left: 12px; +} +.b-qzys { + height: 628px; + + .main { + box-sizing: border-box; + padding: 33px 75px; + + .item { + margin-top: 22px; + display: flex; + justify-content: flex-start; + // align-content: center; + align-items: center; + + &:first-child { + margin-top: 0px; + } + + .item-icon { + width: 70px; + height: 70px; + } + + .item-arrow { + margin-left: 7px; + width: 30px; + height: 30px; + } + + .item-line { + margin-left: 7px; + flex: 0 0 63px; + // width: 63px; + height: 0px; + border-bottom: 1px dashed #2df3ff; + } + + .item-right { + margin-left: 7px; + width: 300px; + text-align: center; + + .item-title { + margin-bottom: -24px; + font-size: 20px; + font-family: Alibaba PuHuiTi; + font-weight: 500; + color: #ffffff; + line-height: 38px; + } + + .item-bg { + width: 300px; + height: 54px; + } + .item-content { + margin-top: -26px; + font-size: 18px; + font-family: Alibaba PuHuiTi; + font-weight: 400; + color: #aacbe2; + line-height: 38px; + } + } + } + } +} + +.b-ytal { + .ytal-list { + margin-top: 19px; + margin-left: 18px; + // padding: 19px 18px; + overflow: hidden; + position: relative; + height: 258px; + + .ytal-list-tran { + width: 100%; + height: 100%; + position: absolute; + left: 0px; + top: 0px; + + .ytal-item { + margin-top: 8px; + + .ytal-item-detail { + width: 571px; + font-size: 16px; + font-family: Alibaba PuHuiTi; + font-weight: 400; + color: #ffffff; + + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + + .ytal-item-line { + height: 0px; + border-bottom: 1px dashed #609ab9; + margin-top: 8px; + opacity: 0.5; + } + + &:first-child { + margin-top: 0px; + } + } + } + } +} diff --git a/src/views/index.vue b/src/views/index.vue index 3341343..dea8804 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -101,8 +101,8 @@ export default { //屏幕调整 // left: 50%; // top: 50%; - left: 20%; - top: 20%; + left: -110%; + top: 10%; transition: 0.2s; transform-origin: 0 0; } diff --git a/src/views/screenLeft/left3.vue b/src/views/screenLeft/left3.vue index ae0546d..b67206a 100644 --- a/src/views/screenLeft/left3.vue +++ b/src/views/screenLeft/left3.vue @@ -2,32 +2,484 @@
+
+
+
32
+
{{'联建单位总数'}}
+
+
+ +
+
+
+
+
{{item.name}}
+
+
+
+
+ + +
- + \ No newline at end of file diff --git a/src/views/screenRight/right1.vue b/src/views/screenRight/right1.vue index 14510ce..c53fe0e 100644 --- a/src/views/screenRight/right1.vue +++ b/src/views/screenRight/right1.vue @@ -1,32 +1,145 @@ - + \ No newline at end of file