服务新增、编辑修改

src/views/systemSettings/views/serviceManagement/serviceEdit.vue

@@ -1,6 +1,6 @@
 <!--
  * @Date: 2022-03-24 09:55:13
- * @LastEditTime: 2022-06-30 16:35:44
+ * @LastEditTime: 2022-08-09 17:22:52
  * @LastEditors: your name
  * @Description: 服务管理-编辑服务
  * have a nice day!
@@ -53,29 +53,29 @@
                 </el-form-item> -->
               </el-col>
               <el-col :span="6">
-                <el-form-item label="生命周期ID键名" prop="lifeCycleCol" label-width="114px">
-                  <el-input v-model="serviceForm.lifeCycleCol" placeholder="请输入生命周期ID键名" clearable />
+                <el-form-item label="数据来源对象" prop="sourceObjectName" label-width="100px">
+                  <el-input v-model="serviceForm.sourceObjectName" placeholder="请输入数据来源对象名称" clearable />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="12">
                 <el-form-item label="服务描述" prop="serviceDescribe">
                   <el-input v-model="serviceForm.serviceDescribe" placeholder="请输入描述" clearable />
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
+              <!-- <el-col :span="4">
                 <el-form-item label="采集线程" prop="threads">
                   <el-input v-model="serviceForm.threads" type="number" placeholder="请输入采集线程数" clearable />
                 </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="是否异步" prop="isAsynchronous">
+              </el-col> -->
+              <el-col :span="4">
+                <el-form-item label-width="0" prop="isAsynchronous">
                   <el-radio-group v-model="serviceForm.isAsynchronous">
-                    <el-radio :label="0">是</el-radio>
-                    <el-radio :label="1">否</el-radio>
+                    <el-radio :label="1">同步</el-radio>
+                    <el-radio :label="0">异步</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <!-- <el-col :span="6">
                 <el-form-item label="数据类型" prop="datatype">
                   <el-select v-model="serviceForm.datatype" clearable>
                     <el-option label="JSON" :value="1" />
@@ -83,15 +83,20 @@
                     <el-option label="自定义" :value="3" />
                   </el-select>
                 </el-form-item>
+              </el-col> -->
+              <el-col :span="8">
+                <el-form-item label="生命周期ID键名" prop="lifeCycleCol" label-width="114px">
+                  <el-input v-model="serviceForm.lifeCycleCol" placeholder="请输入生命周期ID键名" clearable />
+                </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="取值规则" prop="computingMethod">
-                  <el-input v-model="serviceForm.computingMethod" placeholder="请输入取值规则" type="textarea" :autosize="{ minRows: 4, maxRows: 4 }" resize="none" clearable />
+                  <el-input v-model="serviceForm.computingMethod" placeholder="请输入取值规则" type="textarea" :autosize="{ minRows: 3, maxRows: 3 }" resize="none" clearable />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="检测规则" prop="validationExpression">
-                  <el-input v-model="serviceForm.validationExpression" placeholder="请输入检测规则" type="textarea" :autosize="{ minRows: 4, maxRows: 4 }" resize="none" clearable />
+                  <el-input v-model="serviceForm.validationExpression" placeholder="请输入检测规则" type="textarea" :autosize="{ minRows: 3, maxRows: 3 }" resize="none" clearable />
                 </el-form-item>
               </el-col>
               <el-col :span="4">
@@ -130,6 +135,18 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="4">
+                <el-form-item label="日志存储位置" label-width="100px" prop="logDataSourceID">
+                  <el-select v-model="serviceForm.logDataSourceID">
+                    <el-option v-for="dataSource in dataSourceList" :key="dataSource.dataSourceID" :value="dataSource.dataSourceID" :label="dataSource.dataSourceName" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="日志过滤条件" label-width="100px" prop="logList">
+                  <el-input v-model="serviceForm.logList" placeholder="请输入日志过滤条件" clearable />
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </main>
@@ -214,12 +231,13 @@ export default {
         serviceName: '',
         serviceOutputID: null,
         serviceType: null,
-        dataSourceID: null,
+        sourceObjectName: '',
         lifeCycleCol: '',
         serviceDescribe: '',
         threads: null,
         isAsynchronous: 1,
         datatype: null,
+        dataSourceID: null,
         computingMethod: '',
         validationExpression: '',
         startTime: null,
@@ -227,7 +245,9 @@ export default {
         retryCount: null,
         loopCount: null,
         frequencyCount: null,
-        frequencyUnit: null
+        frequencyUnit: null,
+        logDataSourceID: null,
+        logList: '',
       },
       computedTableHeight: '200px',
       targetList: [],

src/views/systemSettings/views/serviceManagement/serviceHome.vue

@@ -1,6 +1,6 @@
 <!--
  * @Date: 2022-04-12 17:49:47
- * @LastEditTime: 2022-06-30 16:36:09
+ * @LastEditTime: 2022-08-09 17:33:20
  * @LastEditors: your name
  * @Description: 服务管理-首页
  * have a nice day!
@@ -47,10 +47,10 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="是否异步" label-width="114px">
+                  <el-form-item label-width="14px">
                     <el-radio-group v-model="serviceForm.isAsynchronous">
-                      <el-radio :label="0">是</el-radio>
-                      <el-radio :label="1">否</el-radio>
+                      <el-radio :label="1">同步</el-radio>
+                      <el-radio :label="0">异步</el-radio>
                     </el-radio-group>
                   </el-form-item>
                 </el-col>
@@ -64,12 +64,22 @@
                     <el-button style="height: 28px; line-height: 0px" size="small" @click="addService" type="primary">新增</el-button>
                   </div>
                 </el-col>
+                <el-col :span="12">
+                  <el-form-item label="数据来源对象" label-width="114px" prop="sourceObjectName">
+                    <el-input v-model="serviceForm.sourceObjectName" placeholder="请输入数据来源对象名称" clearable />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="服务描述" prop="serviceDescribe">
+                    <el-input v-model="serviceForm.serviceDescribe" placeholder="请输入描述" clearable />
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item label="生命周期ID键名" prop="lifeCycleCol" label-width="114px">
                     <el-input v-model="serviceForm.lifeCycleCol" placeholder="请输入生命周期ID键名" clearable />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <!-- <el-col :span="12">
                   <el-form-item label="采集线程" prop="threads">
                     <el-input v-model="serviceForm.threads" type="number" placeholder="请输入采集线程数" clearable />
                   </el-form-item>
@@ -82,7 +92,7 @@
                       <el-option label="自定义" :value="3" />
                     </el-select>
                   </el-form-item>
-                </el-col>
+                </el-col> -->
                 <el-col :span="24">
                   <el-form-item label="取值规则" prop="computingMethod">
                     <el-input v-model="serviceForm.computingMethod" placeholder="请输入取值规则" type="textarea" :autosize="{ minRows: 4, maxRows: 4 }" resize="none" clearable />
@@ -129,9 +139,16 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="24">
-                  <el-form-item label="服务描述" prop="serviceDescribe">
-                    <el-input v-model="serviceForm.serviceDescribe" placeholder="请输入描述" type="textarea" :autosize="{ minRows: 4, maxRows: 4 }" resize="none" clearable />
+                <el-col :span="12">
+                  <el-form-item label="日志存储位置" label-width="100px" prop="logDataSourceID">
+                    <el-select v-model="serviceForm.logDataSourceID">
+                      <el-option v-for="dataSource in dataSourceList" :key="dataSource.dataSourceID" :value="dataSource.dataSourceID" :label="dataSource.dataSourceName" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="日志过滤条件" label-width="100px" prop="logList">
+                    <el-input v-model="serviceForm.logList" placeholder="请输入日志过滤条件" clearable />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -193,6 +210,7 @@ export default {
         serviceOutputID: null,
         serviceType: null,
         dataSourceID: null,
+        sourceObjectName: '',
         lifeCycleCol: "",
         isAsynchronous: 1,
         threads: null,
@@ -206,6 +224,8 @@ export default {
         frequencyCount: null,
         frequencyUnit: null,
         serviceDescribe: "",
+        logDataSourceID: null,
+        logList: '',
       },
       serviceFormRules: {
         serviceName: [
@@ -417,7 +437,7 @@ export default {
         flex-wrap: wrap;
         > .el-row {
           flex-wrap: wrap;
-          > .el-col > .el-form-item {
+          > .el-col .el-form-item {
             margin-bottom: 20px;
             .el-form-item__label {
               padding-right: 16px;