diff --git a/client/.env.development b/client/.env.development
index c5200d4..aacde3e 100644
--- a/client/.env.development
+++ b/client/.env.development
@@ -3,8 +3,8 @@ ENV = 'development'
# base api
#VUE_APP_BASE_API = 'http://10.0.11.127:8000/api'
-VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'
-#VUE_APP_BASE_API = 'https://testsearch.ctc.ac.cn/api'
+#VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'
+VUE_APP_BASE_API = 'https://testsearch.ctc.ac.cn/api'
#VUE_APP_BASE_API = 'http://47.95.0.242:9101/api'
diff --git a/client/src/views/supervision/mytask.vue b/client/src/views/supervision/mytask.vue
index df4c439..60ff3b1 100644
--- a/client/src/views/supervision/mytask.vue
+++ b/client/src/views/supervision/mytask.vue
@@ -4,6 +4,21 @@
我的报送任务
+
+
+
+
+
{{ scope.row.up_rate }}%
+
+ {{ scope.row.dept_.name }}
+
{{ scope.row.confirm_rate }}%
@@ -64,6 +82,7 @@
import {
getmytasklist,
} from "@/api/task";
+import { getOrgList, getSubOrgList } from "@/api/org";
import checkPermission from "@/utils/permission";
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import mytaskrecord from "@/views/supervision/mytaskrecord";
@@ -77,13 +96,15 @@ export default {
page_size: 20,
},
listLoading: true,
- query:null
+ query:null,
+ orgData: [],
};
},
computed: {},
watch: {},
created() {
this.getList();
+ this.getOrgList();
},
methods: {
checkPermission,
@@ -95,12 +116,28 @@ export default {
}
this.listLoading = false;
});
+ },
+ getOrgList() {
+ if (this.checkPermission(["record_confirm"])) {
+ getOrgList({ can_supervision: true }).then((res) => {
+ this.orgData = res.data;
+ });
+ } else {
+ getSubOrgList().then((res) => {
+ this.orgData = res.data;
+ });
+ }
},
clickRow(obj){
this.query = {
dept:obj.dept,
task:obj.task
}
+ },
+ handleFilter() {
+ this.listQuery.page = 1;
+
+ this.getList();
},
handleDo(val){
this.getList()
diff --git a/client/src/views/supervision/mytaskrecord.vue b/client/src/views/supervision/mytaskrecord.vue
index edce980..3869bb5 100644
--- a/client/src/views/supervision/mytaskrecord.vue
+++ b/client/src/views/supervision/mytaskrecord.vue
@@ -1,20 +1,6 @@