Home Explore Help
Sign In
zhilian
/
admin-ui
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

yukai 3 years ago
parent
07fddf04a2 c3825b3d17
commit
059e857b8b
8 changed files with 142 additions and 26 deletions
Split View Show Diff Stats
  1. 1 1
      index.html
  2. 1 0
      src/api/datahub/index.ts
  3. 115 4
      src/theme/dark.scss
  4. 4 8
      src/views/heatStation/heatStation/component/edit.vue
  5. 4 8
      src/views/heatStation/loop/component/edit.vue
  6. 15 3
      src/views/monitor/map.vue
  7. 1 1
      src/views/network/server/component/list.vue
  8. 1 1
      src/views/network/tunnel/component/list.vue

+ 1 - 1
index.html
View File 

@@ -5,7 +5,7 @@
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
 	<link rel="icon" href="/favicon.ico" />
 
-	<script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=Kp8XHK81HSF6rfRkYP7OxYKtK8IaG51d"></script>
 
+	<script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=sGgaYnGYF87fy9dVDvLF5GemYMH02aax"></script>
 
 	<title>SAGOO IOT</title>
 
 </head>
 
 <body>

+ 1 - 0
src/api/datahub/index.ts
View File 

@@ -32,6 +32,7 @@ export default {
 
       delete: (ids: number) => del('/source/template/del', { ids }),
 
       edit: (data: object) => put('/source/template/edit', data),
 
       detail: (id: number) => get('/source/template/detail', { id }),
 
+      allList: (params: object) => get('/source/template/list', params), // 获取所有已发布列表
 
       getdata: (params: object) => get('/source/template/getdata',  params ),
 
    } ,

+ 115 - 4
src/theme/dark.scss
View File 

@@ -14,7 +14,8 @@
 
 	--next-text-color-regular: #9b9da1;
 
 	--next-text-color-placeholder: #7a7a7a;
 
 	--next-color-hover: #3c3c3c;
 
-	--next-color-hover-rgba: rgba(0, 0, 0, 0.3);
 
+	--next-color-hover-rgba: #000000;
 
+
 
 
 	// root
 
 	--next-bg-main-color: var(--next-bg-main) !important;
 
@@ -47,6 +48,7 @@
 
 	--el-color-primary-lighter: var(--next-color-primary) !important;
 
 	--el-color-primary-light-9: var(--next-color-hover) !important;
 
 	--el-text-color-disabled-base: var(--el-color-primary) !important;
 
+	--el-text-color-disabled: var(--next-text-color-placeholder) !important;
 
 	--el-border-color-lighter: var(--next-border-black) !important;
 
 	--el-text-color-placeholder: var(--next-text-color-placeholder) !important;
 
 	--el-disabled-bg-color: var(--next-color-disabled) !important;
 
@@ -70,6 +72,14 @@
 
 			border-color: var(--el-button-hover-border-color, var(--el-button-hover-bg-color)) !important;
 
 		}
 
 	}
 
+	.el-button--text,
 
+	.link-type,
 
+	.link-type:focus {
 
+		color: var(--next-color-white) !important;
 
+		&:hover {
 
+			border-color: var(--el-color-white) !important;
 
+		}
 
+	}
 
 
 	// drawer
 
 	.el-divider__text {
 
@@ -82,9 +92,32 @@
 
 	// tabs
 
 	.el-tabs--border-card {
 
 		background-color: var(--el-color-white) !important;
 
+		border-color: var(--next-border-color-light) !important;
 
 	}
 
 	.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
 
 		background: var(--next-color-primary-lighter);
 
+		border-color: var(--next-border-color-light) !important;
 
+	}
 
+	.el-table__header,
 
+	.el-table__body {
 
+		border-collapse :  collapse !important;
 
+	}
 
+
 
+	.el-divider--horizontal {
 
+		border-color: var(--next-border-color-light) !important;
 
+	}
 
+
 
+	.el-loading-mask {
 
+		background: var(--next-color-primary-lighter) !important;
 
+	}
 
+	// 
+	.el-drawer.rtl.open {
 
+		background: var(--el-color-white) !important;
 
+	}
 
+	 
+	// 组态管理-组态设计
 
+	.page-wrapper > iframe {
 
+		background: var(--next-color-primary-lighter) !important;
 
 	}
 
 
 	// alert / notice-bar
 
@@ -97,7 +130,7 @@
 
 		border: 1px solid var(--next-border-color-light) !important;
 
 	}
 
 	.el-button.is-text:not(.is-disabled):focus, .el-button.is-text:not(.is-disabled):hover {
 
-		background-color: var(--el-color-white) !important;
 
+		background-color: transparent;
 
 	}
 
 	.el-scrollbar__view {
 
 		background-color: var(--el-color-white) !important;
 
@@ -118,7 +151,7 @@
 
 		background-color: var(--el-color-white) !important;
 
 	}
 
 	.el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
 
-		background-color: var(--el-text-color-primary) !important;
 
+		background-color: var(--el-bg-color) !important;
 
 	}
 
 	.el-dialog {
 
 		background-color: var(--el-color-white) !important;
 
@@ -149,15 +182,58 @@
 
 	}
 
 	.el-input {
 
 		--el-input-border-color: var(--next-border-color-light) !important;
 
+		--el-input-hover-border: var(--el-text-color-disabled) !important;
 
+
 
+	}
 
+	.el-date-editor {
 
+		--el-input-border-color: var(--next-border-color-light) !important;
 
+		--el-input-hover-border-color: var(--el-text-color-disabled) !important;
 
+	}
 
+	.el-date-range-picker {
 
+		--el-datepicker-inrange-bg-color: var(--el-bg-color) !important;
 
+	}
 
+	.el-date-table td.in-range .el-date-table-cell:hover {
 
+		background-color: var(--next-border-color-light) !important;
 
+	}
 
+	// .el-input__wrapper:hover {
 
+	// 	border-color: red !important;
 
+	// }
 
+	.el-tree {
 
+		background-color: var(--el-color-white) !important;
 
+		--el-tree-node-hover-bg-color: var(--el-color-white) !important;
 
+		
+	}
 
+	.el-tree-node__content .el-select-dropdown__item.hover {
 
+		background-color: var(--el-color-white) !important;
 
+	}
 
+	.el-tree-node__content:hover {
 
+		background-color: var(--el-color-white) !important;
 
 	}
 
 	.el-table th.el-table__cell,
 
 	.el-table tr {
 
 		background-color: var(--el-color-white) !important;
 
 		color: var(--el-text-color-primary) !important;
 
+		
 		// border: 1px solid var(--next-border-color-light) !important;
 
 	}
 
+	.el-scrollbar__view .el-table__body tr:hover>td.el-table__cell,
 
 	.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
 
-		background-color: var(--next-color-seting) !important;
 
+		// background-color: var(--next-color-seting) !important;
 
+		background-color: var(--el-bg-color) !important;
 
+	}
 
+	.el-table__body-wrapper tr td.el-table-fixed-column--left,
 
+	.el-table__body-wrapper tr td.el-table-fixed-column--right,
 
+	.el-table__body-wrapper tr th.el-table-fixed-column--left,
 
+	.el-table__body-wrapper tr th.el-table-fixed-column--right,
 
+	.el-table__footer-wrapper tr td.el-table-fixed-column--left,
 
+	.el-table__footer-wrapper tr td.el-table-fixed-column--right,
 
+	.el-table__footer-wrapper tr th.el-table-fixed-column--left,
 
+	.el-table__footer-wrapper tr th.el-table-fixed-column--right,
 
+	.el-table__header-wrapper tr td.el-table-fixed-column--left,
 
+	.el-table__header-wrapper tr td.el-table-fixed-column--right,
 
+	.el-table__header-wrapper tr th.el-table-fixed-column--left,
 
+	.el-table__header-wrapper tr th.el-table-fixed-column--right {
 
+		background-color: var(--el-color-white) !important;
 
 	}
 
 	.add-flag-container {
 
 		// .el-form {
 
@@ -178,6 +254,41 @@
 
 		border: 1px solid var(--next-border-color) !important;
 
 		background-color: var(--next-color-disabled) !important;
 
 	}
 
+	.system-dic-container {
 
+		.content,
 
+		.content-box {
 
+			background-color: var(--next-color-disabled) !important;
 
+			color: var(--el-text-color-primary) !important;
 
+		}
 
+		.ant-descriptions-row {
 
+			border-bottom-color: var(--next-border-color-light) !important;
 
+		}
 
+		.ant-descriptions-view {
 
+			border-color: var(--next-border-color-light) !important;
 
+		}
 
+		.ant-descriptions-item-label,
 
+		.ant-descriptions-item-content {
 
+			background-color: var(--next-color-disabled) !important;
 
+			color: var(--el-text-color-primary) !important;
 
+			border-color: var(--next-border-color-light) !important;
 
+		}
 
+	}
 
+	.el-cascader-node:not(.is-disabled):focus, .el-cascader-node:not(.is-disabled):hover {
 
+		background-color: var(--el-bg-color) !important;
 
+	}
 
+	.el-tabs--border-card>.el-tabs__header {
 
+		background-color: var(--next-color-disabled) !important;
 
+	}
 
+	.el-upload--picture-card {
 
+		background-color: var(--next-color-disabled) !important;
 
+		
+	}
 
+	.wu-box {
 
+		border-color: var(--next-border-color-light) !important;
 
+		.wu-title {
 
+			border-color: var(--next-border-color-light) !important;
 
+		}
 
+	}
 
 
 	// menu
 
 	.layout-aside {

+ 4 - 8
src/views/heatStation/heatStation/component/edit.vue
View File 

@@ -126,14 +126,10 @@ export default defineComponent({
 
 		}
 
 		
 		const queryDataHubList = () => {
 
-			datahubApi.template.getList({
 
-				pageNum: 1,
 
-				pageSize: 50,
 
-				name: '',
 
-				key: '',
 
-			}).then((res: any) => {
 
-				state.dataHubList = res.list || [];
 
-			});
 
+			datahubApi.template.allList({})
 
+				.then((res: any) => {
 
+					state.dataHubList = res.list || [];
 
+				});
 
 		};
 
 		const resetForm = () => {
 
 			state.ruleForm = {

+ 4 - 8
src/views/heatStation/loop/component/edit.vue
View File 

@@ -228,14 +228,10 @@ export default defineComponent({
 
 				});
 
 		};
 
 		const queryDataHubList = () => {
 
-			datahubApi.template.getList({
 
-				pageNum: 1,
 
-				pageSize: 50,
 
-				name: '',
 
-				key: '',
 
-			}).then((res: any) => {
 
-				state.dataHubList = res.list || [];
 
-			});
 
+			datahubApi.template.allList({})
 
+				.then((res: any) => {
 
+					state.dataHubList = res.list || [];
 
+				});
 
 		};
 
 		const getDetail = () => {
 
 			api.loop.detail(state.ruleForm.id)

+ 15 - 3
src/views/monitor/map.vue
View File 

@@ -16,23 +16,36 @@
 
 
 
 <script lang="ts" setup>
 
-import { onMounted, ref } from 'vue';
 
+import { onMounted, ref, watch } from 'vue';
 
 import api from '/@/api/heatStation';
 
 import { setMarker } from '/@/utils/map';
 
+import { useStore } from '/@/store/index';
 
 
 const mapRef = ref();
 
 const checkList = ref([]);
 
+const store = useStore();
 
 
 let BMapGL = (window as any).BMapGL;
 
 let map: any = null;
 
+let getThemeConfig:any = null
 
 
 onMounted(() => {
 
+
 
+	// 获取布局配置信息
 
+	getThemeConfig =  store.state.themeConfig.themeConfig;
 
 	map = new BMapGL.Map(mapRef.value, {
 
-		backgroundColor: '#ff9900',
 
 	});
 
+
 
 	const testPt = new BMapGL.Point(104.5, 38);
 
 	map.centerAndZoom(testPt, 5);
 
 	map.enableScrollWheelZoom();
 
+	if(getThemeConfig.isIsDark) {
 
+		map.setMapStyleV2({     
+			styleId: 'b8d841ee37fd5bd41e742049b6fcd0f5'
 
+		});
 
+	}
 
+
 
+
 
 	setTimeout(() => {
 
 		document.querySelectorAll('.anchorBL')[1].remove();
 
 		document.querySelectorAll('.anchorBL')[0].remove();
 
@@ -47,7 +60,6 @@ onMounted(() => {
 
 		console.log(res);
 
 	});
 
 });
 
-
 
 const renderStation = (list: any[]) => {
 
 	setMarker(list, map);
 
 };

+ 1 - 1
src/views/network/server/component/list.vue
View File 

@@ -10,7 +10,7 @@
 
             <!-- <el-table-column align="center" prop="last" label="最近上线"/> -->
 
             <el-table-column align="center" prop="types" label="状态">
 
                 <template #default="scope">
 
-                    <el-tag v-if="!scope.row.status" class="ml-2" type="danger">未启动</el-tag>
 
+                    <el-tag v-if="!scope.row.status" class="ml-2" type="info">未启动</el-tag>
 
                     <el-tag v-else class="ml-2" type="success">启动</el-tag>
 
                 </template>
 
             </el-table-column>

+ 1 - 1
src/views/network/tunnel/component/list.vue
View File 

@@ -8,7 +8,7 @@
 
             <el-table-column show-overflow-tooltip align="center" prop="createdAt" label="创建时间" width="170"/>
 
             <el-table-column align="center" prop="types" label="状态">
 
                 <template #default="scope">
 
-                    <el-tag size="medium" v-if="!scope.row.status" class="ml-2" type="danger">未启动</el-tag>
 
+                    <el-tag size="medium" v-if="!scope.row.status" class="ml-2" type="info">未启动</el-tag>
 
                     <el-tag size="medium" v-else class="ml-2" type="success">启动</el-tag>
 
                 </template>
 
             </el-table-column>