This commit is contained in:
zmj 2024-02-05 16:46:21 +08:00
parent d643900fe6
commit 004af44815
5 changed files with 23 additions and 21 deletions

View File

@ -4,6 +4,6 @@ NODE_ENV = 'development'
# #
# VITE_APP_BASE_URL = 'https://ceshi-new-wokr.lihaink.cn/' # VITE_APP_BASE_URL = 'https://ceshi-new-wokr.lihaink.cn/'
VITE_APP_BASE_URL = 'https://ceshi-new-wokr.lihaink.cn/' # VITE_APP_BASE_URL = 'https://ceshi-new-wokr.lihaink.cn/'
# VITE_APP_BASE_URL = 'http://192.168.1.24:8083' VITE_APP_BASE_URL = 'http://192.168.1.30:8083'

Binary file not shown.

BIN
dist.zip

Binary file not shown.

View File

@ -12,4 +12,8 @@ export function taskList(params: any) {
//任务列表 //任务列表
export function editTask(params: any) { export function editTask(params: any) {
return request.post({ url: '/task/editTask', params }) return request.post({ url: '/task/editTask', params })
} }
// 用户角色
export function apiUserRoleLists() {
return request.get({ url: '/user.user_role/getList' })
}

View File

@ -10,11 +10,11 @@
placeholder="请输入负责人名称" placeholder="请输入负责人名称"
/> />
</el-form-item> </el-form-item>
<el-form-item label="请选择负责人角色" prop="role_id"> <el-form-item label="请选择负责人角色" prop="group_id">
<el-select class="w-[280px]" v-model="queryParams.role_id"> <el-select class="w-[280px]" v-model="queryParams.group_id">
<el-option label="全部" value /> <el-option label="全部" value />
<el-option <el-option
v-for="(item, index) in optionsData.role" v-for="(item, index) in roleList"
:key="index" :key="index"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
@ -58,7 +58,7 @@
<el-table-column label="最近登录IP" prop="login_ip" min-width="120" /> --> <el-table-column label="最近登录IP" prop="login_ip" min-width="120" /> -->
</el-table> </el-table>
</div> </div>
<div class="flex mt-4 justify-end"> <div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
</div> </div>
@ -76,23 +76,22 @@
<script lang="ts" setup name="companyLists"> <script lang="ts" setup name="companyLists">
import { usePaging } from "@/hooks/usePaging"; import { usePaging } from "@/hooks/usePaging";
import { roleAll } from "@/api/perms/role"; import {apiUserRoleLists} from "@/api/newTask.ts"
import { useDictData, useDictOptions } from "@/hooks/useDictOptions";
import { adminLists } from "@/api/perms/admin";
import Popup from "@/components/popup/index.vue";
import { defineEmits } from "vue"; import { defineEmits } from "vue";
import { getUserList } from "@/api/user"; import { getUserList } from "@/api/user";
const { optionsData } = useDictOptions<{
role: any[];
}>({ const roleList=ref([])
role: { const getRoleList=async()=>{
api: roleAll, let res=await apiUserRoleLists()
}, roleList.value=res
});
}
// //
const queryParams = reactive({ const queryParams = reactive({
nickname:"", nickname:"",
role_id:"" group_id:""
}); });
const props = defineProps({ const props = defineProps({
@ -101,7 +100,6 @@ const props = defineProps({
defaults: 0, defaults: 0,
}, },
}); });
// queryParams.company_id = props.company_id;
// //
@ -128,6 +126,6 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: getUserList, fetchFun: getUserList,
params: queryParams, params: queryParams,
}); });
getRoleList()
getLists(); getLists();
</script> </script>