增肌应用指定机器人

src/api/business/ctApplyPlanLog.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+
+// 查询所有
+export function listCtApplyPlanLogAll(query) {
+  return request({
+    url: '/business/ctApplyPlanLog/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询应用执行结果记录管理列表
+export function listCtApplyPlanLog(query) {
+  return request({
+    url: '/business/ctApplyPlanLog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询应用执行结果记录管理详细
+export function getCtApplyPlanLog(id) {
+  return request({
+    url: '/business/ctApplyPlanLog/' + id,
+    method: 'get'
+  })
+}
+
+// 新增应用执行结果记录管理
+export function addCtApplyPlanLog(data) {
+  return request({
+    url: '/business/ctApplyPlanLog',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改应用执行结果记录管理
+export function updateCtApplyPlanLog(data) {
+  return request({
+    url: '/business/ctApplyPlanLog',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除应用执行结果记录管理
+export function delCtApplyPlanLog(id) {
+  return request({
+    url: '/business/ctApplyPlanLog/' + id,
+    method: 'delete'
+  })
+}

src/api/business/ctApplyRebot.js

@@ -0,0 +1,65 @@
+import request from '@/utils/request'
+
+
+
+
+// 查询所有应用机器人绑定列表
+export function updateApplyRebot(data) {
+  return request({
+    url: '/business/ctApplyRebot/updateApplyRebot',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询所有应用机器人绑定列表
+export function listApplyAll(query) {
+  return request({
+    url: '/business/ctApplyRebot/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询应用信息管理列表
+export function listCtApply(query) {
+  return request({
+    url: '/business/ctApply/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询应用信息管理详细
+export function getCtApply(id) {
+  return request({
+    url: '/business/ctApply/' + id,
+    method: 'get'
+  })
+}
+
+// 新增应用信息管理
+export function addCtApply(data) {
+  return request({
+    url: '/business/ctApply',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改应用信息管理
+export function updateCtApply(data) {
+  return request({
+    url: '/business/ctApply',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除应用信息管理
+export function delCtApply(id) {
+  return request({
+    url: '/business/ctApply/' + id,
+    method: 'delete'
+  })
+}

src/api/business/ctRebot.js

@@ -9,6 +9,14 @@ export function syn() {
   })
 }
 
+// 查询所有机器人
+export function listRebotSelectAll(query) {
+  return request({
+    url: '/business/ctRebot/listRebotAll',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询所有可用机器人
 export function listRebotAll(query) {

src/components/FileUpload/index.vue

@@ -55,7 +55,7 @@ export default {
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 50,
+      default: 200,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {

src/views/business/ctApply/index.vue

@@ -110,8 +110,10 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" width="100" />
-      <el-table-column label="操作" align="center" width="200" fixed="right" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="300" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button v-if="scope.row.version != '未发版'" size="mini" type="text" icon="el-icon-edit"
+            @click="showConfigRebot(scope.row)" v-hasPermi="['business:ctApply:configRebot']">设置可执行的机器人</el-button>
           <el-button v-if="scope.row.version != '未发版'" size="mini" type="text" icon="el-icon-edit"
             @click="showConfigTime(scope.row)" v-hasPermi="['business:ctApply:configTime']">设置人工用时</el-button>
         </template>
@@ -188,17 +190,38 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 设置可执行机器人 -->
+    <el-dialog title="配置可执行的机器人" :visible.sync="showConfigRebotVisible" width="400px" append-to-body>
+      <el-form ref="applyRebot" :model="applyRebot" :rules="rules" label-width="120px">
+        <span style="color:red">绑定后其他机器人即使空闲也将不会执行该应用，请慎重</span>
+        <el-form-item label="可执行的机器人" prop="rebotName">
+          <el-select v-model="applyRebot.optRebot" multiple placeholder="请选择">
+            <el-option v-for="rebot in rebotList" :key="rebot.robotClientName" :label="rebot.robotClientName"
+              :value="rebot.robotClientName">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitConfigRebot">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listCtApply, getCtApply, delCtApply, addCtApply, updateCtApply, syn, updateRunDate } from "@/api/business/ctApply";
+import { listApplyAll,updateApplyRebot } from "@/api/business/ctApplyRebot";
+import { listRebotSelectAll, } from "@/api/business/ctRebot";
 
 export default {
   name: "CtApply",
   dicts: ['app_type'],
   data() {
     return {
+      // 显示关联机器人
+      showConfigRebotVisible: false,
       // 显示配置时间
       showConfigTimeVisible: false,
       // 遮罩层
@@ -234,17 +257,46 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      applyRebot: {
+        // 可执行的机器人列表
+        optRebot: [],
+      },
+      // 所有机器人
+      rebotList: []
     };
   },
   created() {
     this.getList();
   },
   methods: {
+     /** 设置绑定的机器人 */
+     submitConfigRebot(row) {
+      console.log("this.applyRebot",this.applyRebot);
+      updateApplyRebot(this.applyRebot).then(res => {
+        this.$modal.msgSuccess("设置成功");
+        this.showConfigRebotVisible = false;
+      });
+
+    },
+    /** 设置绑定的机器人 */
+    showConfigRebot(row) {
+      this.applyRebot.applyId = row.appId
+      listRebotSelectAll({}).then(res => {
+        console.log("listRebotSelectAll",res.data);
+        this.rebotList = res.data;
+        listApplyAll(this.applyRebot).then(res => {
+          console.log("showConfigRebot", res);
+          this.applyRebot.optRebot = res.data;
+          this.showConfigRebotVisible = true;
+        });
+      });
+
+    },
     /** 设置时间 */
     submitConfigTime() {
       let data = { id: this.form.id, appId: this.form.appId, manualTime: this.form.manualTime }
-      console.log("data",data);
+      console.log("data", data);
       updateRunDate(data).then(response => {
         this.$modal.msgSuccess("设置成功");
         this.showConfigTimeVisible = false;
@@ -255,6 +307,7 @@ export default {
     showConfigTime(row) {
       this.form.id = row.id
       this.form.appId = row.appId
+      this.form.manualTime = row.manualTime
       this.showConfigTimeVisible = true;
     },
     /** 同步 */
@@ -275,6 +328,7 @@ export default {
     },
     // 取消按钮
     cancel() {
+      this.showConfigRebotVisible = false;
       this.showConfigTimeVisible = false;
       this.open = false;
       this.reset();

src/views/business/ctApplyPlan/index.vue

@@ -143,7 +143,7 @@
         </template>
       </el-table-column>
       <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
-      <el-table-column label="操作" align="center" width="350" fixed="right" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="450" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <!-- <router-link to="/rpa/ctResourceLibrary">
             <el-button size="mini" v-if="scope.row.taskStatus == 'await_create'" type="text" icon="el-icon-setting"
@@ -153,7 +153,7 @@
             v-if="(scope.row.taskStatus == 'await_create' || scope.row.taskStatus == 'finish' || scope.row.taskStatus == 'stopped' || scope.row.taskStatus == 'error' || scope.row.taskStatus == 'skipped' || scope.row.taskStatus == 'cancel') 
             && (scope.row.excType == '1' || scope.row.excType == '2')"
             type="text" icon="el-icon-date" @click="updateParams(scope.row)"
-            v-hasPermi="['business:ctApplyPlan:updateRunTime']">修改文件</el-button>
+            v-hasPermi="['business:ctApplyPlan:updateFile']">修改文件</el-button>
           <el-button size="mini"
             v-if="((scope.row.excType == '1' && scope.row.taskStatus == 'await_create') || scope.row.excType == '2')"
             type="text" icon="el-icon-date" @click="updateRunTime(scope.row)"

src/views/system/role/index.vue

@@ -99,7 +99,7 @@
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色编号" prop="roleId" width="120" />
+      <!-- <el-table-column label="角色编号" prop="roleId" width="120" /> -->
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="显示顺序" prop="roleSort" width="100" />

vue.config.js

@@ -35,6 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
+        // target: `http://rpa.vogocm.com:9300/prod-api`,
         target: `http://localhost:9000`,
         changeOrigin: true,
         pathRewrite: {