Merge branch 'f-dev' into 'main'

fix：修改Teambition上的问题

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

@@ -13,6 +13,7 @@
   import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useUserStore } from '/@/store/modules/user';
+
   const props = defineProps({
     /**
      * The theme of the current parent component

@@ -31,7 +31,7 @@
   import { CreateContextOptions } from '/@/components/ContextMenu';
 
   import { CheckEvent } from './typing';
-  import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue';
+  import { DoubleLeftOutlined, DoubleRightOutlined } from '@ant-design/icons-vue';
 
   interface State {
     expandedKeys: Keys;
@@ -398,6 +398,22 @@
           );
         });
       }
+      /**
+       * 只针对表格分页和组织列表分页的Tree（不是通过弹窗显示，默认是关闭的并且图标显示）
+       * 如果是其他弹窗出来的Tree（会造成默认是关闭的并且图标显示），则在对应页面重写css样式即可
+       * <style scoped lang="less">
+        :deep(.vben-basic-tree) {
+          width: 100% !important;
+        }
+        :deep(.is-unflod) {
+          display: none !important;
+        }
+        :deep(.is-flod) {
+          display: none !important;
+        }
+        </style>
+        TODO下次优化通过传配置值来动态显示那些页面需要默认展开或收起
+       */
       return () => {
         const { title, helpMessage, toolbar, search, checkable } = props;
         const showTitle = title || toolbar || search || slots.headerTitle;
@@ -435,24 +451,19 @@
             <span
               v-show={unref(isFlod)}
               onClick={() => handleFlodOrUnFoldFunc(false)}
-              style={
-                isFlod.value
-                  ? 'z-index:9999;cursor:pointer;position:absolute;top:40vh;left:17.5vw'
-                  : 'z-index:9999;cursor:pointer;position:absolute;top:40vh;left:0.5vw'
-              }
+              class={['is-flod', unref(isFlod) ? 'fold-right' : 'fold-left']}
             >
-              <RightOutlined />
+              <DoubleLeftOutlined />
             </span>
             <span
               v-show={!unref(isFlod) && unref(treeDataRef).length != 0}
               onClick={() => handleFlodOrUnFoldFunc(true)}
-              style={
-                isFlod.value
-                  ? 'z-index:9999;cursor:pointer;position:absolute;top:40vh;left:17.5vw'
-                  : 'z-index:9999;cursor:pointer;position:absolute;top:40vh;left:0.5vw'
-              }
+              class={[
+                'is-unflod',
+                !unref(isFlod) && unref(treeDataRef).length != 0 ? 'fold-left' : 'fold-right',
+              ]}
             >
-              <LeftOutlined />
+              <DoubleRightOutlined />
             </span>
           </div>
         );
@@ -461,6 +472,20 @@
   });
 </script>
 <style lang="less">
+  .fold-left {
+    z-index: 9999;
+    cursor: pointer;
+    position: absolute;
+    top: 0.85rem;
+    left: 0.5vw;
+  }
+  .fold-right {
+    z-index: 9999;
+    cursor: pointer;
+    position: absolute;
+    top: 0.85rem;
+    left: 17.5vw;
+  }
   @prefix-cls: ~'@{namespace}-basic-tree';
 
   .@{prefix-cls} {

@@ -19,7 +19,7 @@
         >
           <img v-if="tenantLogo" :src="tenantLogo" alt="avatar" />
           <div v-else>
-            <loading-outlined v-if="loading"></loading-outlined>
+            <LoadingOutlined v-if="loading" />
             <plus-outlined v-else />
             <div class="ant-upload-text">上传</div>
           </div>
@@ -73,8 +73,8 @@
 
       async function customUpload({ file }) {
         if (beforeUpload(file)) {
+          tenantLogo.value = '';
           loading.value = true;
-
           const formData = new FormData();
           formData.append('file', file);
           const response = await upload(formData);

@@ -14,7 +14,13 @@
               />
               <CountTo v-else :endVal="0" />
             </div>
-            <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
+            <Tooltip>
+              <template #title>
+                设备数 :{{ growCardList?.deviceInfo.sumCount }} 今日新增
+                {{ toThousands(growCardList?.deviceInfo?.todayAdd) }}
+              </template>
+              <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
+            </Tooltip>
           </div>
           <div> 设备数 </div>
         </div>
@@ -49,7 +55,16 @@
               />
               <CountTo v-else :end-val="0" />
             </div>
-            <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
+            <Tooltip>
+              <template #title>
+                {{
+                  !isAdmin(role)
+                    ? `告警数：今日新增${toThousands(growCardList?.alarmInfo?.todayAdd)}`
+                    : `租户总量：今日新增${toThousands(growCardList?.alarmInfo?.todayAdd)}`
+                }}
+              </template>
+              <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
+            </Tooltip>
           </div>
           <div> {{ !isAdmin(role) ? `告警数` : '租户总量' }}</div>
         </div>
@@ -87,7 +102,16 @@
               />
               <CountTo v-else :end-val="0" />
             </div>
-            <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
+            <Tooltip>
+              <template #title>
+                {{
+                  !isAdmin(role)
+                    ? `消息数：今日新增${toThousands(growCardList?.messageInfo?.todayMessageAdd)}`
+                    : `客户总量：今日新增${toThousands(growCardList?.messageInfo?.todayMessageAdd)}`
+                }}
+              </template>
+              <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
+            </Tooltip>
           </div>
           <div> {{ !isAdmin(role) ? `消息数` : '客户总量' }}</div>
         </div>
@@ -108,6 +132,8 @@
   import { isAdmin } from '/@/enums/roleEnum';
   import { toThousands } from '/@/utils/fnUtils';
   import { CountTo } from '/@/components/CountTo/index';
+  import { Tooltip } from 'ant-design-vue';
+
   defineProps<{
     role: string;
   }>();

@@ -39,11 +39,7 @@
       </Card>
       <Card title="联系我们" :bordered="false" v-bind="$attrs" :headStyle="{ padding: 0 }">
         <template #cover>
-          <img
-            :src="getQrCode"
-            v-if="getQrCode"
-            style="width: 150px; height: 150px; margin: 50px auto"
-          />
+          <img :src="getQrCode" v-if="getQrCode" />
           <Empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
         </template>
         <CardMeta>

@@ -13,7 +13,7 @@
           >
             <img v-if="devicePic" :src="devicePic" alt="avatar" />
             <div v-else>
-              <loading-outlined v-if="loading"></loading-outlined>
+              <LoadingOutlined v-if="loading" />
               <PlusOutlined v-else />
               <div class="ant-upload-text">图片上传</div>
             </div>
@@ -143,6 +143,7 @@
       // 图片上传
       async function customUpload({ file }) {
         if (beforeUpload(file)) {
+          devicePic.value = '';
           loading.value = true;
           const formData = new FormData();
           formData.append('file', file);

@@ -273,6 +273,11 @@
             map.removeOverlay(preMarker);
           }
           map.addOverlay(marker);
+          //标注监听事件
+          marker.addEventListener('click', function () {
+            map.openInfoWindow(infoWindow, map.getCenter());
+          });
+          //标注监听事件
         } else {
           const point = new BMap.Point(106.63028229687498, 36.06735821600903);
           let options = {

@@ -20,7 +20,7 @@
                 style="width: 6.25rem; height: 6.25rem"
               />
               <div v-else>
-                <loading-outlined v-if="loading"></loading-outlined>
+                <LoadingOutlined v-if="loading" />
                 <PlusOutlined v-else />
                 <div class="ant-upload-text">图片上传</div>
               </div>
@@ -79,8 +79,8 @@
       };
       const customUploadqrcodePic = async ({ file }) => {
         if (beforeUploadqrcodePic(file)) {
+          peresonalPic.value = '';
           loading.value = true;
-
           const formData = new FormData();
           formData.append('file', file);
           const response = await uploadApi(formData);

@@ -30,7 +30,7 @@
   import { ref, computed } from 'vue';
   import { useDrawerInner, BasicDrawer } from '/@/components/Drawer/index';
   import { useForm, BasicForm } from '/@/components/Form/index';
-  import { formSchema } from '../config/config.data.ts';
+  import { formSchema } from '../config/config.data';
   import { Card, Tag } from 'ant-design-vue';
   import { createOrEditTransformScriptApi } from '/@/api/device/TransformScriptApi';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -53,7 +53,7 @@
       setFieldsValue(data.record);
     }
   });
-  const [registerForm, { getFieldsValue, setFieldsValue, resetFields }] = useForm({
+  const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
     showActionButtonGroup: false,
     colProps: { span: 24 },
     schemas: formSchema,
@@ -84,9 +84,10 @@
     emit('isStatus', { status: 1, jsCode });
   };
   const handleSubmit = async () => {
-    setDrawerProps({ confirmLoading: true });
-    const fieldsValue = getFieldsValue();
     try {
+      setDrawerProps({ confirmLoading: true });
+      const fieldsValue = await validate();
+      if (!fieldsValue) return;
       await createOrEditTransformScriptApi({
         configuration: {
           jsScript: aceEditor.value.getValue(),
@@ -99,8 +100,6 @@
       const { createMessage } = useMessage();
       createMessage.success('保存成功');
     } catch (e) {
-      const { createMessage } = useMessage();
-      createMessage.success('保存失败');
     } finally {
       setTimeout(() => {
         setDrawerProps({ confirmLoading: false });

@@ -167,3 +167,14 @@
     },
   });
 </script>
+<style scoped lang="less">
+  :deep(.vben-basic-tree) {
+    width: 100% !important;
+  }
+  :deep(.is-unflod) {
+    display: none !important;
+  }
+  :deep(.is-flod) {
+    display: none !important;
+  }
+</style>

@@ -180,3 +180,15 @@
     },
   });
 </script>
+
+<style scoped lang="less">
+  :deep(.vben-basic-tree) {
+    width: 100% !important;
+  }
+  :deep(.is-unflod) {
+    display: none !important;
+  }
+  :deep(.is-flod) {
+    display: none !important;
+  }
+</style>

@@ -19,7 +19,7 @@
         >
           <img v-if="tenantLogo" :src="tenantLogo" alt="avatar" />
           <div v-else>
-            <loading-outlined v-if="loading"></loading-outlined>
+            <LoadingOutlined v-if="loading" />
             <plus-outlined v-else />
             <div class="ant-upload-text">上传</div>
           </div>
@@ -59,8 +59,8 @@
 
       async function customUpload({ file }) {
         if (beforeUpload(file)) {
+          tenantLogo.value = '';
           loading.value = true;
-
           const formData = new FormData();
           formData.append('file', file);
           const response = await upload(formData);

@@ -183,3 +183,15 @@
     },
   });
 </script>
+
+<style scoped lang="less">
+  :deep(.vben-basic-tree) {
+    width: 100% !important;
+  }
+  :deep(.is-unflod) {
+    display: none !important;
+  }
+  :deep(.is-flod) {
+    display: none !important;
+  }
+</style>