Parcourir la source

Merge branch 'appeal0121' into test

1178232204@qq.com il y a 3 ans
Parent
commit
36e3c985a5
3 fichiers modifiés avec 4 ajouts et 3 suppressions
  1. 1 1
      src/html/qcScore.html
  2. 2 1
      src/js/index.js
  3. 1 1
      src/js/utils.js

+ 1 - 1
src/html/qcScore.html

@@ -246,7 +246,7 @@
                 <ul></ul>
             </div>
             <!--<p><span>模块名称: </span><input type="text" value="${modelName}" /></p>-->
-            <p><span style="margin-right: 16px;">提示信息:</span><input title="${msg}" class="ellipsis" id="addQcMsg" type="text" value="${msg}" /></p>
+            <p><span style="margin-right: 16px;">提示信息:</span><input title="${msg}" maxlength="100" class="ellipsis" id="addQcMsg" type="text" value="${msg}" /></p>
             <p><span>分值:</span> <input id="addQcScore" type="text" value="${score}" /></p>
             <p><span style="margin-right: 16px;">备注:</span><input title="${explainInfo}" class="ellipsis" id="addQcInfo" type="text" value="${explainInfo}" autocomplete="off"/></p>
             <p class="warning"><span></span><span class="red">支持≥0的数字输入,最多保留小数点后1位~</span></p>

+ 2 - 1
src/js/index.js

@@ -20,6 +20,7 @@ const {
   setCookie,
   setLocal,
   getCookie,
+  clearAllCookie,
   focusMenuItem,
   getUrlArgObject
 } = require('./utils.js');
@@ -32,7 +33,7 @@ const otherLogo = getUrlArgObject("adLg");
 const is3His = getUrlArgObject('is3His')
 //token判断没有跳登录
 const token = localStorage.getItem('accessToken');
-const onAppeal = getCookie('checkAuth').indexOf('10')
+const onAppeal = getCookie('checkAuth') && getCookie('checkAuth').indexOf('10')
 let auditNumber;
 if (!token || localStorage.getItem('toLogin') === '1') {
   window.location.href = '../login.html';

+ 1 - 1
src/js/utils.js

@@ -360,7 +360,7 @@ const delCookie = function (name) {
   let cval = getCookie(name);
   if (cval != null) document.cookie = name + '=' + cval + ';expires=' + exp.toGMTString();
 };
-function clearAllCookie() {
+const clearAllCookie= function() {
   var keys = document.cookie.match(/[^ =;]+(?=\=)/g);
   if (keys) {
     for (var i = keys.length; i--;)