tangning 2 yıl önce
ebeveyn
işleme
26202143b1

+ 2 - 6
src/views/empower/AddCameraModal.vue

@@ -25,6 +25,7 @@
   import { uploadApi } from '/@/api/product/index';
   import { ResultEnum } from '/@/enums/httpEnum';
   import { authorizeCameraaddOrUpdate } from '/@/api/authorizeModeling';
+  import { copyTextToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import dayjs from 'dayjs';
   import { otherInfoStore } from '/@/store/modules/other';
 
@@ -153,12 +154,7 @@
             okText: '复制授权Key',
             onOk: async () => {
               // 双击复制
-              let save = function (e) {
-                e.clipboardData.setData('text/plain', res.authorizeKey);
-                e.preventDefault(); //阻止默认行为
-              };
-              document.addEventListener('copy', save); //添加一个copy事件
-              document.execCommand('copy'); //执行copy方法
+              copyTextToClipboard(res.authorizeKey);
               createMessage.success('复制成功');
             },
           });

+ 3 - 7
src/views/empower/AddInstallModal.vue

@@ -23,6 +23,7 @@
   import { InvoiceRegister } from '/@/api/order';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { uploadApi } from '/@/api/product/index';
+  import { copyTextToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { ResultEnum } from '/@/enums/httpEnum';
   import { authorizeInstalladdOrUpdate, checkMachineCode } from '/@/api/authorizeModeling';
   import dayjs from 'dayjs';
@@ -106,7 +107,7 @@
         const { id, machineCode } = await validate();
         let res = await checkMachineCode({ machineCode });
         console.log('res', res);
-        if (res && res.id) {
+        if (res && !res.id) {
           createConfirm({
             iconType: 'warning',
             title: () => h('span', '温馨提示'),
@@ -144,12 +145,7 @@
             okText: '复制',
             onOk: async () => {
               // 双击复制
-              let save = function (e) {
-                e.clipboardData.setData('text/plain', res.authorizeKey);
-                e.preventDefault(); //阻止默认行为
-              };
-              document.addEventListener('copy', save); //添加一个copy事件
-              document.execCommand('copy'); //执行copy方法
+              copyTextToClipboard(res.authorizeKey)
               createMessage.success('复制成功');
             },
           });

+ 2 - 6
src/views/empower/algorithm.vue

@@ -49,6 +49,7 @@
   } from '/@/api/authorizeModeling';
   import { useModal } from '/@/components/Modal';
   import { useI18n } from '/@/hooks/web/useI18n';
+  import { copyTextToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import AddModal from './AddModal.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { usePermissionStore } from '/@/store/modules/permission';
@@ -238,12 +239,7 @@
         });
       }
       function handleCopy(str: string) {
-        let save = function (e) {
-          e.clipboardData.setData('text/plain', str);
-          e.preventDefault(); //阻止默认行为
-        };
-        document.addEventListener('copy', save); //添加一个copy事件
-        document.execCommand('copy'); //执行copy方法
+        copyTextToClipboard(str)
         createMessage.success('复制成功');
       }
       function handleEdit(record = {}) {

+ 2 - 6
src/views/empower/camera.vue

@@ -57,6 +57,7 @@
   import DetailModal from './detailModel.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { usePermissionStore } from '/@/store/modules/permission';
+  import { copyTextToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { incrementUseTypeList } from '/@/api/account';
   export default defineComponent({
     components: {
@@ -265,12 +266,7 @@
         opendetailModel(true, record);
       }
       function handleCopy(str: string) {
-        let save = function (e) {
-          e.clipboardData.setData('text/plain', str);
-          e.preventDefault(); //阻止默认行为
-        };
-        document.addEventListener('copy', save); //添加一个copy事件
-        document.execCommand('copy'); //执行copy方法
+        copyTextToClipboard(str);
         createMessage.success('复制成功');
       }
       return {

+ 3 - 3
src/views/empower/detailModel.vue

@@ -80,9 +80,9 @@
           title: '相机类型',
           dataIndex: 'cameraType',
           width: 120,
-          // customRender: ({ record }) => {
-          //   return t(`routes.devices.cameraName.${record.cameraType}`);
-          // },
+          customRender: ({ record }) => {
+            return t(`routes.product.type.${record.cameraType}`);
+          },
         },
         {
           title: 'SN码',

+ 2 - 6
src/views/empower/install.vue

@@ -51,6 +51,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { usePermissionStore } from '/@/store/modules/permission';
   import { incrementUseTypeList } from '/@/api/account';
+  import { copyTextToClipboard } from '/@/hooks/web/useCopyToClipboard';
   export default defineComponent({
     components: {
       BasicTable,
@@ -232,12 +233,7 @@
         canResize: true,
       });
       function handleCopy(str: string) {
-        let save = function (e) {
-          e.clipboardData.setData('text/plain', str);
-          e.preventDefault(); //阻止默认行为
-        };
-        document.addEventListener('copy', save); //添加一个copy事件
-        document.execCommand('copy'); //执行copy方法
+        copyTextToClipboard(str);
         createMessage.success('复制成功');
       }
       async function handleDelete(record) {

+ 5 - 6
src/views/empower/logListModal.vue

@@ -4,6 +4,7 @@
     @register="register"
     title="更换记录"
     :width="800"
+    @ok="closeModal"
     @visible-change="handleVisibleChange"
   >
     <BasicTable @register="registerSubtable">
@@ -28,6 +29,7 @@
   import { DetailsApi, IncrementDelayApi } from '/@/api/account';
   import { usePermissionStore } from '/@/store/modules/permission';
   import { useModal } from '/@/components/Modal';
+  import { copyTextToClipboard } from '/@/hooks/web/useCopyToClipboard';
 
   const { t } = useI18n();
   export default defineComponent({
@@ -65,6 +67,7 @@
         {
           title: '更换Key',
           dataIndex: 'updateAuthorizeKey',
+          ellipsis: true,
           slots: { customRender: 'copy' },
           width: 150,
         },
@@ -120,12 +123,7 @@
         emit('update');
       };
       function handleCopy(str: string) {
-        let save = function (e) {
-          e.clipboardData.setData('text/plain', str);
-          e.preventDefault(); //阻止默认行为
-        };
-        document.addEventListener('copy', save); //添加一个copy事件
-        document.execCommand('copy'); //执行copy方法
+        copyTextToClipboard(str)
         createMessage.success('复制成功');
       }
       function handleVisibleChange(v) {
@@ -141,6 +139,7 @@
         addListFunc,
         registerSubtable,
         reload,
+        closeModal,
         handleDelete,
         t,
       };

+ 3 - 6
src/views/empower/uploadModal.vue

@@ -22,6 +22,7 @@
   import { authorizeCameraupdateSnCode } from '/@/api/authorizeModeling';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { uploadApi } from '/@/api/product/index';
+  import { copyTextToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { ResultEnum } from '/@/enums/httpEnum';
   import { authorizeModelingaddOrUpdate } from '/@/api/authorizeModeling';
   import dayjs from 'dayjs';
@@ -61,6 +62,7 @@
         {
           field: 'snCode',
           component: 'Input',
+          required: true,
           label: '新SN码',
           colProps: { span: 20 },
         },
@@ -107,12 +109,7 @@
             okText: '复制',
             onOk: async () => {
               // 双击复制
-              let save = function (e) {
-                e.clipboardData.setData('text/plain', res.updateAuthorizeKey);
-                e.preventDefault(); //阻止默认行为
-              };
-              document.addEventListener('copy', save); //添加一个copy事件
-              document.execCommand('copy'); //执行copy方法
+              copyTextToClipboard(res.updateAuthorizeKey)
               createMessage.success('复制成功');
             },
           });

+ 3 - 1
src/views/productOperation/cameraScene.vue

@@ -21,7 +21,9 @@
           <Tooltip v-else placement="right">
             <template #title>
               <span>失败原因:{{ record.buildErrorReason }}</span>
-              <p>server-path:{{ record.dataSource }}</p>
+              <p>
+                <span>serverPath:{{ record.dataSource }}</span>
+              </p>
             </template>
             <span
               >{{ record.statusString }}