修复测试问题多个bug

src/views/iot/certificate/index.vue

@@ -109,7 +109,7 @@ const filterStandard = (type: any) => {
 // 状态修改
 const handleStatusChange = (row: any) => {
 	let text = row.status === 1 ? '启用' : '停用';
-	ElMessageBox.confirm('确认要"' + text + '"："' + row.name + '"楼宇吗?', '警告', {
+	ElMessageBox.confirm('确认要"' + text + '"："' + row.name + '"证书吗?', '警告', {
 		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',

src/views/iot/device/channel/component/detail.vue

@@ -4,13 +4,13 @@
 			<el-tab-pane label="通道信息" name="1">
 				<el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="120px" style="width: 90%; margin: 0 auto">
 					<el-form-item label="通道名称" prop="title">
-						<el-input v-model="temp.title" placeholder="请输入通道名称" />
+						<el-input v-model="temp.title" disabled placeholder="请输入通道名称" />
 					</el-form-item>
 					<el-form-item label="注册码" prop="number">
-						<el-input v-model="temp.number" placeholder="请输入注册码" />
+						<el-input v-model="temp.number" disabled placeholder="请输入注册码" />
 					</el-form-item>
 					<el-form-item label="设备地址" prop="slaveId">
-						<el-input v-model.number="temp.slaveId" placeholder="请输入设备地址" />
+						<el-input v-model.number="temp.slaveId" disabled placeholder="请输入设备地址" />
 					</el-form-item>
 					<!-- <el-form-item label="调度周期(秒)" prop="interval">
             <el-input v-model="temp.interval" placeholder="请输入调度周期" />
@@ -18,7 +18,7 @@
 					<el-form-item label="" prop="">
 						<div align="right">
 							<el-button @click="clsoeDialog"> 取 消 </el-button>
-							<el-button type="primary" @click="updateData()"> 保 存 </el-button>
+							<!-- <el-button type="primary" @click="updateData()"> 保 存 </el-button> -->
 						</div>
 					</el-form-item>
 				</el-form>

src/views/iot/device/channel/component/taskDialog.vue

@@ -52,10 +52,9 @@ export default {
 				templateNumber: '',
 			},
 			rules: {
-				title: [{ required: true, message: '请输入模板名称', trigger: 'change' }],
+				title: [{ required: true, message: '请输入标题', trigger: 'change' }],
 				publishTopic: [{ required: true, message: '请输入mqtt主题', trigger: 'change' }],
-				mode: [{ required: true, message: '请选择模式', trigger: 'change' }],
-				templateNumber: [{ required: true, message: '请选择模式', trigger: 'change' }],
+				templateNumber: [{ required: true, message: '请选择设备模板', trigger: 'change' }],
 			},
 			dialogVisible: false,
 			listLoading: false,

src/views/iot/device/template/component/edit.vue

@@ -1,7 +1,7 @@
 <template>
 	<el-dialog :title="textMap[dialogStatus]" v-model="dialogVisible" :width="dialogWidth" :before-close="clsoeDialog" :close-on-click-modal="false">
 		<div class="wrapper">
-			<el-form class="form" ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="120px" style="width: 400px">
+			<el-form class="form" ref="dataForm" :rules="rules" :model="temp" label-position="right" label-width="120px" style="width: 400px">
 				<el-form-item label="模板名称" prop="title">
 					<el-input v-model="temp.title" placeholder="请输入模板名称" />
 				</el-form-item>

src/views/iot/network/tunnel/create.vue

@@ -5,7 +5,7 @@
                 <el-collapse v-model="activeViewName">
                     <el-collapse-item title="基本信息" name="1">
                         <div class="collapse-wrap">
-                            <el-form style="width: 600px;margin: 0 auto;" :model="form" label-width="68px">
+                            <el-form style="width: 600px;margin: 0 auto;" :model="form" :rules="rules" label-width="68px">
                                 <el-form-item label="名称" prop="name">
                                     <el-input v-model="form.name" show-word-limit maxlength="20" placeholder="请填写名称" />
                                 </el-form-item>
@@ -119,7 +119,8 @@ interface TableDataState {
         content: string,
     },
     detail: object,
-    form: object
+    form: object,
+    rules: object,
 }
 export default defineComponent({
     name: 'tunnelCreate',
@@ -180,6 +181,11 @@ export default defineComponent({
                     text: "",
                     timeout: 30
                 }
+            },
+            rules: {
+                name: [
+                    { required: true, message: '名称不能为空', trigger: 'change' }
+                ]
             }
         });
 

src/views/iot/ota-update/module/index.vue

@@ -4,7 +4,7 @@
       <div class="ota-module-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px" @keyup.enter.native="getList(1)">
           <el-form-item label="模块名称" prop="name">
-            <el-input v-model="tableData.param.keyWord" placeholder="请输入产品名称" clearable size="default" style="width: 200px;" />
+            <el-input v-model="tableData.param.name" placeholder="请输入模块名称" clearable size="default" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="所属产品" prop="productId">
             <el-select v-model="tableData.param.productId" filterable placeholder="请选择产品">

src/views/iot/ota-update/update/component/edit.vue

@@ -130,7 +130,7 @@ export default defineComponent({
       isShowDialog: false,
       ruleForm: {
         id: 0,
-        typo: '',
+        typo: '1',
         name: '',
         productId: '',
         module: '',
@@ -147,6 +147,7 @@ export default defineComponent({
       productData: [],
       moduleData: [],
       rules: {
+        typo: [{required: true, message: '升级包类型不能为空', trigger: 'blur'}],
         name: [{required: true, message: '升级包名称不能为空', trigger: 'blur'}],
         productId: [{required: true, message: '所属产品不能为空', trigger: 'blur'}],
         module: [{required: true, message: '升级包模块不能为空', trigger: 'blur'}],
@@ -179,7 +180,7 @@ export default defineComponent({
     const resetForm = () => {
       state.ruleForm = {
         id: 0,
-        typo: '',
+        typo: '1',
         name: '',
         productId: '',
         module: '',

src/views/iot/ota-update/update/index.vue

@@ -53,7 +53,7 @@
 					</template>
 				</el-table-column>
 				<el-table-column label="创建时间" prop="createdAt" align="center" />
-				<el-table-column label="操作" width="100" v-col="'handle'" align="center" fixed="right">
+				<el-table-column label="操作" width="120" v-col="'handle'" align="center" fixed="right">
 					<template #default="scope">
 						<el-button size="small" text type="primary" v-if="!scope.row.folderName" @click="toDetail(scope.row.id)">查看</el-button>
 						<el-button size="small" text type="warning" v-auth="'edit'" @click="onOpenEdit(scope.row)">编辑</el-button>

src/views/iot/scene/manage/component/actionParallelItem.vue

@@ -10,7 +10,7 @@
       </div>
       <div class="product flex flex-warp">
         <el-form-item label="动作类型：" prop="actionType">
-          <el-select v-model="item.actionType" filterable placeholder="请选择动作类型" @change="saveData">
+          <el-select v-model="item.actionType" filterable clearable placeholder="请选择动作类型" @change="saveData">
             <el-option v-for="it in sourceActionTypeData" :key="it.key" :label="it.name" :value="it.key">
               <span style="float: left">{{ it.name }}</span>
               <span style="float: right; font-size: 13px">{{ it.key }}</span>

src/views/iot/scene/manage/component/actionSerialItem.vue

@@ -10,7 +10,7 @@
       </div>
       <div class="product flex flex-warp">
         <el-form-item label="动作类型：" prop="actionType">
-          <el-select v-model="item.actionType" filterable placeholder="请选择动作类型" @change="saveData">
+          <el-select v-model="item.actionType" filterable clearable placeholder="请选择动作类型" @change="saveData">
             <el-option v-for="it in sourceActionTypeData" :key="it.key" :label="it.name" :value="it.key">
               <span style="float: left">{{ it.name }}</span>
               <span style="float: right; font-size: 13px">{{ it.key }}</span>
@@ -177,7 +177,7 @@ const delScene = (index: number) => {
   .product {
     margin-bottom: 20px;
 
-    .el-form-item {
+    :deep(.el-form-item) {
       margin-left: 30px;
       margin-bottom: 10px;
     }

src/views/iot/scene/manage/component/actionType/callWebService.vue

@@ -1,12 +1,12 @@
 <template>
   <el-form-item label="请求方式" prop="productKey" class="form-item" style="margin-left: 50px;">
-    <el-select v-model="fromData.callWebService.method" filterable placeholder="请选择请求方式" @change="saveData">
+    <el-select v-model="fromData.callWebService.method" filterable clearable placeholder="请选择请求方式" @change="saveData">
       <el-option label="POST" value="POST" />
       <el-option label="GET" value="GET" />
     </el-select>
   </el-form-item>
   <el-form-item label="编码：" prop="executeAction" class="form-item">
-    <el-select v-model="fromData.callWebService.encoding" filterable placeholder="请选择触发类型"  @change="saveData">
+    <el-select v-model="fromData.callWebService.encoding" filterable clearable placeholder="请选择触发类型"  @change="saveData">
       <el-option label="UTF-8" value="UTF-8" />
       <el-option label="GBK" value="GBK" />
     </el-select>

src/views/iot/scene/manage/component/actionType/deviceOut.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-form-item label="产品：" prop="productKey" class="form-item" style="margin-left: 50px;">
-    <el-select v-model="fromData.productKey" filterable placeholder="请选择产品" @change="seletChange">
+  <el-form-item label="产品：" prop="productKey" class="form-item">
+    <el-select v-model="fromData.productKey" filterable clearable placeholder="请选择产品" @change="seletChange">
       <el-option v-for="it in sourceData" :key="it.key" :label="it.name" :value="it.key">
         <span style="float: left">{{ it.name }}</span>
         <span style="float: right; font-size: 13px">{{ it.key }}</span>
@@ -9,7 +9,7 @@
   </el-form-item>
 
   <el-form-item label="设备：" prop="deviceKey" class="form-item">
-    <el-select v-model="fromData.deviceKey" filterable placeholder="请选择设备" @change="saveData">
+    <el-select v-model="fromData.deviceKey" filterable clearable placeholder="请选择设备" @change="saveData">
       <el-option label="全部" value="all">全部</el-option>
 
       <el-option v-for="it in deviceListData" :key="it.key" :label="it.name" :value="it.key">
@@ -236,6 +236,5 @@ onMounted(() => {
 <style scoped lang="scss">
 .form-item {
   flex: 0 0 25%;
-
 }
 </style>

src/views/iot/scene/manage/component/actionType/sendNotice.vue

@@ -1,18 +1,18 @@
 <template>
   <el-form-item label="通知方式" prop="productKey" class="form-item" style="margin-left: 50px;">
-    <el-select v-model="fromData.notice.types" filterable placeholder="请选择通知方式" @change="seletChange">
+    <el-select v-model="fromData.notice.types" filterable clearable placeholder="请选择通知方式" @change="seletChange">
       <el-option v-for="item in notice_send_gateway" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
   </el-form-item>
 
   <el-form-item label="通知配置：" prop="name" class="form-item">
-    <el-select v-model="fromData.notice.name" filterable placeholder="请选择通知配置" @change="getTemplist">
+    <el-select v-model="fromData.notice.name" filterable clearable placeholder="请选择通知配置" @change="getTemplist">
       <el-option v-for="item in sendGatewayData" :key="item.id" :label="item.title" :value="item.id" />
     </el-select>
   </el-form-item>
 
   <el-form-item label="通知模板：" prop="executeAction" class="form-item">
-    <el-select v-model="fromData.notice.template" filterable placeholder="请选择触发类型">
+    <el-select v-model="fromData.notice.template" filterable clearable placeholder="请选择触发类型">
       <el-option v-for="item in noticeConfigData" :key="item.id" :label="item.title" :value="item.id" />
     </el-select>
   </el-form-item>

src/views/iot/scene/manage/component/actionType/triggerCustomEvent.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item label="自定义场景：" prop="executeAction" class="form-item">
-    <el-select v-model="fromData.executeAction" filterable placeholder="请选择自定义场景" @change="saveData">
+    <el-select v-model="fromData.executeAction" filterable clearable placeholder="请选择自定义场景" @change="saveData">
       <el-option v-for="item in sceneList" :key="item.id" :label="item.name" :value="item.id" />
     </el-select>
   </el-form-item>

src/views/iot/scene/manage/component/sceneItem.vue

@@ -24,7 +24,7 @@
           <el-select v-model="item.deviceKey" filterable placeholder="请选择设备" @change="EditPen(index)">
             <el-option v-for="it in deviceListData" :key="it.key" :label="it.name" :value="it.key">
               <span style="float: left">{{ it.name }}</span>
-              <span style="float: right; font-size: 13px">{{ it.key }}</span>
+              <span style="float: right; margin-left: 8px;font-size: 13px">{{ it.key }}</span>
             </el-option>
           </el-select>
         </el-form-item>

src/views/iot/scene/manage/index.vue

@@ -120,7 +120,7 @@ const onActionStatus = (item: any) => {
 	}
 }
 const del = (row: any) => {
-	ElMessageBox.confirm(`此操作将删除图形：“${row.name}”，是否继续?`, '提示', {
+	ElMessageBox.confirm('是否确认删除场景名称为："' + row.name + '"的数据项?', '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',
 		type: 'warning',

src/views/system/manage/user/index.vue

@@ -29,7 +29,7 @@
 									<el-option label="全部" :value="-1" />
 									<el-option label="启用" :value="1" />
 									<el-option label="禁用" :value="0" />
-									<el-option label="未验证" :value="2" />
+									<!-- <el-option label="未验证" :value="2" /> -->
 								</el-select>
 							</el-form-item>
 							<el-form-item label="创建时间" prop="dateRange">

src/views/system/monitor/loginLog/index.vue

@@ -16,7 +16,7 @@
           </el-form-item> -->
 
           <el-form-item label="状态" prop="status">
-            <el-select v-model="tableData.param.status" placeholder="登录状态" clearable size="default" style="width: 180px">
+            <el-select v-model="tableData.param.status" placeholder="登录状态" size="default" style="width: 180px">
               <el-option label="全部" :value="-1" />
               <el-option label="成功" :value="1" />
               <el-option label="失败" :value="0" />
@@ -48,7 +48,7 @@
 
             <el-button size="default" type="primary" class="ml10" @click="onRowExport()">
               <el-icon>
-                <ele-Delete />
+                <ele-Download />
               </el-icon>
               导出日志
             </el-button>
@@ -65,7 +65,7 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="编号" align="center" width="60" prop="infoId" />
         <el-table-column label="登录名称" align="center" prop="loginName" />
-        <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
+        <el-table-column label="登录地址" align="center" prop="ipaddr" width="150" :show-overflow-tooltip="true" />
         <el-table-column label="登录地点" v-col="'loginLocation'" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
         <el-table-column label="浏览器" align="center" prop="browser" />
         <el-table-column label="操作系统" show-overflow-tooltip align="center" prop="os" />
@@ -197,7 +197,10 @@ export default defineComponent({
 
     // 导出日志
     const onRowExport = () => {
-      api.log.export(state.tableData.param).then((res: any) => downloadFile(res))
+      api.log.export({
+        ...state.tableData.param,
+        // pageSize: state.tableData.total
+      }).then((res: any) => downloadFile(res))
     };
 
 

src/views/system/monitor/operLog/index.vue

@@ -21,7 +21,7 @@
           </el-form-item>
 
           <el-form-item label="状态" prop="status">
-            <el-select v-model="tableData.param.status" placeholder="请选择状态" clearable size="default" style="width: 180px">
+            <el-select v-model="tableData.param.status" placeholder="请选择状态" size="default" style="width: 180px">
               <el-option label="全部" :value="-1" />
               <el-option label="正常" :value="0" />
               <el-option label="停用" :value="1" />