feat: 日志

src/api/vi/project.js

@@ -42,3 +42,30 @@ export function delProject(projectId) {
     method: 'delete'
   })
 }
+
+export function getExecuteRunParams(projectId) {
+  return request({
+    url: '/vi/project/queryExecuteRunParams',
+    method: 'get',
+    params: {
+      projectId
+    }
+  })
+}
+
+export function projectExecute(data) {
+  return request({
+    url: '/vi/project/execute',
+    method: 'post',
+    data
+  })
+}
+
+export function queryExecuteInstId(projectId) {
+  return request({
+    url: `/vi/project/queryExecuteInstId/${projectId}`,
+    method: 'get',
+    
+  })
+}
+

src/utils/flow.js

@@ -81,11 +81,11 @@ export const getStartNodeFormData = () => {
   return data
 }
 
-export const addValueProperty = (data) => {
+export const addValueProperty = (data, schemeId = '') => {
   // 处理单个对象或对象数组
   const processItem = (item, index, path) => {
     // 根据类型设置默认值
-    item.value = '';
+    item.value =  item.name === 'schemeId' ? schemeId : '';
     item.propPath = `${path}.${index}.`
     if (item.type.includes('array') && !item.type.includes('object')) {
       const type = item.type.match(/<([^>]+)>/)[1]

src/utils/request.js

@@ -73,6 +73,7 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
+  console.log('res', res)
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息

src/views/test/configs/Run.vue

@@ -58,7 +58,7 @@
                 </el-table>
           </template>
         </el-table-column>
-        <el-table-column label="流程ID" prop="itemId" />
+        <el-table-column label="流程ID" prop="itemId" show-overflow-tooltip/>
         <el-table-column label="流程名称" prop="itemName" />
       </el-table>
     </el-form>

src/views/vi/testProject/Run.vue

@@ -0,0 +1,164 @@
+<template>
+  <el-drawer v-model="props.drawer" title="执行" :before-close="handleClose">
+    <el-form
+      ref="ruleFormRef"
+      style="max-width: 600px"
+      :model="{ formData }"
+      :rules="rules"
+      label-width="auto"
+    >
+    <el-form-item  label="机器人IP" prop="formData.terminalId"  :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
+        <el-select v-model="formData.terminalId" style="width: 200px">
+            <el-option
+                v-for="item in terminalIdOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+        </el-select>
+    </el-form-item>
+      <el-table
+        :data="formData.tableData"
+        :border="parentBorder"
+        :preserve-expanded-content="preserveExpanded"
+        default-expand-all
+        style="width: 100%"
+      >
+        <el-table-column type="expand">
+            <template #default="{ row: pRow, $index: pIndex }">
+                <el-table
+                    v-if="pRow.config.length > 0"
+                    :data="pRow.config"
+                    style="width: 100%"
+                    row-key="name" 
+                    default-expand-all
+                >
+                    <el-table-column prop="name" label="入参名称">
+                        <template #default="{ row }">
+                        <span>{{ row.name }}</span>
+                        <span v-if="row.required" style="color: #f56c6c; margin-left: 8px;">*</span>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="type" label="入参类型">
+                        <template #default="{ row }">
+                        <el-tag>{{ row.type }}</el-tag>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="value" label="入参值">
+                        <template #default="{ row, column, $index }">
+                            <el-form-item v-if="row.type !== 'object' && !row.type.includes('array')" label="" :prop="`formData.tableData.${pIndex}.config${row.propPath}value`" :rules="row.required ? [{ required: true, message: '请输入', trigger: 'blur' }] : []">
+                                <el-input v-if="row.type === 'string'" v-model="row.value" :disabled="row.name === 'schemeId'" />
+                                <el-input-number  v-if="row.type === 'number'" :controls="false" v-model="row.value" />
+                                <el-switch v-if="row.type === 'boolean'" v-model="row.value" />
+                            </el-form-item>
+                        </template>
+                    </el-table-column>
+                </el-table>
+          </template>
+        </el-table-column>
+        <el-table-column label="方案名称" prop="itemName" />
+      </el-table>
+    </el-form>
+    <template #footer>
+      <el-button @click="handleClose">关闭</el-button>
+      <el-button type="primary" @click="confirm">确定</el-button>
+    </template>
+  </el-drawer>
+</template>
+<script setup>
+import { ref, watch, onUnmounted } from "vue";
+import { ElMessage } from "element-plus";
+import { addValueProperty, formatTableData } from "@/utils/flow";
+import { listTerminal } from "@/api/device/terminal.js";
+import { getExecuteRunParams, projectExecute } from "@/api/vi/project.js"
+
+const props = defineProps({
+  drawer: Boolean,
+  currentRow: Object,
+});
+
+const emits = defineEmits(["close"]);
+
+const ruleFormRef = ref();
+const rules = ref({});
+
+const formData = ref({
+    terminalId: '',
+    tableData: []
+})
+
+const terminalIdOptions = ref([]);
+
+/** 获取设备终端列表 */
+const handleGetTerminalGroup = async (row) => {
+  const res = await listTerminal({ pageNum: 1, pageSize: 1000 });
+  if (res.code === 200) {
+    terminalIdOptions.value = res.rows?.map((item) => {
+      return {
+        label: `${item.name}(${item.host}:${item.port})`,
+        value: item.id,
+      };
+    });
+  }
+};
+
+const getProjectParams = async () => {
+  const res = await getExecuteRunParams(props.currentRow.projectId);
+  if (res.code === 200) {
+    const data = parseConfig(res.data)
+    console.log('data', data)
+    formData.value.tableData = data
+    handleGetTerminalGroup();
+  }
+};
+
+const parseConfig = (arr) => {
+  arr.forEach(item => {
+      if (item.config) {
+        item.config = addValueProperty(JSON.parse(item.config), item.schemeId)
+      } else {
+        item.config = []
+      }
+  })
+  return arr
+}
+
+const confirm = () => {
+  ruleFormRef.value
+    .validate()
+    .then(async () => {
+      const runParams = {}
+      formData.value.tableData.forEach(item => {
+        const data = formatTableData(item.config)
+        runParams[item.itemId] = data
+      })
+      const res = await projectExecute({ runParams, projectId: props.currentRow.projectId, terminalId: formData.value.terminalId })
+      if (res.code === 200) {
+        ruleFormRef.value.resetFields();
+        ElMessage.success('执行成功')
+        emits("close");
+      } else {
+        ElMessage.success(res.msg)
+      }
+    })
+    .catch((err) => {
+      console.log(err);
+    });
+}
+
+const handleClose = () => {
+  ruleFormRef.value.resetFields();
+  emits("close");
+};
+
+watch(
+  () => props.drawer,
+  (newVal) => {
+    if (newVal) {
+      getProjectParams()
+    }
+  }
+);
+</script>

src/views/vi/testProject/index.vue

@@ -171,7 +171,7 @@
       <el-table-column label="商标" align="center" prop="trademark"  width="150" show-overflow-tooltip />
       <el-table-column label="型号规格" align="center" prop="modelSpec"  width="150" show-overflow-tooltip />
       <el-table-column label="数量" align="center" prop="quantity" />
-      <el-table-column label="操作" align="center" width="220px" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="操作" align="center" width="300px" class-name="small-padding fixed-width" fixed="right">
         <template #default="{ row }">
           <el-button
             size="mini"
@@ -199,6 +199,13 @@
             v-hasPermi="['system:project:remove']"
             >删除</el-button
           >
+          <el-button
+            icon="DataLine"
+            link
+            type="primary"
+            @click="handleOpenDashboard(row)"
+            >流程可视化
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -345,6 +352,41 @@
         </div>
       </template>
     </el-dialog>
+
+    <Run
+      :drawer="executeOpen"
+      @close="executeOpen = false"
+      :currentRow="currentRow"
+    />
+
+    <el-drawer
+      v-model="openDashboard"
+      :destroy-on-close="true"
+      :size="580"
+      :title="currentLog.projectName + '的流程'"
+      append-to-body
+      modal-class="rdashboad-log"
+      @close="handleClose"
+    >
+      <el-card
+        v-for="item in taskRightList"
+        shadow="hover"
+        style="width: 100%; margin-bottom: 10px"
+      >
+        <div
+          class="flex align-center"
+          style="cursor: pointer"
+          @click="handleLogicFlow(item)"
+        >
+          <div>{{ item.name }}</div>
+          <div class="flex align-center" style="margin-left: 10px">
+            <el-icon>
+              <View />
+            </el-icon>
+          </div>
+        </div>
+      </el-card>
+    </el-drawer>
   </div>
 </template>
 
@@ -358,6 +400,9 @@ import {
 } from "@/api/vi/project";
 import TableSearch from "@/components/TableSearch/index.vue";
 import { useContainerHeight } from "@/hooks/tableHeight";
+import Run from "./Run.vue";
+import { getExecuteRunParams, queryExecuteInstId } from "@/api/vi/project.js"
+import { appendParamsToPath } from "@/utils/fn.js";
 
 const topContainerRef = ref();
 const containerHeight = useContainerHeight(topContainerRef);
@@ -538,10 +583,64 @@ const handleSetting = (row) => {
   router.push('/vi/plan/index/' + row.projectId)
 }
 
+const executeOpen = ref(false);
+const currentRow = ref(undefined);
+
 const handleExecute = (row) => {
-  console.log('暂未开发')
+  currentRow.value = row;
+  executeOpen.value = true;
 }
 
+const currentLog = ref({});
+const openDashboard = ref(false);
+const taskRightList = ref([]);
+const lastInstId = ref('')
+
+const handleOpenDashboard = (row) => {
+  openDashboard.value = true;
+  currentLog.value = row;
+  getRightTaskList(row.projectId);
+  getExecuteInstId(row.projectId)
+}
+
+//获取右侧编排数据
+const getRightTaskList = (projectId) => {
+  getExecuteRunParams(projectId).then((response) => {
+    taskRightList.value =
+      response.data?.map((item) => {
+        return {
+          name: item.schemeName,
+          id: item.itemId,
+        };
+      }) || [];
+  });
+};
+
+const getExecuteInstId = (projectId) => {
+  queryExecuteInstId(projectId).then((res) => {
+    console.log('res', res)
+    lastInstId.value = res.data
+  })
+}
+
+// 取消按钮
+function handleClose() {
+  openDashboard.value = false;
+}
+
+const handleLogicFlow = (item) => {
+  const params = {
+    instId: lastInstId.value,
+    taskId: currentLog.value.projectId,
+    itemId: item.id,
+    name: item.name,
+    state: "0",
+    isLog: true,
+  };
+
+  const fullPath = appendParamsToPath("/flow", params);
+  window.open(fullPath, "_blank");
+};
 onMounted(() => {
   getList();
 });