Merge branch 'fix/configuration-center' into 'main_dev'

fix: 修复组态权限区分

See merge request yunteng/thingskit-front!982

@@ -13,13 +13,14 @@
 <script lang="ts">
   import { defineComponent, ref, computed, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchema, PC_DEFAULT_CONTENT, PHONE_DEFAULT_CONTENT, Platform } from './center.data';
+  import { formSchema } from './center.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { saveOrUpdateConfigurationCenter } from '/@/api/configuration/center/configurationCenter';
   import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
   import { buildUUID } from '/@/utils/uuid';
   import { getDeviceProfile } from '/@/api/alarm/position';
+  import { PC_DEFAULT_CONTENT, PHONE_DEFAULT_CONTENT, Platform } from '../center/center.data';
 
   export default defineComponent({
     name: 'ConfigurationDrawer',

@@ -5,28 +5,17 @@ import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter
 import { useComponentRegister } from '/@/components/Form';
 import { OrgTreeSelect } from '../../common/OrgTreeSelect';
 import { getDeviceProfile } from '/@/api/alarm/position';
+import { Platform } from '../center/center.data';
 
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
-export enum Platform {
-  PHONE = 'phone',
-  PC = 'pc',
-}
 
-export enum ConfigurationPermission {
-  CREATE = 'api:yt:configuration:center:post',
-  UPDATE = 'api:yt:configuration:center:update',
-  DELETE = 'api:yt:configuration:center:delete',
-  DESIGN = 'api:yt:configuration:center:get_configuration_info:design',
-  PREVIEW = 'api:yt:configuration:center:get_configuration_info:preview',
-  SHARE = 'api:yt:configuration:center:share',
-  UN_SHARE = 'api:yt:configuration:center:monopoly',
+export enum ConfigurationTemplatePermission {
+  CREATE = 'api:yt:configuration:template:center:post',
+  UPDATE = 'api:yt:configuration:template:center:update',
+  DELETE = 'api:yt:configuration:template:center:delete',
+  DESIGN = 'api:yt:configuration:template:center:get_configuration_info:design',
+  PREVIEW = 'api:yt:configuration:template:center:get_configuration_info:preview',
 }
-
-export const PC_DEFAULT_CONTENT =
-  '<mxfile><diagram>dZHBDsIgDIafhvuEzOh5Tr142sEzGXWQsHVhmKFP7xbAidMT5fv/UtoSVrTuZHgvLyhAE5oJR9iBUMrybT4dM3l4stnTzJPGKBHYAir1hACj7a4EDInRImqr+hTW2HVQ24RxY3BMbTfUadWeN7ACVc31ml6VsPK7jVk4g2pkLJ3tgtLy6A5gkFzg+IFYSVhhEK2PWleAnscXB+Pzjn/U988MdPZHwhQsb0+XZEesfAE=</diagram></mxfile>';
-
-export const PHONE_DEFAULT_CONTENT =
-  '<mxfile><diagram>dZHBEoIgEEC/hru6lXU2q0snD50Z2YQZdB2k0fr6dMCMsU4sb9+ysDDI6uFseCuvJFCzJBIDgyNLkjjdw7hM5OnIYRc5UBklvLSAQr3Qw1l7KIFdIFoibVUbwpKaBksbMG4M9aF2Jx12bXmFK1CUXK/pTQkrHd3E24VfUFXSd04hdYmaz65/SCe5oP4LQc4gM0TWRfWQoZ5mN4/F1Z3+ZD/3MtjYHwVjsJw9boIPgvwN</diagram></mxfile>';
 // 表格列数据
 export const columns: BasicColumn[] = [
   {

@@ -6,12 +6,11 @@
   import {
     deleteConfigurationCenter,
     getPage,
-    shareConfiguration,
   } from '/@/api/configuration/center/configurationCenter';
   import { ConfigurationCenterItemsModal } from '/@/api/configuration/center/model/configurationCenterModal';
   import { PageWrapper } from '/@/components/Page';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { ConfigurationPermission, Platform, searchFormSchema } from './center.data';
+  import { searchFormSchema, ConfigurationTemplatePermission } from './center.data';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
   import ConfigurationCenterDrawer from './ConfigurationCenterDrawer.vue';
@@ -22,10 +21,10 @@
   import { usePermission } from '/@/hooks/web/usePermission';
   import { AuthIcon, CardLayoutButton } from '/@/components/Widget';
   import AuthDropDown from '/@/components/Widget/AuthDropDown.vue';
-  import { ShareModal } from '/@/views/common/ShareModal';
   import { useRole } from '/@/hooks/business/useRole';
   import { Icon } from '/@/components/Icon';
   import { createScadaPageLink, ScadaModeEnum } from './help';
+  import { Platform } from '../center/center.data';
 
   const listColumn = ref(5);
 
@@ -102,11 +101,11 @@
   const { hasPermission } = usePermission();
 
   const getPreviewFlag = computed(() => {
-    return hasPermission(ConfigurationPermission.PREVIEW);
+    return hasPermission(ConfigurationTemplatePermission.PREVIEW);
   });
 
   const getDesignFlag = computed(() => {
-    return hasPermission(ConfigurationPermission.DESIGN);
+    return hasPermission(ConfigurationTemplatePermission.DESIGN);
   });
 
   const handleCreateOrUpdate = (record?: ConfigurationCenterItemsModal) => {
@@ -185,7 +184,7 @@
       >
         <template #header>
           <div class="flex gap-3 justify-end">
-            <Authority v-if="!isCustomerUser" :value="ConfigurationPermission.CREATE">
+            <Authority v-if="!isCustomerUser" :value="ConfigurationTemplatePermission.CREATE">
               <Button type="primary" @click="handleCreateOrUpdate()">新增模板</Button>
             </Authority>
             <CardLayoutButton v-model:value="listColumn" @change="handleCardLayoutChange" />
@@ -225,7 +224,7 @@
               <template class="ant-card-actions" #actions>
                 <Tooltip v-if="!isCustomerUser" title="设计">
                   <AuthIcon
-                    :auth="ConfigurationPermission.DESIGN"
+                    :auth="ConfigurationTemplatePermission.DESIGN"
                     class="!text-lg"
                     icon="ant-design:edit-outlined"
                     @click="handleDesign(item)"
@@ -236,14 +235,14 @@
                   :dropMenuList="[
                     {
                       text: '编辑',
-                      auth: ConfigurationPermission.UPDATE,
+                      auth: ConfigurationTemplatePermission.UPDATE,
                       icon: 'clarity:note-edit-line',
                       event: '',
                       onClick: handleCreateOrUpdate.bind(null, item),
                     },
                     {
                       text: '删除',
-                      auth: ConfigurationPermission.DELETE,
+                      auth: ConfigurationTemplatePermission.DELETE,
                       icon: 'ant-design:delete-outlined',
                       event: '',
                       popconfirm: {
@@ -281,11 +280,6 @@
       </List>
     </section>
     <ConfigurationCenterDrawer @register="registerDrawer" @success="getListData" />
-    <ShareModal
-      @register="registerShareModal"
-      :shareApi="shareConfiguration"
-      @success="getListData"
-    />
   </PageWrapper>
 </template>
 

@@ -15,6 +15,7 @@ export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.SHOW_TIME]: false,
   [ComponentConfigFieldEnum.FONT_SIZE]: 14,
   [ComponentConfigFieldEnum.VALUE_SIZE]: 20,
+  [ComponentConfigFieldEnum.MAX_NUMBER]: 120,
 };
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

@@ -18,16 +18,38 @@
 
   const time = ref<Nullable<number>>(null);
 
+  const POSITIVE_NUMBER = 6;
+
+  const ALL_PART = 7;
+
+  const DEFAULT_PART_VALUE = 20;
+
+  const partValue = computed(() => {
+    const { config } = props;
+    const { option } = config;
+    const { componentInfo } = option;
+    const { maxNumber = 120 } = componentInfo || {};
+    let value = maxNumber / POSITIVE_NUMBER;
+    return value % 10 > 0 ? Math.floor(value / 10) * 10 + 10 : value + 10;
+  });
+
+  const maxValueScale = computed(() => unref(partValue) / DEFAULT_PART_VALUE);
+
   const getValue = computed(() => {
     const maxHeight = 190;
     const minHeight = 15;
+
     const height = maxHeight - minHeight;
-    const rangeNumber = 7;
-    const itemRange = 20;
-    const itemHeight = height / (rangeNumber * itemRange);
+
+    const itemHeight = height / (ALL_PART * (DEFAULT_PART_VALUE * unref(maxValueScale)));
+
     const value = unref(currentValue);
-    const transformValue =
-      maxHeight - (value >= 0 ? value + 20 : itemRange - Math.abs(value)) * itemHeight;
+    let transformValue =
+      maxHeight -
+      (value >= 0
+        ? value + unref(DEFAULT_PART_VALUE * unref(maxValueScale))
+        : DEFAULT_PART_VALUE * unref(maxValueScale) - Math.abs(value)) *
+        itemHeight;
 
     return transformValue >= maxHeight
       ? maxHeight
@@ -184,7 +206,9 @@
             style="stroke: rgb(136, 136, 136); shape-rendering: crispEdges; stroke-width: 1px"
           />
           <foreignObject xmlns="http://www.w3.org/2000/svg" x="-55" y="-10" width="45" height="20">
-            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">-20</div>
+            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">
+              {{ partValue * -1 }}
+            </div>
           </foreignObject>
         </g>
         <g class="tick" opacity="1" transform="translate(0,165)">
@@ -204,7 +228,9 @@
             style="stroke: rgb(136, 136, 136); shape-rendering: crispEdges; stroke-width: 1px"
           />
           <foreignObject xmlns="http://www.w3.org/2000/svg" x="-55" y="-10" width="45" height="20">
-            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">20</div>
+            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">
+              {{ partValue }}
+            </div>
           </foreignObject>
         </g>
         <g class="tick" opacity="1" transform="translate(0,115)">
@@ -214,7 +240,9 @@
             style="stroke: rgb(136, 136, 136); shape-rendering: crispEdges; stroke-width: 1px"
           />
           <foreignObject xmlns="http://www.w3.org/2000/svg" x="-55" y="-10" width="45" height="20">
-            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">40</div>
+            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">
+              {{ partValue * 2 }}
+            </div>
           </foreignObject>
         </g>
         <g class="tick" opacity="1" transform="translate(0,90)">
@@ -224,7 +252,9 @@
             style="stroke: rgb(136, 136, 136); shape-rendering: crispEdges; stroke-width: 1px"
           />
           <foreignObject xmlns="http://www.w3.org/2000/svg" x="-55" y="-10" width="45" height="20">
-            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">60</div>
+            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">
+              {{ partValue * 3 }}
+            </div>
           </foreignObject>
         </g>
         <g class="tick" opacity="1" transform="translate(0,65)">
@@ -234,7 +264,9 @@
             style="stroke: rgb(136, 136, 136); shape-rendering: crispEdges; stroke-width: 1px"
           />
           <foreignObject xmlns="http://www.w3.org/2000/svg" x="-55" y="-10" width="45" height="20">
-            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">80</div>
+            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">
+              {{ partValue * 4 }}
+            </div>
           </foreignObject>
         </g>
         <g class="tick" opacity="1" transform="translate(0,40)">
@@ -244,7 +276,9 @@
             style="stroke: rgb(136, 136, 136); shape-rendering: crispEdges; stroke-width: 1px"
           />
           <foreignObject xmlns="http://www.w3.org/2000/svg" x="-55" y="-10" width="45" height="20">
-            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">100</div>
+            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">
+              {{ partValue * 5 }}
+            </div>
           </foreignObject>
         </g>
         <g class="tick" opacity="1" transform="translate(0,15)">
@@ -254,7 +288,9 @@
             style="stroke: rgb(136, 136, 136); shape-rendering: crispEdges; stroke-width: 1px"
           />
           <foreignObject xmlns="http://www.w3.org/2000/svg" x="-55" y="-10" width="45" height="20">
-            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">120</div>
+            <div class="tick-label" xmlns="http://www.w3.org/1999/xhtml">
+              {{ partValue * 6 }}
+            </div>
           </foreignObject>
         </g>
       </g>

@@ -10,7 +10,7 @@ export function useSendCommand() {
   const loading = ref(false);
 
   const error = () => {
-    createMessage.error('下发指令失败');
+    // createMessage.error('下发指令失败');
     return false;
   };
 
@@ -52,6 +52,7 @@ export function useSendCommand() {
       createMessage.success('命令下发成功');
       return true;
     } catch (msg) {
+      console.error(msg);
       return error();
     } finally {
       loading.value = false;