Эх сурвалжийг харах

fix: 修复bug列表中5个bug

yanglzh 1 жил өмнө
parent
commit
98b2d7356e

+ 5 - 1
README rule.md

@@ -1,3 +1,7 @@
 # 前端开发规范
 # 前端开发规范
 
 
-1. rules校验用change不用blur
+1. rules 校验用 change 不用 blur
+2. upload 重新选择文件不生效
+3. setup
+4. 页面撑满
+5. 表格高度

+ 2 - 2
src/views/iot/ota-update/module/component/edit.vue

@@ -11,10 +11,10 @@
 					<el-input v-model="ruleForm.name" placeholder="请输入模块名称" />
 					<el-input v-model="ruleForm.name" placeholder="请输入模块名称" />
 				</el-form-item>
 				</el-form-item>
 				<el-form-item label="模块别名" prop="nameAs">
 				<el-form-item label="模块别名" prop="nameAs">
-					<el-input v-model="ruleForm.nameAs" placeholder="请输入模块别名" />
+					<el-input v-model.trim="ruleForm.nameAs" placeholder="请输入模块别名" />
 				</el-form-item>
 				</el-form-item>
 				<el-form-item label="模块描述" prop="describe">
 				<el-form-item label="模块描述" prop="describe">
-					<el-input v-model="ruleForm.describe" type="textarea" placeholder="请输入内容" />
+					<el-input v-model.trim="ruleForm.describe" type="textarea" placeholder="请输入内容" />
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>

+ 1 - 1
src/views/iot/ota-update/update/component/batch.vue

@@ -138,7 +138,7 @@ export default defineComponent({
     const initTableData = () => {
     const initTableData = () => {
       batchList();
       batchList();
     };
     };
-    const getList = (pageNum: number) => {
+    const getList = (pageNum?: number) => {
       typeof pageNum === 'number' && (state.tableData.param.pageNum = pageNum)
       typeof pageNum === 'number' && (state.tableData.param.pageNum = pageNum)
       state.tableData.loading = true;
       state.tableData.loading = true;
       state.tableData.param.devOtaFirewareId = props.detail.id;
       state.tableData.param.devOtaFirewareId = props.detail.id;

+ 1 - 1
src/views/iot/ota-update/update/component/device.vue

@@ -3,7 +3,7 @@
 		<div class="search">
 		<div class="search">
 			<el-form :inline="true" ref="queryRef">
 			<el-form :inline="true" ref="queryRef">
 				<el-form-item label="设备名称:" prop="name">
 				<el-form-item label="设备名称:" prop="name">
-					<el-input v-model="params.keyWord" placeholder="请输入产品名称" clearable size="default" style="width: 240px" @submit.prevent />
+					<el-input v-model="params.keyWord" placeholder="请输入设备名称" clearable size="default" style="width: 240px" @submit.prevent />
 				</el-form-item>
 				</el-form-item>
 
 
 				<el-form-item>
 				<el-form-item>

+ 7 - 4
src/views/iot/ota-update/update/component/edit.vue

@@ -20,7 +20,7 @@
         </el-form-item>
         </el-form-item>
 
 
         <el-form-item label="升级包模块" prop="module">
         <el-form-item label="升级包模块" prop="module">
-          <el-select v-model="ruleForm.module" placeholder="请选择产品">
+          <el-select v-model="ruleForm.module" placeholder="请选择升级包模块">
             <el-option v-for="item in moduleData" :key="item.id" :label="item.name" :value="item.id.toString()" />
             <el-option v-for="item in moduleData" :key="item.id" :label="item.name" :value="item.id.toString()" />
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
@@ -44,7 +44,7 @@
         </el-form-item>
         </el-form-item>
 
 
         <el-form-item label="选择升级包" prop="url">
         <el-form-item label="选择升级包" prop="url">
-          <el-upload :accept="['.doc', '.docx', '.zip', '.xls', '.xlsx', '.rar', '.jpg', '.jpeg', '.gif', '.npm', '.png', '.cert']" :show-file-list="false" :limit="1" :headers="headers" :action="uploadUrl" :on-success="updateImg">
+          <el-upload :file-list="fileList" :accept="['.doc', '.docx', '.zip', '.xls', '.xlsx', '.rar', '.jpg', '.jpeg', '.gif', '.npm', '.png', '.cert']" :show-file-list="false" :limit="1" :headers="headers" :action="uploadUrl" :on-success="updateImg">
             <el-button type="Default">上传升级包</el-button>
             <el-button type="Default">上传升级包</el-button>
           </el-upload>
           </el-upload>
           <div v-if="ruleForm.urlName" style="color: green;margin-left: 10px;">{{ ruleForm.urlName }},上传成功</div>
           <div v-if="ruleForm.urlName" style="color: green;margin-left: 10px;">{{ ruleForm.urlName }},上传成功</div>
@@ -53,8 +53,8 @@
 
 
         <el-form-item label="升级包是否验证" prop="check">
         <el-form-item label="升级包是否验证" prop="check">
           <el-radio-group v-model="ruleForm.check">
           <el-radio-group v-model="ruleForm.check">
-            <el-radio :label="1">是</el-radio>
-            <el-radio :label="2">否</el-radio>
+            <el-radio label="1">是</el-radio>
+            <el-radio label="2">否</el-radio>
           </el-radio-group>
           </el-radio-group>
         </el-form-item>
         </el-form-item>
 
 
@@ -123,6 +123,7 @@ export default defineComponent({
         value: 'SHA256',
         value: 'SHA256',
       },
       },
     ]);
     ]);
+    const fileList = ref([]);
     const urlName = ref();
     const urlName = ref();
     const state = reactive<UpdateState>({
     const state = reactive<UpdateState>({
       isShowDialog: false,
       isShowDialog: false,
@@ -197,6 +198,7 @@ export default defineComponent({
       if (res.code === 0) {
       if (res.code === 0) {
         state.ruleForm.url = res.data.full_path
         state.ruleForm.url = res.data.full_path
         state.ruleForm.urlName = res.data.name
         state.ruleForm.urlName = res.data.name
+        fileList.value = []
         ElMessage.success('上传成功');
         ElMessage.success('上传成功');
       } else {
       } else {
         ElMessage.error(res.message);
         ElMessage.error(res.message);
@@ -253,6 +255,7 @@ export default defineComponent({
       areType,
       areType,
       headers,
       headers,
       uploadUrl,
       uploadUrl,
+      fileList,
       urlName,
       urlName,
       updateImg,
       updateImg,
       ...toRefs(state),
       ...toRefs(state),

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

@@ -164,7 +164,7 @@ export default defineComponent({
 
 
     // };
     // };
     const toDetail = (id: number) => {
     const toDetail = (id: number) => {
-      router.push(`/iotmanager/ota/update/detail/${id}`)
+      router.push(`/iotmanager/operation/ota/update/detail/${id}`)
     };
     };
     // 删除模块
     // 删除模块
     const onRowDel = (row?: TableDataRow) => {
     const onRowDel = (row?: TableDataRow) => {