Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

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

@@ -15,11 +15,11 @@
       <div class="wu-box">
         <div class="system-user-search mb15">
           <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="130px">
-            <el-form-item label="字段标题" prop="key">
-              <el-input v-model="tableData.param.key" placeholder="请输入字段标题" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
+            <el-form-item label="字段标题" prop="name">
+              <el-input v-model="tableData.param.name" placeholder="请输入字段标题" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
             </el-form-item>
-            <el-form-item label="字段名称" prop="name">
-              <el-input v-model="tableData.param.name" placeholder="请输入字段名称" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
+            <el-form-item label="字段名称" prop="key">
+              <el-input v-model="tableData.param.key" placeholder="请输入字段名称" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
             </el-form-item>
 
             <el-form-item>

src/views/system/manage/blacklist/component/editPro.vue

@@ -24,7 +24,7 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="onCancel" size="default">取 消</el-button>
-          <el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+          <el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id ? '修 改' : '添 加' }}</el-button>
         </span>
       </template>
     </el-dialog>

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

@@ -98,7 +98,7 @@
 
     <el-dialog :title="currentRow.title + '详情'" v-model="dialogVisible" width="550px">
       <el-form :model="currentRow" ref="formRef" size="default" label-width="90px">
-        <el-form-item label="模块标题" prop="title">
+        <el-form-item label="系统模块" prop="title">
           {{ currentRow.title }}
         </el-form-item>
         <el-form-item label="请求方式" prop="title">