fix: 修改多个页面的显示bug及优化

src/api/datahub/index.ts

@@ -40,7 +40,7 @@ export default {
       add: (data: object) => post('/source/template/add', data),
       delete: (ids: number) => del('/source/template/del', { ids }),
       edit: (data: object) => put('/source/template/edit', data),
-      detail: (id: number) => get('/source/template/detail', { id }),
+      detail: (id: string) => get('/source/template/detail', { id }),
       allList: (params: object) => get('/source/template/list', params), // 获取所有已发布列表
       getdata: (params: object) => get('/source/template/getdata',  params ),
       getDictData: (params: object) => get('/common/dict/data/getDictData',  params ),

src/theme/mixins/index.scss

@@ -6,6 +6,7 @@
 	vertical-align: middle;
 	margin-right: 5px;
 	width: 24px;
+	min-width: 24px;
 	text-align: center;
 }
 

src/views/system/datahub/modeling/component/detail.vue

@@ -18,7 +18,7 @@
 			</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">
+				<el-table-column v-for="(item, index) in jData" :key="item" :label="item" :prop="item" show-overflow-tooltip align="center" min-width="130">
 					<template #header>
 						<div>
 							{{ item }}

src/views/system/datahub/modeling/component/edit.vue

@@ -3,10 +3,10 @@
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '模型'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
 				<el-form-item label="模型标识" prop="key">
-					<el-input v-model="ruleForm.key" placeholder="请输入模型名称" :disabled="ruleForm.id" />
+					<el-input v-model.trim="ruleForm.key" placeholder="请输入模型名称" :disabled="ruleForm.id" />
 				</el-form-item>
 				<el-form-item label="模型名称" prop="name">
-					<el-input v-model="ruleForm.name" placeholder="请输入模型名称" />
+					<el-input v-model.trim="ruleForm.name" placeholder="请输入模型名称" />
 				</el-form-item>
 
 				<el-form-item label="模型类型" prop="type">
@@ -14,8 +14,7 @@
 						<el-option v-for="item in datahub_model_type" :key="item.value" :label="item.label" :value="item.value" />
 					</el-select>
 				</el-form-item>
-				<el-form-item label="定时请求">
-
+				<el-form-item label="定时请求" prop="cronExpression">
 					<div style="display:flex">
 						<el-input v-model="ruleForm.cronExpression" placeholder="请输入cron表达式" />
 						<el-button type="success" @click="showCron('ruleForm')" style="margin-left: 5px;">设置</el-button>
@@ -111,6 +110,7 @@ export default defineComponent({
 				key: [{ required: true, message: '模型标识不能为空', trigger: 'blur' }],
 				name: [{ required: true, message: '模型名称不能为空', trigger: 'blur' }],
 				type: [{ required: true, message: '模型类型不能为空', trigger: 'blur' }],
+				cronExpression: [{ required: true, message: '定时请求不能为空', trigger: 'blur' }],
 				interval: [{ required: true, message: '请输入更新时间', trigger: 'blur' }],
 			},
 		});

src/views/system/datahub/modeling/component/editNode.vue

@@ -36,10 +36,6 @@
 					<el-input v-model="ruleForm.name" placeholder="请输入字段节点名称" />
 				</el-form-item>
 
-
-
-
-
 				<el-form-item label="数据类型" prop="dataType">
 					<el-select v-model="ruleForm.dataType" filterable placeholder="请选择数据类型">
 						<el-option v-for="item in tabData" :key="item.value" :label="item.label" :value="item.value" />
@@ -79,7 +75,7 @@
 					</el-radio-group>
 				</el-form-item>
 
-				<el-form-item label="描述" prop="desc">
+				<el-form-item label="备注说明" prop="desc">
 					<el-input v-model="ruleForm.desc" type="textarea" placeholder="请输入内容"></el-input>
 				</el-form-item>
 			</el-form>
@@ -191,7 +187,7 @@ export default defineComponent({
 			rules: {
 				key: [{ required: true, message: '字段节点标识不能为空', trigger: 'blur' }],
 				name: [{ required: true, message: '字段节点名称不能为空', trigger: 'blur' }],
-				dataType: [{ required: true, message: '字段节点类型不能为空', trigger: 'blur' }],
+				dataType: [{ required: true, message: '数据类型不能为空', trigger: 'blur' }],
 				value: [{ required: true, message: '字段节点取值项不能为空', trigger: 'blur' }],
 				method: [{ required: true, message: '请选择取值方式', trigger: 'blur' }],
 				isSorting: [{ required: true, message: '请选择是否参与排序', trigger: 'blur' }],

src/views/system/datahub/modeling/detail.vue

@@ -29,7 +29,7 @@
                 </el-icon>
                 查询
               </el-button>
-              <el-button size="default" @click="resetQuery(queryRef)">
+              <el-button size="default" @click="resetQuery()">
                 <el-icon>
                   <ele-Refresh />
                 </el-icon>
@@ -63,7 +63,7 @@
             </template>
           </el-table-column>
           <el-table-column label="默认值" prop="default" width="80" :show-overflow-tooltip="true" v-col="'default'" />
-          <el-table-column label="备注说明" prop="value" width="100" :show-overflow-tooltip="true" v-col="'value'" />
+          <el-table-column label="备注说明" prop="desc" width="100" :show-overflow-tooltip="true" v-col="'value'" />
           <el-table-column prop="createdAt" label="创建时间" align="center" width="160" v-col="'createdAt'"></el-table-column>
 
           <el-table-column label="操作" width="100" align="center" fixed="right">
@@ -95,22 +95,6 @@ import EditDic from './component/editNode.vue';
 import RelationDic from './component/relation.vue';
 import api from '/@/api/datahub';
 
-interface TableDataState {
-  ids: number[];
-  tableData: {
-    data: [];
-    total: number;
-    loading: boolean;
-    param: {
-      pageNum: number;
-      pageSize: number;
-      name: string;
-      deviceType: string;
-      status: string;
-      dateRange: string[];
-    };
-  };
-}
 export default defineComponent({
   name: 'dataDetail',
   components: { EditDic, RelationDic },
@@ -118,13 +102,9 @@ export default defineComponent({
     const editDicRef = ref();
     const relationRef = ref();
     const route = useRoute();
-    const state = reactive<TableDataState>({
-      config: {},
-
-      isShowDialog: false,
+    const state = reactive<any>({
       detail: [],
       developer_status: 0,
-
       tableData: {
         data: [],
         total: 0,
@@ -132,15 +112,16 @@ export default defineComponent({
         param: {
           pageNum: 1,
           pageSize: 10,
-          tid: route.params && route.params.id,
+          tid: route.params.id as string,
           status: '',
-          dateRange: [],
+          key: '',
+          name: '',
         },
       },
     });
 
     onMounted(() => {
-      const ids = route.params && route.params.id;
+      const ids = route.params?.id as string;
       api.template.detail(ids).then((res: any) => {
         state.detail = res.data;
         state.developer_status = res.data.status
@@ -157,6 +138,12 @@ export default defineComponent({
       }).finally(() => (state.tableData.loading = false));
     };
 
+    const resetQuery = () => {
+      state.tableData.param.key = ''
+      state.tableData.param.name = ''
+      typeList();
+    };
+
     const handleClick = (tab: TabsPaneContext, event: Event) => {
     };
 
@@ -226,6 +213,7 @@ export default defineComponent({
       relationRef,
       editDicRef,
       onOpenAdd,
+      resetQuery,
       typeList,
       onRowDel,
       onOpenEdit,

src/views/system/datahub/modeling/index.vue

@@ -78,7 +78,7 @@
 						<el-button size="small" text type="success" @click="onOpenRecord(scope.row)" v-if="scope.row.status == 1" v-auth="'record'"
 							>数据记录</el-button
 						>
-						<el-button size="small" text type="info" @click="onOpenJuhe(scope.row)" v-auth="'juhe'">聚合设置</el-button>
+						<el-button size="small" text type="info" :disabled="scope.row.status" @click="onOpenJuhe(scope.row)" v-auth="'juhe'">聚合设置</el-button>
 						<el-button size="small" text type="warning" @click="onOpenEdit(scope.row)" v-if="scope.row.status == 0" v-auth="'edit'">修改</el-button>
 						<el-button size="small" text type="info" @click="onRowDel(scope.row)" v-if="scope.row.status == 0" v-auth="'del'">删除</el-button>
 						<el-button size="small" text type="primary" @click="copy(scope.row)" v-auth="'copy'">复制</el-button>

src/views/system/datahub/source/component/edit.vue

@@ -57,7 +57,7 @@
 										<el-option v-for="item in paramData" :key="item.value" :label="item.label" :value="item.value" />
 									</el-select>
 									<el-input v-model="aaa.name" placeholder="请输入参数标题" style="width: 320px" />
-									<el-input v-model="aaa.key" placeholder="请输入参数名" style="width: 320px" />
+									<el-input v-model="aaa.key" placeholder="请输入参标识" style="width: 320px" />
 									<el-input v-model="aaa.value" placeholder="请输入参数值" style="width: 320px" />
 									<div class="conicon">
 										<el-icon @click="delParamss(index, bbb)">

src/views/system/menu/component/editMenu.vue

@@ -54,7 +54,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="链接地址">
-							<el-input v-model="ruleForm.linkUrl" placeholder="外链/内嵌时链接地址（http:xxx.com）" clearable :disabled="ruleForm.isLink === 0">
+							<el-input v-model="ruleForm.linkUrl" placeholder="外链/内嵌时链接地址（http://xxx.com）" clearable :disabled="ruleForm.isLink === 0">
 							</el-input>
 						</el-form-item>
 					</el-col>