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

src/theme/dark.scss

@@ -114,6 +114,19 @@
 	.el-drawer.rtl.open {
 		background: var(--el-color-white) !important;
 	}
+
+	// 
+	.box-content {
+		border-color: var(--next-border-color-light) !important;
+	}
+
+	.el-cascader__tags .el-tag--info {
+		background: var(--next-border-color-light) !important;
+	}
+
+	input:-webkit-autofill{
+		-webkit-box-shadow:0 0 0 1000px var(--next-border-color-light) inset !important;
+	}
 	 
 	// 组态管理-组态设计
 	.page-wrapper > iframe {
@@ -195,9 +208,7 @@
 	.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;
@@ -213,12 +224,9 @@
 	.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(--el-bg-color) !important;
 	}
 	.el-table__body-wrapper tr td.el-table-fixed-column--left,
@@ -236,9 +244,7 @@
 		background-color: var(--el-color-white) !important;
 	}
 	.add-flag-container {
-		// .el-form {
-			border-bottom-color: var(--next-border-color-light) !important;
-		// }
+		border-bottom-color: var(--next-border-color-light) !important;
 	}
 	.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
 		background-color: var(--el-color-white) !important;

src/views/assess/totalIndex/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="system-user-container">
+	<div class="assess-total-container">
 		<el-card shadow="hover">
 			<div class="system-user-search mb15">
 				<!-- <el-input size="default" placeholder="请输入用户名称" style="max-width: 180px"> </el-input>

src/views/energyAnalysis/loopEnergyCostPerformanceAppraisal/index.vue

@@ -217,7 +217,7 @@ watch(
 	() => store.state.themeConfig.themeConfig.isIsDark,
 	(isIsDark) => {
 		nextTick(() => {
-			state.charts.theme = isIsDark ? 'dark' : '';
+			state.charts.theme = isIsDark ? 'transparent' : '';
 			state.charts.bgColor = isIsDark ? 'transparent' : '';
 			state.charts.color = isIsDark ? '#dadada' : '#303133';
 			setTimeout(() => {

src/views/heatStation/heatStation/component/edit.vue

@@ -66,6 +66,7 @@ import { reactive, toRefs, defineComponent, ref, unref, nextTick, onMounted } fr
 import api from '/@/api/heatStation';
 import datahubApi from '/@/api/datahub';
 import { ElMessage } from 'element-plus';
+import { useStore } from '/@/store/index';
 interface RuleFormState {
 	id: number;
 	parentId: number | string;
@@ -107,6 +108,7 @@ export default defineComponent({
 			dataHubList: [],
 			mapLocal: null as any
 		})
+		const store = useStore();
 		// 打开弹窗
 		const openDialog = (row: any, tree: any) => {
 			resetForm()
@@ -188,11 +190,20 @@ export default defineComponent({
 		const initMap = () => {
 			let BMapGL = (window as any).BMapGL
 			let map = new BMapGL.Map("map-container");
+			// 获取布局配置信息
+			let getThemeConfig =  store.state.themeConfig.themeConfig;
 			// 116.404, 39.915
 			let point = new BMapGL.Point(state.ruleForm.lnt || 116.404, state.ruleForm.lat || 39.915);
 			let zoomCtrl = new BMapGL.ZoomControl();  // 添加缩放控件
 			let cityCtrl = new BMapGL.CityListControl()
+			if(getThemeConfig.isIsDark) {
+				map.setMapStyleV2({     
+					styleId: 'b8d841ee37fd5bd41e742049b6fcd0f5'
+				});
+			}
+
 			map.centerAndZoom(point, 15); 
+			
 			map.enableScrollWheelZoom(true); // 开启滚轮缩放
 			map.addControl(zoomCtrl);
 			map.addControl(cityCtrl);

src/views/monitor/map.vue

@@ -16,7 +16,7 @@
 
 
 <script lang="ts" setup>
-import { onMounted, ref, watch } from 'vue';
+import { onMounted, ref, watch, nextTick } from 'vue';
 import api from '/@/api/heatStation';
 import { setMarker } from '/@/utils/map';
 import { useStore } from '/@/store/index';
@@ -60,6 +60,24 @@ onMounted(() => {
 		console.log(res);
 	});
 });
+// 监听 vuex 中是否开启深色主题
+watch(
+	() => store.state.themeConfig.themeConfig.isIsDark,
+	(isIsDark) => {
+		nextTick(() => {
+			setTimeout(() => {
+				map.setMapStyleV2({     
+					styleId: isIsDark ? 'b8d841ee37fd5bd41e742049b6fcd0f5' : '48b5759a53d0d6f607c049543d4c92e4'
+				});
+				
+			}, 500);
+		});
+	},
+	{
+		deep: true,
+		immediate: true,
+	}
+);
 const renderStation = (list: any[]) => {
 	setMarker(list, map);
 };

src/views/network/server/detail.vue

@@ -8,20 +8,21 @@
 			<el-tab-pane label="通道" name="third">通道</el-tab-pane>
 		</el-tabs>
 		<div style="position: absolute;right:20px;top: 34px;">
-			<el-icon style="font-size: 16px;"><ele-RefreshRight /></el-icon>
-			<el-icon style="font-size: 16px;margin: 0 6px;"><ele-Operation /></el-icon>
-			<el-icon style="font-size: 16px;"><ele-Edit /></el-icon>
+			<el-icon @click="freshData" style="font-size: 16px;margin-right:6px;"><ele-RefreshRight /></el-icon>
+			<!-- <el-icon style="font-size: 16px;margin: 0 6px;"><ele-Operation /></el-icon> -->
+			<el-icon @click="toEdit"  style="cursor: pointer;font-size: 16px;"><ele-Edit /></el-icon>
 		</div>
 	</el-card>
 </template>
 <script lang="ts">
 import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
-import { Delete, Edit, Search, Share, Upload } from '@element-plus/icons-vue';
+// import { Delete, Edit, Search, Share, Upload } from '@element-plus/icons-vue';
+import { ElMessage } from 'element-plus';
 import type { TabsPaneContext } from 'element-plus'
 
 import serverDetail from './component/serverDetail.vue'
 
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 
 import api from '/@/api/network';
 
@@ -44,6 +45,7 @@ export default defineComponent({
 
 	setup(props, context) {
 		const route = useRoute();
+		const router = useRouter();
 		const state = reactive<TableDataState>({
 			resourceModalPro: {
 				mode: '',
@@ -59,6 +61,13 @@ export default defineComponent({
 				state.detail = res
 			})
 		};
+		const freshData = () => {
+			getDetail()
+			ElMessage.success('刷新成功');
+		};
+		const toEdit = () => {
+            router.push(`/network/server/edit/${route.params && route.params.id}`)
+        };
 		onMounted(() => {
 			getDetail()
 		});
@@ -67,8 +76,9 @@ export default defineComponent({
 		}
 
 		return {
-			Edit,
+			toEdit,
 			activeName,
+			freshData,
 			getDetail,
 			handleClick,
 			...toRefs(props),

src/views/network/tunnel/detail.vue

@@ -1,16 +1,16 @@
 <template>
 	<el-card class="system-dic-container" style="position: relative;">
 		<el-tabs v-model="activeName" class="demo-tabs">
-			<el-tab-pane label="服务器详情" name="first">
+			<el-tab-pane label="通道详情" name="first">
 				<serverDetail :detail="detail" />
 			</el-tab-pane>
 			<el-tab-pane label="相关详情" name="second">相关详情</el-tab-pane>
 			<el-tab-pane label="通道" name="third">通道</el-tab-pane>
 		</el-tabs>
 		<div style="position: absolute;right:20px;top: 34px;">
-			<el-icon style="font-size: 16px;"><ele-RefreshRight /></el-icon>
-			<el-icon style="font-size: 16px;margin: 0 6px;"><ele-Operation /></el-icon>
-			<el-icon style="font-size: 16px;"><ele-Edit /></el-icon>
+			<el-icon @click="freshData" style="cursor: pointer;font-size: 16px;margin-right:6px;"><ele-RefreshRight /></el-icon>
+			<!-- <el-icon style="font-size: 16px;margin: 0 6px;"><ele-Operation /></el-icon> -->
+			<el-icon @click="toEdit" style="cursor: pointer;font-size: 16px;"><ele-Edit /></el-icon>
 		</div>
 	</el-card>
 </template>
@@ -21,7 +21,7 @@ import type { TabsPaneContext } from 'element-plus'
 
 import serverDetail from './component/serverDetail.vue'
 
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 
 import api from '/@/api/network';
 
@@ -44,6 +44,7 @@ export default defineComponent({
 
 	setup(props, context) {
 		const route = useRoute();
+		const router = useRouter();
 		const state = reactive<TableDataState>({
 			resourceModalPro: {
 				mode: '',
@@ -58,12 +59,21 @@ export default defineComponent({
 				state.detail = res
 			})
 		};
+		const freshData = () => {
+			getDetail()
+			ElMessage.success('刷新成功');
+		};
+		const toEdit = () => {
+            router.push(`/network/tunnel/edit/${route.params && route.params.id}`)
+        };
 		onMounted(() => {
 			getDetail()
 		});
 
 		return {
 			activeName,
+			toEdit,
+			freshData,
 			getDetail,
 			...toRefs(props),
 			...toRefs(state),

src/views/system/api/component/edit.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="showDialog" :title="`${formData.id?'编辑接口':'新增接口'}`" width="600px" :close-on-click-modal="false" :close-on-press-escape="false">
+  <el-dialog class="api-edit" v-model="showDialog" :title="`${formData.id?'编辑接口':'新增接口'}`" width="600px" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form ref="formRef" :model="formData" :rules="ruleForm" label-width="80px">
       <el-form-item label="关联页面" prop="parentId">
         <el-cascader :options="menuData" :props="{ checkStrictly: false,multiple:true,emitPath: false, value: 'id', label: 'name' }" placeholder="请选择关联页面" clearable class="w100" v-model="formData.menuIds"></el-cascader>