diff --git a/public/img/nodata.png b/public/img/nodata.png new file mode 100644 index 00000000..ebe9842f Binary files /dev/null and b/public/img/nodata.png differ diff --git a/src/api/model/ecm.js b/src/api/model/ecm.js index e4757c8f..2f8ee091 100644 --- a/src/api/model/ecm.js +++ b/src/api/model/ecm.js @@ -82,15 +82,14 @@ export default { data); } }, - cate:{ - name: "创建", + cateAgg: { + name: "时间分类聚合", req: async function(data){ return await http.post( `${config.API_URL}/ecm/event/cate_agg/`, data); } - - } + }, } , diff --git a/src/api/model/wf.js b/src/api/model/wf.js index 43b15cf2..f6341b5c 100644 --- a/src/api/model/wf.js +++ b/src/api/model/wf.js @@ -99,8 +99,8 @@ export default { }, ticketAccept: { name: "接单", - req: async function(id){ - return await http.post(`${config.API_URL}/wf/ticket/${id}/accpet/`); + req: async function(id,data){ + return await http.post(`${config.API_URL}/wf/ticket/${id}/accpet/`,data); } }, addNodeEnd: { @@ -118,7 +118,7 @@ export default { ticketClose: { name: "关闭工单", req: async function(id,data){ - return await http.post(`${config.API_URL}/wf/ticket/{id}/close/`,data); + return await http.post(`${config.API_URL}/wf/ticket/${id}/close/`,data); } }, ticketDeliver: { diff --git a/src/components/scSelect/userselect.vue b/src/components/scSelect/userselect.vue new file mode 100644 index 00000000..ab905acc --- /dev/null +++ b/src/components/scSelect/userselect.vue @@ -0,0 +1,274 @@ + + diff --git a/src/scui.js b/src/scui.js index c450f853..f8690c52 100644 --- a/src/scui.js +++ b/src/scui.js @@ -14,6 +14,7 @@ import scFormTable from './components/scFormTable' import scTableSelect from './components/scTableSelect' import scPageHeader from './components/scPageHeader' import scSelect from './components/scSelect' +import scUserSelect from './components/scSelect/userselect' import scDialog from './components/scDialog' import scForm from './components/scForm' import scTitle from './components/scTitle' @@ -59,13 +60,14 @@ export default { app.component('scWaterMark', scWaterMark); app.component('scQrCode', scQrCode); app.component('scStatusIndicator', scStatusIndicator); + app.component('scUserSelect', scUserSelect); app.component('scTrend', scTrend); //注册全局指令 - app.directive('auth', auth) - app.directive('role', role) - app.directive('time', time) - app.directive('copy', copy) + app.directive('auth', auth); + app.directive('role', role); + app.directive('time', time); + app.directive('copy', copy); //统一注册el-icon图标 for(let icon in elIcons){ diff --git a/src/views/am/area_form.vue b/src/views/am/area_form.vue index 4696a889..94dbea96 100644 --- a/src/views/am/area_form.vue +++ b/src/views/am/area_form.vue @@ -1,266 +1,281 @@ diff --git a/src/views/wf/visitdetail.vue b/src/views/wf/visitdetail.vue index 43bf5933..8355ed7d 100644 --- a/src/views/wf/visitdetail.vue +++ b/src/views/wf/visitdetail.vue @@ -1,112 +1,245 @@