Merge branch 'ww' into 'main'

perf: scheduled tasks if job groub is report will hidden edit button

See merge request huang/yun-teng-iot-front!386

@@ -205,11 +205,9 @@
           <List.Item>
           <List.Item>
             <Card hoverable>
             <Card hoverable>
               <template #cover>
               <template #cover>
-                <img
-                  class="w-36 h-36 flex justify-center items-center"
-                  alt="example"
-                  :src="item.thumbnail || configurationSrc"
-                />
+                <div class="h-full w-full !flex justify-center items-center text-center">
+                  <img class="w-36 h-36" alt="example" :src="item.thumbnail || configurationSrc" />
+                </div>
               </template>
               </template>
               <template class="ant-card-actions" #actions>
               <template class="ant-card-actions" #actions>
                 <Authority value="api:yt:configuration:center:get_configuration_info:get">
                 <Authority value="api:yt:configuration:center:get_configuration_info:get">

 <template>
 <template>
-  <BasicDrawer v-bind="$attrs" title="产品详情" @register="register" width="50%">
+  <BasicDrawer v-bind="$attrs" title="产品详情" @register="register" width="60%">
     <Tabs :animated="true" v-model:activeKey="activeKey" @change="handlePanelChange">
     <Tabs :animated="true" v-model:activeKey="activeKey" @change="handlePanelChange">
       <TabPane forceRender key="product" tab="产品">
       <TabPane forceRender key="product" tab="产品">
         <div class="relative">
         <div class="relative">

@@ -6,83 +6,60 @@
       @register="registerTable"
       @register="registerTable"
     >
     >
       <template #toolbar>
       <template #toolbar>
-        <div class="p-column">
-          <div class="p-content">
-            <a-alert v-if="!isShowBtn" style="width: 511px" type="info" show-icon>
+        <div class="flex-auto">
+          <div class="mb-2">
+            <a-alert v-if="!isShowBtn" type="info" show-icon>
               <template #message>
               <template #message>
-                <span
-                  >当前展示的是已发布到线上的功能定义，如需修改，请点击
+                <span>
+                  当前展示的是已发布到线上的功能定义，如需修改，请点击
                   <span
                   <span
                     @click="handleEditPhysicalModel"
                     @click="handleEditPhysicalModel"
-                    class="ml-2"
-                    style="color: #409eff; cursor: pointer"
+                    class="cursor-pointer text-blue-400"
                     size="small"
                     size="small"
-                    >“编辑物模型”</span
-                  ></span
-                >
+                  >
+                    “编辑物模型”
+                  </span>
+                </span>
               </template>
               </template>
             </a-alert>
             </a-alert>
           </div>
           </div>
-          <div style="height: 20px"></div>
-          <div class="p-bottom">
-            <div>
+          <div class="flex justify-between items-end">
+            <div class="flex gap-2">
               <Authority value="">
               <Authority value="">
-                <div style="display: flex">
-                  <a-button
-                    v-if="isShowBtn"
-                    style="margin-left: -20px"
-                    type="primary"
-                    @click="handleCreateOrEdit(null)"
-                  >
-                    新增物模型
-                  </a-button>
-                  <a-button
-                    :style="[isShowBtn ? { left: 0 + 'px' } : { left: -29 + 'px' }]"
-                    class="ml-2"
-                    type="primary"
-                    @click="handleOpenTsl"
-                  >
-                    物模型TSL
-                  </a-button>
-                </div>
+                <a-button v-if="isShowBtn" type="primary" @click="handleCreateOrEdit(null)">
+                  新增物模型
+                </a-button>
+                <a-button type="primary" @click="handleOpenTsl"> 物模型TSL </a-button>
               </Authority>
               </Authority>
             </div>
             </div>
-            <div>
+            <div class="flex gap-2">
               <Authority value="">
               <Authority value="">
-                <div style="display: flex">
-                  <Popconfirm
-                    title="是否需要发布上线？"
-                    ok-text="确定"
-                    cancel-text="取消"
-                    @confirm="handleEmit"
-                  >
-                    <a-button v-if="isShowBtn" type="primary"> 发布上线 </a-button>
-                  </Popconfirm>
+                <Popconfirm
+                  title="是否需要发布上线？"
+                  ok-text="确定"
+                  cancel-text="取消"
+                  @confirm="handleEmit"
+                >
+                  <a-button v-if="isShowBtn" type="primary"> 发布上线 </a-button>
+                </Popconfirm>
+                <a-button v-if="isShowBtn" class="!bg-gray-200" type="text" @click="handleReturn">
+                  返回
+                </a-button>
+                <Popconfirm
+                  title="您确定要批量删除数据"
+                  ok-text="确定"
+                  cancel-text="取消"
+                  @confirm="handleDeleteOrBatchDelete(null)"
+                >
                   <a-button
                   <a-button
-                    style="background: #d7d7d7"
-                    v-if="isShowBtn"
-                    class="ml-2"
-                    type="text"
-                    @click="handleReturn"
+                    style="display: none"
+                    type="primary"
+                    color="error"
+                    :disabled="hasBatchDelete"
                   >
                   >
-                    返回
+                    批量删除
                   </a-button>
                   </a-button>
-                  <Popconfirm
-                    title="您确定要批量删除数据"
-                    ok-text="确定"
-                    cancel-text="取消"
-                    @confirm="handleDeleteOrBatchDelete(null)"
-                  >
-                    <a-button
-                      style="display: none"
-                      type="primary"
-                      color="error"
-                      :disabled="hasBatchDelete"
-                    >
-                      批量删除
-                    </a-button>
-                  </Popconfirm>
-                </div>
+                </Popconfirm>
               </Authority>
               </Authority>
             </div>
             </div>
           </div>
           </div>
@@ -227,12 +204,4 @@
   :deep(.ant-table-body) {
   :deep(.ant-table-body) {
     height: auto !important;
     height: auto !important;
   }
   }
-
-  :deep(.ant-divider) {
-    margin-top: 58px;
-  }
-
-  :deep(.table-settings) {
-    margin-top: 58px;
-  }
 </style>
 </style>

@@ -27,7 +27,7 @@
               icon: 'clarity:note-edit-line',
               icon: 'clarity:note-edit-line',
               auth: 'api:yt:schedule:update',
               auth: 'api:yt:schedule:update',
               onClick: handleCreateOrEdit.bind(null, record),
               onClick: handleCreateOrEdit.bind(null, record),
-              ifShow: record.status === 0,
+              ifShow: record.status === 0 && EJobGroup.REPORT !== record.jobGroup,
             },
             },
             {
             {
               label: '删除',
               label: '删除',
@@ -104,6 +104,7 @@
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { EJobGroup } from './config.data';
 
 
   const disabledSwitch = ref(false);
   const disabledSwitch = ref(false);
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();

@@ -7,7 +7,7 @@ import {
   DataSource,
   DataSource,
   GradientInfo,
   GradientInfo,
 } from '/@/api/dataBoard/model';
 } from '/@/api/dataBoard/model';
-import { isArray } from '/@/utils/is';
+import { isArray, isNumber } from '/@/utils/is';
 import { buildUUID } from '/@/utils/uuid';
 import { buildUUID } from '/@/utils/uuid';
 
 
 export interface GradientInfoRecord {
 export interface GradientInfoRecord {
@@ -256,7 +256,7 @@ export const update_instrument_2_font = (radioRecord: RadioRecord) => {
 };
 };
 
 
 const handleValue = (value: any) => {
 const handleValue = (value: any) => {
-  return Number(value).toFixed(2);
+  return isNumber(value) ? Number(value).toFixed(2) : 0;
 };
 };
 
 
 export const update_instrument_1_value = (params: DashBoardValue) => {
 export const update_instrument_1_value = (params: DashBoardValue) => {