Merge branch 'f-dev' into 'main'

fix：修复Teambition上的问题,

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

@@ -21,6 +21,7 @@ enum DeviceManagerApi {
   DEVICE_ALARM_URL = '/alarm',
 
   DEVICE_CREDENTIALS = '/device/credentials',
+  COMMAND_ISSUANCE = '/rpc',
 }
 
 export const devicePage = (params: DeviceQueryParam) => {
@@ -207,3 +208,17 @@ export const generateSNCode = () => {
     url: '/device/sn',
   });
 };
+
+//命令下发
+export const commandIssuanceApi = (type, tbDeviceId, data) => {
+  const T = type === 'OneWay' ? 'oneway' : 'twoway';
+  return defHttp.post(
+    {
+      url: DeviceManagerApi.COMMAND_ISSUANCE + '/' + T + '/' + tbDeviceId,
+      data,
+    },
+    {
+      joinPrefix: false,
+    }
+  );
+};

@@ -31,6 +31,7 @@
   import { CreateContextOptions } from '/@/components/ContextMenu';
 
   import { CheckEvent } from './typing';
+  import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue';
 
   interface State {
     expandedKeys: Keys;
@@ -51,6 +52,14 @@
       'update:searchValue',
     ],
     setup(props, { attrs, slots, emit, expose }) {
+      /**
+       * 作者自带Tree组件
+       * 新增显示隐藏
+       * ft
+       */
+      //ft
+      const isFlod = ref(false);
+      //ft
       const state = reactive<State>({
         checkStrictly: props.checkStrictly,
         expandedKeys: props.expandedKeys || [],
@@ -205,6 +214,7 @@
       });
 
       function handleSearch(searchValue: string) {
+        console.log('searchValue', searchValue);
         if (searchValue !== searchText.value) searchText.value = searchValue;
         emit('update:searchValue', searchValue);
         if (!searchValue) {
@@ -223,6 +233,11 @@
         );
       }
 
+      //ft
+      function handleFlodOrUnFoldFunc(v) {
+        isFlod.value = v;
+      }
+      //ft
       function handleClickNode(key: string, children: TreeItem[]) {
         if (!props.clickRowToExpand || !children || children.length === 0) return;
         if (!state.expandedKeys.includes(key)) {
@@ -388,9 +403,10 @@
         const showTitle = title || toolbar || search || slots.headerTitle;
         const scrollStyle: CSSProperties = { height: 'calc(100% - 38px)' };
         return (
-          <div class={[prefixCls, 'h-full', attrs.class]}>
+          <div style={isFlod.value ? '' : 'width:0vw'} class={[prefixCls, 'h-full', attrs.class]}>
             {showTitle && (
               <TreeHeader
+                style={'position:relative'}
                 checkable={checkable}
                 checkAll={checkAll}
                 expandAll={expandAll}
@@ -416,6 +432,28 @@
             </ScrollContainer>
 
             <Empty v-show={unref(getNotFound)} image={Empty.PRESENTED_IMAGE_SIMPLE} class="!mt-4" />
+            <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'
+              }
+            >
+              <RightOutlined />
+            </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'
+              }
+            >
+              <LeftOutlined />
+            </span>
           </div>
         );
       };

@@ -6,28 +6,13 @@
         @select="handleSelect"
         style="position: relative"
         ref="organizationIdTreeRef"
-        :style="[{ width: !isFold ? '0rem' : '20rem' }]"
-        :class="[!isFold ? 'w-1/4 xl:w-1/1' : 'w-1/4 xl:w-1/5']"
       />
-      <div
-        style="position: absolute; top: 1.48rem; left: 6.5rem; cursor: pointer"
-        :style="[{ left: !isFold ? '0.5rem' : '6.5rem' }, { top: !isFold ? '0.8rem' : '1.48rem' }]"
-      >
-        <Tooltip v-if="isFold">
-          <template #title>隐藏组织</template>
-          <MenuFoldOutlined @click="changeWidth(true)" />
-        </Tooltip>
-        <Tooltip v-else>
-          <template #title>打开组织</template>
-          <MenuUnfoldOutlined @click="changeWidth(false)" />
-        </Tooltip>
-      </div>
       <BasicTable
+        style="flex: auto"
         @register="registerTable"
         :searchInfo="searchInfo"
         class="w-3/4 xl:w-4/5"
         :clickToRowSelect="false"
-        :class="[!isFold ? 'w-3/4 xl:w-7/7' : 'w-3/4 xl:w-4/5']"
       >
         <template #toolbar>
           <Authority value="api:yt:alarm:profile:post">
@@ -98,7 +83,7 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, reactive, h, nextTick, ref } from 'vue';
+  import { defineComponent, reactive, h, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
   import { useDrawer } from '/@/components/Drawer';
@@ -106,7 +91,7 @@
   import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
   import { deleteAlarmConfig, queryAlarmConfig } from '/@/api/alarm/config/alarmConfig';
   import { searchFormSchema, columns } from './config.data';
-  import { Modal, Tooltip } from 'ant-design-vue';
+  import { Modal } from 'ant-design-vue';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { findDictItemByCode } from '/@/api/system/dict';
   import { alarmContactGetPage } from '/@/api/device/deviceConfigApi';
@@ -115,7 +100,6 @@
   import { putAlarmConfigStatus } from '/@/api/alarm/config/alarmConfig';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
-  import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons-vue';
 
   export default defineComponent({
     components: {
@@ -126,13 +110,8 @@
       ContactDrawer,
       Switch,
       Authority,
-      MenuFoldOutlined,
-      MenuUnfoldOutlined,
-      Tooltip,
     },
     setup() {
-      const isFold = ref(true);
-
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       // 刷新
@@ -260,13 +239,6 @@
           reload();
         }
       };
-      const changeWidth = (e) => {
-        if (e) {
-          isFold.value = false;
-        } else {
-          isFold.value = true;
-        }
-      };
       return {
         searchInfo,
         hasBatchDelete,
@@ -280,8 +252,6 @@
         showAlarmContact,
         showMessageMode,
         statusChange,
-        changeWidth,
-        isFold,
       };
     },
   });

@@ -2,31 +2,15 @@
   <div>
     <PageWrapper dense contentFullHeight contentClass="flex">
       <OrganizationIdTree
-        style="position: relative"
         class="w-1/4 xl:w-1/5"
-        :style="[{ width: !isFold ? '0rem' : '20rem' }]"
-        :class="[!isFold ? 'w-1/4 xl:w-1/1' : 'w-1/4 xl:w-1/5']"
         @select="handleSelect"
         ref="organizationIdTreeRef"
       />
-      <div
-        style="position: absolute; top: 1.48rem; left: 6.5rem; cursor: pointer"
-        :style="[{ left: !isFold ? '0.5rem' : '6.5rem' }, { top: !isFold ? '0.8rem' : '1.48rem' }]"
-      >
-        <Tooltip v-if="isFold">
-          <template #title>隐藏组织</template>
-          <MenuFoldOutlined @click="changeWidth(true)" />
-        </Tooltip>
-        <Tooltip v-else>
-          <template #title>打开组织</template>
-          <MenuUnfoldOutlined @click="changeWidth(false)" />
-        </Tooltip>
-      </div>
       <BasicTable
+        style="flex: auto"
         @register="registerTable"
         :searchInfo="searchInfo"
         class="w-3/4 xl:w-4/5"
-        :class="[!isFold ? 'w-3/4 xl:w-7/7' : 'w-3/4 xl:w-4/5']"
       >
         <template #toolbar>
           <Authority value="api:yt:alarmContact:post">
@@ -82,8 +66,6 @@
   import { getAlarmContact, deleteAlarmContact } from '/@/api/alarm/contact/alarmContact';
   import { searchFormSchema, columns } from './config.data';
   import { Authority } from '/@/components/Authority';
-  import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons-vue';
-  import { Tooltip } from 'ant-design-vue';
 
   export default defineComponent({
     components: {
@@ -93,12 +75,8 @@
       TableAction,
       ContactDrawer,
       Authority,
-      MenuFoldOutlined,
-      MenuUnfoldOutlined,
-      Tooltip,
     },
     setup() {
-      const isFold = ref(true);
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       // 表格hooks
@@ -157,13 +135,6 @@
         searchInfo.organizationId = organizationId;
         handleSuccess();
       };
-      const changeWidth = (e) => {
-        if (e) {
-          isFold.value = false;
-        } else {
-          isFold.value = true;
-        }
-      };
       return {
         searchInfo,
         hasBatchDelete,
@@ -174,8 +145,6 @@
         registerTable,
         registerDrawer,
         organizationIdTreeRef,
-        changeWidth,
-        isFold,
       };
     },
   });

@@ -6,28 +6,13 @@
         @select="handleSelect"
         ref="organizationIdTreeRef"
         style="position: relative"
-        :style="[{ width: !isFold ? '0rem' : '20rem' }]"
-        :class="[!isFold ? 'w-1/4 xl:w-1/1' : 'w-1/4 xl:w-1/5']"
       />
-      <div
-        style="position: absolute; top: 1.48rem; left: 6.5rem; cursor: pointer"
-        :style="[{ left: !isFold ? '0.5rem' : '6.5rem' }, { top: !isFold ? '0.8rem' : '1.48rem' }]"
-      >
-        <Tooltip v-if="isFold">
-          <template #title>隐藏组织</template>
-          <MenuFoldOutlined @click="changeWidth(true)" />
-        </Tooltip>
-        <Tooltip v-else>
-          <template #title>打开组织</template>
-          <MenuUnfoldOutlined @click="changeWidth(false)" />
-        </Tooltip>
-      </div>
       <BasicTable
+        style="flex: auto"
         :clickToRowSelect="false"
         @register="registerTable"
         :searchInfo="searchInfo"
         class="w-3/4 xl:w-4/5"
-        :class="[!isFold ? 'w-3/4 xl:w-7/7' : 'w-3/4 xl:w-4/5']"
       >
         <template #toolbar>
           <Authority value="api:yt:video:post">
@@ -92,7 +77,7 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, reactive, nextTick, ref } from 'vue';
+  import { defineComponent, reactive, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction, TableImg } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
   import { useDrawer } from '/@/components/Drawer';
@@ -104,8 +89,6 @@
   import { useModal } from '/@/components/Modal';
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons-vue';
-  import { Tooltip } from 'ant-design-vue';
 
   export default defineComponent({
     components: {
@@ -117,12 +100,8 @@
       VideoPreviewModal,
       TableImg,
       Authority,
-      MenuFoldOutlined,
-      MenuUnfoldOutlined,
-      Tooltip,
     },
     setup() {
-      const isFold = ref(true);
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const [registerModal, { openModal }] = useModal();
@@ -191,13 +170,6 @@
           record,
         });
       };
-      const changeWidth = (e) => {
-        if (e) {
-          isFold.value = false;
-        } else {
-          isFold.value = true;
-        }
-      };
       return {
         searchInfo,
         hasBatchDelete,
@@ -210,8 +182,6 @@
         organizationIdTreeRef,
         handleViewVideo,
         registerModal,
-        changeWidth,
-        isFold,
       };
     },
   });

 <template>
+  <div style="position: absolute"> </div>
   <div class="bg-white m-4 mr-0 overflow-hidden">
     <BasicTree
-      v-if="treeData.length > 0"
       title="组织列表"
       toolbar
       search

@@ -6,28 +6,13 @@
         @select="handleSelect"
         ref="organizationIdTreeRef"
         style="position: relative"
-        :style="[{ width: !isFold ? '0rem' : '20rem' }]"
-        :class="[!isFold ? 'w-1/4 xl:w-1/1' : 'w-1/4 xl:w-1/5']"
       />
-      <div
-        style="position: absolute; top: 1.48rem; left: 6.5rem; cursor: pointer"
-        :style="[{ left: !isFold ? '0.5rem' : '6.5rem' }, { top: !isFold ? '0.8rem' : '1.48rem' }]"
-      >
-        <Tooltip v-if="isFold">
-          <template #title>隐藏组织</template>
-          <MenuFoldOutlined @click="changeWidth(true)" />
-        </Tooltip>
-        <Tooltip v-else>
-          <template #title>打开组织</template>
-          <MenuUnfoldOutlined @click="changeWidth(false)" />
-        </Tooltip>
-      </div>
       <BasicTable
+        style="flex: auto"
         :clickToRowSelect="false"
         @register="registerTable"
         :searchInfo="searchInfo"
         class="w-3/4 xl:w-4/5"
-        :class="[!isFold ? 'w-3/4 xl:w-7/7' : 'w-3/4 xl:w-4/5']"
       >
         <template #toolbar>
           <Authority value="api:yt:admin:addConfiguration">
@@ -85,7 +70,7 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, reactive, nextTick, ref } from 'vue';
+  import { defineComponent, reactive, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
   import { useDrawer } from '/@/components/Drawer';
@@ -99,8 +84,6 @@
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { getAppEnvConfig, isDevMode } from '/@/utils/env';
   import { Authority } from '/@/components/Authority';
-  import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons-vue';
-  import { Tooltip } from 'ant-design-vue';
 
   export default defineComponent({
     components: {
@@ -110,12 +93,8 @@
       TableAction,
       ContactDrawer,
       Authority,
-      MenuFoldOutlined,
-      MenuUnfoldOutlined,
-      Tooltip,
     },
     setup() {
-      const isFold = ref(true);
       const { VITE_GLOB_CONFIGURATION } = getAppEnvConfig();
       const isDev = isDevMode();
       const searchInfo = reactive<Recordable>({});
@@ -191,13 +170,7 @@
           `${VITE_GLOB_CONFIGURATION}/${isDev ? '?dev=1&' : '?'}configurationId=${record!.id}`
         );
       };
-      const changeWidth = (e) => {
-        if (e) {
-          isFold.value = false;
-        } else {
-          isFold.value = true;
-        }
-      };
+
       return {
         searchInfo,
         hasBatchDelete,
@@ -210,8 +183,6 @@
         registerTable,
         registerDrawer,
         organizationIdTreeRef,
-        changeWidth,
-        isFold,
       };
     },
   });

@@ -629,3 +629,33 @@ export const TokenSchemas: FormSchema[] = [
     },
   },
 ];
+
+export const CommandSchemas: FormSchema[] = [
+  {
+    field: 'commandType',
+    component: 'RadioGroup',
+    label: '下发类型',
+    colProps: {
+      span: 8,
+    },
+    defaultValue: 'OneWay',
+    componentProps: {
+      options: [
+        {
+          label: 'OneWay',
+          value: 'OneWay',
+        },
+        {
+          label: 'TwoWay',
+          value: 'TwoWay',
+        },
+      ],
+    },
+  },
+  {
+    field: 'commandValue',
+    label: '请输入命令内容',
+    slot: 'commandSlot',
+    component: 'InputTextArea',
+  },
+];

@@ -15,6 +15,9 @@
       <TabPane key="2" tab="实时数据" v-if="deviceDetail?.deviceType !== 'GATEWAY'">
         <RealTimeData :deviceDetail="deviceDetail" />
       </TabPane>
+      <TabPane key="5" tab="命令下发" v-if="deviceDetail?.deviceType !== 'SENSOR'">
+        <CommandIssuance :deviceDetail="deviceDetail" />
+      </TabPane>
       <TabPane key="3" tab="告警"><Alarm :id="deviceDetail.id" /></TabPane>
       <TabPane key="4" tab="子设备" v-if="deviceDetail?.deviceType === 'GATEWAY'">
         <ChildDevice :fromId="deviceDetail?.tbDeviceId" />
@@ -31,6 +34,7 @@
   import RealTimeData from '../tabs/RealTimeData.vue';
   import Alarm from '../tabs/Alarm.vue';
   import ChildDevice from '../tabs/ChildDevice.vue';
+  import CommandIssuance from '../tabs/CommandIssuance.vue';
   import { getDeviceDetail } from '/@/api/device/deviceManager';
   export default defineComponent({
     name: 'DeviceModal',
@@ -42,6 +46,7 @@
       RealTimeData,
       Alarm,
       ChildDevice,
+      CommandIssuance,
     },
     emits: ['reload', 'register'],
     setup() {

+<template>
+  <div class="tabs-detail">
+    <div class="mt-4">
+      <BasicForm @register="registerForm">
+        <template #commandSlot>
+          <div class="flex">
+            <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
+            <Tooltip title='{"method":"setGpio","params":{"pin":7,"value":1}}' class="ml-2">
+              <QuestionCircleOutlined style="font-size: 1rem" />
+            </Tooltip>
+          </div>
+        </template>
+      </BasicForm>
+      <div>
+        <Button :disabled="disable" type="primary" @click="handleOk" class="mr-2">确定</Button>
+        <Button type="default" @click="handleCancel" class="mr-2">重置</Button>
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, onMounted, unref, nextTick } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { CommandSchemas } from '../../config/data';
+  import { commandIssuanceApi } from '/@/api/device/deviceManager';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { Button } from '/@/components/Button';
+  import jsoneditor from 'jsoneditor';
+  import 'jsoneditor/dist/jsoneditor.min.css';
+  import { QuestionCircleOutlined } from '@ant-design/icons-vue';
+  import { Tooltip } from 'ant-design-vue';
+
+  export default defineComponent({
+    components: { BasicForm, Button, QuestionCircleOutlined, Tooltip },
+    props: {
+      deviceDetail: {
+        type: Object,
+        required: true,
+      },
+    },
+    emits: ['register'],
+    setup(props) {
+      const { createMessage } = useMessage();
+      const jsonData: any = ref({});
+      const disable = ref(false);
+      const [registerForm, { getFieldsValue, validate, resetFields }] = useForm({
+        labelWidth: 100,
+        schemas: CommandSchemas,
+        labelAlign: 'right',
+        showSubmitButton: false,
+        showResetButton: false,
+        wrapperCol: {
+          span: 12,
+        },
+      });
+      // json 以及初始化JSON
+      const jsoneditorRef = ref();
+      const jsonValue = ref({});
+      const jsonInstance = ref();
+      onMounted(() => {
+        nextTick(() => {
+          let options = {
+            mode: 'code',
+            mainMenuBar: false,
+            statusBar: false,
+          };
+          let editor = new jsoneditor(jsoneditorRef.value, options);
+          editor.set(jsonValue.value);
+          jsonInstance.value = editor;
+        });
+      });
+
+      const handleCancel = () => {
+        resetFields();
+      };
+      const handleOk = async () => {
+        disable.value = true;
+        // 验证
+        const valid = await validate();
+        if (!valid) return;
+        // 收集表单数据
+        const field = getFieldsValue();
+        jsonData.value = unref(jsonInstance).get();
+        jsonData.value.persistent = true;
+        jsonData.value.additionalInfo = {
+          cmdType: 'API',
+        };
+        commandIssuanceApi(field.commandType, props.deviceDetail.tbDeviceId, jsonData.value)
+          .then((res) => {
+            if (!res) return;
+            createMessage.success('命令下发成功');
+            disable.value = true;
+            // 请求
+            handleCancel();
+          })
+          .catch((e) => {
+            if (e?.message) {
+              createMessage.error(e?.message);
+            }
+          })
+          .finally(() => {
+            setTimeout(() => {
+              disable.value = false;
+            }, 300);
+          });
+      };
+      return {
+        registerForm,
+        handleCancel,
+        handleOk,
+        disable,
+        jsonData,
+        jsoneditorRef,
+        jsonValue,
+        jsonInstance,
+      };
+    },
+  });
+</script>
+<style scoped>
+  .jsoneditor-transform {
+    background-position: -144px -96px;
+    display: none !important;
+  }
+</style>

@@ -4,28 +4,9 @@
       <OrganizationIdTree
         class="w-1/6 xl:w-1/5"
         @select="handleSelect"
-        :style="[{ width: !isFold ? '0rem' : '20rem' }]"
-        :class="[!isFold ? 'w-1/4 xl:w-1/1' : 'w-1/4 xl:w-1/5']"
         ref="organizationIdTreeRef"
       />
-      <div
-        style="position: absolute; top: 1.48rem; left: 6.5rem; cursor: pointer"
-        :style="[{ left: !isFold ? '0.5rem' : '6.5rem' }, { top: !isFold ? '0.8rem' : '1.48rem' }]"
-      >
-        <Tooltip v-if="isFold">
-          <template #title>隐藏组织</template>
-          <MenuFoldOutlined @click="changeWidth(true)" />
-        </Tooltip>
-        <Tooltip v-else>
-          <template #title>打开组织</template>
-          <MenuUnfoldOutlined @click="changeWidth(false)" />
-        </Tooltip>
-      </div>
-      <BasicTable
-        @register="registerTable"
-        class="w-5/6 xl:w-4/5"
-        :class="[!isFold ? 'w-423 xl:w-423' : 'w-5/6 xl:w-4/5']"
-      >
+      <BasicTable style="flex: auto" @register="registerTable" class="w-5/6 xl:w-4/5">
         <template #toolbar>
           <Authority value="api:yt:device:post">
             <a-button type="primary" @click="handleCreate" v-if="authBtn(role)">
@@ -201,11 +182,7 @@
   import { authBtn } from '/@/enums/roleEnum';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
-  import {
-    QuestionCircleOutlined,
-    MenuFoldOutlined,
-    MenuUnfoldOutlined,
-  } from '@ant-design/icons-vue';
+  import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { Authority } from '/@/components/Authority';
 
   export default defineComponent({
@@ -224,12 +201,8 @@
       QuestionCircleOutlined,
       Popover,
       Authority,
-      MenuFoldOutlined,
-      MenuUnfoldOutlined,
     },
     setup(_) {
-      const isFold = ref(true);
-
       const { createMessage } = useMessage();
       const go = useGo();
       const searchInfo = reactive<Recordable>({});
@@ -341,13 +314,6 @@
           createMessage.success('复制成功~');
         }
       };
-      const changeWidth = (e) => {
-        if (e) {
-          isFold.value = false;
-        } else {
-          isFold.value = true;
-        }
-      };
 
       return {
         registerTable,
@@ -372,8 +338,6 @@
         hasBatchDelete,
         handleDeleteOrBatchDelete,
         handleReload,
-        changeWidth,
-        isFold,
       };
     },
   });

@@ -105,6 +105,7 @@
     //TODO-fengtao-设备、属性、条件筛选验证
     const validate = getFieldsValue();
     if (validate.triggerType == undefined) return createMessage.error('请选择设备触发方式');
+    if (validate.type1 == undefined) return createMessage.error('请选择属性触发方式');
     if (validate.device == 'PART') {
       if (validate.entityId == undefined) return createMessage.error('请选择设备');
     }

@@ -142,6 +142,7 @@
     let predicateIsRequired = false;
     let predicateDoubleIsRequired = false;
     let triggerTypeIsRequired = false;
+    let type1IsRequired = false;
     if (clearRule) {
       clearRule.some((s) => {
         if (s.device == 'PART') {
@@ -152,6 +153,9 @@
         if (s.type2 == '' || s.type2 == null) {
           attrIsRequired = true;
         }
+        if (s.type1 == '' || s.type1 == null) {
+          type1IsRequired = true;
+        }
         if (s.triggerType == '' || s.triggerType == null || s.triggerType == undefined) {
           triggerTypeIsRequired = true;
         }
@@ -179,6 +183,7 @@
     if (predicateIsRequired) return createMessage.error('请填写条件筛选');
     if (predicateDoubleIsRequired) return createMessage.error('请填写条件筛选');
     if (triggerTypeIsRequired) return createMessage.error('请选择设备触发方式');
+    if (type1IsRequired) return createMessage.error('请选择属性触发方式');
     //TODO-fengtao-清除告警验证
     //TODO-fengtao-设备验证
     const validate = getFieldsValue();

@@ -5,28 +5,12 @@
         class="w-1/4 xl:w-1/5"
         @select="handleSelect"
         ref="organizationIdTreeRef"
-        style="position: relative"
-        :style="[{ width: !isFold ? '0rem' : '20rem' }]"
-        :class="[!isFold ? 'w-1/4 xl:w-1/1' : 'w-1/4 xl:w-1/5']"
       />
-      <div
-        style="position: absolute; top: 1.48rem; left: 6.5rem; cursor: pointer"
-        :style="[{ left: !isFold ? '0.5rem' : '6.5rem' }, { top: !isFold ? '0.8rem' : '1.48rem' }]"
-      >
-        <Tooltip v-if="isFold">
-          <template #title>隐藏组织</template>
-          <MenuFoldOutlined @click="changeWidth(true)" />
-        </Tooltip>
-        <Tooltip v-else>
-          <template #title>打开组织</template>
-          <MenuUnfoldOutlined @click="changeWidth(false)" />
-        </Tooltip>
-      </div>
       <BasicTable
+        style="flex: auto"
         :clickToRowSelect="false"
         @register="registerTable"
         class="w-3/4 xl:w-4/5"
-        :class="[!isFold ? 'w-3/4 xl:w-7/7' : 'w-3/4 xl:w-4/5']"
       >
         <template #toolbar>
           <Authority value="api:yt:user:post">
@@ -101,7 +85,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, reactive, nextTick, ref } from 'vue';
+  import { defineComponent, reactive, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { deleteUser, getAccountList } from '/@/api/system/system';
   import { PageWrapper } from '/@/components/Page';
@@ -113,8 +97,6 @@
   import { useGo } from '/@/hooks/web/usePage';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Authority } from '/@/components/Authority';
-  import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons-vue';
-  import { Tooltip } from 'ant-design-vue';
 
   export default defineComponent({
     name: 'AccountManagement',
@@ -126,12 +108,8 @@
       TableAction,
       Tag,
       Authority,
-      MenuFoldOutlined,
-      MenuUnfoldOutlined,
-      Tooltip,
     },
     setup() {
-      const isFold = ref(true);
       const go = useGo();
       const [registerModal, { openModal }] = useModal();
       let searchInfo = reactive<Recordable>({});
@@ -190,13 +168,6 @@
       function handleView(record: Recordable) {
         go('/system/account_detail/' + record.id);
       }
-      const changeWidth = (e) => {
-        if (e) {
-          isFold.value = false;
-        } else {
-          isFold.value = true;
-        }
-      };
 
       return {
         registerTable,
@@ -209,8 +180,6 @@
         organizationIdTreeRef,
         hasBatchDelete,
         handleDeleteOrBatchDelete,
-        changeWidth,
-        isFold,
       };
     },
   });

@@ -18,12 +18,6 @@ export const columns: BasicColumn[] = [
     width: 120,
   },
   {
-    title: '反馈方式',
-    dataIndex: 'config',
-    width: 180,
-    slots: { customRender: 'config' },
-  },
-  {
     title: '添加时间',
     dataIndex: 'createTime',
     width: 180,
@@ -63,30 +57,6 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'phone',
-    label: '手机',
-    component: 'Input',
-    componentProps: {
-      disabled: true,
-    },
-  },
-  {
-    field: 'qq',
-    label: 'QQ',
-    component: 'Input',
-    componentProps: {
-      disabled: true,
-    },
-  },
-  {
-    field: 'email',
-    label: '邮箱',
-    component: 'Input',
-    componentProps: {
-      disabled: true,
-    },
-  },
-  {
     field: 'message',
     label: '反馈信息',
     colProps: { span: 24 },

@@ -13,9 +13,6 @@
           </a-button>
         </Authority>
       </template>
-      <template #config="{ record }">
-        <a-button type="link" class="ml-2" @click="showData(record)"> 查看反馈方式 </a-button>
-      </template>
       <template #action="{ record }">
         <TableAction
           :actions="[
@@ -44,15 +41,13 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, reactive, h, nextTick } from 'vue';
+  import { defineComponent, reactive, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
   import FeedbackDrawer from './FeedbackDrawer.vue';
   import { feedbackPage, deleteFeedbackManage } from '/@/api/feedback/feedbackManager';
   import { searchFormSchema, columns } from './config.data';
   import { useModal } from '/@/components/Modal';
-  import { Modal } from 'ant-design-vue';
-  import { JsonPreview } from '/@/components/CodeEditor';
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
 
@@ -130,17 +125,6 @@
           record,
         });
       };
-      function showData(record: Recordable) {
-        if (record.contact) {
-          Modal.info({
-            title: '当前反馈方式',
-            width: 600,
-            centered: true,
-            maskClosable: true,
-            content: h(JsonPreview, { data: JSON.parse(record.contact) }),
-          });
-        }
-      }
       return {
         searchInfo,
         hasBatchDelete,
@@ -152,7 +136,6 @@
         registerDrawer,
         handleViewVideo,
         registerModal,
-        showData,
       };
     },
   });