diff --git a/.env.development b/.env.development index 50cbc9b..4050056 100644 --- a/.env.development +++ b/.env.development @@ -2,10 +2,13 @@ ENV='development' # base api -#VUE_APP_BASE_API=https://suzhoukeji-test.ali251.langye.net -#VUE_APP_UPLOAD_API=https://suzhoukeji-test.ali251.langye.net/api/admin/upload-file +VUE_APP_PRO_API = https://suzhoukeji-test.ali251.langye.net -VUE_APP_PRO_API = https://www.sstbc.com +VUE_APP_BASE_API = https://suzhoukeji-test.ali251.langye.net -VUE_APP_BASE_API = https://wx.sstbc.com -VUE_APP_UPLOAD_API = https://wx.sstbc.com/api/admin/upload-file +VUE_APP_UPLOAD_API = https://suzhoukeji-test.ali251.langye.net/api/admin/upload-file + +#VUE_APP_PRO_API = https://www.sstbc.com + +#VUE_APP_BASE_API = https://wx.sstbc.com +#VUE_APP_UPLOAD_API = https://wx.sstbc.com/api/admin/upload-file diff --git a/src/api/article/index.js b/src/api/article/index.js new file mode 100644 index 0000000..23813b0 --- /dev/null +++ b/src/api/article/index.js @@ -0,0 +1,56 @@ +import request from "@/utils/request"; +function customParamsSerializer(params) { + let result = ''; + for (let key in params) { + if (params.hasOwnProperty(key)) { + if (Array.isArray(params[key])) { + params[key].forEach((item, index) => { + if (item.key) { + result += `${key}[${index}][key]=${item.key}&${key}[${index}][op]=${item.op}&${key}[${index}][value]=${item.value}&`; + + } else { + result += `${key}[${index}]=${item}&` + } + }); + } else { + result += `${key}=${params[key]}&`; + } + } + } + return result.slice(0, -1); +} + +export function index(params, isLoading = false) { + return request({ + method: "get", + url: "/api/admin/article/index", + params, + paramsSerializer: customParamsSerializer, + isLoading + }) +} + +export function show(params, isLoading = true) { + return request({ + method: "get", + url: "/api/admin/article/show", + params, + isLoading + }) +} + +export function save(data) { + return request({ + method: "post", + url: "/api/admin/article/save", + data + }) +} + +export function destroy(params) { + return request({ + method: "get", + url: "/api/admin/article/destroy", + params + }) +} diff --git a/src/api/chartConfig/index.js b/src/api/chartConfig/index.js new file mode 100644 index 0000000..d21a44c --- /dev/null +++ b/src/api/chartConfig/index.js @@ -0,0 +1,63 @@ +import request from "@/utils/request"; +function customParamsSerializer(params) { + let result = ''; + for (let key in params) { + if (params.hasOwnProperty(key)) { + if (Array.isArray(params[key])) { + params[key].forEach((item, index) => { + if (item.key) { + result += `${key}[${index}][key]=${item.key}&${key}[${index}][op]=${item.op}&${key}[${index}][value]=${item.value}&`; + + } else { + result += `${key}[${index}]=${item}&` + } + }); + } else { + result += `${key}=${params[key]}&`; + } + } + } + return result.slice(0, -1); +} +export function index(params, isLoading = false) { + return request({ + method: "get", + url: "/api/admin/statistics-config/index", + params, + paramsSerializer: customParamsSerializer, + isLoading + }) +} + +export function show(params, isLoading = true) { + return request({ + method: "get", + url: "/api/admin/statistics-config/show", + params, + isLoading + }) +} + +export function save(data) { + return request({ + method: "post", + url: "/api/admin/statistics-config/save", + data + }) +} + +export function destroy(params) { + return request({ + method: "get", + url: "/api/admin/statistics-config/destroy", + params + }) +} + +export function calculate(params) { + return request({ + method: "get", + url: "/api/admin/statistics-config/calculate", + params + }) +} \ No newline at end of file diff --git a/src/api/home/index.js b/src/api/home/index.js index 016ae23..1ecb441 100644 --- a/src/api/home/index.js +++ b/src/api/home/index.js @@ -7,3 +7,11 @@ export function home(params){ params }) } + +export function home2(params){ + return request({ + method:'get', + url:'/api/admin/other/home-v2', + params + }) +} diff --git a/src/api/homeChart.js b/src/api/homeChart.js index afd2169..58f61b0 100644 --- a/src/api/homeChart.js +++ b/src/api/homeChart.js @@ -9,6 +9,14 @@ export function home(params,isLoading) { }) } +export function courseChartExport(params,isLoading) { + return request({ + url: '/api/admin/other/courses-home-export', + method: 'get', + params, + isLoading: true + }) +} export function courseChart(params,isLoading) { return request({ url: '/api/admin/other/courses-home', diff --git a/src/api/student/schoolmateCompany.js b/src/api/student/schoolmateCompany.js index 519f233..e71bab3 100644 --- a/src/api/student/schoolmateCompany.js +++ b/src/api/student/schoolmateCompany.js @@ -30,6 +30,15 @@ export function index(params,isLoading = false) { }) } +export function companyConfig(params, isLoading = true) { + return request({ + method: "get", + url: "/api/admin/company/config", + params, + isLoading + }) +} + export function show(params, isLoading = true) { return request({ method: "get", diff --git a/src/api/timeEvent/index.js b/src/api/timeEvent/index.js new file mode 100644 index 0000000..8b83750 --- /dev/null +++ b/src/api/timeEvent/index.js @@ -0,0 +1,56 @@ +import request from "@/utils/request"; +function customParamsSerializer(params) { + let result = ''; + for (let key in params) { + if (params.hasOwnProperty(key)) { + if (Array.isArray(params[key])) { + params[key].forEach((item, index) => { + if (item.key) { + result += `${key}[${index}][key]=${item.key}&${key}[${index}][op]=${item.op}&${key}[${index}][value]=${item.value}&`; + + } else { + result += `${key}[${index}]=${item}&` + } + }); + } else { + result += `${key}=${params[key]}&`; + } + } + } + return result.slice(0, -1); +} + +export function index(params, isLoading = false) { + return request({ + method: "get", + url: "/api/admin/time-event/index", + params, + paramsSerializer: customParamsSerializer, + isLoading + }) +} + +export function show(params, isLoading = true) { + return request({ + method: "get", + url: "/api/admin/time-event/show", + params, + isLoading + }) +} + +export function save(data) { + return request({ + method: "post", + url: "/api/admin/time-event/save", + data + }) +} + +export function destroy(params) { + return request({ + method: "get", + url: "/api/admin/time-event/destroy", + params + }) +} diff --git a/src/assets/map/bg.png b/src/assets/map/bg.png new file mode 100644 index 0000000..3f918e0 Binary files /dev/null and b/src/assets/map/bg.png differ diff --git a/src/assets/map/center-bg.png b/src/assets/map/center-bg.png new file mode 100644 index 0000000..1f32fea Binary files /dev/null and b/src/assets/map/center-bg.png differ diff --git a/src/assets/map/cs_current.png b/src/assets/map/cs_current.png new file mode 100644 index 0000000..83e3bc2 Binary files /dev/null and b/src/assets/map/cs_current.png differ diff --git a/src/assets/map/gs_current.png b/src/assets/map/gs_current.png new file mode 100644 index 0000000..d27532c Binary files /dev/null and b/src/assets/map/gs_current.png differ diff --git a/src/assets/map/gx_current.png b/src/assets/map/gx_current.png new file mode 100644 index 0000000..c4fcc19 Binary files /dev/null and b/src/assets/map/gx_current.png differ diff --git a/src/assets/map/gyy_current.png b/src/assets/map/gyy_current.png new file mode 100644 index 0000000..25b1c87 Binary files /dev/null and b/src/assets/map/gyy_current.png differ diff --git a/src/assets/map/icon1.png b/src/assets/map/icon1.png new file mode 100644 index 0000000..9d5a50a Binary files /dev/null and b/src/assets/map/icon1.png differ diff --git a/src/assets/map/icon2.png b/src/assets/map/icon2.png new file mode 100644 index 0000000..eacbfc4 Binary files /dev/null and b/src/assets/map/icon2.png differ diff --git a/src/assets/map/icon3.png b/src/assets/map/icon3.png new file mode 100644 index 0000000..68f6ddf Binary files /dev/null and b/src/assets/map/icon3.png differ diff --git a/src/assets/map/icon4.png b/src/assets/map/icon4.png new file mode 100644 index 0000000..938141b Binary files /dev/null and b/src/assets/map/icon4.png differ diff --git a/src/assets/map/icon4_cur.png b/src/assets/map/icon4_cur.png new file mode 100644 index 0000000..00a3bbe Binary files /dev/null and b/src/assets/map/icon4_cur.png differ diff --git a/src/assets/map/icon5.png b/src/assets/map/icon5.png new file mode 100644 index 0000000..8c97f88 Binary files /dev/null and b/src/assets/map/icon5.png differ diff --git a/src/assets/map/icon5_cur.png b/src/assets/map/icon5_cur.png new file mode 100644 index 0000000..418cd84 Binary files /dev/null and b/src/assets/map/icon5_cur.png differ diff --git a/src/assets/map/jsc-title.png b/src/assets/map/jsc-title.png new file mode 100644 index 0000000..05aab30 Binary files /dev/null and b/src/assets/map/jsc-title.png differ diff --git a/src/assets/map/ks_current.png b/src/assets/map/ks_current.png new file mode 100644 index 0000000..d3c701e Binary files /dev/null and b/src/assets/map/ks_current.png differ diff --git a/src/assets/map/szmap.png b/src/assets/map/szmap.png new file mode 100644 index 0000000..db60ba9 Binary files /dev/null and b/src/assets/map/szmap.png differ diff --git a/src/assets/map/tc_current.png b/src/assets/map/tc_current.png new file mode 100644 index 0000000..3f560c9 Binary files /dev/null and b/src/assets/map/tc_current.png differ diff --git a/src/assets/map/wj_current.png b/src/assets/map/wj_current.png new file mode 100644 index 0000000..272cf3a Binary files /dev/null and b/src/assets/map/wj_current.png differ diff --git a/src/assets/map/wz_current.png b/src/assets/map/wz_current.png new file mode 100644 index 0000000..c754150 Binary files /dev/null and b/src/assets/map/wz_current.png differ diff --git a/src/assets/map/xc_current.png b/src/assets/map/xc_current.png new file mode 100644 index 0000000..a5b33c3 Binary files /dev/null and b/src/assets/map/xc_current.png differ diff --git a/src/assets/map/zjg_current.png b/src/assets/map/zjg_current.png new file mode 100644 index 0000000..6b0f24d Binary files /dev/null and b/src/assets/map/zjg_current.png differ diff --git a/src/mixin/formMixin.js b/src/mixin/formMixin.js index f4d68b7..290fc5a 100644 --- a/src/mixin/formMixin.js +++ b/src/mixin/formMixin.js @@ -1,6 +1,9 @@ import { getparameter } from "@/api/system/dictionary.js" +import { + companyConfig +} from "@/api/student/schoolmateCompany.js" export default { data() { return { @@ -693,11 +696,18 @@ export default { computed: {}, created() { this.getAllPara() + this.getCompanyConfig() }, mounted() {}, methods: { + // 获取企业资质下拉选择 + getCompanyConfig() { + companyConfig().then(res => { + this.formSelect.company_type = res.companiesTags + }) + }, getAllPara() { - let number = ['company_type', 'company_area','company_tag','company_scale', 'company_industry', 'company_industry_detail', 'type', 'education', + let number = ['company_area','company_tag','company_scale', 'company_industry', 'company_industry_detail', 'type', 'education', 'sign_from','from_tag' ] getparameter({ diff --git a/src/utils/downloadRequest.js b/src/utils/downloadRequest.js index 166c419..c05251b 100644 --- a/src/utils/downloadRequest.js +++ b/src/utils/downloadRequest.js @@ -48,7 +48,7 @@ export async function download(url, method = "get", info, filename) { url, method, responseType: "blob", - timeout: 10000, + timeout: 30000, headers: { Accept: "application/json", "Content-Type": "application/json; charset=utf-8", diff --git a/src/utils/request.js b/src/utils/request.js index a3aafa8..8d91379 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -14,7 +14,7 @@ let loading ; const service = axios.create({ baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests - timeout: 5000, // request timeout + timeout: 30000, // request timeout isLoading:true }) diff --git a/src/views/articles/components/addArticle.vue b/src/views/articles/components/addArticle.vue new file mode 100644 index 0000000..09231f5 --- /dev/null +++ b/src/views/articles/components/addArticle.vue @@ -0,0 +1,175 @@ + + + + + diff --git a/src/views/articles/index.vue b/src/views/articles/index.vue new file mode 100644 index 0000000..9a5c442 --- /dev/null +++ b/src/views/articles/index.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/src/views/calendar/components/addCalendar.vue b/src/views/calendar/components/addCalendar.vue index 32083a7..bb13ede 100644 --- a/src/views/calendar/components/addCalendar.vue +++ b/src/views/calendar/components/addCalendar.vue @@ -1,654 +1,734 @@ - - - - - + + + + + diff --git a/src/views/calendar/index.vue b/src/views/calendar/index.vue index 495c157..febbead 100644 --- a/src/views/calendar/index.vue +++ b/src/views/calendar/index.vue @@ -99,25 +99,39 @@ import { getToken } from '@/utils/auth'; }, methods: { async exportCalendar() { - console.log('导出日历事件') - const res = await index({ - month: this.selectMonth, - is_export: 1, - 'export_fields[is_publish_text]':'是否对外展示', - 'export_fields[type_text]': '日程类型', - 'export_fields[course.name]': '课程名称', - 'export_fields[introduce]': '具体说明', - 'export_fields[title]': '标题', - 'export_fields[url]': '资讯链接', - 'export_fields[start_time]': '开始时间', - 'export_fields[end_time]': '截止时间', - 'export_fields[address]': '地址', - 'export_fields[color]': '主题颜色', - 'export_fields[content]': '内容' - }) - var url = process.env.VUE_APP_BASE_API + '/api/admin/calendars/index?month=' + this.selectMonth + '&is_export=1&export_fields[is_publish_text]=是否对外展示&export_fields[type_text]=日程类型&export_fields[course.name]=课程名称&export_fields[introduce]=具体说明&export_fields[title]=标题&export_fields[url]=资讯链接&export_fields[start_time]=开始时间&export_fields[end_time]=截止时间&export_fields[address]=地址&export_fields[color]=主题颜色&export_fields[content]=内容&token=' + getToken() + try { + await this.$confirm('请选择导出范围', '导出日历事件', { + confirmButtonText: '导出本月', + cancelButtonText: '导出全部', + distinguishCancelAndClose: true, + type: 'info' + }) + this.triggerExport(this.selectMonth) + } catch (action) { + if (action === 'cancel') { + this.triggerExport('') + } + // 关闭弹框不做任何操作 + } + }, + triggerExport(month) { + const monthQuery = month ? `month=${month}` : 'month=' + const url = + process.env.VUE_APP_BASE_API + + `/api/admin/calendars/index?${monthQuery}` + + '&is_export=1&export_fields[is_publish_text]=是否对外展示' + + '&export_fields[type_text]=日程类型' + + '&export_fields[course.name]=课程名称' + + '&export_fields[introduce]=具体说明' + + '&export_fields[title]=标题' + + '&export_fields[url]=资讯链接' + + '&export_fields[start_time]=开始时间' + + '&export_fields[end_time]=截止时间' + + '&export_fields[address]=地址' + + '&export_fields[color]=主题颜色' + + '&export_fields[content]=内容' + + '&token=' + getToken() window.open(url, '_blank') - console.log(res) }, onDateCellClick() { // 阻止 el-calendar 默认点击日期触发的月份切换 diff --git a/src/views/chartConfig/index.vue b/src/views/chartConfig/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/chartConfig/src b/src/views/chartConfig/src new file mode 100644 index 0000000..62d03b8 --- /dev/null +++ b/src/views/chartConfig/src @@ -0,0 +1,1251 @@ + + + + + + 驾驶舱数据配置管理 - 苏州科技商学院 + + + + + + + + + + + + + +
+
+ +
+
+
+
数据模块
+ +
+
+
+ +
+ +
+
+ + +
+
+
快速操作
+
+
+ + +
+
+
+ + +
+ + + +
+ +

请选择一个数据模块进行配置

+

或点击左侧"添加模块"按钮创建新模块

+
+
+
+
+ + + + + + + + diff --git a/src/views/config/components/addTeacher.vue b/src/views/config/components/addTeacher.vue index d451bb6..f84157b 100644 --- a/src/views/config/components/addTeacher.vue +++ b/src/views/config/components/addTeacher.vue @@ -39,7 +39,7 @@ +