Merge remote-tracking branch 'origin/master'

# Conflicts:
#	itdmWeb/src/api/api.js

itdmWeb/src/api/api.js

@@ -36,6 +36,11 @@ const loadAllRoleIds = (params)=>getAction("/sys/permission/loadAllRoleIds",para
 const getPermissionRuleList = (params)=>getAction("/sys/permission/getPermRuleListByPermId",params);
 const queryPermissionRule = (params)=>getAction("/sys/permission/queryPermissionRule",params);
 
+// 委托信息——委托单位下拉列表
+const getWeituoClientList = (params)=>getAction("/weituo/itdmWeituoInfo/distinctClientList",params);
+// 委托信息——根据委托单位查询委托信息列表
+const getWeituoInfoListByClient = (params)=>getAction("/weituo/itdmWeituoInfo/weituoNoList",params);
+
 // 部门管理
 const queryDepartTreeList = (params)=>getAction("/sys/sysDepart/queryTreeList",params);
 const queryDepartTreeSync = (params)=>getAction("/sys/sysDepart/queryDepartTreeSync",params);
@@ -68,6 +73,14 @@ const saveProject = (params)=>postAction("/sych/JHYAddOrUpdate",params);
 const getXmjlList = (params) => getAction('/sych/XMJLList', params);
 // 项目经理拆单后的提交按钮
 const saveProjectJl = (params)=>postAction("/sych/XMJLAddOrUpdate",params);
+// 项目经理拆单后的删除按钮
+const delProjectJl = (params)=>deleteAction("/sych/delete",params);
+// 大屏报警信息删除按钮
+const delBaojing = (params)=>deleteAction("/itdm/voice/delete",params);
+// 大屏设备维护密码验证
+const confirmPa = (params)=>getAction("/itdmMima/itdmMima/panduan",params);
+// 折线图初始化
+const listGraph = (params)=>getAction("/second/screen/chushihua/{id}",params);
 
 
 //日志管理
@@ -116,6 +129,7 @@ export const transitRESTful = {
   post: (url, parameter) => postAction(getTransitURL(url), parameter),
   put: (url, parameter) => putAction(getTransitURL(url), parameter),
   http: (url, parameter) => httpAction(getTransitURL(url), parameter),
+  delete: (url, parameter) => deleteAction(getTransitURL(url), parameter),
 }
 
 export {
@@ -181,7 +195,13 @@ export {
   getJhList,
   saveProject,
   getXmjlList,
-  saveProjectJl
+  saveProjectJl,
+  delProjectJl,
+  getWeituoClientList,
+  getWeituoInfoListByClient,
+  delBaojing,
+  confirmPa,
+  listGraph
 }
 
 

itdmWeb/src/views/module-iTDM/itdmScreen/itdmGraph.vue

@@ -80,8 +80,8 @@ export default {
   methods:{
     // 初始化折线图
     getList() {
-      console.log(this.query)
-      listGraph(this.query.id).then(res => {
+      console.log(this.query.id)
+      listGraph(this.query).then(res => {
         console.log(res)
         this.echartsData = res.data.data
         this.$nextTick(() => {