Merge branch 'sqy_dev' into 'main'

'feat:设备分配客户,oem按钮调整，地图铆钉不显示，账号详情404问题'

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

@@ -136,3 +136,35 @@ export const saveDeviceToken = (data) => {
     }
   );
 };
+
+// 获取当前租户下的客户列表
+export const getCustomerList = (params) => {
+  return defHttp.get({
+    url: '/user/customers/' + params.organizationId,
+  });
+};
+
+// 分配客户或
+export const dispatchCustomer = (data) => {
+  const { customerId, tbDeviceId } = data;
+  return defHttp.post(
+    {
+      url: `/customer/${customerId}/device/${tbDeviceId}`,
+    },
+    {
+      joinPrefix: false,
+    }
+  );
+};
+// 取消分配客户
+export const cancelDispatchCustomer = (data) => {
+  const { customerId, tbDeviceId } = data;
+  return defHttp.delete(
+    {
+      url: `/customer/${customerId}/device/${tbDeviceId}`,
+    },
+    {
+      joinPrefix: false,
+    }
+  );
+};

@@ -12,3 +12,10 @@ export function isAdmin(role: string) {
     return false;
   }
 }
+// 按钮级权限控制,只针对客户
+export function authBtn(role: string): boolean {
+  if (role === RoleEnum.CUSTOMER_USER) {
+    return false;
+  }
+  return true;
+}

@@ -329,6 +329,7 @@
             data: dataArray.filter((item1) => item1[2] === item),
           };
         });
+        console.log(dataArray);
         // 设置数据;
         setOptions({
           tooltip: {

 import { formatToDateTime } from '/@/utils/dateUtil';
 import { FormSchema } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
-
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
-
+import { getCustomerList } from '/@/api/device/deviceManager';
 export const columns: BasicColumn[] = [
   {
     title: '设备名称',
@@ -287,3 +286,19 @@ export const statusType = (type: string): string => {
     return '激活未确认';
   }
 };
+
+export const customerForm: FormSchema[] = [
+  {
+    field: 'customerId',
+    label: '分配客户',
+    component: 'ApiSelect',
+    componentProps: {
+      api: getCustomerList,
+      immediate: false,
+      labelField: 'realName',
+      valueField: 'customerId',
+    },
+    required: true,
+    colProps: { span: 12 },
+  },
+];

@@ -23,7 +23,6 @@ export const columns: BasicColumn[] = [
     slots: { customRender: 'deviceProfile' },
     ellipsis: true,
   },
-
   {
     title: '所属组织',
     dataIndex: 'organizationDTO.name',

+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="registerModal"
+    title="将设备分配给客户"
+    :canFullscreen="false"
+    centered
+    @ok="dispatchCustomer"
+    :minHeight="150"
+    okText="分配"
+  >
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { customerForm } from '../../config/detail.config';
+  import { dispatchCustomer as dispatchCustomerApi } from '/@/api/device/deviceManager';
+  export default defineComponent({
+    name: 'AlarmDetailModal',
+    components: {
+      BasicModal,
+      BasicForm,
+    },
+    emits: ['reload', 'register'],
+    setup(_, { emit }) {
+      let record = {};
+      const [registerModal, { closeModal }] = useModalInner((data: any) => {
+        const { organizationId } = data;
+        record = data;
+        updateSchema([
+          {
+            field: 'customerId',
+            componentProps: {
+              params: { organizationId },
+            },
+          },
+        ]);
+      });
+      const [registerForm, { validate, getFieldsValue, updateSchema, resetFields }] = useForm({
+        labelWidth: 100,
+        showActionButtonGroup: false,
+        schemas: customerForm,
+      });
+      // 分配客户
+      const dispatchCustomer = async () => {
+        await validate();
+        const { customerId } = getFieldsValue();
+        await dispatchCustomerApi({ ...record, customerId });
+        closeModal();
+        resetFields();
+        emit('reload');
+      };
+
+      return {
+        registerModal,
+        registerForm,
+        dispatchCustomer,
+      };
+    },
+  });
+</script>

@@ -11,7 +11,12 @@
             :customRequest="customUpload"
             :before-upload="beforeUpload"
           >
-            <img v-if="devicePic" :src="devicePic" alt="avatar" />
+            <img
+              v-if="devicePic"
+              :src="devicePic"
+              alt="avatar"
+              style="width: 6.25rem; height: 6.25rem"
+            />
             <div v-else>
               <PlusOutlined />
               <div class="ant-upload-text">图片上传</div>
@@ -76,7 +81,6 @@
       [Divider.name]: Divider,
       Upload,
       EnvironmentTwoTone,
-      // LoadingOutlined,
       PlusOutlined,
       Modal,
       [Form.name]: Form,
@@ -175,7 +179,8 @@
         if (!wrapEl) return;
         let preMarker = null;
         const map = new BMap.Map(wrapEl);
-        let myIcon = new BMap.Icon('/src/assets/images/wz.png', new BMap.Size(20, 30));
+        const icon = '/src/assets/images/wz.png';
+        let myIcon = new BMap.Icon(icon, new BMap.Size(20, 30));
         const point = new BMap.Point(Number(longitude), Number(latitude));
         let marker = new BMap.Marker(point, { icon: myIcon });
         if (marker) {

@@ -8,7 +8,7 @@
       />
       <BasicTable @register="registerTable" class="w-5/6 xl:w-4/5">
         <template #toolbar>
-          <a-button type="primary" @click="handleCreate"> 新增设备 </a-button>
+          <a-button type="primary" @click="handleCreate" v-if="authBtn(role)"> 新增设备 </a-button>
         </template>
         <template #deviceProfile="{ record }">
           <a-button type="link" class="ml-2" @click="goDeviceProfile">
@@ -50,6 +50,23 @@
         <template #action="{ record }">
           <TableAction
             :actions="[
+              record.customerId
+                ? {
+                    tooltip: '取消分配给客户',
+                    icon: 'mdi:account-arrow-left',
+                    ifShow: authBtn(role),
+                    popConfirm: {
+                      title: '是否取消分配给客户',
+                      confirm: handleCancelDispatchCustomer.bind(null, record),
+                    },
+                  }
+                : {
+                    icon: 'mdi:account-arrow-right',
+                    tooltip: '分配给客户',
+                    ifShow: authBtn(role),
+                    onClick: handleDispatchCustomer.bind(null, record),
+                  },
+
               {
                 label: '详情',
                 icon: 'ant-design:eye-outlined',
@@ -58,11 +75,13 @@
               {
                 label: '编辑',
                 icon: 'clarity:note-edit-line',
+                ifShow: authBtn(role),
                 onClick: handleEdit.bind(null, record),
               },
               {
                 label: '删除',
                 icon: 'ant-design:delete-outlined',
+                ifShow: authBtn(role),
                 color: 'error',
                 popConfirm: {
                   title: '是否确认删除',
@@ -74,7 +93,8 @@
         </template>
       </BasicTable>
       <DeviceDetailDrawer @register="registerDetailDrawer" />
-      <DeviceModal @register="registerModal" @success="handleSuccess" @reload="handleReload" />
+      <DeviceModal @register="registerModal" @success="handleSuccess" @reload="handleSuccess" />
+      <CustomerModal @register="registerCustomerModal" @reload="handleSuccess" />
     </PageWrapper>
   </div>
 </template>
@@ -85,7 +105,7 @@
   import { columns, searchFormSchema } from './config/device.data';
   import { Tag } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { deleteDevice, devicePage } from '/@/api/device/deviceManager';
+  import { deleteDevice, devicePage, cancelDispatchCustomer } from '/@/api/device/deviceManager';
   import { PageEnum } from '/@/enums/pageEnum';
   import { useGo } from '/@/hooks/web/usePage';
   import { PageWrapper } from '/@/components/Page';
@@ -95,7 +115,11 @@
   import DeviceModal from './cpns/modal/DeviceModal.vue';
   import { useDrawer } from '/@/components/Drawer';
   import DeviceDetailDrawer from './cpns/modal/DeviceDetailDrawer.vue';
+  import CustomerModal from './cpns/modal/CustomerModal.vue';
 
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
+  import { authBtn } from '/@/enums/roleEnum';
   export default defineComponent({
     name: 'DeviceManagement',
     components: {
@@ -106,6 +130,7 @@
       Tag,
       DeviceModal,
       DeviceDetailDrawer,
+      CustomerModal,
     },
     setup(_) {
       const { createMessage } = useMessage();
@@ -114,6 +139,7 @@
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const [registerModal, { openModal }] = useModal();
+      const [registerCustomerModal, { openModal: openCustomerModal }] = useModal();
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
       const [registerTable, { reload }] = useTable({
         title: '设备列表',
@@ -130,22 +156,32 @@
         showIndexColumn: false,
         searchInfo: searchInfo,
         actionColumn: {
-          width: 200,
+          width: 250,
           title: '操作',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           fixed: 'right',
         },
       });
-      const handleReload = () => {
-        handleSuccess();
-      };
+
+      const userInfo: any = getAuthCache(USER_INFO_KEY);
+      const role: string = userInfo.roles[0];
 
       function handleCreate() {
         openModal(true, {
           isUpdate: false,
         });
       }
+      // 分配客户
+      function handleDispatchCustomer(record: Recordable) {
+        openCustomerModal(true, record);
+      }
+      // 取消分配客户
+      async function handleCancelDispatchCustomer(record: Recordable) {
+        console.log('record', record);
+        await cancelDispatchCustomer({ ...record, customerId: '' });
+        handleSuccess();
+      }
 
       function handleDetail(record: Recordable) {
         const { id, tbDeviceId } = record;
@@ -191,12 +227,16 @@
         goDeviceProfile,
         handleSelect,
         registerModal,
-        handleReload,
         registerDetailDrawer,
         DeviceTypeEnum,
         DeviceState,
         searchInfo,
         organizationIdTreeRef,
+        handleDispatchCustomer,
+        handleCancelDispatchCustomer,
+        registerCustomerModal,
+        authBtn,
+        role,
       };
     },
   });

@@ -41,7 +41,7 @@ export const columns: BasicColumn[] = [
     customRender: ({ record }) => {
       const status = record.readStatus;
       const enable = status == 0 ? '未读' : status == 1 ? '已读' : '其他';
-      const color = enable == '未读' ? 'green' : enable == '已读' ? 'yellow' : 'red';
+      const color = enable == '未读' ? 'yellow' : enable == '已读' ? 'green' : 'red';
       const text = enable == '未读' ? '未读' : enable == '已读' ? '已读' : '其他';
       return h(Tag, { color }, () => text);
     },

@@ -21,6 +21,7 @@
     name: 'AccountDetail',
     components: { PageWrapper, Description },
     setup() {
+      console.log(123);
       const route = useRoute();
       const go = useGo();
       const { setTitle, close } = useTabs();

@@ -90,7 +90,7 @@
           setModalProps({ confirmLoading: true });
           await SaveOrUpdateUserInfo(values, unref(isUpdate));
           closeModal();
-          emit('success', { isUpdate: unref(isUpdate), values: { ...values, id: rowId.value } });
+          emit('success');
           createMessage.success(unref(isUpdate) ? '编辑成功' : '新增成功');
         } finally {
           setModalProps({ confirmLoading: false });

@@ -88,7 +88,7 @@
       const { createMessage } = useMessage();
       let searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
-      const [registerTable, { reload, updateTableDataRecord }] = useTable({
+      const [registerTable, { reload }] = useTable({
         title: '账号列表',
         api: getAccountList,
         rowKey: 'id',
@@ -131,14 +131,8 @@
         });
       }
 
-      function handleSuccess({ isUpdate, values }) {
-        if (isUpdate) {
-          // 演示不刷新表格直接更新内部数据。
-          // 注意：updateTableDataRecord要求表格的rowKey属性为string并且存在于每一行的record的keys中
-          updateTableDataRecord(values.id, values);
-        } else {
-          reload();
-        }
+      function handleSuccess() {
+        reload();
       }
 
       function handleSelect(organization) {

@@ -79,7 +79,7 @@
       @click="handleUpdateInfo"
       size="large"
       type="primary"
-      style="margin-top: 20px; background-color: #2950f7; border-radius: 5px"
+      style="margin-top: 20px; border-radius: 5px"
       >保存信息</a-button
     >
   </div>

@@ -79,7 +79,7 @@
       @click="handleUpdateInfo"
       size="large"
       type="primary"
-      style="margin-top: 20px; background-color: #2950f7; border-radius: 5px"
+      style="margin-top: 20px; border-radius: 5px"
       >保存信息</a-button
     >
   </div>

@@ -32,7 +32,7 @@
       @click="handleUpdateInfo"
       size="large"
       type="primary"
-      style="margin-top: 20px; background-color: #2950f7; border-radius: 5px"
+      style="margin-top: 20px; border-radius: 5px"
       >更新基本信息</a-button
     >
   </div>

@@ -81,6 +81,7 @@
           record,
           isUpdate: true,
         });
+        console.log(record);
       }
 
       async function handleDelete(record: Recordable) {