瀏覽代碼

fix: 修复代码检查报错的地方及部分代码优化

yanglzh 2 年之前
父節點
當前提交
d8944bdbdb

+ 22 - 59
src/views/system/assess/totalIndex/component/editItem.vue

@@ -2,18 +2,12 @@
 	<div class="system-add-user-container">
 		<el-dialog :title="ruleForm.item_code ? '编辑指标' : '新增指标'" v-model="isShowDialog" width="769px">
 			<el-form ref="ruleFormRef" :rules="rules" :model="ruleForm" size="default" label-width="90px">
-				<!-- <el-row :gutter="35">
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> -->
-						<el-form-item label="评价名称" prop="title" class="mb20">
-							<el-input size="small" v-model="ruleForm.title" placeholder="请输入评价名称" clearable></el-input>
-						</el-form-item>
-					<!-- </el-col>
-					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20"> -->
-						<el-form-item label="描述">
-							<el-input width="400"  size="small" v-model="ruleForm.explain" type="textarea" placeholder="请输入描述" maxlength="150"></el-input>
-						</el-form-item>
-					<!-- </el-col>
-				</el-row> -->
+				<el-form-item label="评价名称" prop="title" class="mb20">
+					<el-input size="small" v-model="ruleForm.title" placeholder="请输入评价名称" clearable></el-input>
+				</el-form-item>
+				<el-form-item label="描述">
+					<el-input width="400" size="small" v-model="ruleForm.explain" type="textarea" placeholder="请输入描述" maxlength="150"></el-input>
+				</el-form-item>
 			</el-form>
 			<el-button size="default" type="primary" class="mb10 mt10" @click="onOpenAddSign">
 				<el-icon>
@@ -26,9 +20,9 @@
 				<el-table-column align="center" prop="name" label="标识" show-overflow-tooltip></el-table-column>
 				<el-table-column align="center" prop="title" label="数据项" show-overflow-tooltip></el-table-column>
 				<el-table-column align="center" prop="weight" label="权重(%)" width="90" show-overflow-tooltip></el-table-column>
-				<el-table-column align="center" prop="description" label="取值范围" show-overflow-tooltip width="200" >
+				<el-table-column align="center" prop="description" label="取值范围" show-overflow-tooltip width="200">
 					<template #default="scope">
-						<el-tag size="small" class="mr6" v-for="(item, index) in scope.row.ranges" :key="index">{{`${item.start_value}~${item.end_value}`}}</el-tag>
+						<el-tag size="small" class="mr6" v-for="(item, index) in scope.row.ranges" :key="index">{{ `${item.start_value}~${item.end_value}` }}</el-tag>
 					</template>
 				</el-table-column>
 				<el-table-column align="center" label="操作" width="160">
@@ -39,19 +33,6 @@
 					</template>
 				</el-table-column>
 			</el-table>
-			<!-- <el-pagination
-				@size-change="onHandleSizeChange"
-				@current-change="onHandleCurrentChange"
-				class="mt15"
-				:pager-count="5"
-				:page-sizes="[10, 20, 30]"
-				v-model:current-page="tableData.param.pageNum"
-				background
-				v-model:page-size="tableData.param.pageSize"
-				layout="total, sizes, prev, pager, next, jumper"
-				:total="tableData.total"
-			>
-			</el-pagination> -->
 
 			<template #footer>
 				<span class="dialog-footer">
@@ -75,8 +56,6 @@ import SetTask from './setTask.vue';
 
 import api from '/@/api/assess';
 
-
-
 // 定义接口来定义对象的类型
 interface DeptData {
 	deptName: string;
@@ -117,12 +96,9 @@ interface ItemState {
 	};
 }
 
-
-
-
 export default defineComponent({
 	name: 'systemAddUser',
-	components: { AddSign, SetTask},
+	components: { AddSign, SetTask },
 	setup(prop, { emit }) {
 		const addSignRef = ref();
 		const setTaskRef = ref();
@@ -154,16 +130,14 @@ export default defineComponent({
 			]
 		})
 		// 打开弹窗
-		const openDialog = (row:any) => {
-			// if(!row) return
-			// console.log(row.item_code)
-			if(row) {
-				api.getList({itemcode: row.item_code}).then((res: any) => {
+		const openDialog = (row: any) => {
+			if (row) {
+				api.getList({ itemcode: row.item_code }).then((res: any) => {
 					state.ruleForm = res;
 					state.tableData.data = res.targets
 					state.isShowDialog = true;
 				});
-			}else {
+			} else {
 				state.ruleForm = {
 					title: '', // 评价名称
 					explain: '', // 描述
@@ -171,12 +145,9 @@ export default defineComponent({
 					item_code: '',
 					targets: []
 				},
-				state.tableData.data = [];
+					state.tableData.data = [];
 				state.isShowDialog = true;
 			}
-	
-
-
 		};
 		// 关闭弹窗
 		const closeDialog = () => {
@@ -192,7 +163,7 @@ export default defineComponent({
 			await formEl.validate((valid, fields) => {
 				if (valid) {
 					state.ruleForm.targets = state.tableData.data
-					
+
 					api.setItem(state.ruleForm).then((res: any) => {
 						ElMessage.success('提交成功');
 						emit('fetchList');
@@ -205,7 +176,7 @@ export default defineComponent({
 		const onOpenAddSign = () => {
 			addSignRef.value.openDialog(null, null, false);
 		};
-				
+
 		// 打开编辑弹窗
 		const onOpenEditSign = (row: TableDataRow, index: number) => {
 			addSignRef.value.openDialog(row, index, true);
@@ -216,10 +187,10 @@ export default defineComponent({
 		};
 		// 接收数据
 		const handleChange = (data: any, index: any, isEdit: Boolean) => {
-			if(!isEdit) {
+			if (!isEdit) {
 				// 新增
 				state.tableData.data.push(data)
-			}else {
+			} else {
 				state.tableData.data[index] = data
 			}
 		};
@@ -234,7 +205,6 @@ export default defineComponent({
 					state.tableData.data.splice(index, 1)
 					ElMessage.success('删除成功');
 				})
-				.catch(() => {});
 		};
 		// 分页改变
 		const onHandleSizeChange = (val: number) => {
@@ -261,10 +231,6 @@ export default defineComponent({
 			state.tableData.data = data;
 			state.tableData.total = data.length;
 		};
-		// 页面加载时
-		onMounted(() => {
-			// initTableData();
-		});
 		return {
 			rules,
 			ruleFormRef,
@@ -274,12 +240,9 @@ export default defineComponent({
 			onOpenEditSign,// 打开编辑某一个标识项弹窗
 			onRowDel,// 删除某一个标识项
 			onRowDetail,// 打开数据源配置接口弹窗
-
 			onHandleSizeChange,// 标识项分页每页展示条数变化
 			onHandleCurrentChange,// 标识项分页页数变化变化
-
 			handleChange,
-
 			openDialog,
 			closeDialog,
 			onCancel,
@@ -291,9 +254,8 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-
-
 ::v-deep .el-form {
+
 	// display: flex;
 	// justify-self: center;
 	// flex-direction: column;
@@ -302,19 +264,20 @@ export default defineComponent({
 		width: 500px;
 		margin: 8px auto;
 	}
+
 	::v-deep .el-input__inner,
 	::v-deep .el-textarea__inner {
 		width: 400px;
 		// flex-grow: 0;
 	}
+
 	::v-deep .el-input__inner {
 		padding: 1px 10px;
 	}
+
 	::v-deep .el-input__wrapper {
 		flex-grow: 0;
 		padding: 0
 	}
 }
-
-
 </style>

+ 30 - 17
src/views/system/assess/totalIndex/component/setTask.vue

@@ -21,7 +21,7 @@
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item class="inline-row" label="取值周期:" prop="get_time">
 							<el-input v-model="ruleForm.get_time" placeholder="请输入取值周期" clearable></el-input>
-							<div class="tip"  @click="isShow=!isShow" >
+							<div class="tip" @click="isShow = !isShow">
 								<span v-if="!isShow" class="ico_down"></span>
 								<span v-else class="ico_up"></span>
 								帮助
@@ -119,7 +119,7 @@
 							</div>
 						</div>
 					</div>
-													
+
 
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="是否启用:">
@@ -127,12 +127,12 @@
 								<el-radio size="large" :label="1">启用</el-radio>
 								<el-radio size="large" :label="2">禁用</el-radio>
 							</el-radio-group>
-							<el-button v-if="ruleForm.uri&&ruleForm.object" @click="test" style="margin-left: 20px" size="small" type="primary">检测</el-button>
+							<el-button v-if="ruleForm.uri && ruleForm.object" @click="test" style="margin-left: 20px" size="small" type="primary">检测</el-button>
 						</el-form-item>
 					</el-col>
 					<el-col v-if="testRes || testRes.toString()" :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="测试结果:">
-							<span>数据源返回数据值:{{testRes}}</span>
+							<span>数据源返回数据值:{{ testRes }}</span>
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -161,7 +161,7 @@ interface RuleFormRow {
 	state: number;
 	object: string;
 	get_time: string;
-	
+
 }
 interface ItemState {
 	isShowDialog: boolean;
@@ -198,7 +198,7 @@ export default defineComponent({
 		});
 		const onSubmit = async (formEl: FormInstance | undefined) => {
 			if (!formEl) return;
-			await formEl.validate((valid, fields) => {
+			await formEl.validate((valid) => {
 				if (valid) {
 					if (state.status === 1) {
 						// 编辑
@@ -216,7 +216,7 @@ export default defineComponent({
 		};
 		// 新增数据
 		const addDataSourceInfo = (params: any) => {
-			api.addDataSourceInfo(params).then((res: any) => {
+			api.addDataSourceInfo(params).then(() => {
 				ElMessage.success('数据提交成功');
 				closeDialog();
 				state.isShow = false
@@ -281,7 +281,7 @@ export default defineComponent({
 			closeDialog();
 		};
 		// 初始化部门数据
-		const initTableData = () => {};
+		const initTableData = () => { };
 		// 页面加载时
 		onMounted(() => {
 			initTableData();
@@ -308,9 +308,11 @@ export default defineComponent({
 .inline-row {
 	::v-deep .el-form-item__content {
 		display: flex;
+
 		.el-input {
 			width: calc(100% - 100px);
 		}
+
 		.tip {
 			width: 100px;
 			// background-color: pink;
@@ -320,6 +322,7 @@ export default defineComponent({
 			color: var(--el-color-primary);
 			font-size: 12px;
 			cursor: pointer;
+
 			.ico_up {
 				width: 0;
 				height: 0;
@@ -328,39 +331,46 @@ export default defineComponent({
 				margin-right: 8px;
 				margin-top: -7px;
 			}
-			.ico_down{
-				width:0;
-				height:0;
-				border:5px solid transparent ;
-				border-top-color:var(--el-color-primary);
+
+			.ico_down {
+				width: 0;
+				height: 0;
+				border: 5px solid transparent;
+				border-top-color: var(--el-color-primary);
 				margin-right: 8px;
 				margin-top: 7px;
 			}
 		}
 	}
 }
+
 .help-wrap {
 	width: 540px;
 	margin: 0 auto;
+
 	// background-color: pink;
 	.help-item:nth-child(1) {
 		border-top: 1px var(--el-border-color) var(--el-border-style);
 	}
+
 	.help-item {
 		display: flex;
-		
+
 		border-bottom: 1px var(--el-border-color) var(--el-border-style);
 		border-left: 1px var(--el-border-color) var(--el-border-style);
 		border-right: 1px var(--el-border-color) var(--el-border-style);
+
 		.help-item-label,
 		.help-item-content {
 			padding: 12px;
-			
+
 		}
+
 		.help-item-label {
 			background-color: #f3f3f3;
 			width: 110px;
 		}
+
 		.help-item-content {
 			width: 430px;
 			font-size: 12px;
@@ -368,21 +378,24 @@ export default defineComponent({
 			.ant-row {
 				display: flex;
 				width: 100%;
+
 				// justify-content: space-between;
 				.ant-col-6 {
 					width: 33%;
 				}
+
 				.ant-col-6:not(:nth-child(1)) {
 					text-align: center;
 				}
+
 				.ant-col-8 {
 					width: 40%;
 				}
+
 				.ant-col-16 {
 					width: 60%;
 				}
 			}
 		}
 	}
-}
-</style>
+}</style>

+ 1 - 1
src/views/system/assess/totalIndex/index.vue

@@ -138,7 +138,7 @@ export default defineComponent({
         type: 'warning',
       })
         .then(() => {
-          api.deleteItem({ itemcode: row.item_code }).then((res: any) => {
+          api.deleteItem({ itemcode: row.item_code }).then(() => {
             fetchList()
             ElMessage.success('删除成功');
           });

+ 1 - 1
src/views/system/basicConfig/index.vue

@@ -158,7 +158,7 @@ const setDetails = () => {
 			element.configValue = state.info.pic
 		}
 	})
-	api.basicConfig.setDetails({ ConfigInfo: state.data }).then((res: any) => {
+	api.basicConfig.setDetails({ ConfigInfo: state.data }).then(() => {
 		ElMessage.success('设置成功');
 
 	});

+ 8 - 68
src/views/system/city/component/edit.vue

@@ -3,19 +3,10 @@
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '城市'" v-model="dialogVisible" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
 				<el-form-item label="所属城市" prop="">
-					<el-tree-select
-						v-model="ruleForm.parentId"
-						:data="treeData"
-						:props="{
-							label: 'name',
-							children: 'children'
-						}"
-						node-key="id"
-						:clearable="true"
-						check-strictly
-						style="width: 100%;"
-						:render-after-expand="true"
-					/>
+					<el-tree-select v-model="ruleForm.parentId" :data="treeData" :props="{
+						label: 'name',
+						children: 'children'
+					}" node-key="id" :clearable="true" check-strictly style="width: 100%;" :render-after-expand="true" />
 				</el-form-item>
 				<el-form-item label="城市名称" prop="name">
 					<el-input v-model="ruleForm.name" placeholder="请输入城市名称" />
@@ -42,7 +33,7 @@
 </template>
 
 <script lang="ts">
-import { reactive, toRefs, defineComponent, ref, unref, nextTick, onMounted } from 'vue';
+import { reactive, toRefs, defineComponent, ref, unref } from 'vue';
 import api from '/@/api/system';
 import datahubApi from '/@/api/datahub';
 import { ElMessage } from 'element-plus';
@@ -51,12 +42,8 @@ interface RuleFormState {
 	id: number;
 	parentId: number | string;
 	name: string;
-	code:  string;
+	code: string;
 	sort: string;
-	// lnt: number;
-	// lat: number;
-	// principal: string;
-	// types: number;
 	status: number;
 }
 
@@ -74,12 +61,6 @@ export default defineComponent({
 				code: '',
 				sort: 0,
 				status: 1
-				// position: '',
-				// lnt: '',
-				// lat: '',
-				// principal: '',
-				// types: 1,
-				// status: 1
 			},
 			keyword: '',
 			rules: {
@@ -102,12 +83,9 @@ export default defineComponent({
 				(state.ruleForm as any).id = row.id
 				getDetail()
 			}
-			// nextTick(() => {
-			// 	initMap()
-			// }) 
 			state.dialogVisible = true
 		}
-		
+
 		const queryDataHubList = () => {
 			datahubApi.template.allList({})
 				.then((res: any) => {
@@ -167,42 +145,6 @@ 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);
-			if (state.ruleForm.lnt && state.ruleForm.lat) {
-				let marker = new BMapGL.Marker(new BMapGL.Point(state.ruleForm.lnt, state.ruleForm.lat));
-				// 在地图上添加点标记
-				map.addOverlay(marker);
-			}
-
-			state.mapLocal = new BMapGL.LocalSearch(map, {
-				renderOptions:{map: map}
-			})
-
-			map.addEventListener('click', (e: any) => {
-				let point = e.latlng
-				state.ruleForm.lnt = point.lng
-				state.ruleForm.lat = point.lat
-			})
-		}
 
 		const onLocalChange = () => {
 			state.mapLocal.search(state.keyword)
@@ -215,9 +157,6 @@ export default defineComponent({
 			onSubmit,
 			formRef,
 			onLocalChange,
-			// onMapClick,
-			// onMarkersset,
-			// mapReady,
 			...toRefs(state)
 		}
 	}
@@ -228,6 +167,7 @@ export default defineComponent({
 .mb10 {
 	margin-bottom: 10px;
 }
+
 .mr10 {
 	margin-right: 10px;
 }

+ 39 - 42
src/views/system/datahub/modeling/component/detail.vue

@@ -1,46 +1,43 @@
 <template>
 	<div class="system-edit-dic-container">
-		<el-dialog  v-model="isShowDialog" :show-close="false"  width="75%" :fullscreen="dialogFullScreen">
-		 <template #header="{ close, titleId, titleClass }">
-      <div class="my-header">
-        <h4 :id="titleId" :class="titleClass">数据记录</h4>
-		 
-		 <div>
-			<i class="iconfont "  :class="!dialogFullScreen ? 'icon-fullscreen' : 'icon-tuichuquanping'"   @click="quanping"  style="font-size: 22px;cursor: pointer;"></i>
-			<i class="el-icon"  @click="close" style="font-size: 22px;cursor: pointer;    margin-left: 10px; position: relative; top: 3px;"><svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" data-v-029747aa=""><path fill="currentColor" d="M764.288 214.592 512 466.88 259.712 214.592a31.936 31.936 0 0 0-45.12 45.12L466.752 512 214.528 764.224a31.936 31.936 0 1 0 45.12 45.184L512 557.184l252.288 252.288a31.936 31.936 0 0 0 45.12-45.12L557.12 512.064l252.288-252.352a31.936 31.936 0 1 0-45.12-45.184z"></path></svg></i>
-			
-		</div>
-      </div>
-    </template>
+		<el-dialog v-model="isShowDialog" :show-close="false" width="75%" :fullscreen="dialogFullScreen">
+			<template #header="{ close, titleId, titleClass }">
+				<div class="my-header">
+					<h4 :id="titleId" :class="titleClass">数据记录</h4>
+
+					<div>
+						<i class="iconfont " :class="!dialogFullScreen ? 'icon-fullscreen' : 'icon-tuichuquanping'" @click="quanping" style="font-size: 22px;cursor: pointer;"></i>
+						<i class="el-icon" @click="close" style="font-size: 22px;cursor: pointer;    margin-left: 10px; position: relative; top: 3px;"><svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" data-v-029747aa="">
+								<path fill="currentColor"
+									d="M764.288 214.592 512 466.88 259.712 214.592a31.936 31.936 0 0 0-45.12 45.12L466.752 512 214.528 764.224a31.936 31.936 0 1 0 45.12 45.184L512 557.184l252.288 252.288a31.936 31.936 0 0 0 45.12-45.12L557.12 512.064l252.288-252.352a31.936 31.936 0 1 0-45.12-45.184z">
+								</path>
+							</svg></i>
+
+					</div>
+				</div>
+			</template>
 
 			<el-table :data="tableData.data" style="width: 100%">
 				<el-table-column v-for="(item, index) in jData" :key="item" :label="item" :prop="item" show-overflow-tooltip align="center">
 					<template #header>
-					<div >
-						{{item}}
-					</div>
-					<div >
-						<span v-if="item=='created_at'">时间</span>
-						{{titleData[item]}}
-					</div>
-				</template>
+						<div>
+							{{ item }}
+						</div>
+						<div>
+							<span v-if="item == 'created_at'">时间</span>
+							{{ titleData[item] }}
+						</div>
+					</template>
 				</el-table-column>
 			</el-table>
-			<pagination
-				v-show="tableData.total > 0"
-				:total="tableData.total"
-				v-model:page="tableData.param.pageNum"
-				v-model:limit="tableData.param.pageSize"
-				@pagination="typeList"
-			/>
+			<pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="typeList" />
 		</el-dialog>
 	</div>
 </template>
 
 <script lang="ts">
-import { reactive, toRefs, defineComponent, ref, unref } from 'vue';
+import { reactive, toRefs, defineComponent, ref } from 'vue';
 import api from '/@/api/datahub';
-import { ElMessage } from 'element-plus';
 
 interface DicState {
 	isShowDialog: boolean;
@@ -70,12 +67,12 @@ interface TableDataState {
 
 export default defineComponent({
 	name: 'deviceEditPro',
-	setup(prop, { emit }) {
+	setup() {
 		const formRef = ref<HTMLElement | null>(null);
 		const state = reactive<DicState>({
 			isShowDialog: false,
-		    dialogFullScreen: false,
-			titleData:{},
+			dialogFullScreen: false,
+			titleData: {},
 
 			jsonsData: [],
 			jData: [],
@@ -96,13 +93,13 @@ export default defineComponent({
 			if (row) {
 				state.tableData.param.id = row.id;
 
-				api.tnode.getList({tid:row.id}).then((res: any) => {
+				api.tnode.getList({ tid: row.id }).then((res: any) => {
 					res.list.forEach((item, index) => {
 						state.titleData[item.key] = item.name;
 					});
-						//state.titleData = res.list;
-						//state.tableData.total = res.Total;
-					});
+					//state.titleData = res.list;
+					//state.tableData.total = res.Total;
+				});
 				typeList();
 
 			}
@@ -125,7 +122,7 @@ export default defineComponent({
 		const resetForm = () => {
 			state.jsonsData = [];
 			state.jData = [];
-			state.tableData= {
+			state.tableData = {
 				data: [],
 				total: 0,
 				loading: false,
@@ -139,8 +136,8 @@ export default defineComponent({
 		const closeDialog = () => {
 			state.isShowDialog = false;
 		};
-		const quanping=()=>{
-			state.dialogFullScreen = state.dialogFullScreen?false:true;
+		const quanping = () => {
+			state.dialogFullScreen = state.dialogFullScreen ? false : true;
 		}
 		// 取消
 		const onCancel = () => {
@@ -161,8 +158,8 @@ export default defineComponent({
 </script>
 <style scoped>
 .my-header {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
 }
 </style>

+ 10 - 12
src/views/system/datahub/modeling/component/editNode.vue

@@ -13,7 +13,7 @@
 					<el-form-item label="数据源" prop="sourceId">
 						<el-select v-model="ruleForm.sourceId" filterable placeholder="请选择数据源" @change="getNodeList">
 							<el-option v-for="item in sourceData" :key="item.sourceId" :label="item.key" :value="item.sourceId">
-								<span style="float: left">{{ item.name}}</span>
+								<span style="float: left">{{ item.name }}</span>
 								<span style="float: right; font-size: 13px">{{ item.key }}</span>
 							</el-option>
 						</el-select>
@@ -30,7 +30,7 @@
 				</div>
 
 				<el-form-item label="字段节点标识" prop="key">
-					<el-input v-model="ruleForm.key" placeholder="请输入字段节点名称"  />
+					<el-input v-model="ruleForm.key" placeholder="请输入字段节点名称" />
 				</el-form-item>
 				<el-form-item label="字段节点名称" prop="name">
 					<el-input v-model="ruleForm.name" placeholder="请输入字段节点名称" />
@@ -53,19 +53,19 @@
 				</el-form-item> -->
 
 
-				<el-form-item label="默认值" prop="default" v-if="ruleForm.from==1">
+				<el-form-item label="默认值" prop="default" v-if="ruleForm.from == 1">
 					<el-input v-model="ruleForm.default" placeholder="请输入取值项" />
 				</el-form-item>
 
 				<el-form-item label="是否主键" prop="isPk">
-					<el-radio-group v-model="ruleForm.isPk" >
+					<el-radio-group v-model="ruleForm.isPk">
 						<el-radio :label="0">否</el-radio>
 						<el-radio :label="1">是</el-radio>
 					</el-radio-group>
 				</el-form-item>
 
 				<el-form-item label="是否排序" prop="isSorting">
-					<el-radio-group v-model="ruleForm.isSorting" >
+					<el-radio-group v-model="ruleForm.isSorting">
 						<el-radio :label="0">否</el-radio>
 						<el-radio :label="1">是</el-radio>
 					</el-radio-group>
@@ -73,7 +73,7 @@
 
 
 				<el-form-item label="排序方式" prop="isDesc">
-					<el-radio-group v-model="ruleForm.isDesc" >
+					<el-radio-group v-model="ruleForm.isDesc">
 						<el-radio :label="0">倒序</el-radio>
 						<el-radio :label="1">正序</el-radio>
 					</el-radio-group>
@@ -129,14 +129,14 @@ export default defineComponent({
 		const formRef = ref<HTMLElement | null>(null);
 		const state = reactive<DicState>({
 			isShowDialog: false,
-			methodData:[
+			methodData: [
 				{
 					label: 'max',
 					value: 'max',
-				},{
+				}, {
 					label: 'min',
 					value: 'min',
-				},{
+				}, {
 					label: 'avg',
 					value: 'avg',
 				}
@@ -214,14 +214,12 @@ export default defineComponent({
 			state.isShowDialog = true;
 
 			getSouData();
-		
-
 		};
 
 		const getSouData = () => {
 			api.common
 				.getLists({
-					
+
 				})
 				.then((res: any) => {
 					state.sourceData = res.list;

+ 70 - 67
src/views/system/datahub/modeling/detail.vue

@@ -35,7 +35,7 @@
                 </el-icon>
                 重置
               </el-button>
-              <el-button size="default" type="success" class="ml10" @click="onOpenAdd" v-auth="'add'" v-if="developer_status==0">
+              <el-button size="default" type="success" class="ml10" @click="onOpenAdd" v-auth="'add'" v-if="developer_status == 0">
                 <el-icon>
                   <ele-FolderAdd />
                 </el-icon>
@@ -59,7 +59,7 @@
 
           <el-table-column label="数据源名称" align="center" v-col="'from'">
             <template #default="scope">
-              <span v-if="scope.row.from==2">{{scope.row.source.name}}</span>
+              <span v-if="scope.row.from == 2">{{ scope.row.source.name }}</span>
             </template>
           </el-table-column>
           <el-table-column label="默认值" prop="default" width="80" :show-overflow-tooltip="true" v-col="'default'" />
@@ -68,8 +68,8 @@
 
           <el-table-column label="操作" width="100" align="center" fixed="right">
             <template #default="scope">
-              <el-button size="small" text type="warning" @click="onOpenEdit(scope.row)" v-if="developer_status==0" v-auth="'edit'">修改</el-button>
-              <el-button size="small" text type="danger" @click="onRowDel(scope.row)" v-if="developer_status==0" v-auth="'del'">删除</el-button>
+              <el-button size="small" text type="warning" @click="onOpenEdit(scope.row)" v-if="developer_status == 0" v-auth="'edit'">修改</el-button>
+              <el-button size="small" text type="danger" @click="onRowDel(scope.row)" v-if="developer_status == 0" v-auth="'del'">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -88,8 +88,8 @@
 </template>
 <script lang="ts">
 import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
-import { Delete, Edit, Search, Share, Upload } from '@element-plus/icons-vue';
-import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
+import { Edit } from '@element-plus/icons-vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
 import { useRoute } from 'vue-router';
 import EditDic from './component/editNode.vue';
 import RelationDic from './component/relation.vue';
@@ -113,10 +113,10 @@ interface TableDataState {
 }
 export default defineComponent({
   name: 'dataDetail',
-  components: { EditDic,RelationDic },
+  components: { EditDic, RelationDic },
   setup(prop, context) {
     const editDicRef = ref();
-    const relationRef=ref();
+    const relationRef = ref();
     const route = useRoute();
     const state = reactive<TableDataState>({
       config: {},
@@ -149,8 +149,6 @@ export default defineComponent({
       typeList();
     });
 
-
-
     const typeList = () => {
       state.tableData.loading = true;
       api.tnode.getList(state.tableData.param).then((res: any) => {
@@ -201,30 +199,25 @@ export default defineComponent({
     const CkOption = () => {
       //检测是否需要设置关联
       api.template.relation_check(route.params.id).then((res: any) => {
-          if(res.yes && state.developer_status==0){
-            let ids={
-              id:route.params.id,
-            }
-            relationRef.value.openDialog(ids);
-          }else{
-            if (state.developer_status == 1) {
-                api.tnode.undeploy({ id: route.params.id }).then((res: any) => {
-                  ElMessage.success('操作成功');
-                  state.developer_status = 0;
-                });
-              } else {
-                api.tnode.deploy({ id: route.params.id }).then((res: any) => {
-                  ElMessage.success('操作成功');
-                  state.developer_status = 1;
-                });
-              }
+        if (res.yes && state.developer_status == 0) {
+          let ids = {
+            id: route.params.id,
           }
-        
-       });
-
-   
-
-
+          relationRef.value.openDialog(ids);
+        } else {
+          if (state.developer_status == 1) {
+            api.tnode.undeploy({ id: route.params.id }).then((res: any) => {
+              ElMessage.success('操作成功');
+              state.developer_status = 0;
+            });
+          } else {
+            api.tnode.deploy({ id: route.params.id }).then((res: any) => {
+              ElMessage.success('操作成功');
+              state.developer_status = 1;
+            });
+          }
+        }
+      });
     };
 
     return {
@@ -244,59 +237,69 @@ export default defineComponent({
 </script>
 <style>
 .content {
-	background: #fff;
-	width: 100%;
-	padding: 20px;
+  background: #fff;
+  width: 100%;
+  padding: 20px;
 }
+
 .content-box {
-	background: #fff;
-	width: 100%;
-	padding: 20px;
-	margin-top: 20px;
+  background: #fff;
+  width: 100%;
+  padding: 20px;
+  margin-top: 20px;
 }
+
 .cont_box {
-	display: flex;
+  display: flex;
 }
+
 .cont_box .title {
-	font-size: 18px;
+  font-size: 18px;
 }
+
 .cont_box .pro-status {
-	line-height: 30px;
-	margin-left: 30px;
+  line-height: 30px;
+  margin-left: 30px;
 }
+
 .cont_box .pro-status .on {
-	background: #52c41a;
+  background: #52c41a;
 }
+
 .cont_box .pro-status .off {
-	background: #c41a1a;
+  background: #c41a1a;
 }
+
 .cont_box .pro-status span {
-	position: relative;
-	top: -1px;
-	display: inline-block;
-	width: 6px;
-	height: 6px;
-	vertical-align: middle;
-	border-radius: 50%;
-	margin-right: 5px;
+  position: relative;
+  top: -1px;
+  display: inline-block;
+  width: 6px;
+  height: 6px;
+  vertical-align: middle;
+  border-radius: 50%;
+  margin-right: 5px;
 }
+
 .cont_box .pro-option {
-	line-height: 30px;
-	margin-left: 10px;
-	color: #1890ff;
-	cursor: pointer;
+  line-height: 30px;
+  margin-left: 10px;
+  color: #1890ff;
+  cursor: pointer;
 }
+
 .content-box .pro-box {
-	display: flex;
-	padding: 10px;
+  display: flex;
+  padding: 10px;
 }
+
 .content-box .pro-box .protitle {
-	font-size: 18px;
-	font-weight: bold;
-	line-height: 35px;
+  font-size: 18px;
+  font-weight: bold;
+  line-height: 35px;
 }
+
 .content-box .pro-box .buttonedit {
-	border: 0px;
-	color: #1890ff;
-}
-</style>
+  border: 0px;
+  color: #1890ff;
+}</style>

+ 8 - 8
src/views/system/datahub/source/component/edit.vue

@@ -181,7 +181,7 @@ import 'vue3-json-viewer/dist/index.css';
 import vue3cron from '/@/components/vue3cron/vue3cron.vue';
 
 import { ElMessage } from 'element-plus';
-import { Delete, Plus, CircleClose, Minus, Right } from '@element-plus/icons-vue';
+import { Delete, CircleClose, } from '@element-plus/icons-vue';
 
 interface RuleFormState {
 	sourceId: number;
@@ -201,7 +201,7 @@ interface DicState {
 
 export default defineComponent({
 	name: 'Edit',
-	components: { Delete, Plus, CircleClose, Minus, Right, vue3cron },
+	components: { Delete, CircleClose, vue3cron },
 
 	setup(prop, { emit }) {
 		const myRef = ref<HTMLElement | null>(null);
@@ -382,11 +382,11 @@ export default defineComponent({
 			}
 			state.isShowDialog = true;
 		};
-		const onKeyclick = (e) => {
-			if (e.target.innerText && e.target.className == 'jv-key') {
-				let str = e.target.innerText;
-				str = str.substr(0, str.length - 1);
-			}
+		const onKeyclick = () => {
+			// if (e.target.innerText && e.target.className == 'jv-key') {
+			// 	let str = e.target.innerText;
+			// 	str = str.substr(0, str.length - 1);
+			// }
 		};
 		const resetForm = () => {
 			state.devconfig = {};
@@ -423,7 +423,7 @@ export default defineComponent({
 		};
 
 		const setNode = (event) => {
-			state.sourceData.forEach((item, index) => {
+			state.sourceData.forEach((item) => {
 				if (item.id == event) {
 					state.devconfig.productKey = item.product.key;
 					state.devconfig.deviceKey = item.key;

+ 4 - 4
src/views/system/datahub/source/component/editNode.vue

@@ -96,7 +96,7 @@ import 'vue3-json-viewer/dist/index.css';
 import jsontree from '/@/components/jsontree/index.vue';
 
 import { ElMessage } from 'element-plus';
-import { Delete, Minus, Right } from '@element-plus/icons-vue';
+import { Delete, } from '@element-plus/icons-vue';
 
 interface RuleFormState {
 	nodeId: number;
@@ -117,10 +117,9 @@ interface DicState {
 
 export default defineComponent({
 	name: 'Edit',
-	components: { Delete, Minus, Right, jsontree },
+	components: { Delete, jsontree },
 
 	setup(prop, { emit }) {
-		const editDicRef = ref();
 		const formRef = ref<HTMLElement | null>(null);
 		const state = reactive<DicState>({
 			isShowDialog: false,
@@ -495,4 +494,5 @@ export default defineComponent({
 .jv-key {
 	cursor: pointer;
 	color: #0034f1;
-}</style>
+}
+</style>

+ 2 - 15
src/views/system/datahub/source/component/list.vue

@@ -51,19 +51,6 @@ interface TableDataRow {
 
 	createBy: string;
 }
-interface TableDataState {
-	ids: number[];
-	tableData: {
-		data: Array<TableDataRow>;
-		total: number;
-		loading: boolean;
-		param: {
-			pageNum: number;
-			pageSize: number;
-			id: number;
-		};
-	};
-}
 
 export default defineComponent({
 	name: 'deviceEditPro',
@@ -87,7 +74,7 @@ export default defineComponent({
 			},
 		});
 		// 打开弹窗
-		const openDialog = (row: RuleFormState | null) => {
+		const openDialog = (row: any | null) => {
 			resetForm();
 			if (row) {
 				state.tableData.param.sourceId = row.sourceId;
@@ -111,7 +98,7 @@ export default defineComponent({
 			}).finally(() => (state.tableData.loading = false));
 
 			api.node.getList(state.tableData.param).then((res: any) => {
-				res.list.forEach((item, index) => {
+				res.list.forEach((item) => {
 					state.titleData[item.key] = item.name;
 				});
 			});

+ 4 - 4
src/views/system/datahub/source/detail.vue

@@ -111,7 +111,7 @@
 
 								<div class="content-f" v-for="(item, index) in requestParams" :key="index" style="    border: 1px solid #d9d9d9; padding: 10px;margin-bottom: 10px;">
 
-									<div v-for="(aa, bb) in item" :key="inbbdex">
+									<div v-for="(aa) in item" :key="inbbdex" :key="aa.type">
 										<el-form-item label="参数类型:">
 											{{ aa.type }}
 										</el-form-item>
@@ -280,7 +280,7 @@ export default defineComponent({
 				});
 			}
 		};
-		const handleClick = (tab: TabsPaneContext) => {
+		const handleClick = (tab: any) => {
 			if (tab.props.name == 3) {
 				if (state.detail.from == 1) {
 					api.common.api(state.detail.sourceId).then((res: any) => {
@@ -298,7 +298,7 @@ export default defineComponent({
 			}
 		};
 
-		const onRowDel = (row: TableDataRow) => {
+		const onRowDel = (row: any) => {
 			let msg = '你确定要删除所选数据?';
 			let ids: number[] = [];
 			if (row) {
@@ -328,7 +328,7 @@ export default defineComponent({
 		const onOpenEdit = () => {
 			editDicRef.value.openDialog({ sourceId: route.params.sourceId, nodeId: 0, isPk: 0 });
 		};
-		const onOpenEdit1 = (row: TableDataRow) => {
+		const onOpenEdit1 = (row: any) => {
 			editDicRef.value.openDialog(row);
 		};
 

+ 1 - 12
src/views/system/manage/blacklist/component/editPro.vue

@@ -35,13 +35,11 @@
 import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance } from 'vue';
 import api from '/@/api/system';
 import uploadVue from '/@/components/upload/index.vue';
-import { ElMessage, UploadProps } from "element-plus";
+import { ElMessage } from "element-plus";
 import getOrigin from '/@/utils/origin'
 
 interface RuleFormState {
   id: number;
-  // name: string;
-  // dictType: string;
   status: string;
   remark: string;
 }
@@ -57,7 +55,6 @@ interface DicState {
 
 export default defineComponent({
   name: 'deviceEditPro',
-  components: { uploadVue },
   setup(prop, { emit }) {
     const formRef = ref<HTMLElement | null>(null);
     const baseURL: string | undefined | boolean = getOrigin(import.meta.env.VITE_API_URL)
@@ -76,12 +73,6 @@ export default defineComponent({
 
       ruleForm: {
         id: 0,
-        // name: '',
-        // categoryId: '',
-        // deptId: '',
-        // messageProtocol: '',
-        // transportProtocol: '',
-        // deviceType: '设备',
         status: '1',
         remark: ''
       },
@@ -150,10 +141,8 @@ export default defineComponent({
       });
     };
 
-
     return {
       openDialog,
-      // handleAvatarSuccess,
       closeDialog,
       onCancel,
       onSubmit,

+ 1 - 1
src/views/system/manage/blacklist/index.vue

@@ -192,7 +192,7 @@ export default defineComponent({
     };
     // 改变状态
     const onChangeStatus = (id: number, status: number) => {
-      api.blackList.changeStatus({ id: id, status: status }).then((res: any) => {
+      api.blackList.changeStatus({ id: id, status: status }).then(() => {
         ElMessage.success(status == 1 ? '已开启' : '已关闭');
         typeList();
       })

+ 1 - 9
src/views/system/monitor/online/index.vue

@@ -3,14 +3,6 @@
 		<el-card shadow="hover">
 			<div class="system-user-search mb15" v-if="false">
 				<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
-					<!-- <el-form-item label="登录IP" prop="ipaddr">
-            <el-input v-model="tableData.param.ipaddr" placeholder="请输入登录地址" clearable style="width: 180px;" size="default" @keyup.enter.native="dataList" />
-          </el-form-item>
-
-          <el-form-item label="用户名称" prop="loginLocation">
-            <el-input v-model="tableData.param.loginLocation" placeholder="请输入登录地点" clearable style="width: 180px;" size="default" @keyup.enter.native="dataList" />
-          </el-form-item> -->
-
 					<el-form-item label="登录时间" prop="dateRange">
 						<el-date-picker v-model="tableData.param.dateRange" size="default" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
 					</el-form-item>
@@ -52,7 +44,7 @@
 </template>
 
 <script lang="ts">
-import { toRefs, reactive, onMounted, ref, defineComponent, getCurrentInstance } from 'vue';
+import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
 import api from '/@/api/system';