vera_min 1 rok pred
rodič
commit
af62750830

+ 6 - 2
src/components/upload/index.vue

@@ -93,10 +93,14 @@ const updateImg = () => {
 			return item.url
 		}
 	})
-
+	console.log(props.limit)
 	if (props.limit === 1) {
 		const img = list[0]
-		emit('setImg', props.widthHost ? img : img.replace(getOrigin(import.meta.env.VITE_SERVER_URL + '/'), ''))
+		if(!img) {
+			emit('setImg', '');
+			return;
+		}
+		emit('setImg', props.widthHost ? img : img.replace(getOrigin(import.meta.env.VITE_SERVER_URL + '/'), ''));
 	} else {
 		emit('setImgs', list)
 	}

+ 3 - 3
src/views/iot/configuration/list/edit.vue

@@ -1,8 +1,8 @@
 <template>
   <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="name">
-        <el-input v-model="formData.name" placeholder="输入图名称" />
+    <el-form ref="formRef" :model="formData" :rules="ruleForm" label-width="100px">
+      <el-form-item label="组态图名称" prop="name">
+        <el-input v-model="formData.name" placeholder="输入组态图名称" />
       </el-form-item>
       <!-- <el-form-item label="说明" prop="remarks">
         <el-input v-model="formData.remarks" type="textarea" :rows="3" />

+ 1 - 1
src/views/iot/configuration/list/index.vue

@@ -17,7 +17,7 @@
             <el-icon>
               <ele-FolderAdd />
             </el-icon>
-            新增图
+            新增组态
           </el-button>
         </el-form-item>
       </el-form>

+ 1 - 1
src/views/iot/configuration/screen/edit.vue

@@ -1,7 +1,7 @@
 <template>
 	<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="projectName">
+			<el-form-item label="项目名称" prop="projectName">
 				<el-input v-model="formData.projectName" placeholder="输入大屏项目名称" />
 			</el-form-item>
 			<el-form-item label="说明" prop="remarks">

+ 1 - 1
src/views/iot/rule-engine/edit.vue

@@ -2,7 +2,7 @@
 	<el-dialog
 		class="api-edit"
 		v-model="showDialog"
-		:title="`${formData.id ? '编辑规则' : '新增规则'}`"
+		:title="`${formData.id ? '编辑数据转发' : '新增数据转发'}`"
 		width="600px"
 		:close-on-click-modal="false"
 		:close-on-press-escape="false"

+ 1 - 1
src/views/iot/scene/manage/edit.vue

@@ -16,7 +16,7 @@
 	>
 		<el-form ref="formRef" :model="formData" :rules="ruleForm" label-width="80px">
 			<el-form-item label="场景名称" prop="name">
-				<el-input v-model="formData.name" placeholder="请输入场景名称" />
+				<el-input v-model.trim="formData.name" placeholder="请输入场景名称" />
 			</el-form-item>
       <el-form-item label="触发方式" prop="sceneType">
         <el-radio-group v-model="formData.sceneType">

+ 3 - 3
src/views/iot/scene/manage/index.vue

@@ -45,7 +45,7 @@
 		<el-table :data="tableData" style="width: 100%" row-key="id" v-loading="loading">
 			<el-table-column prop="id" label="ID" min-width="100" show-overflow-tooltip v-col="'id'"></el-table-column>
 			<el-table-column prop="name" label="场景名称" show-overflow-tooltip v-col="'name'"></el-table-column>
-			<el-table-column prop="sceneType" label="场景类型" align="center" v-col="'sceneType'">
+			<el-table-column prop="sceneType" label="触发方式" align="center" v-col="'sceneType'">
 				<template #default="scope">
 					<el-tag size="small" v-if="scope.row.sceneType == 'device'">设备触发</el-tag>
 					<el-tag size="small" v-if="scope.row.sceneType == 'manual'">手动触发</el-tag>
@@ -56,10 +56,10 @@
 			<el-table-column prop="status" label="状态" align="center" v-col="'status'">
 				<template #default="scope">
 					<el-tag size="small" type="success" v-if="scope.row.status == 1">启用</el-tag>
-					<el-tag size="small" type="info" v-if="scope.row.status == 0">未启用</el-tag>
+					<el-tag size="small" type="info" v-if="scope.row.status == 0">用</el-tag>
 				</template>
 			</el-table-column>
-			<el-table-column prop="description" label="描述" show-overflow-tooltip v-col="'description'"></el-table-column>
+			<el-table-column prop="description" label="场景描述" show-overflow-tooltip v-col="'description'"></el-table-column>
 
 			<el-table-column prop="createdAt" label="创建时间" align="center" v-col="'createdAt'"></el-table-column>
 			<el-table-column label="操作" width="200" align="center">

+ 1 - 1
src/views/system/monitor/operLog/index.vue

@@ -79,7 +79,7 @@
         <el-table-column label="主机" show-overflow-tooltip align="center" prop="operIp" />
         <el-table-column label="操作地点" v-col="'operLocation'" show-overflow-tooltip align="center" prop="operLocation" />
         <el-table-column label="操作时间" v-col="'operTime'" show-overflow-tooltip align="center" prop="operTime" />
-        <el-table-column label="操作状态" v-col="'status'" align="center" prop="status" width="80">
+        <el-table-column label="操作状态" v-col="'status'" align="center" prop="status" width="100">
           <template #default="scope">
             <el-tag type="success" size="small" v-if="scope.row.status === 1">正常</el-tag>
             <el-tag type="warning" size="small" v-else-if="scope.row.status === 0">停用</el-tag>

+ 5 - 1
src/views/system/monitor/plugin/edit.vue

@@ -24,7 +24,7 @@
 			</el-form-item>
 			<el-form-item label="插件图标" prop="icon">
 				<!-- <el-input v-model="formData.icon" placeholder="输入插件图标" /> -->
-				<uploadVue :width-host="false" :img="formData.icon" @set-img="formData.icon = $event"></uploadVue>
+				<uploadVue :width-host="false" :img="formData.icon" @set-img="setImage"></uploadVue>
 			</el-form-item>
 			<el-form-item label="插件网址" prop="link">
 				<el-input v-model="formData.link" placeholder="输入插件网址" />
@@ -100,6 +100,10 @@ const ruleForm = {
 	// args: [ruleRequired('指令参数不能为空')],
 }
 
+const setImage = (data:string) => {
+	formData.icon = data
+}
+
 const onSubmit = async () => {
 	await formRef.value.validate()
 

+ 3 - 3
src/views/system/monitor/plugin/index.vue

@@ -1,6 +1,6 @@
 <template>
-	<div class="system-plugin-container">
-		<el-card shadow="hover">
+	<div class="system-plugin-container page-full">
+		<el-card shadow="hover" class="page-full-part">
 			<div class="system-user-search mb15">
 				<el-form :model="params" ref="queryRef" :inline="true" label-width="68px">
 					<el-form-item label="关键字" prop="keyWord">
@@ -148,7 +148,7 @@ const resetQuery = () => {
 }
 
 const onDel = (row: any) => {
-	ElMessageBox.confirm(`此操作将删除接口:“${row.name}”,是否继续?`, '提示', {
+	ElMessageBox.confirm(`此操作将删除插件:“${row.name}”,是否继续?`, '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',
 		type: 'warning',