智能交互

src/api/device/flow.js

@@ -61,3 +61,11 @@ export function flowStop(instId) {
         method: 'post'
     })
 }
+
+export function getArmStatus(params) {
+    return request({
+        url: '/api/arm/getPose',
+        method: 'get',
+        params: params
+    })
+}

src/views/corpusManger/speech_synthesis/components/MainWorkspace.vue

@@ -69,6 +69,7 @@
                             <el-form-item label="模型" prop="voice">
                                 <el-select v-model="form.model" placeholder="模型">
                                     <el-option label="科大讯飞" value="科大讯飞" />
+                                    <el-option label="火山引擎" value="火山引擎" />
                                 </el-select>
                             </el-form-item>
                         </el-col>
@@ -196,7 +197,7 @@ const handleClose = (tag) => {
 const form = ref({
     tags: [],
     model: '科大讯飞',
-    voice: 'xiaoyan',
+    voice: 'x4_xiaoyan',
     speed: 50,
     volume: 50,
     pitch: 50,
@@ -236,7 +237,10 @@ const dialectOption = ref([
 const voiceOption = ref([
     {
         label: '女声',
-        value: 'xiaoyan'
+        value: 'x4_xiaoyan'
+    }, {
+        label: '男声',
+        value: 'x4_lingbosong'
     }
 ])
 

src/views/device/register/components/LogicFlow/customFlowNode.js

@@ -119,7 +119,7 @@ class CustomFlowHtmlModel extends HtmlNodeModel {
   getOutlineStyle() {
     const style = super.getOutlineStyle();
     style.stroke = 'none';
-    style.hover.stroke = 'none';
+    // style.hover.stroke = 'none';
     return style;
   }
 }

src/views/flow/components/ParamsDrawer.vue

@@ -59,14 +59,14 @@ defineExpose({ confirmSave })
 // 保存成功 / 失败处理
 const handleSaveSuccess = () => {
   emitter.emit('setProperties', { id: props.data.id })
-  emitter.emit("throwAnError", { id: props.data.id, hasError: false });
+  emitter.emit("throwAnError", { id: props.data.id, hasError: false, type: props.data.type });
   // 无错误，关闭抽屉
   emits('close')
 }
 
 const handleSaveError = () => {
   emitter.emit('setProperties', { id: props.data.id })
-  emitter.emit("throwAnError", { id: props.data.id, hasError: true });
+  emitter.emit("throwAnError", { id: props.data.id, hasError: true, type: props.data.type });
   emits('close')
 }
 

src/views/flow/index.vue

@@ -542,8 +542,16 @@ const initFlow = () => {
             keys: ["backspace", "delete"], // 覆盖删除键
             callback: () => {
               const activeElem = document.activeElement;
-              if (activeElem.tagName === "INPUT" || activeElem.tagName === "TEXTAREA") {
+              if (["INPUT", "TEXTAREA"].includes(activeElem.tagName)) {
-                return; // 不处理输入框内的删除
+                return false
+              }
+
+              const { nodes } = lf.getSelectElements();
+              // 拦截起止节点删除
+              const hasProtectedNode = nodes.some(node => ["start", "end"].includes(node.type));
+              if (hasProtectedNode) {
+                lf.selectElementById(null);
+                return false;
               }
 
               const { nodes, edges } = lf.getSelectElements();
@@ -555,7 +563,7 @@ const initFlow = () => {
 
                 if (hasProtectedNode) {
                   lf.selectElementById(null); // 取消选中
-                  return; // 阻断删除
+                  return false; // 阻断删除
                 }
 
                 // 默认删除逻辑
@@ -571,7 +579,7 @@ const initFlow = () => {
                   // 删除节点所有的边
                   lf.deleteEdgeByNodeId(node.id);
                 });
-                return;
+                return false;
               }
               if (nodes.length === 0 && edges.length > 0) {
                 edges.forEach((node) => {
@@ -584,12 +592,12 @@ const initFlow = () => {
           {
             keys: ["ctrl+z"], // 自定义快捷键
             callback: () => {
-              return false;
+              return true;
             },
           },
           {
             keys: ["ctrl+shift+z"],
-            callback: () => false,
+            callback: () => true,
           },
         ],
       },
@@ -789,8 +797,23 @@ onMounted(() => {
 
   emitter.on("throwAnError", (data) => {
     // 处理错误抛出逻辑
-    const { id, hasError } = data;
+    const { id, hasError, type } = data;
-    const element = document.getElementsByClassName(`node__container ${id}`)[0].parentElement;
+    let element
+    if (type === 'loop') {
+      const tt = document.getElementsByClassName(`group__container ${id}`)[0];
+      if (tt?.parentElement) {
+        element = tt.parentElement;
+      } else {
+        element = tt
+      }
+    } else {
+      const tt = document.getElementsByClassName(`node__container ${id}`)[0]
+      if (tt?.parentElement) {
+        element = tt.parentElement;
+      } else {
+        element = tt
+      }
+    }
     if (hasError) {
       if (!nodeErrorList.value.includes(id)) {
         nodeErrorList.value.push(id);
@@ -889,10 +912,12 @@ onUnmounted(() => {
 
           .node__container {
             border-color: #8dc99d;
+            // pointer-events: none;
           }
 
           .group__container {
             border-color: #8dc99d;
+            // pointer-events: none;
           }
         }
       }

src/views/flow/nodes/common/endNode.js

@@ -181,7 +181,7 @@ class EndNodeHtmlModel extends HtmlNodeModel {
   getOutlineStyle() {
     const style = super.getOutlineStyle();
     style.stroke = "none";
-    style.hover.stroke = "none";
+    // style.hover.stroke = "none";
     return style;
   }
 }

src/views/flow/nodes/common/serviceNode.js

@@ -198,7 +198,7 @@ class ServiceNodeHtmlModel extends HtmlNodeModel {
   getOutlineStyle() {
     const style = super.getOutlineStyle();
     style.stroke = "none";
-    style.hover.stroke = "none";
+    // style.hover.stroke = "none";
     return style;
   }
 }

src/views/flow/nodes/common/startNode.js

@@ -180,7 +180,7 @@ class StartNodeHtmlModel extends HtmlNodeModel {
   getOutlineStyle() {
     const style = super.getOutlineStyle();
     style.stroke = 'none';
-    style.hover.stroke = 'none';
+    // style.hover.stroke = 'none';
     return style;
   }
 }

src/views/flow/nodes/function/codeNode.js

@@ -198,7 +198,7 @@ class CodeNodeHtmlModel extends HtmlNodeModel {
   getOutlineStyle() {
     const style = super.getOutlineStyle();
     style.stroke = "none";
-    style.hover.stroke = "none";
+    // style.hover.stroke = "none";
     return style;
   }
 }

src/views/flow/nodes/function/currentLoopNode.js

@@ -204,7 +204,7 @@ class CurrentLoopNodeHtmlModel extends HtmlNodeModel {
   getOutlineStyle() {
     const style = super.getOutlineStyle();
     style.stroke = "none";
-    style.hover.stroke = "none";
+    // style.hover.stroke = "none";
     return style;
   }
 }

src/views/flow/nodes/function/httpNode.js

@@ -198,7 +198,7 @@ class HttpNodeHtmlModel extends HtmlNodeModel {
   getOutlineStyle() {
     const style = super.getOutlineStyle();
     style.stroke = "none";
-    style.hover.stroke = "none";
+    // style.hover.stroke = "none";
     return style;
   }
 }

src/views/flow/nodes/function/loop.js

@@ -45,7 +45,6 @@ class loopBodyModel extends GroupNodeModel {
   // 计算子节点的包围盒(包含所有子节点的最小矩形区域)
   getChildrenBBox() {
     const children = this.getAllValidChildren(this.children, this.graphModel)
-    console.log('children', children)
     // Array.from(this.children).forEach((id) => {
     //   const node = this.graphModel.getNodeModelById(id)
     //   if (node) {
@@ -109,14 +108,16 @@ class loopBodyModel extends GroupNodeModel {
     return [
       {
         x: x + width / 2 ,
-        y: y + height / 2,
+        // y: y + height / 2,
+        y:y,
         name: "right",
         id: "".concat(this.id, "_1"),
         properties: { connectionType: "source" },
       },
       {
         x: x - width / 2,
-        y: y + height / 2,
+        // y: y + height / 2,
+        y:y,
         name: "left",
         id: "".concat(this.id, "_3"),
         properties: { connectionType: "target" },
@@ -241,6 +242,13 @@ class loopBodyView extends HtmlNode {
     return svgH('g', {}, anchorShapes);
   }
 
+  getOutlineStyle() {
+    const style = super.getOutlineStyle();
+    style.stroke = "none";
+    // style.hover.stroke = "none";
+    return style;
+  }
+
   /**
    * 将 HTML 内容设置到指定的根元素上
    * @param rootEl 根元素

src/views/flow/nodes/function/loop.vue

@@ -87,13 +87,13 @@ onUnmounted(() => {
 .group__container {
   width: 100%;
   height: 100%;
-  min-height: 420px;
+  // min-height: 420px;
   background: #fff;
   padding: 12px;
   cursor: default;
   border-radius: 12px;
   border: 2px solid white;
-  box-shadow: 0 5px 15px 0#00000008;
+  // box-shadow: 0 5px 15px 0#00000008;
   display: flex;
   flex-direction: column;
   position: relative;

src/views/flow/nodes/function/sdAgent.js

@@ -198,7 +198,7 @@ class SdAgentNodeHtmlModel extends HtmlNodeModel {
   getOutlineStyle() {
     const style = super.getOutlineStyle();
     style.stroke = "none";
-    style.hover.stroke = "none";
+    // style.hover.stroke = "none";
     return style;
   }
 }

src/views/flow/nodes/function/sleep.js

@@ -198,7 +198,7 @@ class SleepNodeHtmlModel extends HtmlNodeModel {
   getOutlineStyle() {
     const style = super.getOutlineStyle();
     style.stroke = "none";
-    style.hover.stroke = "none";
+    // style.hover.stroke = "none";
     return style;
   }
 }

src/views/flow/nodes/function/stopLoop.js

@@ -176,7 +176,7 @@ class StopLoopHtmlModel extends HtmlNodeModel {
   getOutlineStyle() {
     const style = super.getOutlineStyle();
     style.stroke = "none";
-    style.hover.stroke = "none";
+    // style.hover.stroke = "none";
     return style;
   }
 }

src/views/flow/nodes/function/subEnd.js

@@ -171,7 +171,7 @@ class SubEndNodeHtmlModel extends HtmlNodeModel {
   getOutlineStyle() {
     const style = super.getOutlineStyle();
     style.stroke = "none";
-    style.hover.stroke = "none";
+    // style.hover.stroke = "none";
     return style;
   }
 }

src/views/flow/nodes/function/subStart.js

@@ -170,7 +170,7 @@ class SubStartNodeHtmlModel extends HtmlNodeModel {
   getOutlineStyle() {
     const style = super.getOutlineStyle();
     style.stroke = "none";
-    style.hover.stroke = "none";
+    // style.hover.stroke = "none";
     return style;
   }
 }

src/views/flow/nodes/function/switch.js

@@ -303,7 +303,7 @@ class SwitchHtmlModel extends HtmlNodeModel {
   getOutlineStyle() {
     const style = super.getOutlineStyle();
     style.stroke = "none";
-    style.hover.stroke = "none";
+    // style.hover.stroke = "none";
     return style;
   }
 }

src/views/vi/testProject/plan/index.vue

@@ -192,12 +192,13 @@
       </el-form>
       <div v-if="form.sceneType && form.sceneType != 1">
         <div>语料配置({{ form.sceneType == 2 ? "单次" : "连续" }})</div>
-        <Setting
+        <!-- <Setting
           type="1"
           v-if="form.sceneType == 2"
           :corpusIds="selectCorpusIds"
           @updateSelectRows="getSelectRows"
-        />
+        /> -->
+        <Single v-if="form.sceneType == 2" :corpusIds="selectCorpusIds" @updateSelectRows="getSelectRows" />
         <Setting
           type="0"
           v-if="form.sceneType == 3"
@@ -228,6 +229,7 @@ import Setting from "./setting.vue";
 import { onMounted } from "vue";
 import { ElMessage } from "element-plus";
 import { useContainerHeight } from "@/hooks/tableHeight";
+import Single from "./single.vue";
 
 const topContainerRef = ref();
 const containerHeight = useContainerHeight(topContainerRef);
@@ -415,7 +417,7 @@ const getWakeList = () => {
 };
 
 const getSelectRows = (arr) => {
-  const corpusIds = arr.map((item) => item.parentId);
+  const corpusIds = arr.map((item) => item.id);
   form.value.corpusIds = corpusIds.toString();
 };
 

src/views/vi/testProject/plan/single.vue

@@ -0,0 +1,187 @@
+<template>
+  <div>
+    <div class="btn-container">
+      <el-button type="primary" @click="openDialog">配置语料</el-button>
+    </div>
+    <el-table :data="selectList" height="260">
+      <el-table-column
+        label="语料类型"
+        align="center"
+        prop="categoryName"
+        width="150"
+        show-overflow-tooltip />
+      <el-table-column
+        label="语音文本"
+        align="center"
+        prop="text"
+        width="150"
+        show-overflow-tooltip
+      />
+      <el-table-column label="音色" align="center" prop="voice" />
+      <el-table-column label="语种" align="center" prop="language" />
+    </el-table>
+
+    <el-dialog title="选择语料" v-model="open" width="700px">
+      <el-form
+        :model="queryParams"
+        ref="queryRef"
+        :inline="true"
+        label-width="68px"
+      >
+        <el-form-item label="语料文本">
+          <el-input
+            v-model="queryParams.text"
+            placeholder="请输入语料名称"
+            clearable
+            @keyup.enter="getList"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="getList"
+            >搜索</el-button
+          >
+          <el-button icon="Refresh" @click="resetForm">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        ref="tableRef"
+        :data="corpusList"
+        :tree-props="{ checkStrictly: true }"
+        :row-key="rowKey"
+        :height="400"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"
+          v-show="false"
+          :selectable="selectable"
+        />
+        <el-table-column
+          label="语料类型"
+          align="center"
+          prop="categoryName"
+          min-width="100"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="语音文本"
+          align="center"
+          prop="text"
+          min-width="200"
+          show-overflow-tooltip
+        />
+        <el-table-column label="音色" align="center" prop="voice" />
+        <el-table-column label="语种" align="center" prop="language" />
+      </el-table>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script setup>
+import { onMounted } from "vue";
+// import { listCorpus, getBatchCorpus } from "@/api/vi/corpus";
+import { getCorpusListApi } from '@/api/corpusManger/corpus.js'
+
+const props = defineProps({
+  corpusIds: {
+    type: String,
+    default: "",
+  },
+});
+
+const emits = defineEmits(["updateSelectRows"]);
+
+const selectList = ref([]);
+const corpusList = ref([]);
+
+const open = ref(false);
+const openDialog = () => {
+  open.value = true;
+  setTimeout(() => {
+    toggleRowSelection();
+  }, 100);
+}
+
+const toggleRowSelection = () => {
+  if (selectList.value.length > 0) {
+    corpusList.value.forEach((row) => {
+      selectList.value.forEach((item) => {
+        if ( item.id === row.id ) {
+          tableRef.value.toggleRowSelection(row, true);
+        }
+      })
+    })
+  }
+}
+
+
+const selectable = (row) => {
+  if (row.continuous + "" === "0") {
+    return false;
+  } else {
+    return true;
+  }
+};
+
+const queryParams = ref({
+    pageNum: 1,
+    pageSize: 100000,
+    text: ''
+})
+
+const getList = async () => {
+  const res = await getCorpusListApi(queryParams.value)
+  if (res.code === 0) {
+    corpusList.value = res.rows
+  }
+};
+
+const resetForm = () => {
+  queryParams.value.text = ''
+  getList()
+}
+
+const tableRef = ref();
+const submitForm = () => {
+  const rows = tableRef.value.getSelectionRows();
+  selectList.value = rows;
+  open.value = false;
+  emits("updateSelectRows", rows);
+  resetForm()
+};
+
+const cancel = () => {
+  open.value = false;
+  resetForm()
+};
+
+const getSelectList = async (corpusIds) => {
+    const res = await getCorpusListApi({
+      ...queryParams.value,
+      text: '',
+      ids: corpusIds
+    })
+    if (res.code === 0) {
+      selectList.value = res.rows
+    }
+};
+
+onMounted(() => {
+  getList();
+  if (props.corpusIds) {
+    getSelectList(props.corpusIds.split(","));
+  }
+});
+</script>
+<style lang="scss" scoped>
+.btn-container {
+  text-align: right;
+  margin-bottom: 12px;
+}
+</style>