瀏覽代碼

Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/qdtlui

# Conflicts:
#	package.json
#	src/views/governance/index.vue
#	src/views/public/index.vue
#	src/views/safe/index.vue
MSI\liwei 3 年之前
父節點
當前提交
fc0a2b4b27

+ 1 - 1
.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 启东市铁路沿线综合治理信息化管理平台
 
 # 生产环境配置
 ENV = 'production'

+ 1 - 1
.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 启东市铁路沿线综合治理信息化管理平台
 
 NODE_ENV = production
 

+ 92 - 95
package.json

@@ -1,95 +1,92 @@
-{
-  "name": "ruoyi",
-  "version": "3.8.1",
-  "description": "若依管理系统",
-  "author": "若依",
-  "license": "MIT",
-  "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
-    "preview": "node build/index.js --preview",
-    "lint": "eslint --ext .js,.vue src"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "src/**/*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ]
-  },
-  "keywords": [
-    "vue",
-    "admin",
-    "dashboard",
-    "element-ui",
-    "boilerplate",
-    "admin-template",
-    "management-system"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
-  },
-  "dependencies": {
-    "@liveqing/liveplayer": "^2.6.7",
-    "@riophae/vue-treeselect": "0.4.0",
-    "axios": "0.24.0",
-    "clipboard": "2.0.8",
-    "copy-webpack-plugin": "^4.6.0",
-    "core-js": "^3.21.0",
-    "echarts": "4.9.0",
-    "element-ui": "2.15.6",
-    "file-saver": "2.0.5",
-    "fuse.js": "6.4.3",
-    "highlight.js": "9.18.5",
-    "js-base64": "^3.7.2",
-    "js-beautify": "1.13.0",
-    "js-cookie": "3.0.1",
-    "jsencrypt": "3.2.1",
-    "moment": "^2.29.1",
-    "nprogress": "0.2.0",
-    "ol": "^6.12.0",
-    "quill": "1.3.7",
-    "screenfull": "5.0.2",
-    "sortablejs": "1.10.2",
-    "vue": "2.6.12",
-    "vue-count-to": "1.0.13",
-    "vue-cropper": "0.5.5",
-    "vue-meta": "2.4.0",
-    "vue-router": "3.4.9",
-    "vuedraggable": "2.24.3",
-    "vuex": "3.6.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "4.4.6",
-    "@vue/cli-plugin-eslint": "4.4.6",
-    "@vue/cli-service": "4.4.6",
-    "babel-eslint": "10.1.0",
-    "babel-plugin-dynamic-import-node": "2.3.3",
-    "chalk": "4.1.0",
-    "compression-webpack-plugin": "5.0.2",
-    "connect": "3.6.6",
-    "eslint": "7.15.0",
-    "eslint-plugin-vue": "7.2.0",
-    "lint-staged": "10.5.3",
-    "runjs": "4.4.2",
-    "sass": "1.32.13",
-    "sass-loader": "10.1.1",
-    "script-ext-html-webpack-plugin": "2.1.5",
-    "svg-sprite-loader": "5.1.1",
-    "vue-template-compiler": "2.6.12"
-  },
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions"
-  ]
-}
+{
+    "name": "ruoyi",
+    "version": "3.8.1",
+    "description": "启东市铁路沿线综合治理信息化管理平台",
+    "author": "新通",
+    "license": "MIT",
+    "scripts": {
+        "dev": "vue-cli-service serve",
+        "build:prod": "vue-cli-service build",
+        "build:stage": "vue-cli-service build --mode staging",
+        "preview": "node build/index.js --preview",
+        "lint": "eslint --ext .js,.vue src"
+    },
+    "husky": {
+        "hooks": {
+            "pre-commit": "lint-staged"
+        }
+    },
+    "lint-staged": {
+        "src/**/*.{js,vue}": [
+            "eslint --fix",
+            "git add"
+        ]
+    },
+    "keywords": [
+        "vue",
+        "admin",
+        "dashboard",
+        "element-ui",
+        "boilerplate",
+        "admin-template",
+        "management-system"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://gitee.com/y_project/RuoYi-Vue.git"
+    },
+    "dependencies": {
+        "@riophae/vue-treeselect": "0.4.0",
+        "axios": "0.24.0",
+        "clipboard": "2.0.8",
+        "core-js": "^3.21.0",
+        "echarts": "4.9.0",
+        "element-ui": "2.15.6",
+        "file-saver": "2.0.5",
+        "fuse.js": "6.4.3",
+        "highlight.js": "9.18.5",
+        "js-beautify": "1.13.0",
+        "js-cookie": "3.0.1",
+        "jsencrypt": "3.2.1",
+        "moment": "^2.29.1",
+        "nprogress": "0.2.0",
+        "ol": "^6.12.0",
+        "quill": "1.3.7",
+        "screenfull": "5.0.2",
+        "sortablejs": "1.10.2",
+        "vue": "2.6.12",
+        "vue-count-to": "1.0.13",
+        "vue-cropper": "0.5.5",
+        "vue-meta": "2.4.0",
+        "vue-router": "3.4.9",
+        "vuedraggable": "2.24.3",
+        "vuex": "3.6.0"
+    },
+    "devDependencies": {
+        "@vue/cli-plugin-babel": "4.4.6",
+        "@vue/cli-plugin-eslint": "4.4.6",
+        "@vue/cli-service": "4.4.6",
+        "babel-eslint": "10.1.0",
+        "babel-plugin-dynamic-import-node": "2.3.3",
+        "chalk": "4.1.0",
+        "compression-webpack-plugin": "5.0.2",
+        "connect": "3.6.6",
+        "eslint": "7.15.0",
+        "eslint-plugin-vue": "7.2.0",
+        "lint-staged": "10.5.3",
+        "runjs": "4.4.2",
+        "sass": "1.32.13",
+        "sass-loader": "10.1.1",
+        "script-ext-html-webpack-plugin": "2.1.5",
+        "svg-sprite-loader": "5.1.1",
+        "vue-template-compiler": "2.6.12"
+    },
+    "engines": {
+        "node": ">=8.9",
+        "npm": ">= 3.0.0"
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions"
+    ]
+}

+ 2 - 2
public/index.html

@@ -6,9 +6,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico"> -->
     <title>
-        <%= webpackConfig.name %>
+        启东市铁路沿线综合治理信息化管理平台
     </title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
     <style>

+ 10 - 4
src/App.vue

@@ -9,19 +9,25 @@ export default  {
   name:  'App',
     metaInfo() {
         return {
-            title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
+            title: "启东市铁路沿线综合治理信息化管理平台",
             titleTemplate: title => {
-                return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
+                return "启东市铁路沿线综合治理信息化管理平台"
             }
         }
     }
 }
 </script>
 
-<style scoped>
-#app{
+<style lang="scss">
+#app {
   background: url("./assets/images/bg@2x.png") no-repeat;
   background-size: 100% 100%;
+}
+.my_table{
+  color: #fff !important;
+  th {
+    color:#fff !important;
 
+  }
 }
 </style>

+ 402 - 372
src/assets/styles/ruoyi.scss

@@ -2,379 +2,409 @@
  * 通用css样式布局处理
  * Copyright (c) 2019 ruoyi
  */
-
  /** 基础通用 **/
-.pt5 {
-	padding-top: 5px;
-}
-.pr5 {
-	padding-right: 5px;
-}
-.pb5 {
-	padding-bottom: 5px;
-}
-.mt5 {
-	margin-top: 5px;
-}
-.mr5 {
-	margin-right: 5px;
-}
-.mb5 {
-	margin-bottom: 5px;
-}
-.mb8 {
-	margin-bottom: 8px;
-}
-.ml5 {
-	margin-left: 5px;
-}
-.mt10 {
-	margin-top: 10px;
-}
-.mr10 {
-	margin-right: 10px;
-}
-.mb10 {
-	margin-bottom: 10px;
-}
-.ml10 {
-	margin-left: 10px;
-}
-.mt20 {
-	margin-top: 20px;
-}
-.mr20 {
-	margin-right: 20px;
-}
-.mb20 {
-	margin-bottom: 20px;
-}
-.ml20 {
-	margin-left: 20px;
-}
-
-.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
-	font-family: inherit;
-	font-weight: 500;
-	line-height: 1.1;
-	color: inherit;
-}
-
-.el-dialog:not(.is-fullscreen) {
-	margin-top: 6vh !important;
-}
-
-.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
-    overflow: auto;
-	overflow-x: hidden;
-	max-height: 70vh;
-	padding: 10px 20px 0;
-}
-
-.el-table {
-	.el-table__header-wrapper, .el-table__fixed-header-wrapper {
-		th {
-			word-break: break-word;
-			background-color: #f8f8f9;
-			color: #515a6e;
-			height: 40px;
-			font-size: 13px;
-		}
-	}
-	.el-table__body-wrapper {
-		.el-button [class*="el-icon-"] + span {
-			margin-left: 1px;
-		}
-	}
-}
-
-/** 表单布局 **/
-.form-header {
-    font-size:15px;
-	color:#6379bb;
-	border-bottom:1px solid #ddd;
-	margin:8px 10px 25px 10px;
-	padding-bottom:5px
-}
-
-/** 表格布局 **/
-.pagination-container {
-	position: relative;
-	height: 25px;
-	margin-bottom: 10px;
-	margin-top: 15px;
-	padding: 10px 20px !important;
-}
-
-/* tree border */
-.tree-border {
-    margin-top: 5px;
-    border: 1px solid #e5e6e7;
-    background: #FFFFFF none;
-    border-radius:4px;
-}
-
-.pagination-container .el-pagination {
-	right: 0;
-	position: absolute;
-	color:#3DFFEA 
-}
-
-@media ( max-width : 768px) {
-  .pagination-container .el-pagination > .el-pagination__jump {
-    display: none !important;
-  }
-  .pagination-container .el-pagination > .el-pagination__sizes {
-    display: none !important;
-  }
-}
-
-.el-table .fixed-width .el-button--mini {
-	padding-left: 0;
-	padding-right: 0;
-	width: inherit;
-}
-
-/** 表格更多操作下拉样式 */
-.el-table .el-dropdown-link {
-	cursor: pointer;
-	color: #409EFF;
-	margin-left: 5px;
-}
-
-.el-table .el-dropdown, .el-icon-arrow-down {
-	font-size: 12px;
-}
-
-.el-tree-node__content > .el-checkbox {
-	margin-right: 8px;
-}
-
-.list-group-striped > .list-group-item {
-	border-left: 0;
-	border-right: 0;
-	border-radius: 0;
-	padding-left: 0;
-	padding-right: 0;
-}
-
-.list-group {
-	padding-left: 0px;
-	list-style: none;
-}
-
-.list-group-item {
-	border-bottom: 1px solid #e7eaec;
-	border-top: 1px solid #e7eaec;
-	margin-bottom: -1px;
-	padding: 11px 0px;
-	font-size: 13px;
-}
-
-.pull-right {
-	float: right !important;
-}
-
-.el-card__header {
-	padding: 14px 15px 7px;
-	min-height: 40px;
-}
-
-.el-card__body {
-	padding: 15px 20px 20px 20px;
-}
-
-.card-box {
-	padding-right: 15px;
-	padding-left: 15px;
-	margin-bottom: 10px;
-}
-
-/* button color */
-.el-button--cyan.is-active,
-.el-button--cyan:active {
-  background: #20B2AA;
-  border-color: #20B2AA;
-  color: #FFFFFF;
-}
-
-.el-button--cyan:focus,
-.el-button--cyan:hover {
-  background: #48D1CC;
-  border-color: #48D1CC;
-  color: #FFFFFF;
-}
-
-.el-button--cyan {
-  background-color: #20B2AA;
-  border-color: #20B2AA;
-  color: #FFFFFF;
-}
-
-/* text color */
-.text-navy {
-	color: #1ab394;
-}
-
-.text-primary {
-	color: inherit;
-}
-
-.text-success {
-	color: #1c84c6;
-}
-
-.text-info {
-	color: #23c6c8;
-}
-
-.text-warning {
-	color: #f8ac59;
-}
-
-.text-danger {
-	color: #ed5565;
-}
-
-.text-muted {
-	color: #888888;
-}
-
-/* image */
-.img-circle {
-	border-radius: 50%;
-}
-
-.img-lg {
-	width: 120px;
-	height: 120px;
-}
-
-.avatar-upload-preview {
-	position: absolute;
-	top: 50%;
-	transform: translate(50%, -50%);
-	width: 200px;
-	height: 200px;
-	border-radius: 50%;
-	box-shadow: 0 0 4px #ccc;
-	overflow: hidden;
-}
-
-/* 拖拽列样式 */
-.sortable-ghost{
-	opacity: .8;
-	color: #fff!important;
-	background: #42b983!important;
-}
-
-.top-right-btn {
-	position: relative;
-	float: right;
-}
-
-.el-button--primary {
-	color:#C5D0D4;
-	background:#0A4559 !important;
-	border-color:#0A4559 !important;
-}
-
-.el-button--primary:hover {
-background: #3DFFEA !important;
-border-color: #3DFFEA !important;
-color: #000000 !important;
-}
-
-.el-pagination__total{
-	color:#3DFFEA
-}
-
-.el-pagination__jump{
-	color:#3DFFEA
-}       
-
-.el-pagination.is-background .btn-prev, .el-pagination.is-background .btn-next, .el-pagination.is-background .el-pager li {   
-		background: #068583 20%;
-		color: #0BC4F0;
-}
-
-.el-pagination.is-background .el-pager li:not(.disabled).active {
-		background-color: #3DFFEA;
-		color: #031B3C;
-}
-
-.el-input__inner{
-	background: #068583 20%;
-	border: 1px solid #068583;
-	color:white
-}
-
-.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell{
-	 background: transparent;
-	 border: none;
-	 color: #C5D0D4;
-}
-
-.el-table .el-table__body tr.el-table__row td.el-table__cell{
-	 background: transparent;
-	 border: none;
-	 color: #C5D0D4;
-}
-
-.el-table .warning-row {
-	background:#052C3E 20%;
-}
-
-.el-table .success-row {
-	background: #041621;
-}
-
-.el-checkbox__inner{
-	background: transparent
-}
-
-/* td{
+
+ .pt5 {
+     padding-top: 5px;
+ }
+
+ .pr5 {
+     padding-right: 5px;
+ }
+
+ .pb5 {
+     padding-bottom: 5px;
+ }
+
+ .mt5 {
+     margin-top: 5px;
+ }
+
+ .mr5 {
+     margin-right: 5px;
+ }
+
+ .mb5 {
+     margin-bottom: 5px;
+ }
+
+ .mb8 {
+     margin-bottom: 8px;
+ }
+
+ .ml5 {
+     margin-left: 5px;
+ }
+
+ .mt10 {
+     margin-top: 10px;
+ }
+
+ .mr10 {
+     margin-right: 10px;
+ }
+
+ .mb10 {
+     margin-bottom: 10px;
+ }
+
+ .ml10 {
+     margin-left: 10px;
+ }
+
+ .mt20 {
+     margin-top: 20px;
+ }
+
+ .mr20 {
+     margin-right: 20px;
+ }
+
+ .mb20 {
+     margin-bottom: 20px;
+ }
+
+ .ml20 {
+     margin-left: 20px;
+ }
+
+ .h1,
+ .h2,
+ .h3,
+ .h4,
+ .h5,
+ .h6,
+ h1,
+ h2,
+ h3,
+ h4,
+ h5,
+ h6 {
+     font-family: inherit;
+     font-weight: 500;
+     line-height: 1.1;
+     color: inherit;
+ }
+
+ .el-dialog:not(.is-fullscreen) {
+     margin-top: 6vh !important;
+ }
+
+ .el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
+     overflow: auto;
+     overflow-x: hidden;
+     max-height: 70vh;
+     padding: 10px 20px 0;
+ }
+
+ .el-table {
+     .el-table__header-wrapper,
+     .el-table__fixed-header-wrapper {
+         th {
+             word-break: break-word;
+             background-color: #f8f8f9;
+             color: #515a6e;
+             height: 40px;
+             font-size: 13px;
+         }
+     }
+     .el-table__body-wrapper {
+         .el-button [class*="el-icon-"]+span {
+             margin-left: 1px;
+         }
+     }
+ }
+ /** 表单布局 **/
+
+ .form-header {
+     font-size: 15px;
+     color: #6379bb;
+     border-bottom: 1px solid #ddd;
+     margin: 8px 10px 25px 10px;
+     padding-bottom: 5px
+ }
+ /** 表格布局 **/
+
+ .pagination-container {
+     position: relative;
+     height: 25px;
+     margin-bottom: 10px;
+     margin-top: 15px;
+     padding: 10px 20px !important;
+ }
+ /* tree border */
+
+ .tree-border {
+     margin-top: 5px;
+     border: 1px solid #e5e6e7;
+     background: #FFFFFF none;
+     border-radius: 4px;
+ }
+
+ .pagination-container .el-pagination {
+     right: 0;
+     position: absolute;
+     color: #3DFFEA
+ }
+
+ @media ( max-width: 768px) {
+     .pagination-container .el-pagination>.el-pagination__jump {
+         display: none !important;
+     }
+     .pagination-container .el-pagination>.el-pagination__sizes {
+         display: none !important;
+     }
+ }
+
+ .el-table .fixed-width .el-button--mini {
+     padding-left: 0;
+     padding-right: 0;
+     width: inherit;
+ }
+ /** 表格更多操作下拉样式 */
+
+ .el-table .el-dropdown-link {
+     cursor: pointer;
+     color: #409EFF;
+     margin-left: 5px;
+ }
+
+ .el-table .el-dropdown,
+ .el-icon-arrow-down {
+     font-size: 12px;
+ }
+
+ .el-tree-node__content>.el-checkbox {
+     margin-right: 8px;
+ }
+
+ .list-group-striped>.list-group-item {
+     border-left: 0;
+     border-right: 0;
+     border-radius: 0;
+     padding-left: 0;
+     padding-right: 0;
+ }
+
+ .list-group {
+     padding-left: 0px;
+     list-style: none;
+ }
+
+ .list-group-item {
+     border-bottom: 1px solid #e7eaec;
+     border-top: 1px solid #e7eaec;
+     margin-bottom: -1px;
+     padding: 11px 0px;
+     font-size: 13px;
+ }
+
+ .pull-right {
+     float: right !important;
+ }
+
+ .el-card__header {
+     padding: 14px 15px 7px;
+     min-height: 40px;
+ }
+
+ .el-card__body {
+     padding: 15px 20px 20px 20px;
+ }
+
+ .card-box {
+     padding-right: 15px;
+     padding-left: 15px;
+     margin-bottom: 10px;
+ }
+ /* button color */
+
+ .el-button--cyan.is-active,
+ .el-button--cyan:active {
+     background: #20B2AA;
+     border-color: #20B2AA;
+     color: #FFFFFF;
+ }
+
+ .el-button--cyan:focus,
+ .el-button--cyan:hover {
+     background: #48D1CC;
+     border-color: #48D1CC;
+     color: #FFFFFF;
+ }
+
+ .el-button--cyan {
+     background-color: #20B2AA;
+     border-color: #20B2AA;
+     color: #FFFFFF;
+ }
+ /* text color */
+
+ .text-navy {
+     color: #1ab394;
+ }
+
+ .text-primary {
+     color: inherit;
+ }
+
+ .text-success {
+     color: #1c84c6;
+ }
+
+ .text-info {
+     color: #23c6c8;
+ }
+
+ .text-warning {
+     color: #f8ac59;
+ }
+
+ .text-danger {
+     color: #ed5565;
+ }
+
+ .text-muted {
+     color: #888888;
+ }
+ /* image */
+
+ .img-circle {
+     border-radius: 50%;
+ }
+
+ .img-lg {
+     width: 120px;
+     height: 120px;
+ }
+
+ .avatar-upload-preview {
+     position: absolute;
+     top: 50%;
+     transform: translate(50%, -50%);
+     width: 200px;
+     height: 200px;
+     border-radius: 50%;
+     box-shadow: 0 0 4px #ccc;
+     overflow: hidden;
+ }
+ /* 拖拽列样式 */
+
+ .sortable-ghost {
+     opacity: .8;
+     color: #fff!important;
+     background: #42b983!important;
+ }
+
+ .top-right-btn {
+     position: relative;
+     float: right;
+ }
+
+ .el-button--primary {
+     color: #C5D0D4;
+     background: #0A4559 !important;
+     border-color: #0A4559 !important;
+ }
+
+ .el-button--primary:hover {
+     background: #3DFFEA !important;
+     border-color: #3DFFEA !important;
+     color: #000000 !important;
+ }
+
+ .el-pagination__total {
+     color: #3DFFEA
+ }
+
+ .el-pagination__jump {
+     color: #3DFFEA
+ }
+
+ .el-pagination.is-background .btn-prev,
+ .el-pagination.is-background .btn-next,
+ .el-pagination.is-background .el-pager li {
+     background: #068583 20%;
+     color: #0BC4F0;
+ }
+
+ .el-pagination.is-background .el-pager li:not(.disabled).active {
+     background-color: #3DFFEA;
+     color: #031B3C;
+ }
+
+ .el-input__inner {
+     background: #068583 20%;
+     border: 1px solid #068583;
+     color: white
+ }
+
+ .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
+     background: transparent;
+     border: none;
+     //  color: #C5D0D4;
+ }
+
+ .el-table .el-table__body tr.el-table__row td.el-table__cell {
+     background: transparent;
+     border: none;
+     //  color: #C5D0D4;
+ }
+
+ .el-table .warning-row {
+     background: #052C3E 20%;
+ }
+
+ .el-table .success-row {
+     background: #041621;
+ }
+
+ .el-checkbox__inner {
+     background: transparent
+ }
+ /* td{
 	border: none;
 	color: #C5D0D4;
 } */
-.el-table::before {
-	height: 0px;
-}
-
-.el-dialog__header{
-	 background: #026F70;
-	 color:#ffffff;
-	 font-size: 1.6rem;
-	 height:4.8rem;
-	 padding-top:1.5rem;
-	 padding-left:2.3rem
-}
-
-.el-dialog__title{
-	 color:#ffffff;
-	 font-size: 1.6rem
-}
-
-.el-dialog__body{
-	background: #041824 84%
-}
-
-.el-dialog__footer{
-	background: #041824 84%
-}
-
-.el-input__inner{
-   background: #041824 84%
-}
-
-.el-textarea__inner{
-	background: #041824 84%
-}
-
-.el-form-item__label{
-	 color:#C5D0D4
-}
-
-.el-icon-arrow-up:before{
-	 color:#23FFFC
-}
+
+ .el-table::before {
+     height: 0px;
+ }
+
+ .el-dialog__header {
+     background: #026F70;
+     color: #ffffff;
+     font-size: 1.6rem;
+     height: 4.8rem;
+     padding-top: 1.5rem;
+     padding-left: 2.3rem
+ }
+
+ .el-dialog__title {
+     color: #ffffff;
+     font-size: 1.6rem
+ }
+
+ .el-dialog__body {
+     background: #041824 84%
+ }
+
+ .el-dialog__footer {
+     background: #041824 84%
+ }
+
+ .el-input__inner {
+     background: #041824 84%
+ }
+
+ .el-textarea__inner {
+     background: #041824 84%
+ }
+
+ .el-form-item__label {
+     color: #C5D0D4
+ }
+
+ .el-icon-arrow-up:before {
+     color: #23FFFC
+ }

+ 9 - 5
src/components/HeaderDiv/index.vue

@@ -7,10 +7,11 @@
             <div :class='currentindex==1?"active":""' @click="goTarget(1)">首页</div>
             <div :class='currentindex==7?"active":""' @click="goTarget(7)">交通局简介</div>
             <div :class='currentindex==2?"active":""' @click="goTarget(2)">设施监测</div>
+             <div :class='currentindex==6?"active":""' @click="goTarget(6)">综合管理</div>
             <div :class='currentindex==3?"active":""' @click="goTarget(3)">治理态势</div>
             <div :class='currentindex==4?"active":""' @click="goTarget(4)">安全态势</div>
             <div :class='currentindex==5?"active":""' @click="goTarget(5)">公众服务</div>
-            <div :class='currentindex==6?"active":""' @click="goTarget(6)">综合管理</div>
+
         </div>
         <div class="time">
             <img src="../../assets/images/图层 9@2x.png" /><span>{{ currenttime }}</span>
@@ -52,7 +53,7 @@ export default {
       }else if(index == 5){
            this.$router.push('/public')
       }else if(index == 6){
-           this.$router.push('/index')
+           this.$router.push('/qdlt/area')
       }else if(index == 7){
            this.$router.push('/introduction')
       }
@@ -80,7 +81,7 @@ export default {
         color: #fff;
         position: absolute;
         top: 1.2rem;
-        left: 63rem;
+        left: 30%;
         >div {
             display: inline-block;
             margin-right: 7.9rem;
@@ -139,9 +140,12 @@ export default {
   color:#fff;
   font-size:1.6rem;
 
+  .item:hover{
+    cursor: pointer;
+  }
 
   .item{
-    width: 27%;
+    width: 33%;
     text-align: center;
     justify-content: center;
     position: relative;
@@ -151,7 +155,7 @@ export default {
     }
   }
    .item1{
-    width: 23%;
+    width: 33%;
   }
   .item2::after{
     content: "";

+ 97 - 29
src/components/map/index.vue

@@ -35,12 +35,12 @@
       </el-checkbox-group>
    </div>
 
-   
+
     <div class='locationDiv' :style="locationStyle" v-show='isShow'>
           <div style="background:blue;height:4rem;width:100%;padding-top:0.8rem;padding-left:0.5rem">
                <span style='color:white;font-size:1.5rem;'>巡检点</span>
           </div>
-          <div style="text-align:center;margin-top:0.5rem"> 
+          <div style="text-align:center;margin-top:0.5rem">
               <img :src='clickObj.imgsrc' style="width:20rem;height:20rem"/>
               <div>{{clickObj.name}}</div>
           </div>
@@ -92,12 +92,12 @@ import Map from "ol/Map";
 import View from "ol/View";
 // import ol from "ol";
 
-// import {getTopLeft, getWidth} from "ol/extent";
+import {getTopLeft, getWidth} from "ol/extent";
 
 // import ImageWMS from "ol/source/ImageWMS";
-// import WMTS from "ol/source/WMTS";
+import WMTS from "ol/source/WMTS";
 // import TileWMS from "ol/source/TileWMS";
-// import WMTSTileGrid from "ol/tilegrid/WMTS";
+import WMTSTileGrid from "ol/tilegrid/WMTS";
 // ol.source.TileImage
 // ol.layer.Tile
 import {get as getProjection, transform} from "ol/proj";
@@ -134,7 +134,7 @@ export default {
       pointObj:{type:Object},
       isEdit:false,
       isLine:false,
-      lineLocations:{type:Array,default:[]},
+      // lineLocations:{type:Array,default:[]},
   },
   dicts: ['tl_static_type','tl_area_type','tl_dt_type'],
   data() {
@@ -212,7 +212,7 @@ export default {
             this.getResource();
     }
     this.map.on("click", function (e) {
-      // console.log(event.screenX+','+event.screenY)        
+      // console.log(event.screenX+','+event.screenY)
           //  that.addMarker(e.coordinate,'专家站点.png',0.2);
             var pixel = that.map.getEventPixel(e.originalEvent);
             var feature = that.map.forEachFeatureAtPixel(e.pixel, function (feature, layer) {
@@ -227,7 +227,7 @@ export default {
                     if (tadata.sectionId == "point") {
                          if(tadata.type == 'location'){
 
-                                var event = window.event; 
+                                var event = window.event;
                                 var x = event.screenX/10+5;
                                 var y = event.screenY/10-20;
                                 console.log(x+','+y);
@@ -263,7 +263,7 @@ export default {
                                         crossOrigin: "anonymous",
                                         src: require("../../assets/images/icons/location.png"), //本地的样式
                                         scale:0.6
-          
+
                                 })
                               })
                               tadata.type = 'location'
@@ -276,7 +276,7 @@ export default {
                                         crossOrigin: "anonymous",
                                         src: require("../../assets/images/icons/location2.png"), //本地的样式
                                         scale:0.6
-          
+
                                 })
                               })
                               tadata.data.sortNo = that.lineLocations.length + 1
@@ -357,7 +357,7 @@ export default {
     //                 //含有lnglat 参数的点标记触发事件
     //             }
     //         }
-              
+
     // })
   },
   methods: {
@@ -376,7 +376,7 @@ export default {
              }else if(this.lineLocations[index].sortNo > data.sortNo){
                     this.lineLocations[index].sortNo = this.lineLocations[index].sortNo-1
              }
-        }   
+        }
      },
       loadCkplayer(url){
         url = 'rtmp://39.104.22.45:30498/rtp/34020001001320000001_34020001001320000001'
@@ -410,7 +410,7 @@ export default {
                                     obj.fence = obj.lnglat
                                     obj.name = obj.locationName
                                     selectLocation.push(obj)
-                              }        
+                              }
                     }
                      for(var i in response.data.staticLocation){
                           var obj = response.data.staticLocation[i]
@@ -426,7 +426,7 @@ export default {
                           if(isSelected == 0){
                                  stationLocation.push(obj)
                           }
-                     }                  
+                     }
                     this.addPoints(stationLocation,'location.png',0.6,'location');
                     this.addPoints(selectLocation,'location2.png',0.6,'selected');
                })
@@ -450,7 +450,7 @@ export default {
                     for(var index in data.data){
                          var obj = data.data[index]
                          if(obj.configKey.indexOf('lined') > -1){
-                                var lineLocations ="["+obj.configValue+"]"                            
+                                var lineLocations ="["+obj.configValue+"]"
                                 var json = JSON.parse(lineLocations);
                                 this.addline(json,'nqtl');
                          }else if(obj.configKey.indexOf('lineun') > -1){
@@ -460,10 +460,60 @@ export default {
                          }
 
                     }
-              })   
+              })
          },
+    transpoints: function (points, type) {
+      if (type == 0) {
+        return points;
+      } else {
+        if (type == 1) {
+          var pp = [];
+          points.forEach(point => {
+            pp.push(transform([parseFloat(point[0]),parseFloat(point[1])], "EPSG:3857", "EPSG:4326"));
+          });
+          return pp;
+        } else {
+          var pp = [];
+          points.forEach(point => {
+            pp.push(transform([parseFloat(point[0]),parseFloat(point[1])], "EPSG:4326", "EPSG:3857"));
+          });
+          return pp;
+        }
+      }
+    },
     initdev: function () {
-      var projection = getProjection("EPSG:3857");
+      function getWMTSLayer(url, layer) {
+        let key = "98ec3e37b32974c2d58ea1a790640fe7"
+        let projection = getProjection("EPSG:4326");
+        let projectionExtent = projection.getExtent();
+        let size = getWidth(projectionExtent) / 256;
+
+        function getResolutions() {
+          let resolutions = [];
+          for (let z = 1; z < 19; ++z) {
+            resolutions[z] = size / Math.pow(2, z);
+          }
+          return resolutions
+        }
+
+        return new Tile({
+          source: new WMTS({
+            url: url,
+            layer: layer,
+            style: "default",
+            matrixSet: "c",
+            format: "tiles",
+            tileGrid: new WMTSTileGrid({
+              origin: getTopLeft(projectionExtent),
+              resolutions: getResolutions(),
+              matrixIds: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
+            }),
+          }),
+
+        })
+
+      }
+      var projection = getProjection("EPSG:4326");
         const satellite = new Tile({ // 卫星地图
           visible: false, // 显示或隐藏(用于切换地图图层(卫星切换街道))
           source: new XYZ({
@@ -504,16 +554,30 @@ export default {
   const map = new Map({
     target: 'map',
     layers: [ // 图层放置(类似有卫星图层,街道图层等)
-      satellite,
-      street,
+      // satellite,
+
+
+
+      getWMTSLayer('https://t{0-7}.tianditu.gov.cn/img_c/wmts?tk=98ec3e37b32974c2d58ea1a790640fe7', 'img'),
+       getWMTSLayer('https://t{0-7}.tianditu.gov.cn/cia_c/wmts?tk=98ec3e37b32974c2d58ea1a790640fe7', 'cia'),
+      //  getWMTSLayer('https://gisserver.tianditu.gov.cn/TDTService/wfs?tk=98ec3e37b32974c2d58ea1a790640fe7', 'LRDL'),
+      // satellite,street,
+      //
+
+
       vector
     ],
     view: new View({
-      zoom: 11, // 当前缩放
-      maxZoom: 16, // 最大缩放
-      minZoom: 8, // 最小缩放
-      projection: 'EPSG:4326',
-      center: [121.65523,31.892831], // 中心坐标
+      zoom: 12, // 当前缩放
+      // maxZoom: 16, // 最大缩放
+      // minZoom: 8, // 最小缩放
+      // projection: projection,
+            projection: 'EPSG:4326',
+
+      // center:  this.transpoints([
+      //   [121.65523,31.892831]
+      // ], 0)[0], // 中心坐标
+      center:[121.65523,31.892831]
     })
   })
 
@@ -604,7 +668,7 @@ export default {
                 tadata: {
                     sectionId: "point",
                     towerNumber: 22,
-                    data: data,
+                    data: data ,
                     type: type
                 }, //这里是用来传值用的,在接下来的一章里(事件)中我会讲到。
                 geometry: new Point(lnglats) //这里是点坐标的位置,这里要注意fromLonLat
@@ -696,19 +760,23 @@ export default {
             this.map.addLayer(markerta); //这里是执行,执行之后点就出来了
       },
       addPoints(data,icon,size,type){
+
+
         var tamarkerArry =[]
         let tamarker = null
         for(var index in data){
           if(type === 'video'){
+
                  tamarker = new Feature({
                     tadata: {
                         sectionId: "point",
                         towerNumber: 22,
-                        data:data[index],
+                        data: data[index],
                         type:type
                     }, //这里是用来传值用的,在接下来的一章里(事件)中我会讲到。
                     geometry: new Point([data[index].longitude, data[index].latitude]) //这里是点坐标的位置,这里要注意fromLonLat
                 });
+
           }else {
                  tamarker = new Feature({
                     tadata: {
@@ -742,7 +810,7 @@ export default {
                 source: new SourceVec({
                     features: tamarkerArry //这里放的就是之前的那个点,如果要放置多个点直接push到这里面就行了
                 }),
-                zIndex:30
+                zIndex:300
             });
 //             markerta.on('mouseover', markerta, function(evt) {
 //                     console.log(evt);
@@ -778,7 +846,7 @@ export default {
                 },
                 geometry: new LineString(lnglats)
             }); //这里要注意写fromLonLat,很重要
-            
+
             var style =this.getStyle(type);
 
             line.setStyle(style);
@@ -852,7 +920,7 @@ export default {
           window.cameraid = this.ccode;
           startPreview(window.cameraid,-1);
         },
-        handleChange(value){  
+        handleChange(value){
             for(var key in this.mapHashMap){
                  this.mapHashMap[key].setVisible(false)
             }

+ 1 - 1
src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '若依管理系统',
+      title: '启东市铁路沿线综合治理信息化管理平台',
       logo: logoImg
     }
   }

+ 11 - 6
src/main.js

@@ -67,7 +67,7 @@ Vue.component('ImagePreview', ImagePreview)
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)
-// Vue.use(Base64)
+    // Vue.use(Base64)
 DictData.install()
 
 /**
@@ -80,14 +80,19 @@ DictData.install()
  */
 
 Vue.use(Element, {
-  size: Cookies.get('size') || 'medium' // set element-ui default size
+    size: Cookies.get('size') || 'medium' // set element-ui default size
 })
 
 Vue.config.productionTip = false
+setTimeout(() => {
+    document.title = "启东市铁路沿线综合治理信息化管理平台";
+}, 1000);
+
+
 
 new Vue({
-  el: '#app',
-  router,
-  store,
-  render: h => h(App)
+    el: '#app',
+    router,
+    store,
+    render: h => h(App)
 })

+ 3 - 3
src/router/index.js

@@ -70,8 +70,8 @@ export const constantRoutes = [{
         children: [{
             path: "index",
             component: () =>
-                import ("@/views/index"),
-            name: "Index"
+                import ("@/views/qdtl/area"),
+            name: "Index",
         }, ],
     },
     {
@@ -197,4 +197,4 @@ export default new Router({
     mode: 'hash', // 去掉url中的#
     scrollBehavior: () => ({ y: 0 }),
     routes: constantRoutes
-})
+})

+ 120 - 123
src/utils/request.js

@@ -12,54 +12,54 @@ let downloadLoadingInstance;
 let isReloginShow;
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
-// 创建axios实例
+    // 创建axios实例
 const service = axios.create({
-  // axios中请求配置有baseURL选项,表示请求URL公共部分
-  baseURL: process.env.VUE_APP_BASE_API,
-  // 超时
-  timeout: 10000
+    // axios中请求配置有baseURL选项,表示请求URL公共部分
+    baseURL: process.env.VUE_APP_BASE_API,
+    // 超时
+    timeout: 10000
 })
 
 // request拦截器
 service.interceptors.request.use(config => {
-  // 是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false
-  // 是否需要防止数据重复提交
-  const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
-  if (getToken() && !isToken) {
-    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-  }
-  // get请求映射params参数
-  if (config.method === 'get' && config.params) {
-    let url = config.url + '?' + tansParams(config.params);
-    url = url.slice(0, -1);
-    config.params = {};
-    config.url = url;
-  }
-  if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
-    const requestObj = {
-      url: config.url,
-      data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
-      time: new Date().getTime()
+    // 是否需要设置 token
+    const isToken = (config.headers || {}).isToken === false
+        // 是否需要防止数据重复提交
+    const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
+    if (getToken() && !isToken) {
+        config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
     }
-    const sessionObj = cache.session.getJSON('sessionObj')
-    if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
-      cache.session.setJSON('sessionObj', requestObj)
-    } else {
-      const s_url = sessionObj.url;                  // 请求地址
-      const s_data = sessionObj.data;                // 请求数据
-      const s_time = sessionObj.time;                // 请求时间
-      const interval = 1000;                         // 间隔时间(ms),小于此时间视为重复提交
-      if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
-        const message = '数据正在处理,请勿重复提交';
-        console.warn(`[${s_url}]: ` + message)
-        return Promise.reject(new Error(message))
-      } else {
-        cache.session.setJSON('sessionObj', requestObj)
-      }
+    // get请求映射params参数
+    if (config.method === 'get' && config.params) {
+        let url = config.url + '?' + tansParams(config.params);
+        url = url.slice(0, -1);
+        config.params = {};
+        config.url = url;
     }
-  }
-  return config
+    if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+        const requestObj = {
+            url: config.url,
+            data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+            time: new Date().getTime()
+        }
+        const sessionObj = cache.session.getJSON('sessionObj')
+        if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
+            cache.session.setJSON('sessionObj', requestObj)
+        } else {
+            const s_url = sessionObj.url; // 请求地址
+            const s_data = sessionObj.data; // 请求数据
+            const s_time = sessionObj.time; // 请求时间
+            const interval = 1000; // 间隔时间(ms),小于此时间视为重复提交
+            if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+                // const message = '数据正在处理,请勿重复提交';
+                // console.warn(`[${s_url}]: ` + message)
+                // return Promise.reject(new Error(message))
+            } else {
+                cache.session.setJSON('sessionObj', requestObj)
+            }
+        }
+    }
+    return config
 }, error => {
     console.log(error)
     Promise.reject(error)
@@ -67,95 +67,92 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-    // 未设置状态码则默认成功状态
-    const code = res.data.code || 200;
-    // 获取错误信息
-    const msg = errorCode[code] || res.data.msg || errorCode['default']
-    // 二进制数据则直接返回
-    if(res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer'){
-      return res.data
-    }
-    if (code === 401) {
-      if (!isReloginShow) {
-        isReloginShow = true;
-        MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', {
-          confirmButtonText: '重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
+        // 未设置状态码则默认成功状态
+        const code = res.data.code || 200;
+        // 获取错误信息
+        const msg = errorCode[code] || res.data.msg || errorCode['default']
+            // 二进制数据则直接返回
+        if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+            return res.data
         }
-      ).then(() => {
-        isReloginShow = false;
-        store.dispatch('LogOut').then(() => {
-          // 如果是登录页面不需要重新加载
-          if (window.location.hash.indexOf("#/login") != 0) {
-            location.href = '/index';
-          }
+        if (code === 401) {
+            if (!isReloginShow) {
+                isReloginShow = true;
+                MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', {
+                    confirmButtonText: '重新登录',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    isReloginShow = false;
+                    store.dispatch('LogOut').then(() => {
+                        // 如果是登录页面不需要重新加载
+                        if (window.location.hash.indexOf("#/login") != 0) {
+                            location.href = '/index';
+                        }
+                    })
+                }).catch(() => {
+                    isReloginShow = false;
+                });
+            }
+            return Promise.reject('无效的会话,或者会话已过期,请重新登录。')
+        } else if (code === 500) {
+            Message({
+                message: msg,
+                type: 'error'
+            })
+            return Promise.reject(new Error(msg))
+        } else if (code !== 200) {
+            Notification.error({
+                title: msg
+            })
+            return Promise.reject('error')
+        } else {
+            return res.data
+        }
+    },
+    error => {
+        console.log('err' + error)
+        let { message } = error;
+        if (message == "Network Error") {
+            message = "后端接口连接异常";
+        } else if (message.includes("timeout")) {
+            message = "系统接口请求超时";
+        } else if (message.includes("Request failed with status code")) {
+            message = "系统接口" + message.substr(message.length - 3) + "异常";
+        }
+        Message({
+            message: message,
+            type: 'error',
+            duration: 5 * 1000
         })
-      }).catch(() => {
-        isReloginShow = false;
-      });
-    }
-      return Promise.reject('无效的会话,或者会话已过期,请重新登录。')
-    } else if (code === 500) {
-      Message({
-        message: msg,
-        type: 'error'
-      })
-      return Promise.reject(new Error(msg))
-    } else if (code !== 200) {
-      Notification.error({
-        title: msg
-      })
-      return Promise.reject('error')
-    } else {
-      return res.data
+        return Promise.reject(error)
     }
-  },
-  error => {
-    console.log('err' + error)
-    let { message } = error;
-    if (message == "Network Error") {
-      message = "后端接口连接异常";
-    }
-    else if (message.includes("timeout")) {
-      message = "系统接口请求超时";
-    }
-    else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
-    }
-    Message({
-      message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
-  }
 )
 
 // 通用下载方法
 export function download(url, params, filename) {
-  downloadLoadingInstance = Loading.service({ text: "正在下载数据,请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
-  return service.post(url, params, {
-    transformRequest: [(params) => { return tansParams(params) }],
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    responseType: 'blob'
-  }).then(async (data) => {
-    const isLogin = await blobValidate(data);
-    if (isLogin) {
-      const blob = new Blob([data])
-      saveAs(blob, filename)
-    } else {
-      const resText = await data.text();
-      const rspObj = JSON.parse(resText);
-      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
-      Message.error(errMsg);
-    }
-    downloadLoadingInstance.close();
-  }).catch((r) => {
-    console.error(r)
-    Message.error('下载文件出现错误,请联系管理员!')
-    downloadLoadingInstance.close();
-  })
+    downloadLoadingInstance = Loading.service({ text: "正在下载数据,请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+    return service.post(url, params, {
+        transformRequest: [(params) => { return tansParams(params) }],
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        responseType: 'blob'
+    }).then(async(data) => {
+        const isLogin = await blobValidate(data);
+        if (isLogin) {
+            const blob = new Blob([data])
+            saveAs(blob, filename)
+        } else {
+            const resText = await data.text();
+            const rspObj = JSON.parse(resText);
+            const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+            Message.error(errMsg);
+        }
+        downloadLoadingInstance.close();
+    }).catch((r) => {
+        console.error(r)
+        Message.error('下载文件出现错误,请联系管理员!')
+        downloadLoadingInstance.close();
+    })
 }
 
 export default service

+ 10 - 8
src/views/bigscreen/index.vue

@@ -10,8 +10,8 @@
     <div class="bottombg">
       <div class="item item2" @click="changeMapTab(1)"><div class="num">1123</div><div>静态资源</div></div>
       <div class="item item1 item2" @click="changeMapTab(2)"><div class="num">113</div><div>动态资源</div></div>
-      <div class="item item1 item2" @click="changeMapTab(3)"><div class="num">531</div><div>重点区域</div></div>
-      <div class="item"><div class="num" @click="changeMapTab(4)">16</div><div>实时告警</div></div>
+      <div class="item item1 " @click="changeMapTab(3)"><div class="num">531</div><div>重点区域</div></div>
+      <!-- <div class="item"><div class="num" @click="changeMapTab(4)">16</div><div>实时告警</div></div> -->
     </div>
 
     <!-- <videodiv :cameracode="ccode" style="width:700px;height:300px;position:absolute;top:100px;left:100px"></videodiv> -->
@@ -68,7 +68,7 @@ export default {
             this.$refs.mapdiv.iconSelect = index
         },
          getTrain(){
-                  this.$refs.mapdiv.addPoint('video.png');            
+                  this.$refs.mapdiv.addPoint('video.png');
          },
          getResource(){
                getResource({date:'2022-03-12'}).then(response =>{
@@ -95,7 +95,7 @@ export default {
                              bridgeArry.push(obj);
                          }else if(obj.areaType == '4'){
                              obj.name = obj.areaName
-                             railArry.push(obj);   
+                             railArry.push(obj);
                          }
                      }
                      for(var index in areaList){
@@ -132,7 +132,7 @@ export default {
                         var json = JSON.parse(data.data);
                          this.$refs.mapdiv.addPoints(json.data.list,'video.png',0.6,'video');
                   });
-              
+
          }
 
     }
@@ -156,9 +156,11 @@ export default {
   color:#fff;
   font-size:1.6rem;
 
-
+.item:hover{
+  cursor: pointer;
+}
   .item{
-    width: 27%;
+    width: 33%;
     text-align: center;
     justify-content: center;
     position: relative;
@@ -168,7 +170,7 @@ export default {
     }
   }
    .item1{
-    width: 23%;
+    width: 33%;
   }
   .item2::after{
     content: "";

+ 6 - 5
src/views/bigscreen/introduction.vue

@@ -121,7 +121,7 @@
                                   </div>
                             </div>
                       </div>
-             
+
                 <div style='font-size: 1.8rem;
                             font-family: Microsoft YaHei;
                             font-weight: 400;
@@ -142,7 +142,7 @@ export default {
   name: "Introduction",
   data() {
     return {
-       
+
     };
   },
    components:{
@@ -152,13 +152,14 @@ export default {
 
   },
   methods: {
-   
+
   }
 };
 </script>
 
 
-<style>
+<style scoped>
+
  .divtitle{
           background: url("~@/assets/images/title2@2x.png") no-repeat;
           background-size: 100% 100%;
@@ -166,7 +167,7 @@ export default {
           height:3.9rem;
           padding-top:0.8rem;
           padding-left:3rem;
-          float: left;
+          /* float: left; */
        }
 .divcontent{
         background: url("~@/assets/images/home_icon/background.png") no-repeat;

+ 16 - 16
src/views/governance/index.vue

@@ -41,7 +41,7 @@
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">视频资源统计</div>
         </div>
 
-        <div id='videoeChart' style="width:45rem;height:25rem">
+        <div id='videoeChart' style="width:45rem;height:25rem;margin-top: 6rem;">
         </div>
 
         <div class="publicTitle" style="margin-top:1.5rem">
@@ -56,10 +56,10 @@
 
   </div>
 
-  <div style="width:50%;height:90rem">
+  <div style="width:50%;height:100vh">
       <mapdiv ref="mapdiv" style=""></mapdiv>
   </div>
-  
+
   <div style="width:25%;height:100%;">
         <div style="width:100%;padding-left:1rem">
         <div class="publicTitle" style="margin-top:1.5rem">
@@ -76,7 +76,7 @@
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">里程数统计</div>
         </div>
 
-         <div id='lcChart' style="width:45rem;height:25rem"></div>
+         <div id='lcChart' style="width:45rem;height:25rem;margin-top:10rem"></div>
 
         <div class="publicTitle" style="margin-top:1.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
@@ -92,7 +92,7 @@
                         <el-table-column type="index" label="序号" width="55" align="center" />
                         <el-table-column label="巡检员" align="center" prop="nickName" />
                         <el-table-column label="巡检次数" align="center" prop="checkCount" />
-                        <el-table-column label="综合分数" align="center" prop="score" />          
+                        <el-table-column label="综合分数" align="center" prop="score" />
               </el-table>
           </div>
         </div>
@@ -102,8 +102,8 @@
     <div class="bottombg">
       <div class="item item2" @click="changeMapTab(1)"><div class="num">1123</div><div>静态资源</div></div>
       <div class="item item1 item2" @click="changeMapTab(2)"><div class="num">113</div><div>动态资源</div></div>
-      <div class="item item1 item2" @click="changeMapTab(3)"><div class="num">531</div><div>重点区域</div></div>
-      <div class="item"><div class="num" @click="changeMapTab(4)">16</div><div>实时告警</div></div>
+      <div class="item item1" @click="changeMapTab(3)"><div class="num">531</div><div>重点区域</div></div>
+      <!-- <div class="item"><div class="num" @click="changeMapTab(4)">16</div><div>实时告警</div></div> -->
     </div>
 
     <!-- <videodiv :cameracode="ccode" style="width:700px;height:300px;position:absolute;top:100px;left:100px"></videodiv> -->
@@ -155,7 +155,7 @@ export default {
     methods:{
         tableRowClassName({ row, rowIndex }) {
                 if ((rowIndex + 1) % 2 === 0) {
-                    return "warning-row"; 
+                    return "warning-row";
                 } else {
                     return "success-row";
                 }
@@ -178,7 +178,7 @@ export default {
                                this.videoChartDate.count.push(data.data.cameraslist[index].num);
                        }
                         this.initchart();
-                })  
+                })
         },
         initchart(){
                 var myChart = this.$echarts.init(document.getElementById('videoeChart'));
@@ -227,7 +227,7 @@ export default {
                                                                 color: "#006691"
                                                                 }
                                         },
-                                        
+
                                 },
                                 series: [
                                         {
@@ -316,8 +316,8 @@ export default {
                                         2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3
                                 ],
                                 itemStyle: {
-                                                normal: {         
-                                                //由上到下的渐变           
+                                                normal: {
+                                                //由上到下的渐变
                                                 color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                                                         offset: 0,
                                                         color: '#0068DC'
@@ -365,7 +365,7 @@ export default {
                              bridgeArry.push(obj);
                          }else if(obj.areaType == '4'){
                              obj.name = obj.areaName
-                             railArry.push(obj);   
+                             railArry.push(obj);
                          }
                      }
                      for(var index in areaList){
@@ -400,14 +400,14 @@ export default {
                         var json = JSON.parse(data.data);
                          this.$refs.mapdiv.addPoints(json.data.list,'video.png',0.6,'video');
                   });
-              
+
          }
     }
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
- .publicTitle{
+<style rel="stylesheet/scss" lang="scss" scoped>
+ .divtitle{
           background: url("~@/assets/images/title@2x.png") no-repeat;
           background-size: 100% 100%;
           width:95%;

+ 1 - 1
src/views/index.vue

@@ -39,7 +39,7 @@
     </el-row>
     <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>若依后台管理框架</h2>
+        <h2>启东市铁路沿线综合治理信息化管理平台</h2>
         <p>
           一直想做一款后台管理系统,看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统。,她可以用于所有的Web应用程序,如网站管理后台,网站会员中心,CMS,CRM,OA等等,当然,您也可以对她进行深度定制,以做出更强系统。所有前端后台代码封装过后十分精简易上手,出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
         </p>

+ 5 - 5
src/views/introduction/index.vue

@@ -71,7 +71,7 @@ export default {
             this.$refs.mapdiv.iconSelect = index
         },
          getTrain(){
-                  this.$refs.mapdiv.addPoint('video.png');            
+                  this.$refs.mapdiv.addPoint('video.png');
          },
          getResource(){
                getResource({date:'2022-03-12'}).then(response =>{
@@ -98,7 +98,7 @@ export default {
                              bridgeArry.push(obj);
                          }else if(obj.areaType == '4'){
                              obj.name = obj.areaName
-                             railArry.push(obj);   
+                             railArry.push(obj);
                          }
                      }
                      for(var index in areaList){
@@ -133,7 +133,7 @@ export default {
                         var json = JSON.parse(data.data);
                          this.$refs.mapdiv.addPoints(json.data.list,'video.png',0.6,'video');
                   });
-              
+
          }
 
     }
@@ -159,7 +159,7 @@ export default {
 
 
   .item{
-    width: 27%;
+    width: 33%;
     text-align: center;
     justify-content: center;
     position: relative;
@@ -169,7 +169,7 @@ export default {
     }
   }
    .item1{
-    width: 23%;
+    width: 33%;
   }
   .item2::after{
     content: "";

+ 8 - 8
src/views/introduction/introduction.vue

@@ -121,7 +121,7 @@
                                   </div>
                             </div>
                       </div>
-             
+
                 <div style='font-size: 1.8rem;
                             font-family: Microsoft YaHei;
                             font-weight: 400;
@@ -130,7 +130,7 @@
                             text-align:center'>启东市交通运输局组织架构</div>
 
              <div class="divtitle" style="margin-top:2rem"><div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;">铁路管理科简介</div></div>
-            
+
              <div style="display: inline-flex;padding-left:16rem;padding-top:3rem">
              <div style="font-size: 1.8rem;
                         font-family: Microsoft YaHei;
@@ -147,8 +147,8 @@
                         font-weight: 400;
                         color: #D6DEE7;
                         margin-left:10rem">
-                负责协调铁路建设过程中的矛盾和问题,协调处理铁路和地方建设关系; 
-                <br/><br/> 指导和协调全市铁路站场周边综合配套和开发建设工作; 
+                负责协调铁路建设过程中的矛盾和问题,协调处理铁路和地方建设关系;
+                <br/><br/> 指导和协调全市铁路站场周边综合配套和开发建设工作;
                 <br/><br/> 配合做好铁路运营方面的相关工作。
              </div>
              </div>
@@ -164,7 +164,7 @@ export default {
   name: "IntroductionIndex",
   data() {
     return {
-       
+
     };
   },
    components:{
@@ -174,13 +174,13 @@ export default {
 
   },
   methods: {
-   
+
   }
 };
 </script>
 
 
-<style>
+<style scoped>
  .divtitle{
           background: url("~@/assets/images/title2@2x.png") no-repeat;
           background-size: 100% 100%;
@@ -188,7 +188,7 @@ export default {
           height:3.9rem;
           padding-top:0.8rem;
           padding-left:3rem;
-          float: left;
+          /* float: left; */
        }
 .divcontent{
         background: url("~@/assets/images/home_icon/background.png") no-repeat;

+ 1 - 1
src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">启东市铁路沿线综合治理信息化管理平台</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

+ 15 - 15
src/views/public/index.vue

@@ -54,7 +54,7 @@
                         </el-table>
                 </div>
   </div>
-  <div style="width:50%;height:90rem;">
+  <div style="width:50%;height:100vh;">
       <mapdiv ref="mapdiv" style=""></mapdiv>
   </div>
   <div style="width:25%;height:100%;">
@@ -63,7 +63,7 @@
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">服务评价</div>
         </div>
-        
+
          <div id='pieChart' style="width:45rem;height:25rem"></div>
          <!-- <div id='lcChart' style="width:45rem;height:25rem"></div> -->
 
@@ -71,7 +71,7 @@
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">投诉数量</div>
         </div>
-        
+
         <div id='tsChart' style="width:45rem;height:25rem"></div>
         
          <div class="publicTitle" style="margin-top:1.5rem">
@@ -88,8 +88,8 @@
     <div class="bottombg">
       <div class="item item2" @click="changeMapTab(1)"><div class="num">1123</div><div>静态资源</div></div>
       <div class="item item1 item2" @click="changeMapTab(2)"><div class="num">113</div><div>动态资源</div></div>
-      <div class="item item1 item2" @click="changeMapTab(3)"><div class="num">531</div><div>重点区域</div></div>
-      <div class="item"><div class="num" @click="changeMapTab(4)">16</div><div>实时告警</div></div>
+      <div class="item item1" @click="changeMapTab(3)"><div class="num">531</div><div>重点区域</div></div>
+      <!-- <div class="item"><div class="num" @click="changeMapTab(4)">16</div><div>实时告警</div></div> -->
     </div>
 
     <!-- <videodiv :cameracode="ccode" style="width:700px;height:300px;position:absolute;top:100px;left:100px"></videodiv> -->
@@ -225,7 +225,7 @@ export default {
                                         offset: 1, color: '#122a61' // 100% 处的颜色
                                     }],
                                     global: false // 缺省为 false
-                                }},       
+                                }},
                                 itemStyle: {
                                     borderColor: "white"
                                     }
@@ -250,9 +250,9 @@ export default {
                         yAxis: {
                              name:"条",
                              nameTextStyle:{
-                                    color:"white", 
-                                    fontSize:16,  
-                                    //padding: [0, 0, 0, 1050] 
+                                    color:"white",
+                                    fontSize:16,
+                                    //padding: [0, 0, 0, 1050]
                                 },
                              axisLabel: {
                                             show: true,
@@ -338,7 +338,7 @@ export default {
         },
         tableRowClassName({ row, rowIndex }) {
                 if ((rowIndex + 1) % 2 === 0) {
-                    return "warning-row"; 
+                    return "warning-row";
                 } else {
                     return "success-row";
                 }
@@ -353,7 +353,7 @@ export default {
                        console.log(this.userList);
                        this.tdxjCount = data.data.xunTotalDistance;
                        this.tdcsCount = data.data.checkPointLogNum;
-                })  
+                })
         },
         initchart(){
               var myChart = this.$echarts.init(document.getElementById('gzhchart'));
@@ -438,9 +438,9 @@ export default {
                                 ]
                                 }
                             ]
-                        }; 
+                        };
                         myChart.setOption(option);
-               
+
         },
           getResource(){
                getResource({date:'2022-03-12'}).then(response =>{
@@ -467,7 +467,7 @@ export default {
                              bridgeArry.push(obj);
                          }else if(obj.areaType == '4'){
                              obj.name = obj.areaName
-                             railArry.push(obj);   
+                             railArry.push(obj);
                          }
                      }
                      for(var index in areaList){
@@ -502,7 +502,7 @@ export default {
                         var json = JSON.parse(data.data);
                          this.$refs.mapdiv.addPoints(json.data.list,'video.png',0.6,'video');
                   });
-              
+
          }
     }
 };

+ 10 - 10
src/views/qdtl/area/index.vue

@@ -39,7 +39,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          style="width:8rem;height:3.2rem;" 
+          style="width:8rem;height:3.2rem;"
           type="primary"
           plain
           icon="el-icon-plus"
@@ -49,7 +49,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          style="width:8rem;height:3.2rem;" 
+          style="width:8rem;height:3.2rem;"
           type="primary"
           plain
           icon="el-icon-edit"
@@ -60,7 +60,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          style="width:8rem;height:3.2rem;" 
+          style="width:8rem;height:3.2rem;"
           type="primary"
           plain
           icon="el-icon-delete"
@@ -72,7 +72,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="areaList" @selection-change="handleSelectionChange" stripe
+    <el-table  v-loading="loading" :data="areaList" @selection-change="handleSelectionChange" stripe
       class="my_table"
       :row-class-name="tableRowClassName"
       :header-cell-style="{background:'#24A3B3 50%',color: '#C5D0D4'}">
@@ -196,7 +196,7 @@
                   </el-table-column>
                   <el-table-column label="经纬度" align="center" prop="lnglat" />
                   <el-table-column label="备注" align="center" prop="remark" />
-          </el-table>    
+          </el-table>
       </div>
     </el-dialog>
 
@@ -213,7 +213,7 @@
                 <el-table-column label="巡检设备" align="center" prop="deviceIds" />
                 <el-table-column label="所属区域" align="center" prop="areaId" />
                 <el-table-column label="备注" align="center" prop="remark" />
-            </el-table>  
+            </el-table>
       </div>
     </el-dialog>
   </div>
@@ -321,12 +321,12 @@ export default {
       }else{
           this.$refs.mapv.typeSelect="Point";
           this.$refs.mapv.changeAddInteractions();
-      } 
+      }
             // this.$refs.mapv.typeSelect="";
     },
     tableRowClassName({ row, rowIndex }) {
         if ((rowIndex + 1) % 2 === 0) {
-             return "warning-row"; 
+             return "warning-row";
         } else {
              return "success-row";
         }
@@ -487,7 +487,7 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
  .divtitle{
           background: url("~@/assets/images/title2@2x.png") no-repeat;
           background-size: 100% 100%;
@@ -495,7 +495,7 @@ export default {
           height:3.9rem;
           padding-top:0.8rem;
           padding-left:3rem;
-          float: left;
+          /* float: left; */
        }
 
 

+ 8 - 8
src/views/qdtl/area1/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="title"><div style="padding-top:0.8rem;padding-left:3rem;font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;">{{title}}</div></div>
-     
+
     <div style="margin-top:1rem">
           <el-button style="width:8rem;height:3.2rem;" type="primary">新增</el-button>
 
@@ -163,7 +163,7 @@ export default {
      },
      tableRowClassName({ row, rowIndex }) {
         if ((rowIndex + 1) % 2 === 0) {
-             return "warning-row"; 
+             return "warning-row";
         } else {
              return "success-row";
         }
@@ -299,9 +299,9 @@ export default {
 
       .el-pagination__jump{
           color:#3DFFEA
-      }       
-      
-      .el-pagination.is-background .btn-prev, .el-pagination.is-background .btn-next, .el-pagination.is-background .el-pager li {   
+      }
+
+      .el-pagination.is-background .btn-prev, .el-pagination.is-background .btn-next, .el-pagination.is-background .el-pager li {
             background: #068583 20%;
             color: #0BC4F0;
       }
@@ -319,13 +319,13 @@ export default {
       .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell{
            background: transparent;
            border: none;
-           color: #C5D0D4;
+           /* color: #C5D0D4; */
       }
 
       .el-table .el-table__body tr.el-table__row td.el-table__cell{
            background: transparent;
            border: none;
-           color: #C5D0D4;
+           /* color: #C5D0D4; */
       }
 
        .el-table .warning-row {
@@ -347,5 +347,5 @@ export default {
         .el-table::before {
           height: 0px;
         }
-         
+
 </style>

+ 6 - 6
src/views/qdtl/device/index.vue

@@ -39,7 +39,7 @@
     <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
         <el-button
-          style="width:8rem;height:3.2rem;" 
+          style="width:8rem;height:3.2rem;"
           type="primary"
           plain
           icon="el-icon-plus"
@@ -49,7 +49,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          style="width:8rem;height:3.2rem;" 
+          style="width:8rem;height:3.2rem;"
           type="primary"
           plain
           icon="el-icon-edit"
@@ -60,7 +60,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          style="width:8rem;height:3.2rem;" 
+          style="width:8rem;height:3.2rem;"
           type="primary"
           plain
           icon="el-icon-delete"
@@ -356,7 +356,7 @@ export default {
     },
     tableRowClassName({ row, rowIndex }) {
         if ((rowIndex + 1) % 2 === 0) {
-             return "warning-row"; 
+             return "warning-row";
         } else {
              return "success-row";
         }
@@ -365,7 +365,7 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
  .divtitle{
           background: url("~@/assets/images/title2@2x.png") no-repeat;
           background-size: 100% 100%;
@@ -373,7 +373,7 @@ export default {
           height:3.9rem;
           padding-top:0.8rem;
           padding-left:3rem;
-          float: left;
+          /* float: left; */
        }
 
 

+ 28 - 24
src/views/qdtl/document/index.vue

@@ -6,10 +6,10 @@
             <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">页眉</div>
         </div>
 
-        <div style='margin-top:8em'>
+        <div style='margin-top:0em'>
              <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="10rem" >
                   <el-row style="">
-                        <el-col :span="12" style="padding-left:10rem"> 
+                        <el-col :span="12" style="padding-left:10rem">
                             <el-form-item label="文头:" prop="wenTou">
                                     <el-input
                                     v-model="queryParams.wenTou"
@@ -20,7 +20,7 @@
                                     />
                                 </el-form-item>
                             </el-col>
-                          <el-col :span="12"> 
+                          <el-col :span="12">
                             <el-form-item label="标题:" prop="title">
                                     <el-input
                                     v-model="queryParams.title"
@@ -33,7 +33,7 @@
                             </el-col>
                    </el-row>
                     <el-row style="">
-                        <el-col :span="12" style="padding-left:10rem"> 
+                        <el-col :span="12" style="padding-left:10rem">
                             <el-form-item label="期数:" prop="periods">
                                 <div style="font-size:1.5rem;color:white;margin-left:3rem">
@@ -47,7 +47,7 @@
                                 </div>
                                 </el-form-item>
                             </el-col>
-                          <el-col :span="12"> 
+                          <el-col :span="12">
                             <el-form-item label="副标题:" prop="secondTitle">
                                     <el-input
                                     v-model="queryParams.secondTitle"
@@ -60,7 +60,7 @@
                             </el-col>
                    </el-row>
                     <el-row style="">
-                        <el-col :span="12" style="padding-left:10rem"> 
+                        <el-col :span="12" style="padding-left:10rem">
                             <el-form-item label="发文日期:" prop="publishDate">
                                      <el-date-picker
                                                 v-model="queryParams.publishDate"
@@ -73,7 +73,7 @@
                                 </el-form-item>
                             </el-col>
                    </el-row>
-                   
+
              </el-form>
         </div>
 
@@ -124,7 +124,7 @@
                                     font-family: Microsoft YaHei;
                                     font-weight: 400;
                                     color: #FFFFFF;">二、典型案例</div>
-                        <div style="margin-top:1rem:padding-left:10rem"> 
+                        <div style="margin-top:1rem:padding-left:10rem">
                               <el-form :model="exampleObj" ref="exampleForm" :inline="true" label-width="68px">
                                         <el-form-item label="所属区域" prop="areaName">
                                             <el-input
@@ -179,7 +179,7 @@
                                     font-family: Microsoft YaHei;
                                     font-weight: 400;
                                     color: #FFFFFF;">三、专职巡防员巡防打卡情况</div>
-                        <div style="margin-top:1rem:padding-left:10rem"> 
+                        <div style="margin-top:1rem:padding-left:10rem">
                               <el-form :model="exampleObj" ref="exampleForm" :inline="true" label-width="13rem">
                                         <el-form-item label="巡防统计周期:" prop="dateArry">
                                             <el-date-picker
@@ -218,7 +218,7 @@
                                     font-family: Microsoft YaHei;
                                     font-weight: 400;
                                     color: #FFFFFF;">四、存在问题</div>
-                        <div style="margin-top:1rem:padding-left:10rem"> 
+                        <div style="margin-top:1rem:padding-left:10rem">
                               <el-form :model="questionObj" ref="exampleForm" :inline="true" label-width="68px">
                                         <el-form-item label="所属区域" prop="areaName">
                                             <el-input
@@ -273,7 +273,7 @@
                                     font-family: Microsoft YaHei;
                                     font-weight: 400;
                                     color: #FFFFFF;">五、工作建议</div>
-                        <div style="margin-top:1rem:padding-left:10rem"> 
+                        <div style="margin-top:1rem:padding-left:10rem">
                               <el-form :model="adviceObj" ref="exampleForm" :inline="true" label-width="68px">
                                         <el-form-item label="所属区域" prop="areaName">
                                             <el-input
@@ -351,7 +351,7 @@
          <div style='margin-top:8em'>
              <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="10rem" >
                   <el-row style="">
-                        <el-col :span="12" style="padding-left:10rem"> 
+                        <el-col :span="12" style="padding-left:10rem">
                             <el-form-item label="报送机关:" prop="baoSong">
                                     <el-input
                                     v-model="queryParams.baoSong"
@@ -362,7 +362,7 @@
                                     />
                                 </el-form-item>
                             </el-col>
-                          <el-col :span="12"> 
+                          <el-col :span="12">
                             <el-form-item label="抄送机关:" prop="chaoSong">
                                     <el-input
                                     v-model="queryParams.chaoSong"
@@ -375,7 +375,7 @@
                             </el-col>
                    </el-row>
                     <el-row style="">
-                        <el-col :span="12" style="padding-left:10rem"> 
+                        <el-col :span="12" style="padding-left:10rem">
                             <el-form-item label="统稿人:" prop="tongGao">
                                     <el-input
                                     v-model="queryParams.tongGao"
@@ -386,7 +386,7 @@
                                     />
                                 </el-form-item>
                             </el-col>
-                          <el-col :span="12"> 
+                          <el-col :span="12">
                             <el-form-item label="审核人:" prop="shenHe">
                                     <el-input
                                     v-model="queryParams.shenHe"
@@ -399,7 +399,7 @@
                             </el-col>
                    </el-row>
                     <el-row style="">
-                        <el-col :span="12" style="padding-left:10rem"> 
+                        <el-col :span="12" style="padding-left:10rem">
                             <el-form-item label="签发人:" prop="qianFa">
                                     <el-input
                                     v-model="queryParams.qianFa"
@@ -411,7 +411,7 @@
                                 </el-form-item>
                             </el-col>
                    </el-row>
-                   
+
              </el-form>
         </div>
 
@@ -473,7 +473,7 @@ export default {
   methods: {
        tableRowClassName({ row, rowIndex }) {
             if ((rowIndex + 1) % 2 === 0) {
-                return "warning-row"; 
+                return "warning-row";
             } else {
                 return "success-row";
             }
@@ -558,29 +558,33 @@ export default {
                 //    }
              }
        }
-    
+
   }
 };
 </script>
 
-<style>
+<style scoped>
  .divtitle{
           background: url("~@/assets/images/title2@2x.png") no-repeat;
-          background-size: 100% 100%;
+          background-size: cover;
           width:100%;
           height:3.9rem;
           padding-top:0.8rem;
           padding-left:2rem;
-          float: left;
-          display: inline-flex
+          /* float: left; */
+          display: inline-flex;
+          margin-bottom: 3rem;
        }
  .el-textarea__inner{
         color:white
  }
 
 .app-container{
-      background: url("~@/assets/images/bg@2x.png") no-repeat;
+      background: url("~@/assets/images/bg@2x.png") ;
       background-size: 100% 100%;
+
+    background-repeat-y: repeat;
+    background-position: center;
 }
 
 .el-range-editor--medium .el-range-separator{

+ 10 - 10
src/views/qdtl/line/index.vue

@@ -377,7 +377,7 @@ export default {
     },
     tableRowClassName({ row, rowIndex }) {
         if ((rowIndex + 1) % 2 === 0) {
-             return "warning-row"; 
+             return "warning-row";
         } else {
              return "success-row";
         }
@@ -411,7 +411,7 @@ export default {
       // getLine(id).then(response => {
         // console.log(response)
         this.form = row;
-        this.locationsList = row.locations
+        this.locationsList = row.locations ?? []
         this.open = true;
         this.title = "修改巡检线路管理";
       // });
@@ -464,22 +464,22 @@ export default {
           for(var index in this.locationsList){
                if(this.locationsList[index].sortNo == data.sortNo-1){
                         this.locationsList[index].sortNo = data.sortNo
-               }     
+               }
         }
         data.sortNo =  data.sortNo-1;
-        this.locationsList.sort(function(a, b){return a.sortNo - b.sortNo}); 
+        this.locationsList.sort(function(a, b){return a.sortNo - b.sortNo});
       }
-        
+
     },
     handleDown(data){
         if(data.sortNo < this.locationsList){
            for(var index in this.locationsList){
                if(this.locationsList[index].sortNo == data.sortNo+1){
                         this.locationsList[index].sortNo = data.sortNo
-               }     
+               }
               }
               data.sortNo =  data.sortNo+1;
-              this.locationsList.sort(function(a, b){return a.sortNo - b.sortNo}); 
+              this.locationsList.sort(function(a, b){return a.sortNo - b.sortNo});
               }
     },
      locationDelete(data){
@@ -489,13 +489,13 @@ export default {
              }else if(this.locationsList[index].sortNo > data.sortNo){
                     this.selectUserList[index].sortNo = this.selectUserList[index].sortNo-1
              }
-        }   
+        }
     },
   }
 };
 </script>
 
-<style>
+<style scoped>
  .divtitle{
           background: url("~@/assets/images/title2@2x.png") no-repeat;
           background-size: 100% 100%;
@@ -503,7 +503,7 @@ export default {
           height:3.9rem;
           padding-top:0.8rem;
           padding-left:3rem;
-          float: left;
+          /* float: left; */
        }
 
  .titleFont{

+ 6 - 6
src/views/qdtl/location/index.vue

@@ -29,7 +29,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          style="width:8rem;height:3.2rem;" 
+          style="width:8rem;height:3.2rem;"
           type="primary"
           plain
           icon="el-icon-plus"
@@ -39,7 +39,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-           style="width:8rem;height:3.2rem;" 
+           style="width:8rem;height:3.2rem;"
           type="primary"
           plain
           icon="el-icon-edit"
@@ -50,7 +50,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          style="width:8rem;height:3.2rem;" 
+          style="width:8rem;height:3.2rem;"
           type="primary"
           plain
           icon="el-icon-delete"
@@ -348,7 +348,7 @@ export default {
     },
         tableRowClassName({ row, rowIndex }) {
         if ((rowIndex + 1) % 2 === 0) {
-             return "warning-row"; 
+             return "warning-row";
         } else {
              return "success-row";
         }
@@ -362,7 +362,7 @@ export default {
 </script>
 
 
-<style>
+<style scoped>
  .divtitle{
           background: url("~@/assets/images/title2@2x.png") no-repeat;
           background-size: 100% 100%;
@@ -370,7 +370,7 @@ export default {
           height:3.9rem;
           padding-top:0.8rem;
           padding-left:3rem;
-          float: left;
+          /* float: left; */
        }
 
 

+ 8 - 8
src/views/qdtl/location1/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="title"><div style="padding-top:0.8rem;padding-left:3rem;font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;">{{title}}</div></div>
-     
+
     <div style="margin-top:1rem">
           <el-button style="width:8rem;height:3.2rem;" type="primary">新增</el-button>
 
@@ -156,7 +156,7 @@ export default {
   methods: {
      tableRowClassName({ row, rowIndex }) {
         if ((rowIndex + 1) % 2 === 0) {
-             return "warning-row"; 
+             return "warning-row";
         } else {
              return "success-row";
         }
@@ -292,9 +292,9 @@ export default {
 
       .el-pagination__jump{
           color:#3DFFEA
-      }       
-      
-      .el-pagination.is-background .btn-prev, .el-pagination.is-background .btn-next, .el-pagination.is-background .el-pager li {   
+      }
+
+      .el-pagination.is-background .btn-prev, .el-pagination.is-background .btn-next, .el-pagination.is-background .el-pager li {
             background: #068583 20%;
             color: #0BC4F0;
       }
@@ -312,13 +312,13 @@ export default {
       .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell{
            background: transparent;
            border: none;
-           color: #C5D0D4;
+           /* color: #C5D0D4; */
       }
 
       .el-table .el-table__body tr.el-table__row td.el-table__cell{
            background: transparent;
            border: none;
-           color: #C5D0D4;
+           /* color: #C5D0D4; */
       }
 
        .el-table .warning-row {
@@ -340,5 +340,5 @@ export default {
         .el-table::before {
           height: 0px;
         }
-         
+
 </style>

+ 5 - 5
src/views/qdtl/paiban/index.vue

@@ -43,7 +43,7 @@
     <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          style="width:8rem;height:3.2rem;" 
+          style="width:8rem;height:3.2rem;"
           type="primary"
           plain
           icon="el-icon-plus"
@@ -53,7 +53,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-           style="width:8rem;height:3.2rem;" 
+           style="width:8rem;height:3.2rem;"
           type="primary"
           plain
           icon="el-icon-edit"
@@ -64,7 +64,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          style="width:8rem;height:3.2rem;" 
+          style="width:8rem;height:3.2rem;"
           type="primary"
           plain
           icon="el-icon-delete"
@@ -302,7 +302,7 @@ export default {
     },
         tableRowClassName({ row, rowIndex }) {
         if ((rowIndex + 1) % 2 === 0) {
-             return "warning-row"; 
+             return "warning-row";
         } else {
              return "success-row";
         }
@@ -316,7 +316,7 @@ export default {
 </script>
 
 
-<style>
+<style scoped>
  .divtitle{
           background: url("~@/assets/images/title2@2x.png") no-repeat;
           background-size: 100% 100%;

+ 11 - 11
src/views/qdtl/plan/index.vue

@@ -260,7 +260,7 @@
                               @click="userDelete(scope.row)"
                             ></el-button>
                           </template>
-                        </el-table-column>  
+                        </el-table-column>
               </el-table>
           </div>
        </div>
@@ -319,7 +319,7 @@
                               @click="userDelete(scope.row)"
                             ></el-button>
                           </template>
-                        </el-table-column>  
+                        </el-table-column>
               </el-table>
           </div>
        </div>
@@ -486,7 +486,7 @@ export default {
                       }
                       if(obj.startDate.getTime() <= this.timeTable[index].startDate && obj.endDate.getTime() >= this.timeTable[index].endDate){
                                       return 3;
-                      } 
+                      }
               }
               return 0;
     },
@@ -582,7 +582,7 @@ export default {
       this.resetForm("form");
     },
     userDelete(data){
-        console.log(data); 
+        console.log(data);
         var selectUserArry = [];
         for(var index in this.selectUserList){
              if(this.selectUserList[index].userId == data.userId){
@@ -590,12 +590,12 @@ export default {
              }else{
                selectUserArry.push(this.selectUserList[index].userId);
              }
-        }   
+        }
         this.selectUser = selectUserArry
     },
     tableRowClassName({ row, rowIndex }) {
         if ((rowIndex + 1) % 2 === 0) {
-             return "warning-row"; 
+             return "warning-row";
         } else {
              return "success-row";
         }
@@ -627,10 +627,10 @@ export default {
           var s  = str.match(reg);
           var result="";
           if(s){
-              result = new Date(s[1],s[2] - 1,s[3],s[4],s[5],s[6]);                              
+              result = new Date(s[1],s[2] - 1,s[3],s[4],s[5],s[6]);
           }
           return result ;
-    },            
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -757,7 +757,7 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
  .divtitle{
           background: url("~@/assets/images/title2@2x.png") no-repeat;
           background-size: 100% 100%;
@@ -765,7 +765,7 @@ export default {
           height:3.9rem;
           padding-top:0.8rem;
           padding-left:3rem;
-          float: left;
+          /* float: left; */
        }
 
  .titleFont{
@@ -774,4 +774,4 @@ export default {
         color: #3DFFEA;
         line-height: 3.6rem;
  }
-</style>
+</style>

+ 1 - 1
src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">启东市铁路沿线综合治理信息化管理平台</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

+ 12 - 12
src/views/safe/index.vue

@@ -9,9 +9,9 @@
                 <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">预警分析</div>
         </div>
         <!-- <br/> -->
-        <div>
+        <div style="display:flex;padding:2rem 0">
            <div class="yjcontent1" style="padding-left:2rem;padding-top:1.5rem">
-               <div>
+               <div >
                   <div style="font-size: 1.4rem;
                               font-family: Adobe Heiti Std;
                               font-weight: normal;
@@ -49,7 +49,7 @@
 
 
   </div>
-  <div style="width:50%;height:90rem;">
+  <div style="width:50%;height:100vh">
       <mapdiv ref="mapdiv" style=""></mapdiv>
   </div>
   <div style="width:25%;height:100%;">
@@ -100,7 +100,7 @@
                     </div>
               </div>
         </div>
-        
+
         <div class='pieChart' style='margin-top:5rem'></div>
          <!-- <div id='lcChart' style="width:45rem;height:25rem"></div> -->
 
@@ -119,8 +119,8 @@
     <div class="bottombg">
       <div class="item item2" @click="changeMapTab(1)"><div class="num">1123</div><div>静态资源</div></div>
       <div class="item item1 item2" @click="changeMapTab(2)"><div class="num">113</div><div>动态资源</div></div>
-      <div class="item item1 item2" @click="changeMapTab(3)"><div class="num">531</div><div>重点区域</div></div>
-      <div class="item"><div class="num" @click="changeMapTab(4)">16</div><div>实时告警</div></div>
+      <div class="item item1" @click="changeMapTab(3)"><div class="num">531</div><div>重点区域</div></div>
+      <!-- <div class="item"><div class="num" @click="changeMapTab(4)">16</div><div>实时告警</div></div> -->
     </div>
 
     <!-- <videodiv :cameracode="ccode" style="width:700px;height:300px;position:absolute;top:100px;left:100px"></videodiv> -->
@@ -211,7 +211,7 @@ export default {
         },
         tableRowClassName({ row, rowIndex }) {
                 if ((rowIndex + 1) % 2 === 0) {
-                    return "warning-row"; 
+                    return "warning-row";
                 } else {
                     return "success-row";
                 }
@@ -226,7 +226,7 @@ export default {
                        console.log(this.userList);
                        this.tdxjCount = data.data.xunTotalDistance;
                        this.tdcsCount = data.data.checkPointLogNum;
-                })  
+                })
         },
         initchart(){
               var myChart = this.$echarts.init(document.getElementById('yjchart'));
@@ -316,9 +316,9 @@ export default {
                                 ]
                                 }
                             ]
-                        }; 
+                        };
                         myChart.setOption(option);
-               
+
         },
           getResource(){
                getResource({date:'2022-03-12'}).then(response =>{
@@ -345,7 +345,7 @@ export default {
                              bridgeArry.push(obj);
                          }else if(obj.areaType == '4'){
                              obj.name = obj.areaName
-                             railArry.push(obj);   
+                             railArry.push(obj);
                          }
                      }
                      for(var index in areaList){
@@ -380,7 +380,7 @@ export default {
                         var json = JSON.parse(data.data);
                          this.$refs.mapdiv.addPoints(json.data.list,'video.png',0.6,'video');
                   });
-              
+
          }
     }
 };

+ 6 - 5
vue.config.js

@@ -9,7 +9,8 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
-const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
+const name =
+    "启东市铁路沿线综合治理信息化管理平台"; // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -62,9 +63,9 @@ module.exports = {
         },
         plugins: [
             new CopyWebpackPlugin([
-                { from: 'node_modules/@liveqing/liveplayer/dist/component/crossdomain.xml'},
-                { from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer-lib.min.js', to: 'js/'},
-                { from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer.swf'}
+                { from: 'node_modules/@liveqing/liveplayer/dist/component/crossdomain.xml' },
+                { from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer-lib.min.js', to: 'js/' },
+                { from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer.swf' }
             ]),
             // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
             new CompressionPlugin({
@@ -138,4 +139,4 @@ module.exports = {
                 }
             )
     }
-}
+}