Merge branch 'dev_zxc' into test

src/js/itemManager.js

@@ -1,6 +1,7 @@
 const $ = require('jquery');
 require("../css/itemManager.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
+require('./modal.js');
 const {api} = require('./api.js')
 const {post} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
@@ -9,6 +10,8 @@ const iconDown= require("./../images/arrow_down.png")
 const iconUp = require("./../images/arrow_up.png")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
+
+
 let casesId="", name="", isReject ="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp =""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -215,6 +218,7 @@ function saveEdit(item,activePage){
     post(api.updataQcCasesEntry,param).then(res =>{
         if(res.data.code == '0'){
             // const data = res.data.data
+            $.alerModal({"message":"修改成功",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             getTabData(activePage)
         }else{}
     }).catch((e) =>{

src/js/modal.js

@@ -12,6 +12,8 @@ const jQuery = require('jquery');
             sureText:"确定",
             message: '<p class="tip">内容</p>',
             time: 1500,
+            isFather: false,
+            fatherWrapper:'',
             type:'modal',//tip,loading
             callback:function(){
                 alert(99)
@@ -46,7 +48,12 @@ const jQuery = require('jquery');
             left:$(".modaltip").width()/2+'px',
             top:$(".modaltip").height()/2+'px'
         })
-        $("body").append(box)
+        if(ops.isFather){
+           ops.fatherWrapper.append(box)
+        } else{
+            console.log('bbbbbbb')
+            $("body").append(box)
+        }
         if(ops.type == 'tip'){
             setTimeout(function(){
                 box.remove();

src/js/moduleManager.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/moduleManager.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
-
+require('./modal.js');
 
 // const  layui = require('layui-src');
 const {api} = require('./api.js')
@@ -147,6 +147,7 @@ function saveModifyOne(item){
     })
     post(api.saveQcCases, {qcCasesSaveVOList}).then(res =>{
         if(res.data.code == '0'){
+            $.alerModal({"message":"修改成功",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             getTabData()
         }else{}
     }).catch((e) =>{

src/js/qcList.js

@@ -1,6 +1,6 @@
 const $ = require('jquery');
 require("../css/qcList.less");
-
+require('./modal.js');
 const {api} = require('./api.js')
 const {post} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
@@ -51,11 +51,7 @@ function getTabData(activePage){
                 $('.pagination').html("")
             }
         }else{
-            removeDialog()
-            dialog(res.data.msg)
-            setTimeout(function(){
-                removeDialog()
-            },2000)
+            $.alerModal({"message":res.data.msg,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         }
     }).catch((e) =>{
     
@@ -70,11 +66,7 @@ $(".filter").on("click", function(e){
     const start = new Date(behosDateStart).getTime()
     const end = new Date(behosDateEnd).getTime()
     if(start > end){
-        removeDialog()
-        dialog('开始时间不能大于结束时间~')
-        setTimeout(function(){
-            removeDialog()
-        },2000)
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         return
     }
     if(behosDateStart){
@@ -142,11 +134,7 @@ function bindScoreDetail(){
         const age = tabList[index].age
         const noScore = tabList[index].level == '未评分'
         if(noScore){
-            removeDialog()
-            dialog('请先进行评分！')
-            setTimeout(function(){
-                removeDialog()
-            },2000)
+            $.alerModal({"message":'请先进行评分！',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         } else{
             scoreDetail(id,age)
@@ -247,11 +235,7 @@ $('.recordScoreBtn').on("click",function(e){
         }
     }
     if(scoreList.length === 0){
-        removeDialog()
-        dialog('请选择要评分的项！')
-        setTimeout(function(){
-            removeDialog()
-        },2000)
+        $.alerModal({"message":'请选择要评分的项！',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         return
     } else{
         loading()