wenhongquan 3 tahun lalu
induk
melakukan
24d95098dd
2 mengubah file dengan 24 tambahan dan 5 penghapusan
  1. 2 2
      src/views/login.vue
  2. 22 3
      src/views/task/list/index.vue

+ 2 - 2
src/views/login.vue

@@ -93,7 +93,7 @@ const loading = ref(false);
 const captchaOnOff = ref(true);
 // 注册开关
 const register = ref(false);
-const redirect = ref(undefined);
+const redirect = ref('/task/list/1');
 
 function handleLogin() {
   proxy.$refs.loginRef.validate(valid => {
@@ -126,7 +126,7 @@ function handleLogin() {
 
 function getCode() {
   getCodeImg().then(res => {
-    captchaOnOff.value = res.captchaOnOff === undefined ? true : res.captchaOnOff;
+    captchaOnOff.value = res.captchaOnOff === undefined ? false : res.captchaOnOff;
     if (captchaOnOff.value) {
       codeUrl.value = "data:image/gif;base64," + res.img;
       loginForm.value.uuid = res.uuid;

+ 22 - 3
src/views/task/list/index.vue

@@ -16,7 +16,7 @@
             end-placeholder="结束时间"
           />
         </el-form-item>
-        <el-form-item label="任务状态">
+        <el-form-item label="任务状态" v-if="currentstatus==1">
           <el-select
             v-model="queryparameters.status"
             class="m-1"
@@ -134,7 +134,7 @@
 </template>
 
 <script setup>
-import { defineComponent, ref, reactive, onMounted } from "vue";
+import { defineComponent, ref, reactive, onMounted, computed } from "vue";
 import { useDict } from "@/utils/dict";
 import TaskAdd from "@/components/Task/Add";
 import router from "../../../router";
@@ -149,6 +149,7 @@ import {
 } from "@/api/system/task";
 import { cloneDeep } from 'lodash';
 import { isArray } from "@vue/shared";
+import { useRoute } from "vue-router";
 
 const {
   task_status,
@@ -177,6 +178,11 @@ const tableData = ref([]);
 const pagedata = ref({});
 const taskinfo = ref();
 const taskaddref = ref();
+const route = useRoute()
+ const currentstatus = computed(() => route.params.status);
+
+
+
 
 const addtask = () => {
   showadd.value = true;
@@ -226,7 +232,17 @@ const ontaskadd = async ()=>{
   loading.value = false;
   getList();
 }
+
 const getList = () => {
+  if (currentstatus.value != 1) {
+    if (currentstatus.value == 2){
+      queryparameters.value.status = 1;
+    } else {
+     queryparameters.value.status = currentstatus.value;
+    }
+  } else {
+    queryparameters.value.status = "";
+  }
   listTask(proxy.addDateRange(queryparameters.value, qdate.value)).then(
     (response) => {
       tableData.value = response.rows;
@@ -236,8 +252,11 @@ const getList = () => {
 };
 getList();
 
+
+
 onMounted(() => {
-  // console.log(taskaddref.value)
+
+
 });
 </script>