11

.env.development

@@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = ./
 
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
-VITE_PROXY = [["/basic-api","http://localhost:3000"],["/upload","https://v4-uat.4dkankan.com/service/manage/common/upload/files"],["/service","https://v4-uat.4dkankan.com"]]
+VITE_PROXY = [["/basic-api","http://localhost:3000"],["/upload","https://v4-uat.4dkankan.com/service/manage/common/upload/files"],["/service","http://192.168.0.211"]]
 # VITE_PROXY=[["/api","https://vvbin.cn/test"]]
 
 # Delete console

.vscode/settings.json

@@ -138,5 +138,6 @@
     "brotli",
     "tailwindcss",
     "sider"
-  ]
+  ],
+  "vue-i18n.i18nPaths": "src\\locales,src\\locales\\lang,dist\\resource\\tinymce\\langs,public\\resource\\tinymce\\langs"
 }

src/api/staff/list.ts

@@ -21,7 +21,7 @@ enum Api {
   addUcenterUser = '/service/manage/user/addUcenterUser',
   ReUcenterUserPassword = '/service/manage/user/ReUcenterUserPassword',
   delUcenterUser = '/service/manage/user/delUcenterUser',
-  updateUcenterUser = '/service/manage/user/updateUcenterUser'
+  updateUcenterUser = '/service/manage/user/updateUcenterUser',
 }
 
 /**
@@ -41,56 +41,56 @@ export const clean = (params) =>
 export const saveAddApi = (params) =>
   defHttp.post<Result>({
     url: Api.addUcenterUser,
-    params:{
-        ...params,
-        password: encodeStr(window.btoa(params.password))
+    params: {
+      ...params,
+      password: encodeStr(window.btoa(params.password)),
     },
     headers: {
       // @ts-ignore
       ignoreCancelToken: true,
     },
   });
-  export const updateUcenterUser = (params) =>
-defHttp.post<Result>({
-  url: Api.updateUcenterUser,
-  params:{
+export const updateUcenterUser = (params) =>
+  defHttp.post<Result>({
+    url: Api.updateUcenterUser,
+    params: {
       ...params,
-      password: encodeStr(window.btoa(params.password))
-  },
-  headers: {
-    // @ts-ignore
-    ignoreCancelToken: true,
-  },
-});
+      password: encodeStr(window.btoa(params.password)),
+    },
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 
 export const delUcenterUser = (params: DelParams) =>
-defHttp.post<Result>({
-  url: Api.delUcenterUser,
-  params,
-  headers: {
-    // @ts-ignore
-    ignoreCancelToken: true,
-  },
-});
+  defHttp.post<Result>({
+    url: Api.delUcenterUser,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 export function ReUcenterUserPassword(params) {
   return defHttp.post<Result>(
     { url: Api.ReUcenterUserPassword, params },
     // { errorMessageMode: 'none' },
   );
-} 
+}
 export function updatePasswordApi(params) {
-    return defHttp.post<Result>(
-      { url: Api.updatePassword, params },
-      // { errorMessageMode: 'none' },
-    );
-} 
+  return defHttp.post<Result>(
+    { url: Api.updatePassword, params },
+    // { errorMessageMode: 'none' },
+  );
+}
 
 export function reMyselfPassword(params) {
   return defHttp.post<Result>(
     { url: Api.reMyselfPassword, params },
     // { errorMessageMode: 'none' },
   );
-} 
+}
 export const staffListApi = (params: PageParams) =>
   defHttp.post<ListGetResultModel>({
     url: Api.pageList,
@@ -170,17 +170,17 @@ export const checkUserApi = (params) =>
   });
 
 export const saveApi = (params) =>
-defHttp.post<Result>({
-  url: Api.staffSave,
-  params:{
+  defHttp.post<Result>({
+    url: Api.staffSave,
+    params: {
       ...params,
-      password: encodeStr(window.btoa(params.password))
-  },
-  headers: {
-    // @ts-ignore
-    ignoreCancelToken: true,
-  },
-});
+      password: encodeStr(window.btoa(params.password)),
+    },
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 export const updateApi = (params) =>
   defHttp.post<Result>({
     url: Api.update,

src/views/device/index.vue

@@ -107,17 +107,17 @@
           title: '设备类型',
           dataIndex: 'type',
           ellipsis: false,
-          width: 80,  
+          width: 80,
           customRender: ({ record }) => {
-            let typeObj ={
-              // '0':'旧双目相机',
-              // '1':'四维看看',
-              // '2':'四维看看lite',
-              '9':'四维看见',
-              // '10':'四维深时',
-            }
+            let typeObj = {
+              '0': '旧双目相机',
+              '1': '四维看看',
+              '2': '四维看看lite',
+              '9': '四维看见',
+              '10': '四维深时',
+            };
             return typeObj[record.type]
-          }        
+          }
         },
 
         {

src/views/device/putModal.vue

@@ -46,8 +46,8 @@
           colProps: {
             span: 18,
           },
-          helpMessage:'wifi名称需包含前缀，如““4DKKMI_”。',
-          defaultValue:'4DKKMI_',
+          helpMessage:'wifi名称需包含前缀，如““4DKKPRO_”。',
+          defaultValue:'4DKKPRO_',
           rules: [
             {
               required: true,
@@ -57,13 +57,13 @@
                 if (!value) {
                   return Promise.reject('请输入wifi名称');
                 }
-                var list:string[] = ['4DKKMI_',];
+                var list:string[] = ['4DKKPRO_',];
                 const some = list.some(item=>{
                   return value.indexOf(item) != -1
                 })
                 console.log('validator',some)
                 if(!some){
-                  return Promise.reject('wifi名称需包含前缀，如“4DKKMI_”。');
+                  return Promise.reject('wifi名称需包含前缀，如“4DKKPRO_”。');
                 }
                 return Promise.resolve();
               },

src/views/lanUser/adddetailsModal.vue

@@ -126,8 +126,22 @@
             maxLength: 16,
             readonly:preventAutoFill.value,
             minLength: 8,
-            autoComplete:'off',
-          }
+            autoComplete: 'off',
+          },
+        },
+        {
+          field: 'roleId',
+          label: '角色',
+          component: 'ApiSelect',
+          componentProps: {
+            api: getRoleListByParam,
+            labelField: 'roleName',
+            valueField: 'id',
+          },
+          colProps: {
+            xl: 12,
+            xxl: 12,
+          },
         },
         {
           field: 'id',

src/views/lanUser/detailsModal.vue

@@ -12,7 +12,7 @@
 </template>
 <script lang="ts">
   import { defineComponent, ref, computed } from 'vue';
-  import { updateUcenterUser } from '/@/api/staff/list'; //roleLIstApi
+  import { updateUcenterUser, getRoleListByParam } from '/@/api/staff/list'; //roleLIstApi
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { useI18n } from '/@/hooks/web/useI18n';
@@ -64,6 +64,20 @@
           ],
         },
         {
+          field: 'roleId',
+          label: '角色',
+          component: 'ApiSelect',
+          componentProps: {
+            api: getRoleListByParam,
+            labelField: 'roleName',
+            valueField: 'id',
+          },
+          colProps: {
+            xl: 12,
+            xxl: 12,
+          },
+        },
+        {
           field: 'id',
           component: 'Input',
           label: 'id',
@@ -92,11 +106,11 @@
             console.log('useModalInner', data);
             setFieldsValue({
             ...data,
-            userName:'',
-            password:'',
-            roleId: data.roleId != 2 ? data.roleId : '',
+            userName: '',
+            password: '',
+            roleId: data.roleId,
           });
-        },200)
+        }, 200)
       }
       function companyIdChange(companyId) {
         // resetFields(['permList'])

src/views/lanUser/list.vue

@@ -123,12 +123,11 @@
         //   dataIndex: 'phone',
         //   width: 160,
         // },
-        // {
-        //   title: t('common.roleName'),
-        //   dataIndex: 'roleName',
-        //   width: 100,
-        // },
-
+        {
+          title: t('common.roleName'),
+          dataIndex: 'roleName',
+          width: 100,
+        },
         {
           title: '创建人',
           dataIndex: 'sysUserName',

src/views/productOperation/cameraScene.vue

@@ -2,8 +2,8 @@
   <PageWrapper contentBackground>
     <template #footer >
       <a-tabs v-model:activeKey="tableType" @change="changeTable">
-        <!-- <a-tab-pane :key="0" tab="四维看看" :disabled="loading"/> -->
-        <a-tab-pane :key="1" tab="四维看见" :disabled="loading"/>
+        <a-tab-pane :key="0" tab="四维看看" :disabled="loading"/>
+        <!-- <a-tab-pane :key="1" tab="四维看见" :disabled="loading"/> -->
         <!-- <a-tab-pane :key="2" tab="四维深时" :disabled="loading"/>
         <a-tab-pane :key="3" tab="四维双目Lite" :disabled="loading"/>  -->
       </a-tabs
@@ -133,7 +133,7 @@
       const permissionStore = usePermissionStore();
       const { getCheckPerm } = permissionStore;
       const loading = ref(false);
-      const tableType = ref<Recordable>(1); //0看看 、1看见、2深时
+      const tableType = ref<Recordable>(0); //0看看 、1看见、2深时
       const tabList = ref<Array>(['四维看看', '四维看见', '四维深时', '四维双目Lite']);
       const columns: BasicColumn[] = [
         {

src/views/statistics/components/sceneEchart.vue

@@ -24,7 +24,7 @@
   const ssobjList = ref<number[]>([]);
   const yixStringData = ref<string[]>([]);
   const echartTypr = ref('line')
-  const nameList = ref<string[]>(['看见场景',]);//'看看场景','深时场景','深时obj']);
+  const nameList = ref<string[]>(['看看场景',]);//'看看场景','深时场景','深时obj']);
   const maxSize = ref(0);
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>)
@@ -36,7 +36,7 @@
     let fileTile = props.title||'订单数据'
     let fields  = {
     'time':'日期',
-    'kj':'看见场景',
+    'kj':'看看场景',
     // 'kk':'看看场景',
     // 'ss':'深时场景',
     // 'dy':'深时obj',

src/views/statistics/scene/index.vue

@@ -38,7 +38,7 @@ async function getList() {
   let downlist = [],
     xdata = [];
   const {kjList,kkList,ssList,ssobjList} = await sceneTrend(SearchData);
-  kjList.map((ele) => {
+  kkList.map((ele) => {
     xdata.push(ele.groupKey);
     downlist.push(ele.count);
   });