修改登录

src/store/user.ts

@@ -86,7 +86,7 @@ export const useUserStore = defineStore('user', {
       return new Promise((resolve, reject) => {
         login(data)
           .then((res: ObjTy) => {
-            const { date, token, userid } = res.data
+            const { date, token, userid } = res.returnData
             this.SET_TOKEN(token)
             this.SET_UserId(userid)
             this.SET_UserType('1')

src/views/login/Login.vue

@@ -81,12 +81,12 @@ onBeforeMount(() => {
 });
 
 const getToken = async () => {
-  const { code, data, message } = await gettoken({
+  const { code, returnData, message } = await gettoken({
     appid: PLATFROM_CONFIG.appId,
     appSecret: PLATFROM_CONFIG.appKeyString,
   });
-  if (code == 0 && data) {
-    setCodeToken(data.appToken);
+  if (code == 0 && returnData) {
+    setCodeToken(returnData.appToken);
     getCheckCode();
     //getSystemSet();
   } else {
@@ -96,11 +96,11 @@ const getToken = async () => {
 
 //获取动态验证码
 const getCheckCode = async () => {
-  const { code, message, data } = await GetCheckCode({
+  const { code, message, returnData } = await GetCheckCode({
     appToken: getCodeToken(),
   });
   if (code == 0) {
-    identifyCode.value = data;
+    identifyCode.value = returnData;
   } else {
     ElMessage.error(message);
   }

src/views/userManagement/hooks/useTree.ts

@@ -0,0 +1,46 @@
+import { Query } from '@/api/dataIntegration'
+import { translateDataToTreeAll } from '@/utils/validate'
+import { ref, onBeforeMount } from 'vue'
+const dataObj = ref<any>({
+  auth_id: -1,
+  auth_name: '所有权限',
+  auth_status: true,
+  up_auth_id: -1,
+  auth_type: 0,
+  disabled: true,
+  children: [] as Array<any>,
+})
+const data = ref<any>([])
+const setTree = (arr: Array<any>, upkey = 'up_auth_id', key = 'auth_id') => {
+  if (arr.length) {
+    const datas = translateDataToTreeAll(arr, upkey, key)
+    dataObj.value.children = datas
+  }
+  return dataObj
+}
+
+const getTree = async () => {
+  try {
+    const { returnData, code } = await Query({
+      id: DATACONTENT_ID.authTreeNewId,
+      dataContent: [sessionStorage.getItem('User_Id')],
+    })
+    if (code == 0 && returnData.listValues) {
+      data.value = [setTree(returnData.listValues)]
+      return data
+    } else {
+      data.value = [dataObj]
+      return data
+    }
+  } catch (error) {
+    data.value = [dataObj]
+    return data
+  }
+}
+onBeforeMount(() => {
+  getTree()
+})
+export default {
+  setTree,
+  getTree,
+}

src/views/userManagement/permission/index.vue

@@ -79,7 +79,7 @@
               <el-option v-for="(item, index) in optionsType" :key="index" :label="item.label" :value="item.value"> </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="父级权限" prop="authParent">
+          <el-form-item label="父级权限" prop="auth_id">
             <el-select v-model="ruleForm.auth_id" size="default" placeholder="请选择">
               <el-option v-for="(item, index) in optionsParent" :key="index" :label="item.label" :value="item.value"> </el-option>
             </el-select>
@@ -106,19 +106,19 @@ import { ref, reactive, onBeforeMount } from "vue";
 import { CloseBold } from "@element-plus/icons-vue";
 import Dialog from "@/components/dialog/index.vue";
 import { ElMessage, FormInstance, FormRules } from "element-plus";
-import { translateDataToTreeAll } from "@/utils/validate";
-import { GeneralDataReception, Query } from "@/api/dataIntegration";
+import { GeneralDataReception } from "@/api/dataIntegration";
 import * as _ from "lodash";
+import tree from "../hooks/useTree";
 //当前选中数据
-const currData = ref({});
+const currData = ref<any>({});
 //当前要删除的数据
-const delObj = ref({});
+const delObj = ref<any>({});
 //下级权限数据
-const childrenData = ref([]);
+const childrenData = ref<any>([]);
 //默认展开
 const currentKey = ref([-1]);
 //权限树
-const data = ref([]);
+const data = ref<any>([]);
 //删除弹框
 const flag = ref(false);
 //新增编辑弹框
@@ -132,7 +132,7 @@ const auId = ref("");
 //新增编辑弹框-标题
 const editDialogTitle = ref("新增下级权限");
 //新增编辑弹框-表单
-const ruleForm = ref({
+const ruleForm = ref<any>({
   auth_name: "",
   auth_type: "",
   auth_comment: "",
@@ -140,6 +140,7 @@ const ruleForm = ref({
   auth_ident: "",
   app_id: "",
   auth_status: true,
+  auth_id: "",
 });
 const optionsType = ref([
   {
@@ -166,41 +167,9 @@ const defaultProps = {
   label: "auth_name",
 };
 
-//获取权限树数据
 const getAuthTree = async () => {
-  try {
-    const { returnData, code } = await Query({
-      id: DATACONTENT_ID.authTreeNewId,
-      dataContent: [sessionStorage.getItem("User_Id")],
-    });
-    if (code == 0 && returnData.listValues) {
-      const obj = {
-        auth_id: -1,
-        auth_name: "所有权限",
-        auth_status: true,
-        up_auth_id: -1,
-        auth_type: 0,
-        disabled: true,
-        children: translateDataToTreeAll(
-          returnData.listValues,
-          "up_auth_id",
-          "auth_id"
-        ),
-      };
-      data.value = [obj];
-    } else {
-      const obj = {
-        auth_id: -1,
-        auth_name: "所有权限",
-        auth_status: true,
-        up_auth_id: -1,
-        auth_type: 0,
-        disabled: true,
-        children: [],
-      };
-    }
-    data.value = [obj];
-  } catch (error) {}
+  const res = await tree.getTree();
+  data.value = res.value;
 };
 
 onBeforeMount(() => {
@@ -220,7 +189,11 @@ const handleNodeClick = (data) => {
 
 //启用禁用
 const renderChange = (data) => {
-  console.log(data);
+  if (data.children) {
+    delete data.children;
+  }
+  data.event = 2;
+  changeAuth(data);
 };
 
 //修改
@@ -255,14 +228,6 @@ const onNodeClick = (data) => {
 const remove = () => {
   delObj.value.event = 3;
   changeAuth(delObj.value, "del");
-  /* const datas = childrenData.value;
-  datas.filter((item, index) => {
-    if (item.auth_id == auId.value) {
-      datas.splice(index, 1);
-    }
-  });
-  flag.value = false;
-  ElMessage.success("删除成功");*/
 };
 
 //判断对象是否为空
@@ -290,7 +255,7 @@ const addAuth = () => {
 };
 
 //增删改
-const changeAuth = async (obj, type) => {
+const changeAuth = async (obj?, type?) => {
   const { code, message } = await GeneralDataReception({
     serviceId: SERVICE_ID.authScId,
     dataContent: JSON.stringify(obj),

src/views/userManagement/role/auth.vue

@@ -81,7 +81,6 @@ import { Query, GeneralDataReception } from "@/api/dataIntegration";
 import { translateDataToTreeAll } from "@/utils/validate";
 import { ElMessage, ElTree } from "element-plus";
 import * as _ from "lodash";
-import { from } from "webpack-sources/lib/CompatSource";
 const route = useRoute();
 const role_id = route.query.role_id;
 const ruleForm = ref({