1

.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.25"]]
 # VITE_PROXY=[["/api","https://vvbin.cn/test"]]
 
 # Delete console

src/api/operate/index.ts

@@ -51,130 +51,134 @@ enum Api {
   sceneApplyHandle = '/service/manage/sceneApply/handle',
   getInfoMail = '/service/manage/getInfo',
   updateMail = '/service/manage/update',
-  caseaddOrUpdate='/service/manage/case/addOrUpdate',
+  caseaddOrUpdate = '/service/manage/case/addOrUpdate',
   caseList = '/service/manage/case/list',
-  caseDel='/service/manage/case/del',
-  caseRelease='/service/manage/case/isShow',
-  caseWithdraw='/service/manage/case/release',
+  caseDel = '/service/manage/case/del',
+  caseRelease = '/service/manage/case/isShow',
+  caseWithdraw = '/service/manage/case/release',
+  getAuthList = '/service/manage/jy/sceneUserAuth/getAuthList',
+  getByRyId = '/service/manage/jy/user/getByRyId',
+  addAuth = '/service/manage/jy/sceneUserAuth/addAuth',
+  delAuth = '/service/manage/jy/sceneUserAuth/delAuth',
 }
 
 /**
  * @description: Get sample list value
  */
 
- export const agentAuditList = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.agentAuditList,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const agentAuditHandle = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.agentAuditHandle,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const sendEmail = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.sendEmail,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const sceneApplyList = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.sceneApplyList,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const sceneApplyHandle = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.sceneApplyHandle,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- 
- export const caseListApi = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.caseList,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- 
- export const caseaddOrUpdateApi = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.caseaddOrUpdate,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
-  
- export const casePublicApi = (params: PageParams) =>
- defHttp.get<RentListGetResultModel>({
-   url: Api.caseWithdraw,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const caseReleaseApi = (params: PageParams) =>
- defHttp.get<RentListGetResultModel>({
-   url: Api.caseRelease,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const caseDelApi = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.caseDel,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const ListApi = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.pageList,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
+export const agentAuditList = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.agentAuditList,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const agentAuditHandle = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.agentAuditHandle,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const sendEmail = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.sendEmail,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const sceneApplyList = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.sceneApplyList,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const sceneApplyHandle = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.sceneApplyHandle,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
+export const caseListApi = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.caseList,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
+export const caseaddOrUpdateApi = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.caseaddOrUpdate,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
+export const casePublicApi = (params: PageParams) =>
+  defHttp.get<RentListGetResultModel>({
+    url: Api.caseWithdraw,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const caseReleaseApi = (params: PageParams) =>
+  defHttp.get<RentListGetResultModel>({
+    url: Api.caseRelease,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const caseDelApi = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.caseDel,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const ListApi = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.pageList,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 //显示隐藏
 export const NewDisplay = (params: PageParams) =>
   defHttp.post<RentListGetResultModel>({
@@ -341,17 +345,17 @@ export const sceneDelete = (params: sceneControlParams) =>
       ignoreCancelToken: true,
     },
   });
-  
+
 export const qjsceneDelete = (params: overallDelete) =>
-defHttp.post<Result>({
-  url: Api.qjsceneDelete,
-  params: params,
-  // data: params,
-  headers: {
-    // @ts-ignore
-    ignoreCancelToken: true,
-  },
-});
+  defHttp.post<Result>({
+    url: Api.qjsceneDelete,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 export const checkDownLoad = (params: sceneControlParams) =>
   defHttp.get<checkDownLoadResult>({
     url: Api.checkDownLoad,
@@ -462,4 +466,48 @@ export const intercomMessageHandle = (params: updateParams) =>
       // @ts-ignore
       ignoreCancelToken: true,
     },
-  });
+  });
+
+// 根据场景码获取授权用户列表
+export const getAuthList = (params) =>
+  defHttp.post<Result>({
+    url: Api.getAuthList,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
+// 根据警员ID获取用户列表
+export const getByRyId = (params) =>
+  defHttp.post<Result>({
+    url: Api.getByRyId,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
+// 根据警员ID获取用户列表
+export const addAuth = (params) =>
+  defHttp.post<Result>({
+    url: Api.addAuth,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
+// 根据警员ID获取用户列表
+export const delAuth = (params) =>
+  defHttp.post<Result>({
+    url: Api.delAuth,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });

src/views/productOperation/modal/PowersModal.vue

@@ -38,7 +38,7 @@
           />
         </template>
       </BasicTable>
-      <detailModal @register="registerDetail" />
+      <detailModal @register="registerDetail" @update="reload" />
     </div>
   </BasicModal>
 </template>
@@ -52,26 +52,18 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import detailModal from './detailModal.vue';
   import { usePermissionStore } from '/@/store/modules/permission';
-  import {
-    operateSceneList,
-    sceneMove,
-    sceneDelete,
-  } from '/@/api/operate';
-  import {
-    BasicTable,
-    useTable,
-    TableAction,
-    BasicColumn,
-  } from '/@/components/Table';
+  import { getAuthList, addAuth, delAuth } from '/@/api/operate';
+  import { BasicTable, useTable, TableAction, BasicColumn } from '/@/components/Table';
   const { t } = useI18n();
   export default defineComponent({
-    components: { BasicModal, BasicForm, BasicTable, TableAction, detailModal},
+    components: { BasicModal, BasicForm, BasicTable, TableAction, detailModal },
     props: {
       userData: { type: Object },
     },
     emits: ['update', 'register'],
     setup(props, { emit }) {
       const modelRef = ref({});
+      const numRef = ref(null);
       const fileFlow = reactive({
         showList: true,
       });
@@ -79,22 +71,28 @@
       const columns: BasicColumn[] = [
         {
           title: '警员ID',
-          dataIndex: 'sceneName',
+          dataIndex: 'ryId',
           width: 150,
         },
         {
           title: '姓名',
-          dataIndex: 'sceneName',
+          dataIndex: 'ryNickName',
           width: 180,
         },
         {
           title: '浏览权限',
-          dataIndex: 'num',
+          dataIndex: 'lookAuth',
+          customRender: ({ record }) => {
+            return record.lookAuth == 1 ? '不限时间' : `${record.lookEndTime} 截止`;
+          },
           width: 180,
         },
         {
           title: '编辑权限',
-          dataIndex: 'num',
+          dataIndex: 'editAuth',
+          customRender: ({ record }) => {
+            return record.editAuth == 1 ? '不限时间' : `${record.editEndTime} 截止`;
+          },
           width: 180,
         },
         {
@@ -110,28 +108,38 @@
       const permissionStore = usePermissionStore();
       const { getCheckPerm } = permissionStore;
       const { createMessage, createConfirm } = useMessage();
-      const [registerTable, { reload }] = useTable({
-        api: operateSceneList,
+      const [registerTable, { reload, getRawDataSource }] = useTable({
+        api: getAuthList,
         title: `已授权列表`,
-        // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
         columns: columns,
-        // searchInfo: { type: tableType },
         useSearchForm: false,
-        // formConfig: searchForm,
-        showTableSetting: false,
+        immediate: false,
+        searchInfo: {
+          num: numRef,
+        },
+        afterFetch: (T) => {
+          let { authType } = getRawDataSource();
+          setFieldsValue({
+            authType,
+          });
+          console.log('modelRef.value.num', getRawDataSource(), T);
+          return T;
+        },
+        showTableSetting: true,
+        tableSetting: { fullScreen: true },
         showIndexColumn: false,
-        rowKey: 'num',
+        canResize: true,
+        rowKey: 'id',
         fetchSetting: {
           pageField: 'pageNum',
           sizeField: 'pageSize',
-          listField: 'list',
+          listField: 'pageInfo.list',
           totalField: 'total',
         },
-        canResize: true,
       });
       const schemas: FormSchema[] = [
         {
-          field: 'Powerstype',
+          field: 'authType',
           component: 'RadioGroup',
           defaultValue: 0,
           componentProps: {
@@ -141,7 +149,7 @@
             ],
             onChange: (value) => {
               fileFlow.showList = value.target.value ? false : true;
-              console.log('fileFlow.showList', value.target.value, fileFlow.showList)
+              console.log('fileFlow.showList', value.target.value, fileFlow.showList);
             },
           },
           label: '授权方式',
@@ -161,26 +169,25 @@
       onMounted(() => {});
       let addListFunc = () => {};
       const [register, { closeModal }] = useModalInner((data) => {
-        console.log(data);
         data && onDataReceive(data);
       });
 
       function onDataReceive(data) {
         modelRef.value = data;
+        numRef.value = data.num;
+        console.log('num', numRef.value);
+        reload();
         resetFields();
         setFieldsValue({
           type: data.sceneName,
+
         });
       }
       const handleSubmit = async () => {
         try {
           const params = await validate();
-          const apiData = {
-            snCode: params.snCode,
-            num: modelRef.value.num,
-          };
-          console.log('res', apiData, params);
-          const res = await sceneMove(apiData);
+          console.log('res', params);
+          const res = await addAuth({num:numRef.value,...params});
           console.log('res', res);
           closeModal();
           resetFields();
@@ -191,24 +198,21 @@
         }
       };
       function addPowes() {
-        openDetaileModal(true, {});
+        openDetaileModal(true, { num: modelRef.value.num});
       }
       function handleEdit(record: Recordable) {
         openDetaileModal(true, record);
       }
       async function handleDelete(record: Recordable) {
-        console.log('handleDelete', record);
         createConfirm({
           title: '删除',
-          content: '确定要删除场景吗？',
+          content: `确定要删除 ${record.ryNickName} 吗？`,
           onOk: async () => {
-            sceneDelete({ num: record.num }).then(() => {
-              message.success({
-                content: '删除成功',
-              });
-
-              reload();
+            await delAuth({ id: record.id })
+            message.success({
+              content: '删除成功',
             });
+            reload();
           },
         });
       }
@@ -229,13 +233,13 @@
         registerDetail,
         openDetaileModal,
         addPowes,
+        reload,
       };
     },
   });
 </script>
 
 <style lang="less" scoped>
-.powesrTable{
-
-}
-</style>
+  .powesrTable {
+  }
+</style>

src/views/productOperation/modal/detailModal.vue

@@ -25,6 +25,7 @@
   import { companyAdd, companyUpdate } from '/@/api/customer';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { uploadApi } from '/@/api/product/index';
+  import { getByRyId, addAuth } from '/@/api/operate';
   import { useModalInner } from '/@/components/Modal';
   import dayjs from 'dayjs';
 
@@ -43,25 +44,34 @@
       });
       const { createMessage } = useMessage();
       const title = ref('新增客户');
+      const optionsName = ref([]);
       const schemas: FormSchema[] = [
         {
-          field: 'id',
+          field: 'num',
           component: 'Input',
           show: false,
           label: 'id',
           required: false,
         },
         {
-          field: 'ryid',
-          component: 'Input',
+          field: 'ryId',
+          component: 'AutoComplete',
           label: '警员ID',
           required: true,
+          componentProps: {
+            filterOption: onFilterOption,
+            onSearch: onSearch,
+            onChange: (data) => {
+              const item = optionsName.value && optionsName.value.find(ele => ele.ryId == data)
+              setFieldsValue({ryNickName: item && item.ryNickName ? item.ryNickName : ''});
+            },
+          },
           colProps: {
             span: 20,
           },
         },
         {
-          field: 'name',
+          field: 'ryNickName',
           component: 'Input',
           label: '姓名',
           required: true,
@@ -73,7 +83,7 @@
           },
         },
         {
-          field: 'set',
+          field: 'editAuth',
           component: 'RadioGroup',
           label: '编辑权限',
           defaultValue: 0,
@@ -91,13 +101,13 @@
               console.log('params', params);
               isEdit.value = value.target.value == 0 ? true : false;
               if (value.target.value == 1) {
-                params.view = 1;
+                params.lookAuth = 1;
               }
               params.isEmpower = isEdit.value ? [] : params.isEmpower;
-              setFieldsValue({...params, set: value.target.value});
+              setFieldsValue({...params, editAuth: value.target.value});
               updateSchema([
                 {
-                  field: 'setTime',
+                  field: 'editEndTime',
                   ifShow: value.target.value == 2,
                 },
                 {
@@ -111,24 +121,24 @@
           },
         },
         {
-          field: 'setTime',
+          field: 'editEndTime',
           component: 'DatePicker',
           label: '编辑到期日期',
           ifShow: false,
           required: true,
-          defaultValue: dayjs().add(1, 'month').format('YYYY-MM-DD HH:mm'),
+          defaultValue: dayjs().add(1, 'month').format('YYYY-MM-DD HH:mm:ss'),
           componentProps: {
             disabled: false,
             'show-time': true,
-            valueFormat: 'YYYY-MM-DD HH:mm',
-            format: 'YYYY-MM-DD HH:mm',
+            valueFormat: 'YYYY-MM-DD HH:mm:ss',
+            format: 'YYYY-MM-DD HH:mm:ss',
             disabledDate: (current) => {
               return current && current < dayjs().endOf('day');
             },
           },
         },
         {
-          field: 'view',
+          field: 'lookAuth',
           component: 'RadioGroup',
           label: '查看权限',
           defaultValue: 1,
@@ -142,31 +152,31 @@
             ],
             onChange: (value) => {
               updateSchema({
-                field: 'viewTime',
+                field: 'lookEndTime',
                 ifShow: value.target.value == 2,
               });
             },
           },
         },
         {
-          field: 'viewTime',
+          field: 'lookEndTime',
           component: 'DatePicker',
           label: '查看到期日期',
           ifShow: false,
           required: true,
-          defaultValue: dayjs().add(1, 'month').format('YYYY-MM-DD HH:mm'),
+          defaultValue: dayjs().add(1, 'month').format('YYYY-MM-DD HH:mm:ss'),
           componentProps: {
             disabled: false,
             'show-time': true,
-            valueFormat: 'YYYY-MM-DD HH:mm',
-            format: 'YYYY-MM-DD HH:mm',
+            valueFormat: 'YYYY-MM-DD HH:mm:ss',
+            format: 'YYYY-MM-DD HH:mm:ss',
             disabledDate: (current) => {
               return current && current < dayjs().endOf('day');
             },
           },
         },
         {
-          field: 'empower',
+          field: 'isAuthor',
           component: 'RadioGroup',
           label: '是否可授权他人',
           defaultValue: 0,
@@ -211,52 +221,57 @@
       onMounted(() => {});
       let addListFunc = () => {};
       const [register, { closeModal }] = useModalInner((data) => {
-        console.log('data', data);
+        onSearch('');
         if (data) {
           title.value = data.id ? '编辑授权' : '新增授权';
           modelRef.value = data.id ? true : false;
-          setFieldsValue(data);
+          setFieldsValue({
+            ...data,
+            isEmpower:[data.canAuthLook?0:'',data.canEditLook?1:'']
+          });
         } else {
           title.value = '新增客户';
         }
         updateSchema([
-          { field: 'isEmpower', ifShow: false },
-          { field: 'setTime', ifShow: false },
-          { field: 'viewTime', ifShow: false },
+          { field: 'isEmpower', ifShow: data.isAuthor == 1 },
+          { field: 'editEndTime', ifShow: data.editAuth == 2 },
+          { field: 'lookEndTime', ifShow: data.lookAuth == 2 },
         ]);
       });
-      // function onDataReceive(data) {
-      //   modelRef.value = data;
-      //   resetFields();
-      //   setFieldsValue({
-      //     type: data.sceneName,
-      //   });
-      // }
+      function onFilterOption(inputText: string, option) {
+        console.log('option', inputText, option.value);
+        if (option.value) {
+          return option.value.indexOf(inputText) >= 0;
+        }
+        // return option.value.indexOf(inputText.toUpperCase()) >= 0;
+      }
+      async function onSearch(searchText) {
+        const list = await getByRyId({ ryId: searchText });
+        optionsName.value = list.map((ele) => {
+            return { ...ele, value: ele.ryId };
+          }) || [];
+        // console.log('paramList', optionsList);
+        // optionsName.value = optionsList || [];
+        updateSchema({
+          field: 'ryId',
+          componentProps: {
+            options: optionsName.value,
+          },
+        });
+      }
       const handleSubmit = async () => {
         try {
           const params = await validate();
           console.log('params', params);
-          const apiData = {
+          await addAuth({
             ...params,
-            floorLogo: (params.floorLogo && params.floorLogo[0]) || '',
-            qrLogo: (params.qrLogo && params.qrLogo[0]) || '',
-            topLogo: (params.topLogo && params.topLogo[0]) || '',
-          };
-          console.log(modelRef.value);
-          let tips: string;
-          if (modelRef.value) {
-            // apiData.id = modelRef.value.id;
-            await companyUpdate(apiData);
-            tips = '修改成功。';
-          } else {
-            tips = '添加成功。';
-            await companyAdd(apiData);
-          }
-
+            canAuthLook: params.isEmpower.every(item => item == 0) ? 1 : 0,
+            canEditLook: params.isEmpower.every(item => item == 1) ? 1 : 0,
+          });
           closeModal();
           resetFields();
           emit('update');
-          createMessage.success(tips);
+          createMessage.success('操作成功');
         } catch (error) {
           console.log('not passing', error);
         }