Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue

src/views/services/directivePackage/components/ConfigServiceDirective.data.ts

@@ -22,9 +22,22 @@ export const columns: BasicColumn[] = [
     dataIndex: 'directiveName',
   },
   {
-    title: '指令标签',
+    title: '体型标签',
     align: 'center',
-    dataIndex: 'tagList',
+    dataIndex: 'bodyTagList',
+    ellipsis: false,
+    format(text, record, index) {
+      if (!!text) {
+        return text.map((item) => item.tagName).join('、');
+      } else {
+        return '-';
+      }
+    },
+  },
+  {
+    title: '情绪标签',
+    align: 'center',
+    dataIndex: 'emotionTagList',
     ellipsis: false,
     format(text, record, index) {
       if (!!text) {
@@ -65,7 +78,20 @@ export const selectedColumns: BasicColumn[] = [
   {
     title: '指令标签',
     align: 'center',
-    dataIndex: 'tagList',
+    dataIndex: 'bodyTagList',
+    ellipsis: false,
+    format(text, record, index) {
+      if (!!text) {
+        return text.map((item) => item.tagName).join('、');
+      } else {
+        return '-';
+      }
+    },
+  },
+  {
+    title: '指令标签',
+    align: 'center',
+    dataIndex: 'emotionTagList',
     ellipsis: false,
     format(text, record, index) {
       if (!!text) {
@@ -85,7 +111,7 @@ export const selectedColumns: BasicColumn[] = [
     key: 'action',
     slots: { customRender: 'action' },
     fixed: 'right', // 如果需要固定在右侧
-    align:'center',
+    align: 'center',
-    width:100
+    width: 100,
   },
 ];

src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue

@@ -64,7 +64,10 @@
         <span v-if="column.dataIndex === 'typeName'">
           {{ text || record.typeId_dictText }}
         </span>
-        <span v-if="column.dataIndex === 'tagList'">
+        <span v-if="column.dataIndex === 'bodyTagList'">
+          {{ handleTags('', text, '') }}
+        </span>
+        <span v-if="column.dataIndex === 'emotionTagList'">
           {{ handleTags('', text, '') }}
         </span>
         <span v-if="column.dataIndex === 'cycleType'">

src/views/services/directivePackage/components/DirectivePackageModal.vue

@@ -29,9 +29,17 @@
                       <a-button type="link" danger preIcon="ic:baseline-remove-circle"></a-button>
                     </a-popconfirm>
                   </span>
-                  <span :class="{ 'selected': selectedDirective === directive.id }">
+                  <div :class="{ 'selected': selectedDirective === directive.id }">
-                    {{ directive.directiveName + handleTags('（', directive, '）') }}
+                    <div>
-                  </span>
+                      {{ directive.directiveName }}
+                    </div>
+                    <div>
+                      体型标签：{{ handleBodyTags('', directive, '') }}
+                    </div>
+                    <div>
+                      情绪标签：{{ handleEmotionTags('', directive, '') }}
+                    </div>
+                  </div>
                 </a-card>
               </a-badge-ribbon>
             </a-col>
@@ -48,7 +56,8 @@
           <div class="directiveInfoClass">周期类型：{{ filterDictTextByCache('period_type', derectiveInfo.cycleType) }}</div>
           <div class="directiveInfoClass">服务时长(分钟)：{{ derectiveInfo.serviceDuration }}</div>
           <div class="directiveInfoClass">服务说明：{{ derectiveInfo.serviceContent }}</div>
-          <div class="directiveInfoClass">指令标签：{{ handleTags('', derectiveInfo, '') }}</div>
+          <div class="directiveInfoClass">体型标签：{{ handleBodyTags('', derectiveInfo, '') }}</div>
+          <div class="directiveInfoClass">情绪标签：{{ handleEmotionTags('', derectiveInfo, '') }}</div>
           <div class="directiveInfoClass">语音文件：
             <span v-if="!derectiveInfo.mp3File">暂无文件</span>
             <audio controls disabled="false" v-else>
@@ -118,12 +127,25 @@ const seletedRecord = ref({ directives: [] })//里面记录了已选择的服务
 const { createMessage } = useMessage();
 
 /**
- * 处理服务指令标签翻译
+ * 处理体型标签翻译
  * @param directive_ 
  */
-function handleTags(prefix, directive_, suffix) {
+function handleBodyTags(prefix, directive_, suffix) {
-  if (!!directive_.tagList && directive_.tagList.length > 0) {
+  if (!!directive_.bodyTagList && directive_.bodyTagList.length > 0) {
-    let str = directive_.tagList.map(item => item.tagName).join('、 ');
+    let str = directive_.bodyTagList.map(item => item.tagName).join('、 ');
+    return prefix + str + suffix
+  } else {
+    return ''
+  }
+}
+
+/**
+ * 处理情绪标签翻译
+ * @param directive_ 
+ */
+function handleEmotionTags(prefix, directive_, suffix) {
+  if (!!directive_.emotionTagList && directive_.emotionTagList.length > 0) {
+    let str = directive_.emotionTagList.map(item => item.tagName).join('、 ');
     return prefix + str + suffix
   } else {
     return ''
@@ -136,7 +158,9 @@ function handleTags(prefix, directive_, suffix) {
 function add() {
   title.value = '新增服务指令包';
   visible.value = true;
+  selectedDirective.value = ''
   seletedRecord.value = { directives: [] }
+  derectiveInfo.value = {}
   nextTick(() => {
     registerForm.value.add();
   });
@@ -147,6 +171,8 @@ function add() {
  * @param record
  */
 function edit(record) {
+  selectedDirective.value = ''
+  derectiveInfo.value = {}
   seletedRecord.value = record
   title.value = disableSubmit.value ? '详情' : '编辑';
   visible.value = true;

src/views/services/directivePackage/components/PackageList.vue

@@ -53,11 +53,20 @@
             <a-row>
               <a-col :span="22" :push="1" v-for="directive of selectedDirective.directives" :key="directive.id"
                 style="margin-top: 15px;" @click="directiveInfo(directive)">
-                <a-badge-ribbon :text="filterDictTextByCache('period_type', directive.cycleType)" :style="{ top: '-10px' }">
+                <a-badge-ribbon :text="filterDictTextByCache('period_type', directive.cycleType)"
+                  :style="{ top: '-10px' }">
                   <a-card size="small">
-                    <span :class="{ 'selected-dire': directiveId === directive.id }">
+                    <div :class="{ 'selected-dire': directiveId === directive.id }">
-                      {{ directive.directiveName + handleTags('（', directive, '）') }}
+                      <div>
-                    </span>
+                        {{ directive.directiveName }}
+                      </div>
+                      <div>
+                        体型标签：{{ handleBodyTags('', directive, '') }}
+                      </div>
+                      <div>
+                        情绪标签：{{ handleEmotionTags('', directive, '') }}
+                      </div>
+                    </div>
                   </a-card>
                 </a-badge-ribbon>
               </a-col>
@@ -76,7 +85,8 @@
             </div>
             <div class="directiveInfoClass">服务时长(分钟)：{{ derectiveInfo.serviceDuration }}</div>
             <div class="directiveInfoClass">服务说明：{{ derectiveInfo.serviceContent }}</div>
-            <div class="directiveInfoClass">指令标签：{{ handleTags('', derectiveInfo, '') }}</div>
+            <div class="directiveInfoClass">体型标签：{{ handleBodyTags('', derectiveInfo, '') }}</div>
+            <div class="directiveInfoClass">情绪标签：{{ handleEmotionTags('', derectiveInfo, '') }}</div>
             <div class="directiveInfoClass">语音文件：
               <span v-if="!derectiveInfo.mp3File">暂无文件</span>
               <audio controls disabled="false" v-else>
@@ -179,12 +189,25 @@ function remove(data) {
 }
 
 /**
- * 处理服务指令标签翻译
+ * 处理体型标签翻译
  * @param directive_ 
  */
-function handleTags(prefix, directive_, suffix) {
+function handleBodyTags(prefix, directive_, suffix) {
-  if (!!directive_.tagList && directive_.tagList.length > 0) {
+  if (!!directive_.bodyTagList && directive_.bodyTagList.length > 0) {
-    let str = directive_.tagList.map(item => item.tagName).join('、 ');
+    let str = directive_.bodyTagList.map(item => item.tagName).join('、 ');
+    return prefix + str + suffix
+  } else {
+    return ''
+  }
+}
+
+/**
+ * 处理情绪标签翻译
+ * @param directive_ 
+ */
+function handleEmotionTags(prefix, directive_, suffix) {
+  if (!!directive_.emotionTagList && directive_.emotionTagList.length > 0) {
+    let str = directive_.emotionTagList.map(item => item.tagName).join('、 ');
     return prefix + str + suffix
   } else {
     return ''

src/views/services/directiveTag/bodytag/BodyTag.api.ts

@@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
 const { createConfirm } = useMessage();
 
 enum Api {
-  list = '/directiveTag/directiveTag/list',
+  list = '/directiveTag/bodyTag/list',
-  save='/directiveTag/directiveTag/add',
+  save='/directiveTag/bodyTag/add',
-  edit='/directiveTag/directiveTag/edit',
+  edit='/directiveTag/bodyTag/edit',
-  deleteOne = '/directiveTag/directiveTag/delete',
+  deleteOne = '/directiveTag/bodyTag/delete',
-  deleteBatch = '/directiveTag/directiveTag/deleteBatch',
+  deleteBatch = '/directiveTag/bodyTag/deleteBatch',
-  importExcel = '/directiveTag/directiveTag/importExcel',
+  importExcel = '/directiveTag/bodyTag/importExcel',
-  exportXls = '/directiveTag/directiveTag/exportXls',
+  exportXls = '/directiveTag/bodyTag/exportXls',
 }
 
 /**

src/views/services/directiveTag/bodytag/BodyTag.data.ts

@@ -6,7 +6,7 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '标签名称',
+    title: '体型名称',
     align: "center",
     dataIndex: 'tagName'
   },
@@ -24,7 +24,7 @@ export const columns: BasicColumn[] = [
 
 // 高级查询数据
 export const superQuerySchema = {
-  tagName: {title: '标签名称',order: 0,view: 'text', type: 'string',},
+  tagName: {title: '体型名称',order: 0,view: 'text', type: 'string',},
   sort: {title: '排序',order: 1,view: 'number', type: 'number',},
   izEnabled: {title: '是否启用',order: 2,view: 'radio', type: 'string',dictCode: 'iz_enabled',},
 };

src/views/services/directiveTag/bodytag/BodyTagList.vue

@@ -7,8 +7,8 @@
         <a-row :gutter="24">
           <a-col :lg="6">
             <a-form-item name="tagName">
-              <template #label><span title="标签名称">标签名称</span></template>
+              <template #label><span title="体型名称">体型名称</span></template>
-              <JInput v-model:value="queryParam.tagName" allowClear placeholder="请输入标签名称" />
+              <JInput v-model:value="queryParam.tagName" allowClear placeholder="请输入体型名称" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
@@ -65,18 +65,18 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <DirectiveTagModal ref="registerModal" @success="handleSuccess"></DirectiveTagModal>
+    <BodyTagModal ref="registerModal" @success="handleSuccess"></BodyTagModal>
   </div>
 </template>
 
-<script lang="ts" name="directiveTag-directiveTag" setup>
+<script lang="ts" name="bodyTag-bodyTag" setup>
 import { ref, reactive } from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { useListPage } from '/@/hooks/system/useListPage';
-import { columns, superQuerySchema } from './DirectiveTag.data';
+import { columns, superQuerySchema } from './BodyTag.data';
-import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './DirectiveTag.api';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './BodyTag.api';
 import { downloadFile } from '/@/utils/common/renderUtils';
-import DirectiveTagModal from './components/DirectiveTagModal.vue'
+import BodyTagModal from './components/BodyTagModal.vue'
 import { useUserStore } from '/@/store/modules/user';
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
@@ -90,7 +90,7 @@ const userStore = useUserStore();
 //注册table数据
 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
-    title: '指令标签',
+    title: '体型标签',
     api: list,
     columns,
     canResize: false,
@@ -111,7 +111,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     },
   },
   exportConfig: {
-    name: "指令标签",
+    name: "体型标签",
     url: getExportUrl,
     params: queryParam,
   },

src/views/services/directiveTag/bodytag/components/BodyTagForm.vue

@@ -5,8 +5,8 @@
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="DirectiveTagForm">
           <a-row>
 						<a-col :span="24">
-							<a-form-item label="标签名称" v-bind="validateInfos.tagName" id="DirectiveTagForm-tagName" name="tagName">
+							<a-form-item label="体型名称" v-bind="validateInfos.tagName" id="DirectiveTagForm-tagName" name="tagName">
-								<a-input v-model:value="formData.tagName" placeholder="请输入标签名称"  allow-clear ></a-input>
+								<a-input v-model:value="formData.tagName" placeholder="请输入体型名称"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
@@ -32,7 +32,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import { getValueType } from '/@/utils';
-  import { saveOrUpdate } from '../DirectiveTag.api';
+  import { saveOrUpdate } from '../BodyTag.api';
   import { Form } from 'ant-design-vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   const props = defineProps({
@@ -55,7 +55,7 @@
   const confirmLoading = ref<boolean>(false);
   //表单验证
   const validatorRules = reactive({
-    tagName: [{ required: true, message: '请输入标签名称!'},],
+    tagName: [{ required: true, message: '请输入体型名称!'},],
     sort: [{ required: true, message: '请输入排序!'}, { pattern: /^\d+$/, message: '请输入正整数!'},],
     izEnabled: [{ required: true, message: '请选择是否启用!'},],
   });

src/views/services/directiveTag/bodytag/components/BodyTagModal.vue

@@ -1,12 +1,12 @@
 <template>
   <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
-    <DirectiveTagForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DirectiveTagForm>
+    <BodyTagForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></BodyTagForm>
   </j-modal>
 </template>
 
 <script lang="ts" setup>
   import { ref, nextTick, defineExpose } from 'vue';
-  import DirectiveTagForm from './DirectiveTagForm.vue'
+  import BodyTagForm from './BodyTagForm.vue'
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');

src/views/services/directiveTag/emotiontag/EmotionTag.api.ts

@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/directiveTag/emotionTag/list',
+  save='/directiveTag/emotionTag/add',
+  edit='/directiveTag/emotionTag/edit',
+  deleteOne = '/directiveTag/emotionTag/delete',
+  deleteBatch = '/directiveTag/emotionTag/deleteBatch',
+  importExcel = '/directiveTag/emotionTag/importExcel',
+  exportXls = '/directiveTag/emotionTag/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}

src/views/services/directiveTag/emotiontag/EmotionTag.data.ts

@@ -0,0 +1,30 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '情绪名称',
+    align: "center",
+    dataIndex: 'tagName'
+  },
+  {
+    title: '排序',
+    align: "center",
+    dataIndex: 'sort'
+  },
+  {
+    title: '是否启用',
+    align: "center",
+    dataIndex: 'izEnabled_dictText'
+  },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  tagName: {title: '情绪名称',order: 0,view: 'text', type: 'string',},
+  sort: {title: '排序',order: 1,view: 'number', type: 'number',},
+  izEnabled: {title: '是否启用',order: 2,view: 'radio', type: 'string',dictCode: 'iz_enabled',},
+};

src/views/services/directiveTag/emotiontag/EmotionTagList.vue

@@ -0,0 +1,278 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
+        :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="tagName">
+              <template #label><span title="情绪名称">情绪名称</span></template>
+              <JInput v-model:value="queryParam.tagName" allowClear placeholder="请输入情绪名称" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="izEnabled">
+              <template #label><span title="是否启用">是否启用</span></template>
+              <j-dict-select-tag type='list' v-model:value="queryParam.izEnabled" dictCode="iz_enabled"
+                :ignoreDisabled="true" placeholder="请选择是否启用" allowClear />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
+                  style="margin-left: 8px">重置</a-button>
+                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <!-- <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button>批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <!-- <super-query :config="superQueryConfig" @search="handleSuperQuery" /> -->
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <EmotionTagModal ref="registerModal" @success="handleSuccess"></EmotionTagModal>
+  </div>
+</template>
+
+<script lang="ts" name="emotionTag-emotionTag" setup>
+import { ref, reactive } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { columns, superQuerySchema } from './EmotionTag.data';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './EmotionTag.api';
+import { downloadFile } from '/@/utils/common/renderUtils';
+import EmotionTagModal from './components/EmotionTagModal.vue'
+import { useUserStore } from '/@/store/modules/user';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+
+const formRef = ref();
+const queryParam = reactive<any>({});
+const toggleSearchStatus = ref<boolean>(false);
+const registerModal = ref();
+const userStore = useUserStore();
+//注册table数据
+const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+  tableProps: {
+    title: '情绪标签',
+    api: list,
+    columns,
+    canResize: false,
+    useSearchForm: false,
+    pagination: {
+      current: 1,
+      pageSize: 50,
+      pageSizeOptions: ['50', '70', '100'],
+    },
+    actionColumn: {
+      width: 160,
+      fixed: 'right',
+    },
+    beforeFetch: async (params) => {
+      params.column = 'sort'
+      params.order = 'asc'
+      return Object.assign(params, queryParam);
+    },
+  },
+  exportConfig: {
+    name: "情绪标签",
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+});
+const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+const labelCol = reactive({
+  xs: 24,
+  sm: 4,
+  xl: 8,
+  xxl: 8
+});
+const wrapperCol = reactive({
+  xs: 24,
+  sm: 20,
+  xl: 16,
+  xxl: 16
+});
+
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
+
+/**
+ * 高级查询事件
+ */
+function handleSuperQuery(params) {
+  Object.keys(params).map((k) => {
+    queryParam[k] = params[k];
+  });
+  searchQuery();
+}
+
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  registerModal.value.disableSubmit = false;
+  registerModal.value.add();
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  registerModal.value.disableSubmit = false;
+  registerModal.value.edit(record);
+}
+
+/**
+ * 详情
+ */
+function handleDetail(record: Recordable) {
+  registerModal.value.disableSubmit = true;
+  registerModal.value.edit(record);
+}
+
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await deleteOne({ id: record.id }, handleSuccess);
+}
+
+/**
+ * 批量删除事件
+ */
+async function batchHandleDelete() {
+  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+}
+
+/**
+ * 成功回调
+ */
+function handleSuccess() {
+  (selectedRowKeys.value = []) && reload();
+}
+
+/**
+ * 操作栏
+ */
+function getTableAction(record) {
+  return [
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record)
+    }, {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+        placement: 'topLeft',
+      }
+    }
+  ];
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+
+  ]
+}
+
+/**
+ * 查询
+ */
+function searchQuery() {
+  reload();
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+  formRef.value.resetFields();
+  selectedRowKeys.value = [];
+  //刷新数据
+  reload();
+}
+
+
+
+
+</script>
+
+<style lang="less" scoped>
+.jeecg-basic-table-form-container {
+  padding: 0;
+
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
+  }
+
+  .query-group-cust {
+    min-width: 100px !important;
+  }
+
+  .query-group-split-cust {
+    width: 30px;
+    display: inline-block;
+    text-align: center
+  }
+
+  .ant-form-item:not(.ant-form-item-with-help) {
+    margin-bottom: 16px;
+    height: 32px;
+  }
+
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+}
+</style>

src/views/services/directiveTag/emotiontag/components/EmotionTagForm.vue

@@ -0,0 +1,161 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="DirectiveTagForm">
+          <a-row>
+						<a-col :span="24">
+							<a-form-item label="情绪名称" v-bind="validateInfos.tagName" id="DirectiveTagForm-tagName" name="tagName">
+								<a-input v-model:value="formData.tagName" placeholder="请输入情绪名称"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="排序" v-bind="validateInfos.sort" id="DirectiveTagForm-sort" name="sort">
+								<a-input-number v-model:value="formData.sort" placeholder="请输入排序" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="DirectiveTagForm-izEnabled" name="izEnabled">
+								<j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled" placeholder="请选择是否启用"  allow-clear />
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../EmotionTag.api';
+  import { Form } from 'ant-design-vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: () => ({})},
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    tagName: '',   
+    sort: 99,
+    izEnabled: '0',   
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = reactive({
+    tagName: [{ required: true, message: '请输入情绪名称!'},],
+    sort: [{ required: true, message: '请输入排序!'}, { pattern: /^\d+$/, message: '请输入正整数!'},],
+    izEnabled: [{ required: true, message: '请选择是否启用!'},],
+  });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      const tmpData = {};
+      Object.keys(formData).forEach((key) => {
+        if(record.hasOwnProperty(key)){
+          tmpData[key] = record[key]
+        }
+      })
+      //赋值
+      Object.assign(formData, tmpData);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    try {
+      // 触发表单验证
+      await validate();
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    }
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    padding: 14px;
+  }
+</style>

src/views/services/directiveTag/emotiontag/components/EmotionTagModal.vue

@@ -0,0 +1,77 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <EmotionTagForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></EmotionTagForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import EmotionTagForm from './EmotionTagForm.vue'
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style lang="less">
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
+<style lang="less" scoped></style>

src/views/services/serviceDirective/ConfigServiceDirective.data.ts

@@ -5,6 +5,17 @@ import { render } from '/@/utils/common/renderUtils';
 import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
+  {
+    title: '分类标签',
+    align: 'center',
+    dataIndex: 'instructionTagId_dictText',
+    width: 100,
+    customCell: (record, index, column) => {
+      if (record.instructionRowSpan != null) {
+        return { rowSpan: record.instructionRowSpan };
+      }
+    },
+  },
   {
     title: '服务类别',
     align: 'center',
@@ -25,26 +36,29 @@ export const columns: BasicColumn[] = [
       }
     },
   },
-  {
-    title: '分类标签',
-    align: 'center',
-    dataIndex: 'instructionTagId_dictText',
-    width: 100,
-    customCell: (record, index, column) => {
-      if (record.instructionRowSpan != null) {
-        return { rowSpan: record.instructionRowSpan };
-      }
-    },
-  },
   {
     title: '服务指令名称',
     align: 'center',
     dataIndex: 'directiveName',
   },
   {
-    title: '指令标签',
+    title: '体型标签',
     align: 'center',
-    dataIndex: 'tagList',
+    dataIndex: 'bodyTagList',
+    width: 150,
+    ellipsis: false,
+    format(text, record, index) {
+      if (!!text) {
+        return text.map((item) => item.tagName).join('、');
+      } else {
+        return '-';
+      }
+    },
+  },
+  {
+    title: '情绪标签',
+    align: 'center',
+    dataIndex: 'emotionTagList',
     width: 150,
     ellipsis: false,
     format(text, record, index) {

src/views/services/serviceDirective/ConfigServiceDirectiveList.vue

@@ -69,13 +69,21 @@
               </a-form-item>
             </a-col> -->
             <a-col :lg="6">
-              <a-form-item name="tags">
+              <a-form-item name="bodyTags">
-                <template #label><span title="指令标签">指令标签</span></template>
+                <template #label><span title="体型标签">体型标签</span></template>
-                <JSelectMultiple  type="list" v-model:value="queryParam.tags" :dictCode="`nu_config_directive_tag,tag_name,id,del_flag = '0' order by sort asc`"
+                <JSelectMultiple type="list" v-model:value="queryParam.bodyTags"
-                  :ignoreDisabled="true" placeholder="请选择指令标签" allowClear />
+                  :dictCode="`nu_config_body_tag,tag_name,id,del_flag = '0' order by sort asc`" :ignoreDisabled="true"
+                  placeholder="请选择体型标签" allowClear />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="emotionTags">
+                <template #label><span title="情绪标签">情绪标签</span></template>
+                <JSelectMultiple type="list" v-model:value="queryParam.emotionTags"
+                  :dictCode="`nu_config_emotion_tag,tag_name,id,del_flag = '0' order by sort asc`" :ignoreDisabled="true"
+                  placeholder="请选择情绪标签" allowClear />
               </a-form-item>
             </a-col>
-
             <a-col :lg="6">
               <a-form-item name="cycleType">
                 <template #label><span title="周期类型">周期类型</span></template>
@@ -115,8 +123,10 @@
           preIcon="tabler:settings">配置服务类别</a-button>
         <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleType"
           preIcon="tabler:settings">配置服务类型</a-button>
-        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleTag"
+        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleBodyTag"
-          preIcon="tabler:settings">配置指令标签</a-button>
+          preIcon="tabler:settings">配置体型标签</a-button>
+        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleEmotionTag"
+          preIcon="tabler:settings">配置情绪标签</a-button>
         <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleAdd"
           preIcon="ant-design:plus-outlined">新增服务指令</a-button>
         <!-- <a-button type="primary" v-auth="'serviceDirective:config_service_directive:exportXls'"
@@ -178,12 +188,20 @@
     <ConfigServiceTypeList v-if="typeOpen"></ConfigServiceTypeList>
   </a-drawer>
 
-  <!-- 指令标签 -->
+  <!-- 体型标签 -->
-  <a-drawer title="指令标签" width="60vw" :open="tagOpen" @close="onTagClose">
+  <a-drawer title="体型标签" width="60vw" :open="bodyTagOpen" @close="onBodyTagClose">
     <template #footer>
-      <a-button type="primary" @click="onTagClose" style="float: right;">关闭</a-button>
+      <a-button type="primary" @click="onBodyTagClose" style="float: right;">关闭</a-button>
     </template>
-    <DirectiveTagList v-if="tagOpen"></DirectiveTagList>
+    <BodyTagList v-if="bodyTagOpen"></BodyTagList>
+  </a-drawer>
+
+  <!-- 情绪标签 -->
+  <a-drawer title="情绪标签" width="60vw" :open="emotionTagOpen" @close="onEmotionTagClose">
+    <template #footer>
+      <a-button type="primary" @click="onEmotionTagClose" style="float: right;">关闭</a-button>
+    </template>
+    <EmotionTagList v-if="emotionTagOpen"></EmotionTagList>
   </a-drawer>
 
   <!-- 视频播放 -->
@@ -211,7 +229,8 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT
 import { cloneDeep } from "lodash-es";
 import ConfigServiceCategoryList from '../serviceCategory/ConfigServiceCategoryList.vue';
 import ConfigServiceTypeList from '../serviceType/ConfigServiceTypeList.vue';
-import DirectiveTagList from '../directiveTag/DirectiveTagList.vue';
+import BodyTagList from '/@/views/services/directivetag/bodytag/BodyTagList.vue';
+import EmotionTagList from '/@/views/services/directivetag/emotiontag/EmotionTagList.vue';
 import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
 import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
 
@@ -267,7 +286,8 @@ const superQueryConfig = reactive(superQuerySchema);
 
 const categoryOpen = ref(false)//服务类别抽屉
 const typeOpen = ref(false)//服务类型抽屉
-const tagOpen = ref(false)//指令标签抽屉
+const bodyTagOpen = ref(false)//体型标签抽屉
+const emotionTagOpen = ref(false)//情绪标签抽屉
 
 /**
  * 高级查询事件
@@ -410,9 +430,13 @@ function handleCategory() {
 function handleType() {
   typeOpen.value = true
 }
-//指令标签抽屉打开
+//体型标签抽屉打开
-function handleTag() {
+function handleBodyTag() {
-  tagOpen.value = true
+  bodyTagOpen.value = true
+}
+//情绪标签抽屉打开
+function handleEmotionTag() {
+  emotionTagOpen.value = true
 }
 //服务类别抽屉关闭
 function onCategoryClose() {
@@ -423,11 +447,14 @@ function onCategoryClose() {
 function onTypeClose() {
   typeOpen.value = false
 }
-//指令标签抽屉关闭
+//体型标签抽屉关闭
-function onTagClose() {
+function onBodyTagClose() {
-  tagOpen.value = false
+  bodyTagOpen.value = false
+}
+//体型标签抽屉关闭
+function onEmotionTagClose() {
+  emotionTagOpen.value = false
 }
-
 
 const showVideoModal = ref(false); // 控制模态框显示
 const videoUrl = ref(''); // 视频 URL

src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue

@@ -96,10 +96,16 @@
               </a-form-item>
             </a-col> -->
             <a-col :span="24">
-              <a-form-item label="指令标签" id="ConfigServiceDirectiveForm-typeId" :labelCol="labelCol2"
+              <a-form-item label="体型标签" id="ConfigServiceDirectiveForm-typeId" :labelCol="labelCol2"
                 :wrapperCol="wrapperCol2" name="typeId">
-                <JCheckbox v-model:value="formData.tags"
+                <JCheckbox v-model:value="formData.bodyTags"
-                  :dictCode="`nu_config_directive_tag,tag_name,id,del_flag = 0 order by sort asc`" />
+                  :dictCode="`nu_config_body_tag,tag_name,id,del_flag = 0 order by sort asc`" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="情绪标签" :labelCol="labelCol2" :wrapperCol="wrapperCol2" name="emoTags">
+                <JCheckbox v-model:value="formData.emotionTags"
+                  :dictCode="`nu_config_emotion_tag,tag_name,id,del_flag = 0 order by sort asc`" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -152,7 +158,7 @@
             <a-col :span="12">
               <a-form-item label="语音文件" v-bind="validateInfos.mp3File" id="ConfigServiceDirectiveForm-mp3File"
                 name="mp3File">
-                <j-upload v-model:value="formData.mp3File" accept=".mp3" :disabled="true" :maxCount="1" ></j-upload>
+                <j-upload v-model:value="formData.mp3File" accept=".mp3" :disabled="true" :maxCount="1"></j-upload>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -316,7 +322,8 @@ function add() {
  * 编辑
  */
 function edit(record) {
-  formData.tags = ''
+  formData.bodyTags = ''
+  formData.emotionTags = ''
   nextTick(() => {
     resetFields();
     const tmpData = {};

src/views/services/serviceTag/components/ConfigServiceDirective.data.ts

@@ -22,9 +22,22 @@ export const columns: BasicColumn[] = [
     dataIndex: 'directiveName',
   },
   {
-    title: '指令标签',
+    title: '体型标签',
     align: 'center',
-    dataIndex: 'tagList',
+    dataIndex: 'bodyTagList',
+    ellipsis: false,
+    format(text, record, index) {
+      if (!!text) {
+        return text.map((item) => item.tagName).join('、');
+      } else {
+        return '-';
+      }
+    },
+  },
+  {
+    title: '情绪标签',
+    align: 'center',
+    dataIndex: 'emotionTagList',
     ellipsis: false,
     format(text, record, index) {
       if (!!text) {
@@ -63,9 +76,22 @@ export const selectedColumns: BasicColumn[] = [
     dataIndex: 'directiveName',
   },
   {
-    title: '指令标签',
+    title: '体型标签',
     align: 'center',
-    dataIndex: 'tagList',
+    dataIndex: 'bodyTagList',
+    ellipsis: false,
+    format(text, record, index) {
+      if (!!text) {
+        return text.map((item) => item.tagName).join('、');
+      } else {
+        return '-';
+      }
+    },
+  },
+  {
+    title: '情绪标签',
+    align: 'center',
+    dataIndex: 'emotionTagList',
     ellipsis: false,
     format(text, record, index) {
       if (!!text) {
@@ -85,7 +111,7 @@ export const selectedColumns: BasicColumn[] = [
     key: 'action',
     slots: { customRender: 'action' },
     fixed: 'right', // 如果需要固定在右侧
-    align:'center',
+    align: 'center',
-    width:100
+    width: 100,
   },
 ];

src/views/services/serviceTag/components/ConfigServiceDirectiveForm.vue

@@ -91,10 +91,17 @@
           </a-row>
           <a-row>
             <a-col :span="24">
-              <a-form-item label="指令标签" id="ConfigServiceDirectiveForm-typeId" :labelCol="labelCol2"
+              <a-form-item label="体型标签" id="ConfigServiceDirectiveForm-typeId" :labelCol="labelCol2"
-                :wrapperCol="wrapperCol2" name="typeId">
+                :wrapperCol="wrapperCol2" name="bodyTags">
-                <JCheckbox v-model:value="formData.tags"
+                <JCheckbox v-model:value="formData.bodyTags"
-                  :dictCode="`nu_config_directive_tag,tag_name,id,del_flag = 0 order by sort asc`" />
+                  :dictCode="`nu_config_body_tag,tag_name,id,del_flag = 0 order by sort asc`" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="情绪标签" :labelCol="labelCol2"
+                :wrapperCol="wrapperCol2" name="emotionTags">
+                <JCheckbox v-model:value="formData.emotionTags"
+                  :dictCode="`nu_config_emotion_tag,tag_name,id,del_flag = 0 order by sort asc`" />
               </a-form-item>
             </a-col>
             <a-col :span="12">

src/views/services/serviceTag/components/ConfigServiceDirectiveList.vue

@@ -64,7 +64,10 @@
         <span v-if="column.dataIndex === 'typeName'">
           {{ text || record.typeId_dictText }}
         </span>
-        <span v-if="column.dataIndex === 'tagList'">
+        <span v-if="column.dataIndex === 'bodyTagList'">
+          {{ handleTags('', text, '') }}
+        </span>
+        <span v-if="column.dataIndex === 'emotionTagList'">
           {{ handleTags('', text, '') }}
         </span>
         <span v-if="column.dataIndex === 'cycleType'">

src/views/services/serviceTag/components/ServiceTagList.vue

@@ -53,11 +53,20 @@
             <a-row>
               <a-col :span="22" :push="1" v-for="directive of selectedDirective.directives" :key="directive.id"
                 style="margin-top: 15px;" @click="directiveInfo(directive)">
-                <a-badge-ribbon :text="filterDictTextByCache('period_type', directive.cycleType)" :style="{ top: '-10px' }">
+                <a-badge-ribbon :text="filterDictTextByCache('period_type', directive.cycleType)"
+                  :style="{ top: '-10px' }">
                   <a-card size="small">
-                    <span :class="{ 'selected-dire': directiveId === directive.id }">
+                    <div :class="{ 'selected-dire': directiveId === directive.id }">
-                      {{ directive.directiveName + handleTags('（', directive, '）') }}
+                      <div>
-                    </span>
+                        {{ directive.directiveName }}
+                      </div>
+                      <div>
+                        体型标签：{{ handleBodyTags('', directive, '') }}
+                      </div>
+                      <div>
+                        情绪标签：{{ handleEmotionTags('', directive, '') }}
+                      </div>
+                    </div>
                   </a-card>
                 </a-badge-ribbon>
               </a-col>
@@ -76,7 +85,8 @@
             </div>
             <div class="directiveInfoClass">服务时长(分钟)：{{ derectiveInfo.serviceDuration }}</div>
             <div class="directiveInfoClass">服务说明：{{ derectiveInfo.serviceContent }}</div>
-            <div class="directiveInfoClass">指令标签：{{ handleTags('', derectiveInfo, '') }}</div>
+            <div class="directiveInfoClass">体型标签：{{ handleBodyTags('', derectiveInfo, '') }}</div>
+            <div class="directiveInfoClass">情绪标签：{{ handleEmotionTags('', derectiveInfo, '') }}</div>
             <div class="directiveInfoClass">语音文件：
               <span v-if="!derectiveInfo.mp3File">暂无文件</span>
               <audio controls disabled="false" v-else>
@@ -179,12 +189,25 @@ function remove(data) {
 }
 
 /**
- * 处理服务指令标签翻译
+ * 处理体型标签翻译
  * @param directive_ 
  */
-function handleTags(prefix, directive_, suffix) {
+function handleBodyTags(prefix, directive_, suffix) {
-  if (!!directive_.tagList && directive_.tagList.length > 0) {
+  if (!!directive_.bodyTagList && directive_.bodyTagList.length > 0) {
-    let str = directive_.tagList.map(item => item.tagName).join('、 ');
+    let str = directive_.bodyTagList.map(item => item.tagName).join('、 ');
+    return prefix + str + suffix
+  } else {
+    return ''
+  }
+}
+
+/**
+ * 处理情绪标签翻译
+ * @param directive_ 
+ */
+function handleEmotionTags(prefix, directive_, suffix) {
+  if (!!directive_.emotionTagList && directive_.emotionTagList.length > 0) {
+    let str = directive_.emotionTagList.map(item => item.tagName).join('、 ');
     return prefix + str + suffix
   } else {
     return ''

src/views/services/serviceTag/components/ServiceTagModal.vue

@@ -29,9 +29,17 @@
                       <a-button type="link" danger preIcon="ic:baseline-remove-circle"></a-button>
                     </a-popconfirm>
                   </span>
-                  <span :class="{ 'selected': selectedDirective === directive.id }">
+                  <div :class="{ 'selected': selectedDirective === directive.id }">
-                    {{ directive.directiveName + handleTags('（', directive, '）') }}
+                    <div>
-                  </span>
+                      {{ directive.directiveName }}
+                    </div>
+                    <div>
+                      体型标签：{{ handleBodyTags('', directive, '') }}
+                    </div>
+                    <div>
+                      情绪标签：{{ handleEmotionTags('', directive, '') }}
+                    </div>
+                  </div>
                 </a-card>
               </a-badge-ribbon>
             </a-col>
@@ -48,7 +56,8 @@
           <div class="directiveInfoClass">周期类型：{{ filterDictTextByCache('period_type', derectiveInfo.cycleType) }}</div>
           <div class="directiveInfoClass">服务时长(分钟)：{{ derectiveInfo.serviceDuration }}</div>
           <div class="directiveInfoClass">服务说明：{{ derectiveInfo.serviceContent }}</div>
-          <div class="directiveInfoClass">指令标签：{{ handleTags('', derectiveInfo, '') }}</div>
+          <div class="directiveInfoClass">体型标签：{{ handleBodyTags('', derectiveInfo, '') }}</div>
+          <div class="directiveInfoClass">情绪标签：{{ handleEmotionTags('', derectiveInfo, '') }}</div>
           <div class="directiveInfoClass">语音文件：
             <span v-if="!derectiveInfo.mp3File">暂无文件</span>
             <audio controls disabled="false" v-else>
@@ -118,12 +127,26 @@ const seletedRecord = ref({ directives: [] })//里面记录了已选择的服务
 const { createMessage } = useMessage();
 
 /**
- * 处理服务指令标签翻译
+ * 处理体型标签翻译
  * @param directive_ 
  */
-function handleTags(prefix, directive_, suffix) {
+function handleBodyTags(prefix, directive_, suffix) {
-  if (!!directive_.tagList && directive_.tagList.length > 0) {
+  if (!!directive_.bodyTagList && directive_.bodyTagList.length > 0) {
-    let str = directive_.tagList.map(item => item.tagName).join('、 ');
+    let str = directive_.bodyTagList.map(item => item.tagName).join('、 ');
+    return prefix + str + suffix
+  } else {
+    return ''
+  }
+}
+
+/**
+ * 处理情绪标签翻译
+ * @param directive_ 
+ */
+function handleEmotionTags(prefix, directive_, suffix) {
+  console.log("🌊 ~ handleEmotionTags ~ directive_:", directive_)
+  if (!!directive_.emotionTagList && directive_.emotionTagList.length > 0) {
+    let str = directive_.emotionTagList.map(item => item.tagName).join('、 ');
     return prefix + str + suffix
   } else {
     return ''
@@ -136,7 +159,9 @@ function handleTags(prefix, directive_, suffix) {
 function add() {
   title.value = '新增服务标签';
   visible.value = true;
+  selectedDirective.value = ''
   seletedRecord.value = { directives: [] }
+  derectiveInfo.value = {}
   nextTick(() => {
     registerForm.value.add();
   });
@@ -147,6 +172,8 @@ function add() {
  * @param record
  */
 function edit(record) {
+  selectedDirective.value = ''
+  derectiveInfo.value = {}
   seletedRecord.value = record
   title.value = disableSubmit.value ? '详情' : '编辑';
   visible.value = true;