From f2b547e9e48104eae9aac5827d05e16249d7d989 Mon Sep 17 00:00:00 2001 From: 18500206848 Date: Tue, 5 Mar 2024 22:57:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=B8=AA=E4=BA=BA=E6=8B=9B?= =?UTF-8?q?=E5=B7=A5=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/chengdu/js/detail.js | 4 +- public/chengdu/js/index.js | 8 +- src/views/manage/mission/delayDialog.vue | 89 --- src/views/manage/mission/index.vue | 68 +-- src/views/manage/mission/zpView.vue | 2 - src/views/manage/recruit/count/index.vue | 286 ++++++++++ .../manage/recruit/count/table/detail.vue | 250 +++++++++ .../manage/recruit/count/table/gather.vue | 198 +++++++ src/views/manage/recruit/index.vue | 514 ++++++++++++++++++ .../wageView.vue => recruit/zpView.vue} | 29 +- src/views/manage/works/delayDialog.vue | 89 --- src/views/manage/works/index.vue | 61 +-- src/views/manage/works/wageView.vue | 177 ------ vue.config.js | 4 +- 14 files changed, 1274 insertions(+), 505 deletions(-) delete mode 100644 src/views/manage/mission/delayDialog.vue create mode 100644 src/views/manage/recruit/count/index.vue create mode 100644 src/views/manage/recruit/count/table/detail.vue create mode 100644 src/views/manage/recruit/count/table/gather.vue create mode 100644 src/views/manage/recruit/index.vue rename src/views/manage/{mission/wageView.vue => recruit/zpView.vue} (83%) delete mode 100644 src/views/manage/works/delayDialog.vue delete mode 100644 src/views/manage/works/wageView.vue diff --git a/public/chengdu/js/detail.js b/public/chengdu/js/detail.js index e481490..8c520db 100644 --- a/public/chengdu/js/detail.js +++ b/public/chengdu/js/detail.js @@ -1,6 +1,6 @@ //var baseUrl = 'http://cgsu81beft.51xd.pub'; var baseUrl = "http://39.101.167.152:8088/shekecaiji"; -var testUrl = "http://192.168.3.104:8000/jobslink-api/jkworksreport" +var testUrl = "http://localhost:8000/jobslink-api/jkworksreport" var href = window.location.href.split("="); var shengFen = unescape(href[1].split("&")[0]); @@ -19,7 +19,7 @@ function getCookie(cookieName) { } return ""; } - + var token = getCookie("jobslink-access-token"); //头部数据-------------------------------------- diff --git a/public/chengdu/js/index.js b/public/chengdu/js/index.js index b209116..8079cae 100644 --- a/public/chengdu/js/index.js +++ b/public/chengdu/js/index.js @@ -1,6 +1,6 @@ //var baseUrl = 'http://cgsu81beft.51xd.pub'; var baseUrl = "http://39.101.167.152:8088/shekecaiji"; -var testUrl = "http://192.168.3.104:8000/jobslink-api/jkworksreport" +var testUrl = "http://localhost:8000/jobslink-api/jkworksreport" console.log(document.cookie) // 获取cookie @@ -32,7 +32,7 @@ var allData = {"citys":[ {"fromName":"德阳","toName":"厦门","coords":[[104.398651, 31.127991],[118.11022, 24.490474]]}, {"fromName":"德阳","toName":"昆明","coords":[[104.398651, 31.127991],[102.712251, 25.040609]]}, ]}; - + var token = getCookie("jobslink-access-token"); // $.ajaxSetup({ // headers: { @@ -63,7 +63,7 @@ function getMapData1() { }); } -// 分行业需求 +// 分行业需求 function getMapData2() { $.ajax({ type: "GET", @@ -74,7 +74,7 @@ function getMapData2() { url: testUrl + "/getMapData2", async: false, success: function (res) { - + console.log(res) }, }); diff --git a/src/views/manage/mission/delayDialog.vue b/src/views/manage/mission/delayDialog.vue deleted file mode 100644 index bfcd78d..0000000 --- a/src/views/manage/mission/delayDialog.vue +++ /dev/null @@ -1,89 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/manage/mission/index.vue b/src/views/manage/mission/index.vue index c7538e4..c365f44 100644 --- a/src/views/manage/mission/index.vue +++ b/src/views/manage/mission/index.vue @@ -102,7 +102,7 @@ size="small" @click.stop="handleCheck" type="primary" - >任务审核审核 - - @@ -163,10 +143,8 @@ import { download, } from "@/api/manage/mission"; import { mapGetters } from "vuex"; -import delayDialog from "./delayDialog"; import missionView from "@/views/util/mission-view"; import zpView from "./zpView"; -import wageView from "./wageView"; import { missionState, wageUnitCategoryState } from "@/common/dic"; import { calcDate } from "@/util/date"; import { Message } from "element-ui"; @@ -181,7 +159,7 @@ const message = lodash.throttle( ); export default { - components: { delayDialog, missionView, zpView, wageView }, + components: {missionView, zpView }, name: "manage_mission", data() { return { @@ -207,7 +185,7 @@ export default { // { value: 2, label: "任务中" }, { value: 3, label: "已完成" }, { value: 4, label: "已失效" }, - + ], option: { height: "auto", @@ -373,9 +351,6 @@ export default { rowZPView(row) { this.$refs.zpView.open(row.missionNo); }, - handleWageView(row) { - this.$refs.wageView.open(row.missionNo); - }, searchReset() { this.query = {}; this.onLoad(this.page); @@ -511,43 +486,6 @@ export default { .catch(() => {}); } }, - handleFinish(row) { - if (row.status!=2) { - this.$message.error('只能提前完成【任务中】的任务') - } - /*只能提前完成【任务中】的任务*/ - else{ - let h = this.$createElement; - this.$confirm( - h("p", { style: "color: #F56C6C" }, "一旦确定无法修改"), - "您确定要提前此任务吗？", - { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - center: true, - inputType: "textarea", - inputPlaceholder: "备注原因", - } - ) - .then(() => { - this.loading = true; - complet(row.id) - .then(() => { - this.$message({ - type: "success", - message: "操作成功!", - }); - this.loading = false; - this.onLoad(this.page, this.query); - }) - .catch(() => { - this.loading = false; - }); - }) - .catch(() => { }); - } - }, downRecords() { if (this.query.time) { this.query.stime = this.query.time[0]; diff --git a/src/views/manage/mission/zpView.vue b/src/views/manage/mission/zpView.vue index 9e4a6f2..8d5bcfc 100644 --- a/src/views/manage/mission/zpView.vue +++ b/src/views/manage/mission/zpView.vue @@ -40,9 +40,7 @@ export default { }, visible: false, checkDialog: false, - delayDialog: false, zpviewDialog: false, - finishDialog: false, option: { height: "auto", tip: false, diff --git a/src/views/manage/recruit/count/index.vue b/src/views/manage/recruit/count/index.vue new file mode 100644 index 0000000..8f050c1 --- /dev/null +++ b/src/views/manage/recruit/count/index.vue @@ -0,0 +1,286 @@ + + + + + diff --git a/src/views/manage/recruit/count/table/detail.vue b/src/views/manage/recruit/count/table/detail.vue new file mode 100644 index 0000000..b51e069 --- /dev/null +++ b/src/views/manage/recruit/count/table/detail.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/views/manage/recruit/count/table/gather.vue b/src/views/manage/recruit/count/table/gather.vue new file mode 100644 index 0000000..085c6db --- /dev/null +++ b/src/views/manage/recruit/count/table/gather.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/views/manage/recruit/index.vue b/src/views/manage/recruit/index.vue new file mode 100644 index 0000000..4c3b084 --- /dev/null +++ b/src/views/manage/recruit/index.vue @@ -0,0 +1,514 @@ + + + + + diff --git a/src/views/manage/mission/wageView.vue b/src/views/manage/recruit/zpView.vue similarity index 83% rename from src/views/manage/mission/wageView.vue rename to src/views/manage/recruit/zpView.vue index fac27be..d214828 100644 --- a/src/views/manage/mission/wageView.vue +++ b/src/views/manage/recruit/zpView.vue @@ -1,5 +1,5 @@ {}); } }, - handleFinish(row) { - if (row.jobStatus!=2) { - this.$message.error('只能提前完成【任务中】的任务') - } - /*只能提前完成【任务中】的任务*/ - else{ - let h = this.$createElement; - this.$confirm( - h("p", { style: "color: #F56C6C" }, "一旦确定无法修改"), - "您确定要提前此任务吗？", - { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - center: true, - inputType: "textarea", - inputPlaceholder: "备注原因", - } - ) - .then(() => { - this.loading = true; - complet(row.id) - .then(() => { - this.$message({ - type: "success", - message: "操作成功!", - }); - this.loading = false; - this.onLoad(this.page, this.query); - }) - .catch(() => { - this.loading = false; - }); - }) - .catch(() => { }); - } - }, downRecords() { if (this.query.time) { this.query.stime = this.query.time[0]; diff --git a/src/views/manage/works/wageView.vue b/src/views/manage/works/wageView.vue deleted file mode 100644 index fac27be..0000000 --- a/src/views/manage/works/wageView.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - - - diff --git a/vue.config.js b/vue.config.js index 9fd31b3..07b827f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -23,10 +23,10 @@ module.exports = { port: 1888, proxy: { "/api": { - // target: 'http://192.168.3.104:8000', // 本地服务接口地址 + target: 'http://localhost:8000', // 本地服务接口地址 // target: "http://39.98.184.58:8000", // 阿里云后台地址 // target: "http://192.168.3.108:8000", // 本地 - target: 'http://192.168.3.111:8000', + // target: 'http://192.168.3.111:8000', ws: true, changeOrigin: true, pathRewrite: {