Sfoglia il codice sorgente

修复设备管理中bug

yukai 1 anno fa
parent
commit
ed18c6162d

+ 14 - 3
src/views/iot/device/instance/detail.vue

@@ -104,7 +104,7 @@
                 </tr>
                 <tr class="ant-descriptions-row">
                   <th class="ant-descriptions-item-label ant-descriptions-item-colon">固件版本</th>
-                  <td class="ant-descriptions-item-content" colspan="1">{{ prodetail.version }}</td>
+                  <td class="ant-descriptions-item-content" colspan="1">{{ detail.version }}</td>
                   <th class="ant-descriptions-item-label ant-descriptions-item-colon">注册时间</th>
                   <td class="ant-descriptions-item-content" colspan="1">{{ detail.updatedAt }}</td>
                   <th class="ant-descriptions-item-label ant-descriptions-item-colon">最后上线时间</th>
@@ -272,7 +272,7 @@
         </el-tab-pane>
         <el-tab-pane label="日志管理" name="4">
           <div class="system-user-search mb15">
-            <el-form :model="logtableData.param" ref="queryRef" :inline="true" label-width="68px">
+            <el-form :model="logtableData.param" ref="logqueryRef" :inline="true" label-width="68px">
               <el-form-item label="日志类型" prop="types">
                 <el-select v-model="logtableData.param.types" placeholder="日志类型" clearable size="default">
                   <el-option v-for="item in logTypeData" :key="item" :label="item" :value="item" />
@@ -290,7 +290,7 @@
                   </el-icon>
                   查询
                 </el-button>
-                <el-button size="default" @click="resetQuery(queryRef)">
+                <el-button size="default" @click="resetQuery(logqueryRef)">
                   <el-icon>
                     <ele-Refresh />
                   </el-icon>
@@ -449,6 +449,8 @@ export default defineComponent({
   components: { SubDeviceMutipleBind, SubDevice, EditDic, EditAttr, EditFun, EditEvent, EditTab, devantd, ListDic, functionCom, setAttr },
 
   setup(prop, context) {
+    const logqueryRef = ref();
+
     const array_list=ref([]);
     const route = useRoute();
     const editDicRef = ref();
@@ -884,6 +886,12 @@ export default defineComponent({
         state.logtableData.total = res.Total;
       });
     };
+        	/** 重置按钮操作 */
+		const resetQuery = (formEl: FormInstance | undefined) => {
+			if (!formEl) return;
+			formEl.resetFields();
+			getlog();
+		};
 
     const CkOption = () => {
       if (state.developer_status == 2) {
@@ -921,7 +929,10 @@ export default defineComponent({
     const setAttr = (row: any) => {
       setAttrRef.value.show(row)
     }
+
     return {
+      logqueryRef,
+      resetQuery,
       getStatusText,
       getValueText,
       onlineTimeoutUpdate,

+ 5 - 1
src/views/iot/device/product/component/editAttr.vue

@@ -195,6 +195,7 @@ import api from '/@/api/device';
 import { Plus, Minus, Right } from '@element-plus/icons-vue';
 import EditOption from './editOption.vue';
 import { ElMessage } from 'element-plus';
+import { validateNoSpace } from '/@/utils/validator';
 
 interface RuleFormState {
 	id: number;
@@ -261,7 +262,10 @@ export default defineComponent({
 				desc: '',
 			},
 			rules: {
-				name: [{ required: true, message: '属性定义名称不能为空', trigger: 'blur' }],
+				name: [ { required: true, message: '属性定义名称不能为空', trigger: 'blur' },
+        				{ max: 32, message: '属性定义名称不能超过32个字符', trigger: 'blur' },
+						{ validator: validateNoSpace, message: '属性定义名称不能包含空格', trigger: 'blur' }
+					],
 				key: [{ required: true, message: '属性定义标识不能为空', trigger: 'blur' }],
 				accessMode: [{ required: true, message: '请选择是否只读', trigger: 'blur' }],
 				type: [{ required: true, message: '请选择数据类型', trigger: 'blur' }],

+ 1 - 1
src/views/iot/device/product/detail.vue

@@ -359,7 +359,7 @@ export default defineComponent({
 
 		// 删除产品
 		const onRowDel = (key, type) => {
-			let msg = `此操作将永久删除该数据吗?是否继续?`;
+			let msg = `此操作将永久删除该数据吗?是否继续?`;
 
 			if (key.length === 0) {
 				ElMessage.error('请选择要删除的数据。');

+ 1 - 1
src/views/system/application/edit.vue

@@ -89,7 +89,7 @@ const ruleForm = {
 	accessKey: [ruleRequired('AK不能为空')],
 	secureKey: [ruleRequired('SK不能为空')],
 	orgId: [ruleRequired('组织不能为空')],
-	roleId: [ruleRequired('角色产品不能为空')],
+	roleId: [ruleRequired('角色不能为空')],
 };
 const onSubmit = async () => {
 	await formRef.value.validate();