diff --git a/public/chengdu/js/detail.js b/public/chengdu/js/detail.js index e481490..ba90bc4 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://192.168.3.108:8000/jobslink-api/jkworksreport" var href = window.location.href.split("="); var shengFen = unescape(href[1].split("&")[0]); diff --git a/public/chengdu/js/index.js b/public/chengdu/js/index.js index fd0ac52..007539b 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://192.168.3.108:8000/jobslink-api/jkworksreport" console.log(document.cookie) // 获取cookie diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue index 440a3ba..7678d5c 100644 --- a/src/views/tenant/main/serve/index.vue +++ b/src/views/tenant/main/serve/index.vue @@ -219,7 +219,7 @@ 查看详情 @@ -255,6 +255,8 @@ + + @@ -273,6 +275,8 @@ import { getMatchPolicy, getMatchServeList } from "@/api/tenant/serve"; +import { detail as missionDetail } from "@/api/tenant/mission"; +import { detail as workDetail } from "@/api/tenant/postzp"; import { getWorkTypes } from "@/api/tenant/common"; import { mapGetters } from "vuex"; import addGroups from "./Dialog/addGroups"; @@ -282,6 +286,8 @@ import { check18IdCardNo, isvalidatemobile, isExcel } from "@/util/validate"; import { getTemplate } from "@/api/resource/template"; import ied from "@/views/util/import-error-dialog"; import { excelAccept } from "@/common/accept"; +import missionView from "../../mission/Table/missionView.vue"; +import workView from "../../works/Table/missionView.vue" // import ServeDetail from './Dialog/ServeDetail.vue' // import CopyMission from "../mission/Dialog/CopyMission"; const page = { @@ -290,10 +296,6 @@ const page = { total: 0, } export default { - components: { - // ServeDetail, - // CopyMission - }, filters: { ellipsis(value) { if (!value) return ""; @@ -310,6 +312,10 @@ export default { companyName: '', name: '' }, + viewDrawer: false, + workViewDrawer: false, + view: {}, + workViewModel: {}, statusArr: { 0: "未启用", 1: "服务中", @@ -383,7 +389,7 @@ export default { excelForm: { isCovered: 1 }, }; }, - components: { addGroups, transferGroups, Resume, ied }, + components: { addGroups, transferGroups, Resume, ied, missionView, workView}, watch: {}, computed: { ...mapGetters(["permission"]), @@ -1224,7 +1230,22 @@ export default { }, handleCloseLog() { this.innerDrawer3 = false - } + }, + /*查看*/ + toWorkMissionDetail(row) { + if(row.type == 0) { + missionDetail(row.missionNo).then((res) => { + this.viewDrawer = true; + this.view = res; + }); + } else if(row.type == 1) { + workDetail(row.id).then(res => { + this.workViewDrawer = true; + this.workViewModel = res; + }) + } + + }, }, }; diff --git a/vue.config.js b/vue.config.js index 452de14..def90d0 100644 --- a/vue.config.js +++ b/vue.config.js @@ -23,9 +23,9 @@ module.exports = { port: 1888, proxy: { "/api": { - target: 'http://192.168.3.104:8000', // 本地服务接口地址 + // target: 'http://192.168.3.104:8000', // 本地服务接口地址 // target: "http://39.98.184.58:8000", // 阿里云后台地址 - // target: "http://192.168.3.108:8000", // 本地 + target: "http://192.168.3.108:8000", // 本地 ws: true, changeOrigin: true, pathRewrite: {