diff --git "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" "b/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" deleted file mode 100644 index 82adf50..0000000 --- "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" "b/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" deleted file mode 100644 index 82adf50..0000000 --- "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\265\201\351\207\217.png" "b/public/static/images/\346\265\201\351\207\217.png" deleted file mode 100644 index fee6806..0000000 --- "a/public/static/images/\346\265\201\351\207\217.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" "b/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" deleted file mode 100644 index 82adf50..0000000 --- "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\265\201\351\207\217.png" "b/public/static/images/\346\265\201\351\207\217.png" deleted file mode 100644 index fee6806..0000000 --- "a/public/static/images/\346\265\201\351\207\217.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\351\231\215\351\233\250.png" "b/public/static/images/\351\231\215\351\233\250.png" deleted file mode 100644 index 904a6cb..0000000 --- "a/public/static/images/\351\231\215\351\233\250.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" "b/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" deleted file mode 100644 index 82adf50..0000000 --- "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\265\201\351\207\217.png" "b/public/static/images/\346\265\201\351\207\217.png" deleted file mode 100644 index fee6806..0000000 --- "a/public/static/images/\346\265\201\351\207\217.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\351\231\215\351\233\250.png" "b/public/static/images/\351\231\215\351\233\250.png" deleted file mode 100644 index 904a6cb..0000000 --- "a/public/static/images/\351\231\215\351\233\250.png" +++ /dev/null Binary files differ diff --git a/src/views/document/fileManagement/accessStatistics/index.vue b/src/views/document/fileManagement/accessStatistics/index.vue index ab0978e..bac487d 100644 --- a/src/views/document/fileManagement/accessStatistics/index.vue +++ b/src/views/document/fileManagement/accessStatistics/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -102,4 +103,11 @@ padding-top: 0 !important; } } +.fileTreeSel { + .el-tree-node__children { + .el-tree-node__expand-icon { + visibility: hidden; + } + } +} diff --git "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" "b/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" deleted file mode 100644 index 82adf50..0000000 --- "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\265\201\351\207\217.png" "b/public/static/images/\346\265\201\351\207\217.png" deleted file mode 100644 index fee6806..0000000 --- "a/public/static/images/\346\265\201\351\207\217.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\351\231\215\351\233\250.png" "b/public/static/images/\351\231\215\351\233\250.png" deleted file mode 100644 index 904a6cb..0000000 --- "a/public/static/images/\351\231\215\351\233\250.png" +++ /dev/null Binary files differ diff --git a/src/views/document/fileManagement/accessStatistics/index.vue b/src/views/document/fileManagement/accessStatistics/index.vue index ab0978e..bac487d 100644 --- a/src/views/document/fileManagement/accessStatistics/index.vue +++ b/src/views/document/fileManagement/accessStatistics/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -102,4 +103,11 @@ padding-top: 0 !important; } } +.fileTreeSel { + .el-tree-node__children { + .el-tree-node__expand-icon { + visibility: hidden; + } + } +} diff --git a/src/views/document/fileManagement/list/operate.vue b/src/views/document/fileManagement/list/operate.vue index 4f01b4a..4862d31 100644 --- a/src/views/document/fileManagement/list/operate.vue +++ b/src/views/document/fileManagement/list/operate.vue @@ -47,6 +47,7 @@ listType="text" :disabled="opts.type === 'view'" @preview="handlePreview" + :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf']" /> diff --git "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" "b/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" deleted file mode 100644 index 82adf50..0000000 --- "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\265\201\351\207\217.png" "b/public/static/images/\346\265\201\351\207\217.png" deleted file mode 100644 index fee6806..0000000 --- "a/public/static/images/\346\265\201\351\207\217.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\351\231\215\351\233\250.png" "b/public/static/images/\351\231\215\351\233\250.png" deleted file mode 100644 index 904a6cb..0000000 --- "a/public/static/images/\351\231\215\351\233\250.png" +++ /dev/null Binary files differ diff --git a/src/views/document/fileManagement/accessStatistics/index.vue b/src/views/document/fileManagement/accessStatistics/index.vue index ab0978e..bac487d 100644 --- a/src/views/document/fileManagement/accessStatistics/index.vue +++ b/src/views/document/fileManagement/accessStatistics/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -102,4 +103,11 @@ padding-top: 0 !important; } } +.fileTreeSel { + .el-tree-node__children { + .el-tree-node__expand-icon { + visibility: hidden; + } + } +} diff --git a/src/views/document/fileManagement/list/operate.vue b/src/views/document/fileManagement/list/operate.vue index 4f01b4a..4862d31 100644 --- a/src/views/document/fileManagement/list/operate.vue +++ b/src/views/document/fileManagement/list/operate.vue @@ -47,6 +47,7 @@ listType="text" :disabled="opts.type === 'view'" @preview="handlePreview" + :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf']" /> diff --git a/src/views/document/fileManagement/readAuth/index.vue b/src/views/document/fileManagement/readAuth/index.vue index 3f1f3b5..33dc196 100644 --- a/src/views/document/fileManagement/readAuth/index.vue +++ b/src/views/document/fileManagement/readAuth/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -159,7 +160,7 @@ }); - diff --git "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" "b/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" deleted file mode 100644 index 82adf50..0000000 --- "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\265\201\351\207\217.png" "b/public/static/images/\346\265\201\351\207\217.png" deleted file mode 100644 index fee6806..0000000 --- "a/public/static/images/\346\265\201\351\207\217.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\351\231\215\351\233\250.png" "b/public/static/images/\351\231\215\351\233\250.png" deleted file mode 100644 index 904a6cb..0000000 --- "a/public/static/images/\351\231\215\351\233\250.png" +++ /dev/null Binary files differ diff --git a/src/views/document/fileManagement/accessStatistics/index.vue b/src/views/document/fileManagement/accessStatistics/index.vue index ab0978e..bac487d 100644 --- a/src/views/document/fileManagement/accessStatistics/index.vue +++ b/src/views/document/fileManagement/accessStatistics/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -102,4 +103,11 @@ padding-top: 0 !important; } } +.fileTreeSel { + .el-tree-node__children { + .el-tree-node__expand-icon { + visibility: hidden; + } + } +} diff --git a/src/views/document/fileManagement/list/operate.vue b/src/views/document/fileManagement/list/operate.vue index 4f01b4a..4862d31 100644 --- a/src/views/document/fileManagement/list/operate.vue +++ b/src/views/document/fileManagement/list/operate.vue @@ -47,6 +47,7 @@ listType="text" :disabled="opts.type === 'view'" @preview="handlePreview" + :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf']" /> diff --git a/src/views/document/fileManagement/readAuth/index.vue b/src/views/document/fileManagement/readAuth/index.vue index 3f1f3b5..33dc196 100644 --- a/src/views/document/fileManagement/readAuth/index.vue +++ b/src/views/document/fileManagement/readAuth/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -159,7 +160,7 @@ }); - diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index 1b65c5f..f382cba 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -107,7 +108,7 @@ }); - diff --git "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" "b/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" deleted file mode 100644 index 82adf50..0000000 --- "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\265\201\351\207\217.png" "b/public/static/images/\346\265\201\351\207\217.png" deleted file mode 100644 index fee6806..0000000 --- "a/public/static/images/\346\265\201\351\207\217.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\351\231\215\351\233\250.png" "b/public/static/images/\351\231\215\351\233\250.png" deleted file mode 100644 index 904a6cb..0000000 --- "a/public/static/images/\351\231\215\351\233\250.png" +++ /dev/null Binary files differ diff --git a/src/views/document/fileManagement/accessStatistics/index.vue b/src/views/document/fileManagement/accessStatistics/index.vue index ab0978e..bac487d 100644 --- a/src/views/document/fileManagement/accessStatistics/index.vue +++ b/src/views/document/fileManagement/accessStatistics/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -102,4 +103,11 @@ padding-top: 0 !important; } } +.fileTreeSel { + .el-tree-node__children { + .el-tree-node__expand-icon { + visibility: hidden; + } + } +} diff --git a/src/views/document/fileManagement/list/operate.vue b/src/views/document/fileManagement/list/operate.vue index 4f01b4a..4862d31 100644 --- a/src/views/document/fileManagement/list/operate.vue +++ b/src/views/document/fileManagement/list/operate.vue @@ -47,6 +47,7 @@ listType="text" :disabled="opts.type === 'view'" @preview="handlePreview" + :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf']" /> diff --git a/src/views/document/fileManagement/readAuth/index.vue b/src/views/document/fileManagement/readAuth/index.vue index 3f1f3b5..33dc196 100644 --- a/src/views/document/fileManagement/readAuth/index.vue +++ b/src/views/document/fileManagement/readAuth/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -159,7 +160,7 @@ }); - diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index 1b65c5f..f382cba 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -107,7 +108,7 @@ }); - diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 25ae659..e43526a 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -375,7 +375,7 @@ .part { color: #5b9cd8; cursor: pointer; - width: 85%; + width: 95%; margin-bottom: 15px; border-bottom: 1px dashed #c6c6c6; .el-radio { @@ -390,7 +390,7 @@ border-radius: 8px; position: absolute; top: 30px; - left: 300px; + left: 25%; z-index: 99; padding: 10px; display: flex; diff --git "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" "b/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" deleted file mode 100644 index 82adf50..0000000 --- "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\265\201\351\207\217.png" "b/public/static/images/\346\265\201\351\207\217.png" deleted file mode 100644 index fee6806..0000000 --- "a/public/static/images/\346\265\201\351\207\217.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\351\231\215\351\233\250.png" "b/public/static/images/\351\231\215\351\233\250.png" deleted file mode 100644 index 904a6cb..0000000 --- "a/public/static/images/\351\231\215\351\233\250.png" +++ /dev/null Binary files differ diff --git a/src/views/document/fileManagement/accessStatistics/index.vue b/src/views/document/fileManagement/accessStatistics/index.vue index ab0978e..bac487d 100644 --- a/src/views/document/fileManagement/accessStatistics/index.vue +++ b/src/views/document/fileManagement/accessStatistics/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -102,4 +103,11 @@ padding-top: 0 !important; } } +.fileTreeSel { + .el-tree-node__children { + .el-tree-node__expand-icon { + visibility: hidden; + } + } +} diff --git a/src/views/document/fileManagement/list/operate.vue b/src/views/document/fileManagement/list/operate.vue index 4f01b4a..4862d31 100644 --- a/src/views/document/fileManagement/list/operate.vue +++ b/src/views/document/fileManagement/list/operate.vue @@ -47,6 +47,7 @@ listType="text" :disabled="opts.type === 'view'" @preview="handlePreview" + :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf']" /> diff --git a/src/views/document/fileManagement/readAuth/index.vue b/src/views/document/fileManagement/readAuth/index.vue index 3f1f3b5..33dc196 100644 --- a/src/views/document/fileManagement/readAuth/index.vue +++ b/src/views/document/fileManagement/readAuth/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -159,7 +160,7 @@ }); - diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index 1b65c5f..f382cba 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -107,7 +108,7 @@ }); - diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 25ae659..e43526a 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -375,7 +375,7 @@ .part { color: #5b9cd8; cursor: pointer; - width: 85%; + width: 95%; margin-bottom: 15px; border-bottom: 1px dashed #c6c6c6; .el-radio { @@ -390,7 +390,7 @@ border-radius: 8px; position: absolute; top: 30px; - left: 300px; + left: 25%; z-index: 99; padding: 10px; display: flex; diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue index 7a865e6..ade6f4a 100644 --- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue +++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue @@ -221,7 +221,7 @@ getProjectStatisticsM(); setTimeout(() => { initEcharts(); - }, 500); + }, 1500); }); diff --git "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" "b/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" deleted file mode 100644 index 82adf50..0000000 --- "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\265\201\351\207\217.png" "b/public/static/images/\346\265\201\351\207\217.png" deleted file mode 100644 index fee6806..0000000 --- "a/public/static/images/\346\265\201\351\207\217.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\351\231\215\351\233\250.png" "b/public/static/images/\351\231\215\351\233\250.png" deleted file mode 100644 index 904a6cb..0000000 --- "a/public/static/images/\351\231\215\351\233\250.png" +++ /dev/null Binary files differ diff --git a/src/views/document/fileManagement/accessStatistics/index.vue b/src/views/document/fileManagement/accessStatistics/index.vue index ab0978e..bac487d 100644 --- a/src/views/document/fileManagement/accessStatistics/index.vue +++ b/src/views/document/fileManagement/accessStatistics/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -102,4 +103,11 @@ padding-top: 0 !important; } } +.fileTreeSel { + .el-tree-node__children { + .el-tree-node__expand-icon { + visibility: hidden; + } + } +} diff --git a/src/views/document/fileManagement/list/operate.vue b/src/views/document/fileManagement/list/operate.vue index 4f01b4a..4862d31 100644 --- a/src/views/document/fileManagement/list/operate.vue +++ b/src/views/document/fileManagement/list/operate.vue @@ -47,6 +47,7 @@ listType="text" :disabled="opts.type === 'view'" @preview="handlePreview" + :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf']" /> diff --git a/src/views/document/fileManagement/readAuth/index.vue b/src/views/document/fileManagement/readAuth/index.vue index 3f1f3b5..33dc196 100644 --- a/src/views/document/fileManagement/readAuth/index.vue +++ b/src/views/document/fileManagement/readAuth/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -159,7 +160,7 @@ }); - diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index 1b65c5f..f382cba 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -107,7 +108,7 @@ }); - diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 25ae659..e43526a 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -375,7 +375,7 @@ .part { color: #5b9cd8; cursor: pointer; - width: 85%; + width: 95%; margin-bottom: 15px; border-bottom: 1px dashed #c6c6c6; .el-radio { @@ -390,7 +390,7 @@ border-radius: 8px; position: absolute; top: 30px; - left: 300px; + left: 25%; z-index: 99; padding: 10px; display: flex; diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue index 7a865e6..ade6f4a 100644 --- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue +++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue @@ -221,7 +221,7 @@ getProjectStatisticsM(); setTimeout(() => { initEcharts(); - }, 500); + }, 1500); }); diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 04529d5..200a0d7 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -287,7 +287,7 @@ .headLightDX { position: absolute; top: 38px; - z-index: 9900; + z-index: 200; width: 215px; height: 39px; pointer-events: none; diff --git "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" "b/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" deleted file mode 100644 index 82adf50..0000000 --- "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\265\201\351\207\217.png" "b/public/static/images/\346\265\201\351\207\217.png" deleted file mode 100644 index fee6806..0000000 --- "a/public/static/images/\346\265\201\351\207\217.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\351\231\215\351\233\250.png" "b/public/static/images/\351\231\215\351\233\250.png" deleted file mode 100644 index 904a6cb..0000000 --- "a/public/static/images/\351\231\215\351\233\250.png" +++ /dev/null Binary files differ diff --git a/src/views/document/fileManagement/accessStatistics/index.vue b/src/views/document/fileManagement/accessStatistics/index.vue index ab0978e..bac487d 100644 --- a/src/views/document/fileManagement/accessStatistics/index.vue +++ b/src/views/document/fileManagement/accessStatistics/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -102,4 +103,11 @@ padding-top: 0 !important; } } +.fileTreeSel { + .el-tree-node__children { + .el-tree-node__expand-icon { + visibility: hidden; + } + } +} diff --git a/src/views/document/fileManagement/list/operate.vue b/src/views/document/fileManagement/list/operate.vue index 4f01b4a..4862d31 100644 --- a/src/views/document/fileManagement/list/operate.vue +++ b/src/views/document/fileManagement/list/operate.vue @@ -47,6 +47,7 @@ listType="text" :disabled="opts.type === 'view'" @preview="handlePreview" + :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf']" /> diff --git a/src/views/document/fileManagement/readAuth/index.vue b/src/views/document/fileManagement/readAuth/index.vue index 3f1f3b5..33dc196 100644 --- a/src/views/document/fileManagement/readAuth/index.vue +++ b/src/views/document/fileManagement/readAuth/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -159,7 +160,7 @@ }); - diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index 1b65c5f..f382cba 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -107,7 +108,7 @@ }); - diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 25ae659..e43526a 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -375,7 +375,7 @@ .part { color: #5b9cd8; cursor: pointer; - width: 85%; + width: 95%; margin-bottom: 15px; border-bottom: 1px dashed #c6c6c6; .el-radio { @@ -390,7 +390,7 @@ border-radius: 8px; position: absolute; top: 30px; - left: 300px; + left: 25%; z-index: 99; padding: 10px; display: flex; diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue index 7a865e6..ade6f4a 100644 --- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue +++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue @@ -221,7 +221,7 @@ getProjectStatisticsM(); setTimeout(() => { initEcharts(); - }, 500); + }, 1500); }); diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 04529d5..200a0d7 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -287,7 +287,7 @@ .headLightDX { position: absolute; top: 38px; - z-index: 9900; + z-index: 200; width: 215px; height: 39px; pointer-events: none; diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 6fbf7c4..108d45a 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -212,7 +212,7 @@ chartOption.floodOneMapFXYP.series[1].markLine.data[0].label.formatter = '设防水位 ' + datas.sfZ + 'm'; let arrs2 = []; datas.riverX.map(item => { - arrs2.push(Number(datas.z) + 59); + arrs2.push(Number(datas.z) + Number(datas.gcZ) + 1); }); chartOption.floodOneMapFXYP.series[0].data = arrs2; //当前水位 diff --git "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" "b/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" deleted file mode 100644 index 82adf50..0000000 --- "a/public/static/images/\346\260\264\344\275\215\347\233\221\346\265\213\347\202\271.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\265\201\351\207\217.png" "b/public/static/images/\346\265\201\351\207\217.png" deleted file mode 100644 index fee6806..0000000 --- "a/public/static/images/\346\265\201\351\207\217.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\351\231\215\351\233\250.png" "b/public/static/images/\351\231\215\351\233\250.png" deleted file mode 100644 index 904a6cb..0000000 --- "a/public/static/images/\351\231\215\351\233\250.png" +++ /dev/null Binary files differ diff --git a/src/views/document/fileManagement/accessStatistics/index.vue b/src/views/document/fileManagement/accessStatistics/index.vue index ab0978e..bac487d 100644 --- a/src/views/document/fileManagement/accessStatistics/index.vue +++ b/src/views/document/fileManagement/accessStatistics/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -102,4 +103,11 @@ padding-top: 0 !important; } } +.fileTreeSel { + .el-tree-node__children { + .el-tree-node__expand-icon { + visibility: hidden; + } + } +} diff --git a/src/views/document/fileManagement/list/operate.vue b/src/views/document/fileManagement/list/operate.vue index 4f01b4a..4862d31 100644 --- a/src/views/document/fileManagement/list/operate.vue +++ b/src/views/document/fileManagement/list/operate.vue @@ -47,6 +47,7 @@ listType="text" :disabled="opts.type === 'view'" @preview="handlePreview" + :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf']" /> diff --git a/src/views/document/fileManagement/readAuth/index.vue b/src/views/document/fileManagement/readAuth/index.vue index 3f1f3b5..33dc196 100644 --- a/src/views/document/fileManagement/readAuth/index.vue +++ b/src/views/document/fileManagement/readAuth/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -159,7 +160,7 @@ }); - diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index 1b65c5f..f382cba 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -12,6 +12,7 @@ check-strictly clearable style="width: 100%" + class="fileTreeSel" /> @@ -107,7 +108,7 @@ }); - diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 25ae659..e43526a 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -375,7 +375,7 @@ .part { color: #5b9cd8; cursor: pointer; - width: 85%; + width: 95%; margin-bottom: 15px; border-bottom: 1px dashed #c6c6c6; .el-radio { @@ -390,7 +390,7 @@ border-radius: 8px; position: absolute; top: 30px; - left: 300px; + left: 25%; z-index: 99; padding: 10px; display: flex; diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue index 7a865e6..ade6f4a 100644 --- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue +++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue @@ -221,7 +221,7 @@ getProjectStatisticsM(); setTimeout(() => { initEcharts(); - }, 500); + }, 1500); }); diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 04529d5..200a0d7 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -287,7 +287,7 @@ .headLightDX { position: absolute; top: 38px; - z-index: 9900; + z-index: 200; width: 215px; height: 39px; pointer-events: none; diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 6fbf7c4..108d45a 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -212,7 +212,7 @@ chartOption.floodOneMapFXYP.series[1].markLine.data[0].label.formatter = '设防水位 ' + datas.sfZ + 'm'; let arrs2 = []; datas.riverX.map(item => { - arrs2.push(Number(datas.z) + 59); + arrs2.push(Number(datas.z) + Number(datas.gcZ) + 1); }); chartOption.floodOneMapFXYP.series[0].data = arrs2; //当前水位 diff --git a/src/views/sponeScreen/waterFlood/rainReport.vue b/src/views/sponeScreen/waterFlood/rainReport.vue index 4897ac9..d7eef8b 100644 --- a/src/views/sponeScreen/waterFlood/rainReport.vue +++ b/src/views/sponeScreen/waterFlood/rainReport.vue @@ -34,7 +34,7 @@ - +