Merge branch 'main_dev' into ft

fengwotao
2 parents ebb6baad 51a11031
Showing 7 changed files with 73 additions and 12 deletions
src/layouts/default/menu/index.vue
src/views/device/list/cpns/modal/DeviceModal.vue
src/views/device/list/cpns/step/DeviceStep1.vue
src/views/sys/login/Login.vue
src/views/system/customize/cpns/CVIDraw.vue
src/views/system/customize/cpns/customUplaod/CustomUploadComp.vue
src/views/visual/packages/components/Other/SwitchSignalLight/config.vue
--- a/src/layouts/default/menu/index.vue
View file @7b98391
+++ b/src/layouts/default/menu/index.vue
View file @7b98391
@@ -183,7 +183,6 @@
       padding: 10px 4px 10px 10px;
       img {
-        width: @logo-width;
         height: @logo-width;
       }
     }
--- a/src/views/device/list/cpns/modal/DeviceModal.vue
View file @7b98391
+++ b/src/views/device/list/cpns/modal/DeviceModal.vue
View file @7b98391
@@ -145,6 +145,8 @@
           // !!!此处需要删除地图的属性，否则会报堆栈溢出的错误 Uncaught RangeError: Maximum call stack size exceeded
           Reflect.deleteProperty(DeviceStep1Ref.value.positionState, 'map');
           Reflect.deleteProperty(DeviceStep1Ref.value.positionState, 'marker');
+          Reflect.deleteProperty(DeviceStep1Ref.value.devicePositionState, 'map');
+          Reflect.deleteProperty(DeviceStep1Ref.value.devicePositionState, 'marker');
           setModalProps({
             confirmLoading: true,
           });
@@ -156,7 +158,7 @@
               customerId: currentDeviceData.customerId,
               deviceInfo: {
                 avatar: DeviceStep1Ref.value?.devicePic,
-                ...DeviceStep1Ref.value?.positionState,
+                ...DeviceStep1Ref.value?.devicePositionState,
               },
             };
             validateNameLength(stepRecord.name);
@@ -168,7 +170,7 @@
               sn: stepRecord.name,
               deviceInfo: {
                 avatar: DeviceStep1Ref.value?.devicePic,
-                ...DeviceStep1Ref.value?.positionState,
+                ...DeviceStep1Ref.value?.devicePositionState,
               },
               deviceToken:
                 unref(current) === 0 || !unref(stepState).addAgree
--- a/src/views/device/list/cpns/step/DeviceStep1.vue
View file @7b98391
+++ b/src/views/device/list/cpns/step/DeviceStep1.vue
View file @7b98391
@@ -46,7 +46,7 @@
           </div>
         </template>
         <template #deviceAddress>
-          <Input disabled v-model:value="positionState.address">
+          <Input disabled v-model:value="devicePositionState.address">
             <template #addonAfter>
               <EnvironmentTwoTone @click="selectPosition" />
             </template>
@@ -128,6 +128,7 @@
   import { useDrawer } from '/@/components/Drawer';
   import DeptDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
   import { TaskTypeEnum } from '/@/views/task/center/config';
+  import { toRaw } from 'vue';
   export default defineComponent({
     components: {
@@ -239,8 +240,14 @@
       const selectPosition = () => {
         visible.value = true;
         if (!positionState.longitude) {
-          positionState.longitude = '104.04666605565338';
-          positionState.latitude = '30.543516387560476';
+          positionState.longitude = '104.05326410962411';
+          positionState.latitude = '30.54855093076791';
+
+          // 根据经纬度获取详细位置
+          if (positionState.longitude && positionState.latitude) {
+            var pt = new BMap.Point(positionState.longitude, positionState.latitude);
+            getAddrByPoint(pt);
+          }
           initMap(positionState.longitude, positionState.latitude);
         } else {
           initMap(positionState.longitude, positionState.latitude);
@@ -261,6 +268,15 @@
         map: null,
         marker: null,
       });
+
+      const devicePositionState = ref({
+        longitude: '',
+        latitude: '',
+        address: '',
+        map: null,
+        marker: null,
+      });
+
       /**
        * 逆地址解析函数（根据坐标点获取详细地址）
        * @param {Object} point   百度地图坐标点，必传
@@ -371,6 +387,7 @@
       // 确定选择的位置
       const handleOk = () => {
         visible.value = false;
+        devicePositionState.value = { ...toRaw(positionState) };
       };
       // 取消选择位置
       const handleCancel = () => {
@@ -385,6 +402,7 @@
         positionState.longitude = deviceInfo.longitude;
         positionState.latitude = deviceInfo.latitude;
         positionState.address = deviceInfo.address;
+        devicePositionState.value = { ...toRaw(positionState) };
         devicePic.value = deviceInfo.avatar;
         setFieldsValue({
           ...data,
@@ -418,11 +436,13 @@
       function parentResetDevicePic(deviceInfo) {
         devicePic.value = deviceInfo.avatar;
       }
+
       // 父组件重置位置
       function parentResetPositionState() {
         for (let key in positionState) {
           positionState[key] = '';
         }
+        devicePositionState.value = { ...toRaw(positionState) };
       }
       // 禁用设备类型
       function disabledDeviceType(disabled: boolean) {
@@ -474,6 +494,7 @@
         handleOpenOrgDrawer,
         handleSuccess,
         handleTreeOrg,
+        devicePositionState,
       };
     },
   });
--- a/src/views/sys/login/Login.vue
View file @7b98391
+++ b/src/views/sys/login/Login.vue
View file @7b98391
@@ -16,8 +16,8 @@
         <div class="hidden min-h-full pl-4 mr-4 xl:flex xl:flex-col xl:w-6/12">
           <!-- <AppLogo class="-enter-x" /> -->
           <div style="display: flex; margin-top: 10px">
-            <img v-if="defaultLogo" :src="defaultLogo" style="width: 48px; height: 48px" />
-            <img style="width: 48px; height: 48px" v-else src="/src/assets/images/logo.png" />
+            <img v-if="defaultLogo" :src="defaultLogo" class="h-12" />
+            <img class="h-12" v-else src="/src/assets/images/logo.png" />
             <div
               class="ml-2 truncate md:opacity-100"
               style="
--- a/src/views/system/customize/cpns/CVIDraw.vue
View file @7b98391
+++ b/src/views/system/customize/cpns/CVIDraw.vue
View file @7b98391
@@ -24,8 +24,9 @@
                   :customRequest="customUploadIconPic"
                   :before-upload="beforeUploadIconPic"
                 >
-                  <div v-if="iconPic">
+                  <div v-if="iconPic" class="relative">
                     <img :src="iconPic" class="m-auto fill-img" />
+                    <CloseCircleOutlined class="absolute icon-delete" @click.stop="handleDelete" />
                     <div style="background-color: #ccc; margin-top: 20px">重新上传</div>
                   </div>
                   <div v-else>
@@ -81,7 +82,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import type { FileItem } from '/@/components/Upload/src/typing';
   import { iconUpload, getPlatForm, updatePlatForm, resetPlateInfo } from '/@/api/oem/index';
-  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { PlusOutlined, CloseCircleOutlined } from '@ant-design/icons-vue';
   import { useUserStore } from '/@/store/modules/user';
   import { createLocalStorage } from '/@/utils/cache/index';
   import { Authority } from '/@/components/Authority';
@@ -100,6 +101,7 @@
       ContentUploadText,
       Spin,
       CustomUploadComp,
+      CloseCircleOutlined,
     },
     setup() {
       const loading = ref(false);
@@ -188,6 +190,11 @@
         storage.set('platformInfo', newFieldValue);
       }
+      // 删除浏览器ico图标
+      const handleDelete = () => {
+        iconPic.value = '';
+      };
+
       onMounted(async () => {
         const res = await getPlatForm();
         setFieldsValue(res);
@@ -227,6 +234,7 @@
         handleResetInfo,
         handleSetBgImgUrl,
         handleSetLogoImgUrl,
+        handleDelete,
       };
     },
   });
@@ -251,4 +259,12 @@
     width: 100%;
     height: 100%;
   }
+
+  .icon-delete {
+    top: -13px;
+    right: -13px;
+    color: rgb(146, 145, 145);
+    font-size: 1rem;
+    z-index: 9999;
+  }
 </style>
--- a/src/views/system/customize/cpns/customUplaod/CustomUploadComp.vue
View file @7b98391
+++ b/src/views/system/customize/cpns/customUplaod/CustomUploadComp.vue
View file @7b98391
 <script setup name="CustomUploadComp" lang="ts">
-  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { PlusOutlined, CloseCircleOutlined } from '@ant-design/icons-vue';
   import { Upload, Spin } from 'ant-design-vue';
   import { ref, watchEffect } from 'vue';
   import { useUpload } from './hooks/useUploadFile.hook';
@@ -40,6 +40,12 @@
     }
   };
+  // 删除图片
+  const handleDelete = () => {
+    uploadImgUrl.value = '';
+    emit('setImg', uploadImgUrl.value);
+  };
+
   watchEffect(() => {
     init();
   });
@@ -59,7 +65,10 @@
       :customRequest="customUpload"
       :before-upload="beforeUploadVerify"
     >
-      <img v-if="uploadImgUrl" class="fill-img" :src="uploadImgUrl" alt="avatar" />
+      <div v-if="uploadImgUrl" class="w-full h-full modal-div relative">
+        <img class="fill-img" :src="uploadImgUrl" alt="avatar" />
+        <CloseCircleOutlined class="absolute icon-delete" @click.stop="handleDelete" />
+      </div>
       <div v-else>
         <Spin v-if="uploadLoading" tip="正在上传中..." />
         <PlusOutlined v-else />
@@ -74,4 +83,12 @@
     width: 100%;
     height: 100%;
   }
+
+  .icon-delete {
+    top: -13px;
+    right: -13px;
+    color: rgb(146, 145, 145);
+    font-size: 1rem;
+    z-index: 9999;
+  }
 </style>
--- a/src/views/visual/packages/components/Other/SwitchSignalLight/config.vue
View file @7b98391
+++ b/src/views/visual/packages/components/Other/SwitchSignalLight/config.vue
View file @7b98391
@@ -34,6 +34,12 @@
         },
       },
       {
+        field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
+        label: '显示设备名称',
+        component: 'Checkbox',
+        defaultValue: option.showDeviceName,
+      },
+      {
         field: ComponentConfigFieldEnum.SHOW_TIME,
         label: '显示时间',
         component: 'Checkbox',