Merge branch 'master' of https://gitea.qinmian.online/2112A-ONE/cloud-ui

src/api/quest/quest.js

@@ -12,7 +12,7 @@ export function listQuest(query) {
 // 查询任务详细
 export function getQuest(id) {
   return request({
-    url: '/quest/quest/' + id,
+    url: '/quest/quest/selectTaskById/' + id,
     method: 'get'
   })
 }

src/main.js

@@ -16,8 +16,8 @@ import {download} from '@/utils/request'
 
 import './assets/icons' // icon
 import './permission' // permission control
-import {getDicts} from "@/api/system/dict/data";
-import {getConfigKey} from "@/api/system/config";
+import {getDicts} from "/src/api/system/dict/data";
+import {getConfigKey} from "/src/api/system/config";
 import {addDateRange, handleTree, parseTime, resetForm, selectDictLabel, selectDictLabels} from "@/utils/muyu";
 // 分页组件
 import Pagination from "@/components/Pagination";

src/views/login.vue

@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import {getCodeImg} from "@/api/login";
+import {getCodeImg} from "/src/api/login";
 import Cookies from "js-cookie";
 import {decrypt, encrypt} from '@/utils/jsencrypt'
 

src/views/market/apitype/index.vue

@@ -195,7 +195,7 @@
 </template>
 
 <script>
-import { listApitype, getApitype, delApitype, addApitype, updateApitype } from "@/api/market/apitype";
+import { listApitype, getApitype, delApitype, addApitype, updateApitype } from "/src/api/market/apitype";
 
 export default {
   name: "Apitype",

src/views/monitor/online/index.vue

@@ -60,7 +60,7 @@
 </template>
 
 <script>
-import {forceLogout, list} from "@/api/monitor/online";
+import {forceLogout, list} from "/src/api/monitor/online";
 
 export default {
   name: "Online",

src/views/quest/index.vue

@@ -130,6 +130,9 @@
         <el-form-item label="规则编码" prop="ruleCode">
           <el-input v-model="form.ruleCode" placeholder="请输入规则编码" />
         </el-form-item>
+        <el-form-item label="任务类型" prop="task_type">
+          <el-input v-model="form.taskType" placeholder="请输入任务类型" />
+        </el-form-item>
         <el-form-item label="启用状态" prop="state">
           <el-input v-model="form.state" placeholder="请输入启用状态" />
         </el-form-item>
@@ -146,7 +149,7 @@
 </template>
 
 <script>
-import { listQuest, getQuest, delQuest, addQuest, updateQuest } from "@/api/quest/quest";
+import {listQuest, getQuest, delQuest, addQuest, updateQuest} from "../../api/quest/quest";
 
 export default {
   name: "Quest",
@@ -197,8 +200,9 @@ export default {
     getList() {
       this.loading = true;
       listQuest(this.queryParams).then(response => {
-        this.questList = response.rows;
-        this.total = response.total;
+        console.log(response)
+        this.questList = response.data.rows;
+        this.total = response.data.total;
         this.loading = false;
       });
     },

src/views/register.vue

@@ -67,7 +67,7 @@
 </template>
 
 <script>
-import {getCodeImg, register} from "@/api/login";
+import {getCodeImg, register} from "/src/api/login";
 
 export default {
   name: "Register",

src/views/rule/ruleType/index.vue

@@ -144,7 +144,7 @@
 </template>
 
 <script>
-import { listRuleType, getRuleType, delRuleType, addRuleType, updateRuleType } from "@/api/rule/ruleType";
+import { listRuleType, getRuleType, delRuleType, addRuleType, updateRuleType } from "/src/api/rule/ruleType";
 
 export default {
   name: "RuleType",

src/views/system/config/index.vue

@@ -189,7 +189,7 @@
 </template>
 
 <script>
-import {addConfig, delConfig, getConfig, listConfig, refreshCache, updateConfig} from "@/api/system/config";
+import {addConfig, delConfig, getConfig, listConfig, refreshCache, updateConfig} from "/src/api/system/config";
 
 export default {
   name: "Config",

src/views/system/dept/index.vue

@@ -165,7 +165,7 @@
 </template>
 
 <script>
-import {addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept} from "@/api/system/dept";
+import {addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept} from "/src/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 

src/views/system/dict/data.vue

@@ -203,8 +203,8 @@
 </template>
 
 <script>
-import {addData, delData, getData, listData, updateData} from "@/api/system/dict/data";
-import {getType, optionselect as getDictOptionselect} from "@/api/system/dict/type";
+import {addData, delData, getData, listData, updateData} from "/src/api/system/dict/data";
+import {getType, optionselect as getDictOptionselect} from "/src/api/system/dict/type";
 
 export default {
   name: "Data",

src/views/system/dict/index.vue

@@ -196,7 +196,7 @@
 </template>
 
 <script>
-import {addType, delType, getType, listType, refreshCache, updateType} from "@/api/system/dict/type";
+import {addType, delType, getType, listType, refreshCache, updateType} from "/src/api/system/dict/type";
 
 export default {
   name: "Dict",

src/views/system/logininfor/index.vue

@@ -134,7 +134,7 @@
 </template>
 
 <script>
-import {cleanLogininfor, delLogininfor, list, unlockLogininfor} from "@/api/system/logininfor";
+import {cleanLogininfor, delLogininfor, list, unlockLogininfor} from "/src/api/system/logininfor";
 
 export default {
   name: "Logininfor",

src/views/system/menu/index.vue

@@ -282,7 +282,7 @@
 </template>
 
 <script>
-import {addMenu, delMenu, getMenu, listMenu, updateMenu} from "@/api/system/menu";
+import {addMenu, delMenu, getMenu, listMenu, updateMenu} from "/src/api/system/menu";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import IconSelect from "@/components/IconSelect";

src/views/system/notice/index.vue

@@ -279,7 +279,7 @@
 </template>
 
 <script>
-import {addNotice, delNotice, getNotice, listNotice, updateNotice} from "@/api/system/notice";
+import {addNotice, delNotice, getNotice, listNotice, updateNotice} from "/src/api/system/notice";
 import { findNoticeByNoticeId } from '../../../api/system/notice'
 import { listDept } from '../../../api/system/dept'
 import Treeselect from '@riophae/vue-treeselect'

src/views/system/operlog/index.vue

@@ -216,7 +216,7 @@
 </template>
 
 <script>
-import {cleanOperlog, delOperlog, list} from "@/api/system/operlog";
+import {cleanOperlog, delOperlog, list} from "/src/api/system/operlog";
 
 export default {
   name: "Operlog",

src/views/system/post/index.vue

@@ -164,7 +164,7 @@
 </template>
 
 <script>
-import {addPost, delPost, getPost, listPost, updatePost} from "@/api/system/post";
+import {addPost, delPost, getPost, listPost, updatePost} from "/src/api/system/post";
 
 export default {
   name: "Post",

src/views/system/role/authUser.vue

@@ -104,7 +104,7 @@
 </template>
 
 <script>
-import {allocatedUserList, authUserCancel, authUserCancelAll} from "@/api/system/role";
+import {allocatedUserList, authUserCancel, authUserCancelAll} from "/src/api/system/role";
 import selectUser from "./selectUser";
 
 export default {

src/views/system/role/index.vue

@@ -275,8 +275,8 @@ import {
   getRole,
   listRole,
   updateRole
-} from "@/api/system/role";
-import {roleMenuTreeselect, treeselect as menuTreeselect} from "@/api/system/menu";
+} from "/src/api/system/role";
+import {roleMenuTreeselect, treeselect as menuTreeselect} from "/src/api/system/menu";
 
 export default {
   name: "Role",

src/views/system/role/selectUser.vue

@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import {authUserSelectAll, unallocatedUserList} from "@/api/system/role";
+import {authUserSelectAll, unallocatedUserList} from "/src/api/system/role";
 
 export default {
   dicts: ['sys_normal_disable'],

src/views/system/user/authRole.vue

@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import {getAuthRole, updateAuthRole} from "@/api/system/user";
+import {getAuthRole, updateAuthRole} from "/src/api/system/user";
 
 export default {
   name: "AuthRole",

src/views/system/user/index.vue

@@ -370,7 +370,7 @@ import {
   listUser,
   resetUserPwd,
   updateUser
-} from "@/api/system/user";
+} from "/src/api/system/user";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";

src/views/system/user/profile/index.vue

@@ -68,7 +68,7 @@
 import userAvatar from "./userAvatar";
 import userInfo from "./userInfo";
 import resetPwd from "./resetPwd";
-import {getUserProfile} from "@/api/system/user";
+import {getUserProfile} from "/src/api/system/user";
 
 export default {
   name: "Profile",

src/views/system/user/profile/resetPwd.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import {updateUserPwd} from "@/api/system/user";
+import {updateUserPwd} from "/src/api/system/user";
 
 export default {
   data() {

src/views/system/user/profile/userAvatar.vue

@@ -58,7 +58,7 @@
 <script>
 import store from "@/store";
 import {VueCropper} from "vue-cropper";
-import {uploadAvatar} from "@/api/system/user";
+import {uploadAvatar} from "/src/api/system/user";
 import {debounce} from '@/utils'
 
 export default {

src/views/system/user/profile/userInfo.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import {updateUserProfile} from "@/api/system/user";
+import {updateUserProfile} from "/src/api/system/user";
 
 export default {
   props: {

src/views/tool/gen/editTable.vue

@@ -127,9 +127,9 @@
 </template>
 
 <script>
-import {getGenTable, updateGenTable} from "@/api/tool/gen";
-import {optionselect as getDictOptionselect} from "@/api/system/dict/type";
-import {listMenu as getMenuTreeselect} from "@/api/system/menu";
+import {getGenTable, updateGenTable} from "/src/api/tool/gen";
+import {optionselect as getDictOptionselect} from "/src/api/system/dict/type";
+import {listMenu as getMenuTreeselect} from "/src/api/system/menu";
 import basicInfoForm from "./basicInfoForm";
 import genInfoForm from "./genInfoForm";
 import Sortable from 'sortablejs'
@@ -195,11 +195,8 @@ export default {
             parentMenuId: genTable.parentMenuId
           };
           updateGenTable(genTable).then(res => {
-            this.$modal.msgSuccess(res.data.msg);
-            if (res.code == 200) {
-              this.$modal.msg("成功")
+            this.$modal.msgSuccess(res.msg);
             this.close();
-            }
           });
         } else {
           this.$modal.msgError("表单校验未通过，请重新检查提交内容");

src/views/tool/gen/index.vue

@@ -195,7 +195,7 @@
 </template>
 
 <script>
-import {delTable, genCode, listTable, previewTable, synchDb} from "@/api/tool/gen";
+import {delTable, genCode, listTable, previewTable, synchDb} from "/src/api/tool/gen";
 import importTable from "./importTable";
 import hljs from "highlight.js/lib/highlight";
 import "highlight.js/styles/github-gist.css";