修改页面样式

src/components/OrgCard/OrgCardCom.vue

@@ -7,25 +7,24 @@
     :bodyStyle="{ padding: '24px 24px 0 24px' }" @click="handleClick">
     <template #title>
       <a-row style="font-weight: normal; ">
-        <a-col :span="existTagFunc() ? 16 : 21">
+        <a-col :span="16">
           <div>
             <span class="ellipsis-one-lines1" :title="orgInfo.departName" style="font-size: 17px; font-weight: bold;">{{
               orgInfo.departName
             }}</span>
           </div>
         </a-col>
-        <a-col :span="existTagFunc() ? 8 : 3" style="text-align: right;">
+        <a-col :span="8" style="text-align: right;">
           <div style="display: flex; align-items: center; justify-content: flex-end; gap: 8px;">
-            <span v-if="isDirectiveMain && showMainTile"
+            <!-- <span v-if="isDirectiveMain && showMainTile"
               style="color: #909399; font-size: 12px; font-weight: bold; white-space: nowrap;">
               标准指令库
             </span>
             <span v-if="isElderTagMain && showMainTile"
               style="color: #909399; font-size: 12px; font-weight: bold; white-space: nowrap;">
               标准标签库
-            </span>
+            </span> -->
-            <div class="zxClass" :class="{ 'zxbkClass': existTagFunc() }" style="min-width: 35px;">{{ orgInfo.orgCode
+            <div style="min-width: 35px;margin-top:3px;">机构编码:{{ orgInfo.orgCode }}
-            }}
             </div>
           </div>
         </a-col>
@@ -49,7 +48,7 @@
           </a-col>
           <a-col :span="12" style="text-align: right;">
             <a-button style="font-size: 12px;" v-show="showDetail" type="link" size="small"
-              @click.stop="handleDetail">了解更多</a-button>
+              @click.stop="handleDetail">查看详情</a-button>
             <a-button style="font-size: 12px;" v-show="showHldy" type="link" size="small"
               @click.stop="handleHldy">护理单元</a-button>
             <a-button style="font-size: 12px;" v-show="showInfo" type="link" size="small"

src/views/elder/elderbk/ElderBkItemList.vue

@@ -73,7 +73,7 @@ const userStore = useUserStore();
 //注册table数据
 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
-    title: '指令备份子表',
+    title: '指令快照子表',
     api: list,
     columns,
     canResize: false,

src/views/elder/elderbk/ElderBkMain.data.ts

@@ -16,7 +16,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'orgCode_dictText'
   },
   {
-    title: '备份时间',
+    title: '操作时间',
     align: "center",
     dataIndex: 'createTime',
     customRender:({text}) =>{
@@ -29,5 +29,5 @@ export const columns: BasicColumn[] = [
 // 高级查询数据
 export const superQuerySchema = {
   orgCode: {title: ' 机构编码',order: 0,view: 'list', type: 'string',dictTable: "sys_depart", dictCode: 'org_code', dictText: 'depart_name',},
-  createTime: {title: '备份时间',order: 1,view: 'date', type: 'string',},
+  createTime: {title: '操作时间',order: 1,view: 'date', type: 'string',},
 };

src/views/elder/elderbk/ElderBkMainList.vue

@@ -14,7 +14,7 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item name="createTime">
-              <template #label><span title="备份时间">备份时间</span></template>
+              <template #label><span title="操作时间">操作时间</span></template>
               <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.createTime"
                 class="query-group-cust" />
             </a-form-item>
@@ -82,7 +82,7 @@ const pkid = ref('')
 //注册table数据
 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
-    title: '指令备份主表',
+    title: '指令快照主表',
     api: list,
     columns,
     canResize: false,

src/views/services/directivebk/DirectiveBkItemList.vue

@@ -5,7 +5,7 @@
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
         :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="5">
+          <a-col :xl="8" :xxl="6">
             <a-form-item name="instructionTagId">
               <template #label><span title="分类标签">分类标签</span></template>
               <j-dict-select-tag v-model:value="queryParam.instructionTagId" :orgCode="bkOrgCode"
@@ -15,7 +15,7 @@
             </a-form-item>
           </a-col>
 
-          <a-col :lg="5">
+          <a-col :xl="8" :xxl="6">
             <a-form-item name="categoryId">
               <template #label><span title="服务类别">服务类别</span></template>
               <j-dict-select-tag type="list" v-model:value="queryParam.categoryId" :orgCode="bkOrgCode"
@@ -24,7 +24,7 @@
             </a-form-item>
           </a-col>
 
-          <a-col :lg="5">
+          <a-col :xl="8" :xxl="6">
             <a-form-item name="typeId">
               <template #label><span title="服务类型">服务类型</span></template>
               <j-dict-select-tag type="list" v-model:value="queryParam.typeId" :orgCode="bkOrgCode"
@@ -32,13 +32,13 @@
                 placeholder="请选择服务类型" allowClear :ignoreDisabled="true" />
             </a-form-item>
           </a-col>
-          <a-col :lg="5">
+          <a-col :xl="8" :xxl="6">
             <a-form-item name="directiveName">
               <template #label><span title="服务指令">服务指令</span></template>
               <JInput v-model:value="queryParam.directiveName" placeholder="请输入服务指令名称" allowClear />
             </a-form-item>
           </a-col>
-          <a-col :xl="4" :lg="4" :md="4" :sm="4">
+          <a-col  :xl="8" :xxl="6">
             <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>
@@ -93,7 +93,7 @@ const userStore = useUserStore();
 //注册table数据
 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
-    title: '指令备份子表',
+    title: '指令快照子表',
     api: list,
     columns,
     canResize: false,
@@ -116,7 +116,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     },
   },
   exportConfig: {
-    name: "指令备份子表",
+    name: "指令快照子表",
     url: getExportUrl,
     params: queryParam,
   },

src/views/services/directivebk/DirectiveBkMain.data.ts

@@ -8,7 +8,8 @@ export const columns: BasicColumn[] = [
   {
     title: ' 机构编码',
     align: "center",
-    dataIndex: 'orgCode'
+    dataIndex: 'orgCode',
+    width: '150px',
   },
   {
     title: ' 机构名称',
@@ -16,7 +17,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'orgCode_dictText'
   },
   {
-    title: '备份时间',
+    title: '操作时间',
     align: "center",
     dataIndex: 'createTime',
     customRender:({text}) =>{
@@ -29,5 +30,5 @@ export const columns: BasicColumn[] = [
 // 高级查询数据
 export const superQuerySchema = {
   orgCode: {title: ' 机构编码',order: 0,view: 'list', type: 'string',dictTable: "sys_depart", dictCode: 'org_code', dictText: 'depart_name',},
-  createTime: {title: '备份时间',order: 1,view: 'date', type: 'string',},
+  createTime: {title: '操作时间',order: 1,view: 'date', type: 'string',},
 };

src/views/services/directivebk/DirectiveBkMainList.vue

@@ -5,21 +5,21 @@
       <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-col  :xl="8" :xxl="6">
             <a-form-item name="orgCode">
               <template #label><span title="机构名称">机构名称</span></template>
-              <j-dict-select-tag placeholder="请选择所属机构" v-model:value="queryParam.orgCode"
+              <j-dict-select-tag placeholder="请选择机构名称" v-model:value="queryParam.orgCode"
                 dictCode="sys_depart,depart_name,org_code" allow-clear />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <a-col  :xl="8" :xxl="6">
             <a-form-item name="createTime">
-              <template #label><span title="备份时间">备份时间</span></template>
+              <template #label><span title="操作时间">操作时间</span></template>
               <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.createTime"
                 class="query-group-cust" />
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col  :xl="8" :xxl="6">
             <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>
@@ -82,7 +82,7 @@ const pkid = ref('')
 //注册table数据
 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
-    title: '指令备份主表',
+    title: '指令快照主表',
     api: list,
     columns,
     canResize: false,
@@ -103,7 +103,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     },
   },
   exportConfig: {
-    name: "服务指令备份",
+    name: "服务指令快照",
     url: getExportUrl,
     params: queryParam,
   },
@@ -116,12 +116,12 @@ const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDat
 const labelCol = reactive({
   xs: 24,
   sm: 4,
-  xl: 5,
+  xl: 8,
-  xxl: 5
+  xxl: 8
 });
 const wrapperCol = reactive({
   xs: 24,
-  sm: 20,
+  sm: 16,
 });
 
 /**

src/views/synchronization/directive/directiveopelog/DirectiveOpeLogMain.data.ts

@@ -6,7 +6,7 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '机构编码',
+    title: '机构名称',
     align: 'center',
     dataIndex: 'orgCode_dictText',
   },
@@ -23,9 +23,10 @@ export const columns: BasicColumn[] = [
     width: 80,
   },
   {
-    title: '操作日期',
+    title: '操作时间',
     align: 'center',
     dataIndex: 'createTime',
+    width: 160,
   },
   {
     title: '分类标签',
@@ -49,6 +50,7 @@ export const columns: BasicColumn[] = [
     title: '服务指令',
     align: 'center',
     dataIndex: 'directiveName',
+    width: 120,
   },
   // {
   //   title: '周期类型',

src/views/synchronization/directive/directiveopelog/DirectiveOpeLogMainList.vue

@@ -7,8 +7,8 @@
         <a-row :gutter="24">
           <a-col :lg="6">
             <a-form-item name="orgCode">
-              <template #label><span title="机构">机构</span></template>
+              <template #label><span title="机构名称">机构名称</span></template>
-              <j-dict-select-tag placeholder="请选择机构" v-model:value="queryParam.orgCode"
+              <j-dict-select-tag placeholder="请选择机构名称" v-model:value="queryParam.orgCode"
                 dictCode="sys_depart,depart_name,org_code" allow-clear />
             </a-form-item>
           </a-col>

src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoCompare.vue

@@ -71,15 +71,15 @@ const fieldLabels: Record<string, string> = {
   directiveName: '服务指令',
   tollPrice: '收费价格(元)',
   comPrice: '提成价格(元)',
-  serviceContent: '服务说明',
+  serviceContent: '服务指令描述',
   serviceDuration: '服务时长(分钟)',
   timeoutDuration: '超时时长(分钟)',
   mp3File: '语音文件',
   mp4File: '视频文件',
-  previewFile: '预览图片(大)',
+  previewFile: '服务指令图片',
-  previewFileSmall: '预览图片(小)',
+  // previewFileSmall: '预览图片(小)',
-  immediateFile: '即时指令图片',
+  immediateFile: '指令样式（选中）',
-  immediateFileFocus: '即时指令焦点图片',
+  immediateFileFocus: '指令样式（选中）',
 };
 
 // 需要显示的字段顺序
@@ -93,7 +93,7 @@ const displayFields = [
   'serviceDuration',
   'timeoutDuration',
   'previewFile',
-  'previewFileSmall',
+  // 'previewFileSmall',
   'mp3File',
   'mp4File',
   'immediateFile',
@@ -110,17 +110,17 @@ const columns = computed(() => [
     ellipsis: false
   },
   {
-    title: '旧数据',
+    title: '变更前',
     dataIndex: 'oldValue',
     key: 'oldValue',
-    width: '45%',
+    width: '42%',
     ellipsis: false
   },
   {
-    title: '新数据',
+    title: '变更后',
     dataIndex: 'newValue',
     key: 'newValue',
-    width: '45%',
+    width: '42%',
     ellipsis: false
   }
 ]);

src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogMainModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-drawer :title="title" width="80vw" v-model:visible="visible" :closable="true"
+  <a-drawer :title="title" width="1000" v-model:visible="visible" :closable="true"
     :footer-style="{ textAlign: 'right' }" :bodyStyle="{ 'padding': '14px' }" @close="handleCancel">
     <!-- 新增-查看 -->
     <DirectiveOpeLogInfoAdd v-if="dataType == 'add'" ref="registerForm" @ok="submitCallback"

src/views/synchronization/directive/directivesynclog/DirectiveSyncLogMain.data.ts

@@ -6,24 +6,26 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '镜像机构',
+    title: '目标镜像机构',
     align: 'center',
     dataIndex: 'opeOrgCode_dictText',
   },
   {
-    title: '被镜像机构',
+    title: '源镜像机构',
     align: 'center',
     dataIndex: 'targetOrgCode_dictText',
   },
   {
-    title: '镜像日期',
+    title: '镜像时间',
     align: 'center',
     dataIndex: 'createTime',
+    width: 160,
   },
   {
     title: '镜像码',
     align: 'center',
     dataIndex: 'orgDirectiveCode',
+    width: 100,
   },
 ];
 

src/views/synchronization/directive/directivesynclog/DirectiveSyncLogMainList.vue

@@ -5,34 +5,34 @@
       <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-col  :xl="8" :xxl="6">
             <a-form-item name="opeOrgCode">
-              <template #label><span title="镜像机构">镜像机构</span></template>
+              <template #label><span title="目标镜像机构">目标镜像机构</span></template>
               <j-dict-select-tag v-model:value="queryParam.opeOrgCode" dictCode="sys_depart,depart_name,org_code"
-                placeholder="请选择镜像机构" allowClear />
+                placeholder="请选择目标镜像机构" allowClear />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <a-col  :xl="8" :xxl="6">
             <a-form-item name="targetOrgCode">
-              <template #label><span title="被镜像机构">被镜像机构</span></template>
+              <template #label><span title="源镜像机构">源镜像机构</span></template>
-              <j-dict-select-tag placeholder="请选择被镜像机构" v-model:value="queryParam.targetOrgCode"
+              <j-dict-select-tag placeholder="请选择源镜像机构" v-model:value="queryParam.targetOrgCode"
                 dictCode="sys_depart,depart_name,org_code" allow-clear />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <a-col  :xl="8" :xxl="6">
             <a-form-item name="createTime">
               <template #label><span title="镜像日期">镜像日期</span></template>
               <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.createTime"
                 class="query-group-cust" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <a-col  :xl="8" :xxl="6">
             <a-form-item name="orgDirectiveCode">
               <template #label><span title="镜像码">镜像码</span></template>
               <JInput placeholder="请输入镜像码" v-model:value="queryParam.orgDirectiveCode" allow-clear></JInput>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col  :xl="8" :xxl="6">
             <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>
@@ -111,12 +111,12 @@ const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDat
 const labelCol = reactive({
   xs: 24,
   sm: 4,
-  xl: 6,
+  xl: 8,
-  xxl: 5
+  xxl: 8
 });
 const wrapperCol = reactive({
   xs: 24,
-  sm: 20,
+  sm: 16,
 });
 
 /**

src/views/synchronization/directive/directivesynclog/components/DirectiveSyncLogInfoModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-drawer :title="title" width="80vw" v-model:visible="visible" :closable="true"
+  <a-drawer :title="title" width="900" v-model:visible="visible" :closable="true"
     :footer-style="{ textAlign: 'right' }" @close="handleCancel"
     :bodyStyle="{ background: 'linear-gradient(135deg, #f1f7ff 0%, #f1f7ff 100%)', padding: '14px' }">
     <DirectiveSyncLogInfoList v-if="visible" ref="registerForm" @ok="submitCallback" :formBpm="false">

src/views/synchronization/directive/syncList.vue

@@ -22,7 +22,7 @@
             <a-button type="primary" preIcon="ant-design:file-sync-outlined" @click="handleSyncLogOpen"
               style="margin-right: 10px;">镜像日志</a-button>
             <a-button type="primary" preIcon="ant-design:copy-outlined" @click="handleDirectiveBackups"
-              style="margin-right: 10px;">指令备份</a-button>
+              style="margin-right: 10px;">指令快照</a-button>
           </a-col>
         </a-row>
       </a-form>
@@ -33,7 +33,7 @@
     </OrgListCom>
 
     <!-- 操作日志 -->
-    <a-drawer v-model:visible="opeLogOpen" title="操作日志" width="80vw" :footer-style="{ textAlign: 'right' }"
+    <a-drawer v-model:visible="opeLogOpen" title="操作日志" width="1200" :footer-style="{ textAlign: 'right' }"
       :bodyStyle="{ padding: '0px', height: '80vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
       wrapClassName="org-list-modal" @cancel="handleOpeLogClose">
       <template #footer>
@@ -46,7 +46,7 @@
     </a-drawer>
 
     <!-- 镜像日志 -->
-    <a-drawer v-model:visible="syncLogOpen" title="镜像日志" width="80vw" :footer-style="{ textAlign: 'right' }"
+    <a-drawer v-model:visible="syncLogOpen" title="镜像日志" width="1000" :footer-style="{ textAlign: 'right' }"
       :bodyStyle="{ padding: '0px', height: '80vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
       wrapClassName="org-list-modal" @cancel="handleSyncLogClose">
       <template #footer>
@@ -58,8 +58,8 @@
       </div>
     </a-drawer>
 
-    <!-- 指令备份 -->
+    <!-- 指令快照 -->
-    <a-drawer v-model:visible="directiveBackupsOpen" title="指令备份" width="85vw" :footer-style="{ textAlign: 'right' }"
+    <a-drawer v-model:visible="directiveBackupsOpen" title="指令快照" width="900" :footer-style="{ textAlign: 'right' }"
       :bodyStyle="{ padding: '14px', height: '80vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
       wrapClassName="org-list-modal" @cancel="handleDirectiveBackupsClose">
       <template #footer>
@@ -103,7 +103,7 @@ const existDirectiveIds = ref([])//指令库已存在指令id
 const directiveMainOrgInfo = ref()
 const directiveBackupsOpen = ref(false)
 const syncLogOpen = ref(false)
-const backupsRef = ref()//指令备份
+const backupsRef = ref()//指令快照
 const syncLogRef = ref()//镜像日志ref
 const opeLogOpen = ref(false)
 const opeLogRef = ref()
@@ -166,14 +166,14 @@ function refreshDMExistedIds(dmOrgInfo, izReset = false, izQuery = true) {
 }
 
 /**
- * 查看指令备份
+ * 查看指令快照
  */
 function handleDirectiveBackups() {
   directiveBackupsOpen.value = true
 }
 
 /**
- * 关闭指令备份
+ * 关闭指令快照
  */
 function handleDirectiveBackupsClose() {
   directiveBackupsOpen.value = false

src/views/synchronization/eldertag/syncList.vue

@@ -145,7 +145,7 @@ const elderTagMainOrgInfo = ref()
 const listVisible = ref(false)
 const listRef = ref(false)
 const elderTagBackupsOpen = ref(false)
-const backupsRef = ref()//指令备份
+const backupsRef = ref()//指令快照
 
 const labelCol = reactive({
   xs: 24,
@@ -312,14 +312,14 @@ function getElderTagMainOrgInfo() {
 }
 
 /**
- * 查看指令备份
+ * 查看指令快照
  */
 function handleElderBackups() {
   elderTagBackupsOpen.value = true
 }
 
 /**
- * 关闭指令备份
+ * 关闭指令快照
  */
 function handleElderBackupsClose() {
   elderTagBackupsOpen.value = false