diff --git a/package.json b/package.json index e080c59..30b1b20 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "lint": "node ./node_modules/@vue/cli-service/bin/vue-cli-service.js lint" }, "dependencies": { + "@ant-design/icons": "^2.1.1", "@chenfengyuan/vue-countdown": "^1.1.2", "ag-grid-community": "^21.0.1", "ag-grid-vue": "^21.0.1", diff --git a/src/axios.js b/src/axios.js index 5d6656e..246504c 100644 --- a/src/axios.js +++ b/src/axios.js @@ -1,6 +1,7 @@ import axios from 'axios' import router from '@/router' import store from '@/store/store' +import { API_BASE_URL } from '@/config' const domain = "" // import themeConfig from '@/../themeConfig.js' @@ -20,7 +21,7 @@ const headers = { var myax= new axios.create({ - baseURL: 'http://hr.asco-intl.com:2020/kernel/api/', + baseURL: `${API_BASE_URL}/`, headers, // domain }) diff --git a/src/components/SingleUploadInput.vue b/src/components/SingleUploadInput.vue index c660a91..54a9756 100644 --- a/src/components/SingleUploadInput.vue +++ b/src/components/SingleUploadInput.vue @@ -40,7 +40,7 @@ function getBase64(file) { }); } -//import themeConfig from "../../../../themeConfig"; +import { API_BASE_URL } from '@/config' export default { name: 'UploadInput', @@ -69,7 +69,7 @@ export default { }, data() { return { - url: 'http://hr.asco-intl.com:2020/kernel/api/register/upload', + url: `${API_BASE_URL}/register/upload`, previewVisible: false, previewImage: '', fileList: [], diff --git a/src/config.js b/src/config.js new file mode 100644 index 0000000..4113fc7 --- /dev/null +++ b/src/config.js @@ -0,0 +1,3 @@ +// آدرس API — برای تغییر دامنه یا پورت فقط همین فایل را ویرایش کنید +export const API_HOST = 'http://hr.asco-intl.com:2020' +export const API_BASE_URL = `${API_HOST}/kernel/api` diff --git a/src/main.js b/src/main.js index 4d6a6c9..41a43d4 100644 --- a/src/main.js +++ b/src/main.js @@ -23,8 +23,10 @@ Vue.use(Antd) // axios import axios from './axios.js' +import { API_BASE_URL } from '@/config' Vue.prototype.$http = axios +Vue.prototype.$apiBase = API_BASE_URL // API Calls /*import './http/requests'*/ diff --git a/src/views/contract/conractModel.js b/src/views/contract/conractModel.js index b69c77c..8073494 100644 --- a/src/views/contract/conractModel.js +++ b/src/views/contract/conractModel.js @@ -1,12 +1,13 @@ import XTbl, {Xtc} from '../../components/new-x-table/index'; import store from '@/store/store' +import { API_BASE_URL } from '@/config' let unitsFilter = {} store.state.contract.units.map((x) => { unitsFilter[x.id] = x.value }) let contractTypes = store.state.contract.contractTypes -const tbl = new XTbl('http://hr.asco-intl.com:2020/kernel/api/personnel/contract/table', 'لیست قرارداد ها'); +const tbl = new XTbl(`${API_BASE_URL}/personnel/contract/table`, 'لیست قرارداد ها'); tbl.add(new Xtc('personnel.proposal.name', 'نام پرسنل').filterText()) tbl.add(new Xtc('personnel.proposal.ncode', 'کد ملی').filterText()) tbl.add(new Xtc('personnel_id', 'کد پرسنلی').filterText()) diff --git a/src/views/personel/Personel.vue b/src/views/personel/Personel.vue index 9e8144e..4425258 100644 --- a/src/views/personel/Personel.vue +++ b/src/views/personel/Personel.vue @@ -92,7 +92,7 @@