Merge branch 'master-mj-yuanjinpeng' into 'master-mj'

fix: 动环实施告警无法点击告警消除的问题优化



See merge request !1240

@@ -2657,14 +2657,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                         })
                         //获取知识库开启状态 lsq 2022-04-15
                         admin.req({
-                            url: common.domainName + '/api-user/sysConf/getByCode',
+                            url: common.domainName + '/mj/sys/conf/getByCode?code=knFlag',
                             type: "get",
-                            data: {
-                                code: 'knFlag'
-                            },
-                            done: function (data) {
-                                let knFlag = data.object.value;
-                                if (knFlag == '1') {
+                            success: function (res) {
+                                let knFlag = res.data.value;
+                                if (knFlag == 'on') {
                                     //开启闭环
                                     // Start 将对象转成key=value&key1=value1 LSQ 2022/03/22
                                     let urlParams = '';
@@ -2686,7 +2683,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                                         data: {
                                             alarmId: params.id
                                         },
-                                        done: function (data) {
+                                        success: function (data) {
                                             if (data.data && data.data.length > 0) {
                                                 //已存入了草稿
                                                 layer.msg('告警消除已存入草稿中了！', {icon: 2, time: 2000});
@@ -2698,7 +2695,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                                                     shadeClose: true,//开启遮罩层
                                                     id: 'alarms_clear_id',
                                                     // content: laytpl(res.body).render(JSON.stringify(params)),
-                                                    content: ['/vue3/index.html#/alarmsClearEditor?' + urlParams, 'no'],
+                                                    content: ['/monitor-web/vue3/index.html#/alarmsClearEditor?' + urlParams, 'no'],
                                                     cancel: function () {
                                                         clearTimeout();
                                                     }
@@ -2724,7 +2721,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                                                 accessToken: common.getMjToken(),
                                                 noticeFlag: $('input[name="noticeFlag"]:checked').val()
                                             }
-                                            , done: function (res) {
+                                            , success: function (res) {
                                                 //如果消除成功，关闭弹出框然后重新加载页面
                                                 if (res.success) {
                                                     layer.close(index);

@@ -224,7 +224,7 @@ export default {
             proxy.userList = [];
 
             // 查询信息中心的用户
-            proxy.$http.get("/api-user/org/getOrgUserList?orgCode=xxzx", {}, function (res) {
+            proxy.$http.get("/mj/common/getUserByOrgCode?orgCode=xxzx", {}, function (res) {
                 if (res && res.data) {
                     res.data.map(function (v) {
                         let desc = [];
@@ -400,9 +400,9 @@ export default {
         let noticeFlag = Vue.ref(true);
         //获取当前登录人-操作人
         let getUserByToken = () => {
-            proxy.$http.get(`/api-user/users/getUserByToken`, {}, function (res) {
-                if (res && res.code == 0) {
-                    let userData = res.object;
+            proxy.$http.get(`/mj/sys/auth/getCurrenUser`, {}, function (res) {
+                if (res) {
+                    let userData = res.data.user;
                     loginName.value = userData.username;
 
                 }