tangning 1 год назад
Родитель
Сommit
0d4d2e957c

BIN
public/favicon.ico


+ 2 - 2
src/locales/lang/json/en.json

@@ -460,7 +460,7 @@
             "sceneName": "scene title",
             "num": "scene code",
             "createTime": "Shooting time",
-            "amount": "Completion time of calculation",
+            "amount": "creation time",
             "snCode": "SN",
             "sceneSize": "scene size",
             "userName": "Account",
@@ -545,7 +545,7 @@
                 "id": "User ID",
                 "companyName": "company",
                 "nickName": "account",
-                "createTime": "Creation time"
+                "createTime": "creation time"
             },
             "password": "Change Password"
         }

+ 3 - 2
src/locales/lang/json/ja.json

@@ -125,7 +125,8 @@
         "addRoleName": "キャラクターを作成",
         "submitState": "コミット成功",
         "tips": "ヒント",
-        "editRoleName": "ロールの編集"
+        "editRoleName": "ロールの編集",
+        "normal": "通常"
     },
     "component": {
         "app": {
@@ -542,7 +543,7 @@
             "4dsg": "4DKK_Meta",
             "migrateAccount.required": "企業アカウントを入力してください。",
             "migrateDevice.required": "カメラSNを選択してください。",
-            "amount": "アップデート時間",
+            "amount": "作成時間",
             "snCode": "カメラSN",
             "sceneSize": "シーン サイズ",
             "copyTime": "時間をコピーする",

+ 12 - 11
src/locales/lang/json/zh.json

@@ -357,7 +357,7 @@
         },
         "login": {
             "backSignIn": "返回",
-            "signInFormTitle": "登录",
+            "signInFormTitle": "账号登录",
             "mobileSignInFormTitle": "手机登录",
             "qrSignInFormTitle": "二维码登录",
             "signUpFormTitle": "注册",
@@ -368,7 +368,7 @@
             "scanSign": "扫码后点击\"确认\",即可完成登录",
             "loginButton": "登录",
             "registerButton": "注册",
-            "rememberMe": "记住",
+            "rememberMe": "记住密码",
             "forgetPassword": "忘记密码?",
             "otherSignIn": "其他登录方式",
             "loginSuccessTitle": "登录成功",
@@ -379,8 +379,8 @@
             "mobilePlaceholder": "请输入手机号码",
             "policyPlaceholder": "勾选后才能注册",
             "diffPwd": "两次输入密码不一致",
-            "userName": "账号",
-            "password": "密码",
+            "userName": "请输入账号",
+            "password": "请输入密码",
             "confirmPassword": "确认密码",
             "email": "邮箱",
             "smsCode": "短信验证码",
@@ -418,17 +418,17 @@
                 "6": "深光点云场景",
                 "7": "深光Mesh场景"
             },
-            "sceneName": "场景标题",
+            "sceneName": "场景名称",
             "num": "场景码",
-            "createTime": "拍摄时间",
-            "amount": "计算完成时间",
+            "createTime": "创建时间",
+            "amount": "更新时间",
             "snCode": "SN码",
             "sceneSize": "场景大小",
             "userName": "所属账户",
             "viewCount": "浏览量",
             "copyTime": "复制时间",
             "isCopy": "是否复制",
-            "status": "状态",
+            "status": "场景状态",
             "statusType": {
                 "0": "同步中",
                 "1": "同步成功",
@@ -440,19 +440,20 @@
             "timeList": "授权时间",
             "transferTitle": "迁移场景",
             "transferTips": "请勾选同步场景!",
-            "transferSccuse": "迁移成功"
+            "transferSccuse": "迁移成功",
+            "createUserName": "创建人"
         },
         "system": {
             "roleBut": "权限",
             "userName": "用户名",
             "config": "Untiy配置",
-            "accountList": "账户列表",
+            "accountList": "用户管理",
             "password": "修改密码",
             "userList": {
                 "id": "用户ID",
                 "companyName": "所属公司",
                 "userName": "用户名称",
-                "nickName": "账",
+                "nickName": "账",
                 "createTime": "创建时间"
             }
         }

+ 1 - 1
src/router/routes/modules/config.ts

@@ -10,7 +10,7 @@ export const config: AppRouteRecordRaw = {
   component: LAYOUT,
   meta: {
     title: t('routes.system.config'),
-    icon: 'ph:user-list-duotone',
+    icon: 'hugeicons:configuration-01',
     orderNo: 10,
     hideChildrenInMenu: true,
     roles: [RoleEnum.SUPER],

+ 70 - 32
src/views/scene/list.vue

@@ -13,13 +13,18 @@
     <div class="desc-wrap-BasicTable">
       <BasicTable @register="registerTable">
         <template #toolbar>
-          <a-button type="primary" @click="handleMove"> {{t('routes.scene.sceneAsync')}}</a-button>
+          <a-button type="primary" @click="handleMove">
+            {{ t('routes.scene.sceneAsync') }}</a-button
+          >
         </template>
 
         <template #href="{ record }">
-          <a v-if="record.title && record.webSite && record.status == 1" target="_blank" :href="record.webSite">{{
-            record.title
-          }}</a>
+          <a
+            v-if="record.title && record.webSite && record.status == 1"
+            target="_blank"
+            :href="record.webSite"
+            >{{ record.title }}</a
+          >
           <span v-else-if="record.title">{{ record.title }}</span>
           <span v-else>-</span>
         </template>
@@ -34,6 +39,7 @@
               },
               {
                 label: t('common.delText'),
+                disabled: record.status != 1,
                 color: 'error',
                 onClick: handleDelete.bind(null, record),
               },
@@ -124,31 +130,37 @@
           width: 180,
         },
         {
+          title: t('routes.scene.createUserName'),
+          dataIndex: 'creator',
+          ellipsis: true,
+          width: 180,
+        },
+        {
           title: t('routes.scene.createTime'),
           dataIndex: 'createTime',
-          width: 180,
+          width: 150,
           customRender: ({ record }) => {
             return (
-              record.createTime &&
-              h(Time, {
-                value: record.createTime,
-                mode: 'datetime',
-              })
+              (record.createTime &&
+                h(Time, {
+                  value: record.createTime,
+                  mode: 'datetime',
+                })) ||
+              '-'
             );
           },
         },
         {
           title: t('routes.scene.amount'),
-          dataIndex: 'amount',
-          width: 210,
+          dataIndex: 'updateTime',
+          width: 150,
           customRender: ({ record }) => {
             return (
-              (record.algorithmTime &&
-                h(Time, {
-                  value: record.algorithmTime,
-                  mode: 'datetime',
-                })) ||
-              '-'
+              record.updateTime &&
+              h(Time, {
+                value: record.updateTime,
+                mode: 'datetime',
+              })
             );
           },
         },
@@ -249,9 +261,9 @@
             },
           },
           {
-            label: t('routes.scene.num'),
-            field: 'num',
-            labelWidth: locale.value != 'zh' ? 100 : 60,
+            label: t('routes.scene.createUserName'),
+            field: 'creator',
+            labelWidth: locale.value != 'zh' ? 80 : 60,
             component: 'Input',
             componentProps: {
               maxLength: 100,
@@ -262,12 +274,14 @@
             },
           },
           {
-            field: 'snCode',
-            label: t('routes.scene.snCode'),
-            labelWidth: locale.value != 'zh' ? 100 : 60,
-            component: 'Input',
+            field: 'timeList',
+            label: t('routes.scene.createTime'),
+            labelWidth: locale.value != 'zh' ? 80 : 60,
+            component: 'RangePicker',
             componentProps: {
               maxLength: 100,
+              valueFormat: 'YYYY-MM-DD',
+              format: 'YYYY-MM-DD',
             },
             colProps: {
               xl: 4,
@@ -275,16 +289,32 @@
             },
           },
           {
-            field: 'userName',
-            label: t('routes.scene.userName'),
-            component: 'Input',
-            componentProps: {
-              maxLength: 100,
-            },
+            field: 'status',
+            component: 'Select',
+            label: '出库类型',
             colProps: {
               xl: 4,
               xxl: 4,
             },
+            componentProps: {
+              options: [
+                {
+                  label: t('routes.scene.statusType.0'),
+                  value: '0',
+                  key: '0',
+                },
+                {
+                  label: t('routes.scene.statusType.1'),
+                  value: '1',
+                  key: '1',
+                },
+                {
+                  label: t('routes.scene.statusType.-1'),
+                  value: '-1',
+                  key: '-1',
+                },
+              ],
+            },
           },
         ],
       };
@@ -305,6 +335,14 @@
         showTableSetting: true,
         showIndexColumn: false,
         rowKey: 'num',
+        beforeFetch: (T) => {
+          console.log('afterFetch', T);
+          if (T.timeList) {
+            T.timeStart = T.timeList[0] + ' 00:00:00';
+            T.timeEnd = T.timeList[1] + ' 23:59:59';
+          }
+          return T;
+        },
         fetchSetting: {
           pageField: 'pageNum',
           sizeField: 'pageSize',
@@ -340,7 +378,7 @@
           onOk: async () => {
             await caseDelApi([record.id]);
             reload();
-            message.success({content: t('common.optSuccess')});
+            message.success({ content: t('common.optSuccess') });
           },
         });
       }

+ 1 - 1
src/views/sys/login/Login.vue

@@ -33,7 +33,7 @@
             </div>
           </div>
         </div> -->
-        <div class="flex w-full h-full py-5 xl:h-auto xl:py-0 xl:my-0 xl:w-5/12">
+        <div class="flex w-full h-full py-5 xl:h-auto xl:py-0 xl:my-0 xl:w-4/12">
           <div
             :class="`${prefixCls}-form`"
             class="relative w-full px-5 py-8 mx-auto my-auto rounded-md shadow-md xl:ml-16 xl:bg-transparent sm:px-8 xl:p-4 xl:shadow-none sm:w-3/4 lg:w-2/4 xl:w-auto enter-x"