diff --git a/src/api/modules/api.js b/src/api/modules/api.js index 3eb2b9d..5e719cd 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -1189,4 +1189,45 @@ export function correctList(data) { method: 'get', params: data }) +} + +// /zkhouse/findWeekMonth +export function findWeekMonth(data) { + return request({ + url: '/autoSR/zkhouse/findWeekMonth', + method: 'get', + params: data + }) +} +// +export function deleteById(data) { + return request({ + url: '/autoSR/api/zkMessage/deleteById', + method: 'get', + params: data + }) +} +// +export function weekFindById(data) { + return request({ + url: '/autoSR/api/zkMessage/findById', + method: 'get', + params: data + }) +} +// +export function byWeekMonthData(data) { + return request({ + url: '/autoSR/zkhouse/byWeekMonthData', + method: 'get', + params: data + }) +} +// +export function insertSelective(data) { + return request({ + url: '/autoSR/api/zkMessage/insertSelective', + method: 'get', + params: data + }) } \ No newline at end of file diff --git a/src/main.js b/src/main.js index 1de069c..e686458 100644 --- a/src/main.js +++ b/src/main.js @@ -22,6 +22,10 @@ import api from './api' import AvueUeditor from 'avue-plugin-ueditor' Vue.use(AvueUeditor); +import VueQuillEditor from 'vue-quill-editor' //vue-quill-editor其它文件可在应用页面直接引入 + +Vue.use(VueQuillEditor) + import 'echarts' import ECharts from 'vue-echarts' Vue.component('v-chart', ECharts) diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index e861933..50d25bb 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -109,11 +109,10 @@ 通知(0) --> - - + - + diff --git a/src/router/page/index.js b/src/router/page/index.js index eaf0bdb..d54b98f 100644 --- a/src/router/page/index.js +++ b/src/router/page/index.js @@ -41,6 +41,18 @@ export default [{ path: '/reportExcel/weekReport', component: () => import(/* webpackChunkName: "views" */ '@/views/reportExcel/weekReport'), name: '报告详情', // 周报 + }, + + + { + path: '/suglist', + component: () => import(/* webpackChunkName: "views" */"@/views/building/sugList") + }, + + + { + path: '/sugdetail', + component: () => import(/* webpackChunkName: "views" */"@/views/building/sugDetail") } ] diff --git a/src/views/building/index.vue b/src/views/building/index.vue index b75679a..451ad83 100644 --- a/src/views/building/index.vue +++ b/src/views/building/index.vue @@ -266,6 +266,9 @@ {{ row.lockFlag == 0 ? "禁用" : "启用"}} + + 使用建议 + @@ -971,6 +974,18 @@ export default { } }); }, + +// 跳转其他页面 + toOtherPage(page) { + console.log(page) + this.$router.push({ + path: '/suglist', + query: { + id: page.id + } + }) + }, + toDisable(row) { this.$confirm( `确定${row.lockFlag == 0 diff --git a/src/views/building/sugDetail.vue b/src/views/building/sugDetail.vue new file mode 100644 index 0000000..4b42583 --- /dev/null +++ b/src/views/building/sugDetail.vue @@ -0,0 +1,187 @@ + + + + + \ No newline at end of file diff --git a/src/views/building/sugList.vue b/src/views/building/sugList.vue new file mode 100644 index 0000000..91ab24e --- /dev/null +++ b/src/views/building/sugList.vue @@ -0,0 +1,234 @@ + + + + + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index fe9317d..d53ab34 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,14 +3,13 @@ * https://cli.vuejs.org/zh/config/ */ // const url = 'http://192.168.31.161:9999' //长龙 -// const url = 'http://192.168.31.211:9999' // 泽明 -// const url = 'http://192.168.31.100:9999' //王笑 +const url = 'http://192.168.31.152:9999' // 泽明 // const url = 'http://62.234.122.43:9999' //正式 // const url = 'http://81.70.55.170:9999' // 新测试服务器IP // const url = 'http://192.168.31.86:9999' // 胜浩 // const url = 'https://zanyong.hfju.com' // 正式域名 // const url = 'http://127.0.0.1:9999' // 本地 -const url = 'http://81.70.55.170:9999' // 新测试 +// const url = 'http://81.70.55.170:9999' // 新测试 // const url = 'http://82.156.35.22:9999' // 新正式ip const CompressionWebpackPlugin = require('compression-webpack-plugin') const productionGzipExtensions = ['js', 'css']