修改

public/config.js

@@ -2,6 +2,7 @@ window.SERVICE_ID = {
   sysMenuId: 1, //权限菜单
   sysAllMenuId: 3, //获取全部权限
   getUserTableId: 9, //根据账号组获取账号
+  getJqId: 10023, //获取机器维护列表
   getTableColumnId: 18122, //获取表头
   authTreeId: 18126, //获取表头
 };

src/layout/mixin/getPublicData.js

@@ -39,14 +39,14 @@ export default {
       }
     },
     //增/删/改
-    async generalDataReception (id, data, event) {
+    async generalDataReception (id, data, event, type) {
       try {
         const params = {
           serviceId: id,
           dataContent: data,
           event: `${event}`,
         };
-        const { code } =
+        const { code, returnData } =
           event == 1
             ? await newData(params)
             : event == 2
@@ -54,7 +54,11 @@ export default {
               : await moveData(params);
         if (code == 0) {
           this.$message.success("操作成功");
-          return 1
+          if (type) {
+            return returnData
+          } else {
+            return 1
+          }
         } else {
           this.$message.error("操作失败");
           return 0

src/views/systemSettings/views/newAuth/components/table.vue

@@ -28,7 +28,7 @@
     <div class="table-yl box-public-shadow-mini">
       <div class="table-yl-head flex">
         <div class="title">列设置</div>
-        <!-- <el-button @click="restData" type="primary" size="small" class="rmScs">初始化</el-button> -->
+        <el-button @click="restData" type="primary" size="small" class="rmScs">初始化</el-button>
       </div>
       <div class="table-yl-content">
         <el-table :data="tableData" stripe border height="100%" style="width: 100%">
@@ -211,7 +211,9 @@ export default {
       tableData: [],
       authArrs: [],
       tableFlag: false,
-      allData: []
+      allData: [],
+      addAuthId: '',
+      editAuthId: ''
     }
   },
   watch: {
@@ -219,6 +221,7 @@ export default {
       handler (val) {
         if (val == 'add') {
           this.clearForm()
+          this.tableData = []
         }
       },
       immediate: true
@@ -229,8 +232,20 @@ export default {
           obj.serviceID = obj.queryTemplateID
           // this.getTable(obj.queryTemplateID)
         }
+        if (this.authType == 'add' && obj.auth_id) {
+          this.addAuthId = obj.auth_id
+        } else if (this.authType == 'edit' && obj.auth_id) {
+          this.editAuthId = obj.auth_id
+        }
+        if (this.addAuthId && this.editAuthId) {
+          if (this.addAuthId != this.editAuthId) {
+            this.tableData = []
+          }
+        } else {
+          this.tableData = []
+        }
         this.form = obj
-        this.restData()
+        // this.restData()
       },
       immediate: true
     },
@@ -283,11 +298,15 @@ export default {
       this.tableForm = row
     },
     async restData () {
-      const { code, returnData } = await initColumnSet({ auth_id: this.form.auth_id })
-      if (code && returnData && returnData.length) {
-        this.tableData = returnData
+      if (this.form.auth_id) {
+        const { code, returnData } = await initColumnSet({ auth_id: this.form.auth_id })
+        if (code && returnData && returnData.length) {
+          this.tableData = returnData
+        } else {
+          this.tableData = []
+        }
       } else {
-        this.tableData = []
+        this.$message.error('请添加数据保存后再操作')
       }
     }
   }

src/views/systemSettings/views/newAuth/index.vue

@@ -24,7 +24,7 @@
           </el-scrollbar>
         </div>
       </div>
-      <div :style="form.auth_type == 4 ? 'height:50%':''" class="newAuth-content-right box-public-shadow-mini flex1">
+      <div :style="componentName == 'Table' ? 'height:50%':''" class="newAuth-content-right box-public-shadow-mini flex1">
         <div class="newAuth-content-right-head flex">
           <div class="title">权限信息维护</div>
           <el-button type="primary" @click="handleSave" size="small">保存</el-button>
@@ -183,8 +183,7 @@ export default {
     },
     //树删除-确定
     async tableRemove () {
-      let code = null
-      code = await this.generalDataReception(this.queryId, this.rmObj, 3)
+      const code = await this.generalDataReception(this.queryId, this.rmObj, 3)
       if (code) {
         this.setTreeData()
         this.rmObj = {}
@@ -213,21 +212,19 @@ export default {
             }
           }
           if (this.dataType == 'add') {
-            // if (data.auth_id || data.auth_id == '' || data.app_id || data.app_id == '') {
-            //   delete data.auth_id
-            //   delete data.app_id
-            // }
-            code = await this.generalDataReception(this.queryId, data, 1)
+            const res = await this.generalDataReception(this.queryId, data, 1, true)
+            if (res && res.length) {
+              const { auth_id, Value } = res[0]
+              Value.auth_id = auth_id
+              this.authObj = Value
+            }
           } else {
             code = await this.generalDataReception(this.queryId, data, 2)
           }
-          if (code) {
-            if (this.dataType == 'add') {
-              this.authObj = {}
-              this.clearForm()
-            }
-            this.setTreeData()
-          }
+          // if (this.dataType == 'add') {
+          //   this.clearForm()
+          // }
+          this.setTreeData()
         } else {
           return false
         }

src/views/systemSettings/views/newService/index.vue

@@ -76,14 +76,16 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="机器ID">
-                <el-input clearable v-model="formInline.workId" :disabled="activeIndex == null" size="small" placeholder="请输入机器ID"></el-input>
+                <el-select :disabled="activeIndex == null" clearable size="small" v-model="formInline.workId" placeholder="请选择机器ID">
+                  <el-option v-for="(item,index) in jqList" :key="index" :label="item.deployNodeName" :value="`${item.deployNodeID}`"></el-option>
+                </el-select>
               </el-form-item>
             </el-form>
           </div>
           <div v-if="formInline.serviceType == 4" class="cj-form">
             <div class="title">采集配置</div>
             <el-form class="flex" style="flex-wrap: wrap;justify-content: flex-start;" :inline="true" :model="formInline">
-              <el-form-item label="采集类型" style="margin-left: 50px;">
+              <el-form-item label="采集类型">
                 <el-select clearable size="small" style="width: 175px;" v-model="formInline.taskType" placeholder="请选择采集类型">
                   <el-option label="CRON表达式" :value="0"></el-option>
                   <el-option label="轮询方式" :value="1"></el-option>
@@ -97,7 +99,12 @@
                   <el-input clearable style="width:170px" v-model="formInline.frequencyCount" size="small" placeholder="请输入采集频率"></el-input>
                 </el-form-item>
                 <el-form-item label="频率单位" style="margin-left: 50px;">
-                  <el-input clearable style="width:170px" v-model="formInline.frequencyUnit" size="small" placeholder="请输入频率单位"></el-input>
+                  <el-select clearable size="small" style="width: 175px;" v-model="formInline.frequencyUnit" placeholder="请选择频率单位">
+                    <el-option label="毫秒" :value="1"></el-option>
+                    <el-option label="秒" :value="1000"></el-option>
+                    <el-option label="分钟" :value="60000"></el-option>
+                    <el-option label="小时" :value="3600000"></el-option>
+                  </el-select>
                 </el-form-item>
               </template>
               <template v-else-if="formInline.taskType == 0">
@@ -105,16 +112,16 @@
                   <el-input clearable style="width:300px" v-model="formInline.cronExpress" size="small" placeholder="请输入CRON表达式"></el-input>
                 </el-form-item>
               </template>
-              <el-form-item label="有效时间" prop="startTime" style="margin-left: 50px;">
+              <el-form-item label="有效时间" prop="startTime" :style="formInline.taskType ? 'margin-left: 0px':'50px'">
                 <el-date-picker size="small" style="width: 175px;" v-model="formInline.taskValid" type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="有效时间" />
               </el-form-item>
-              <el-form-item label="失效时间" prop="stopTime" style="margin-left: 50px;">
+              <el-form-item label="失效时间" prop="stopTime" :style="formInline.taskType ? 'margin-left: 50px':'50px'">
                 <el-date-picker size="small" style="width: 175px;" v-model="formInline.taskInvalid" type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="有效时间" />
               </el-form-item>
             </el-form>
           </div>
         </div>
-        <div :style="formInline.serviceType != 4 ? 'height: calc(100% - 180px);':'height: calc(100% - 260px);'" class="newService-content-right-bottom">
+        <div :style="formInline.serviceType != 4 ? 'height: calc(100% - 180px);':'height: calc(100% - 305px);'" class="newService-content-right-bottom">
           <Table :dataId="dataId" :dataContent="msgContent" width="860px" tableHeight="calc(100% - 30px)" dataTitle="算法配置" />
         </div>
       </div>
@@ -167,7 +174,8 @@ export default {
       noMore: false,
       loading: false,
       dataId: 8,
-      msgContent: {}
+      msgContent: {},
+      jqList: []
     }
   },
   computed: {
@@ -180,6 +188,7 @@ export default {
     this.title = title
     this.queryId = qid
     this.getQuery(qid)
+    this.getMsgList(SERVICE_ID.getJqId)
   },
   updated () {
     this.scrollDown()
@@ -220,6 +229,21 @@ export default {
         this.loading = false;
       }
     },
+    async getMsgList (id) {
+      try {
+        const { code, returnData } = await Query({
+          serviceId: id,
+          page: 1,
+          pageSize: 99,
+          dataContent: {},
+        })
+        if (code == 0) {
+          this.jqList = returnData
+        }
+      } catch (error) {
+        this.jqList = []
+      }
+    },
     load () {
       if (!this.noMore) {
         this.getQuery(this.queryId);