Merge branch 'pc-repair' of http://git.dashitech.com/seimin/zuel-itsm-3.0.2 into pc-repair

index.html

@@ -728,14 +728,12 @@
               >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.name:'暂无'}}</span
             >
           </li>
-          <li
-            class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag"
-          >
-            <strong>电话：</strong
-            ><span
-              >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span
-            >
+          {{if incident.directProcess != 1}}
+          <li class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag">
+            <strong>电话：</strong>
+            <span>{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span>
           </li>
+          {{/if}}
           <li class="pop1-hd__itemList">
             <strong>处理进度：</strong>
             <div class="pop1-hd__itemListProcess clearfix">
@@ -839,14 +837,12 @@
               >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.name:'暂无'}}</span
             >
           </li>
-          <li
-            class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag"
-          >
-            <strong>电话：</strong
-            ><span
-              >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span
-            >
+          {{if incident.directProcess != 1}}
+          <li class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag">
+            <strong>电话：</strong>
+            <span>{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span>
           </li>
+          {{/if}}
           <li class="pop1-hd__itemList">
             <strong>处理进度：</strong>
             <div class="pop1-hd__itemListProcess clearfix">
@@ -956,14 +952,12 @@
               >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.name:'暂无'}}</span
             >
           </li>
-          <li
-            class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag"
-          >
-            <strong>电话：</strong
-            ><span
-              >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span
-            >
+          {{if incident.directProcess != 1}}
+          <li class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag">
+            <strong>电话：</strong>
+            <span>{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span>
           </li>
+          {{/if}}
           <li class="pop1-hd__itemList">
             <strong>处理进度：</strong>
             <div class="pop1-hd__itemListProcess clearfix">
@@ -1079,14 +1073,12 @@
               >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.name:'暂无'}}</span
             >
           </li>
-          <li
-            class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag"
-          >
-            <strong>电话：</strong
-            ><span
-              >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span
-            >
+          {{if incident.directProcess != 1}}
+          <li class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag">
+            <strong>电话：</strong>
+            <span>{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span>
           </li>
+          {{/if}}
           <li class="pop1-hd__itemList">
             <strong>处理进度：</strong>
             <div class="pop1-hd__itemListProcess clearfix">
@@ -1208,14 +1200,12 @@
               >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.name:'暂无'}}</span
             >
           </li>
-          <li
-            class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag"
-          >
-            <strong>电话：</strong
-            ><span
-              >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span
-            >
+          {{if incident.directProcess != 1}}
+          <li class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag">
+            <strong>电话：</strong>
+            <span>{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span>
           </li>
+          {{/if}}
           <li class="pop1-hd__itemList">
             <strong>处理进度：</strong>
             <div class="pop1-hd__itemListProcess clearfix">
@@ -1335,14 +1325,12 @@
               >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.name:'暂无'}}</span
             >
           </li>
-          <li
-            class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag"
-          >
-            <strong>电话：</strong
-            ><span
-              >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span
-            >
+          {{if incident.directProcess != 1}}
+          <li class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag">
+            <strong>电话：</strong>
+            <span>{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span>
           </li>
+          {{/if}}
           <li class="pop1-hd__itemList">
             <strong>处理进度：</strong>
             <div class="pop1-hd__itemListProcess clearfix">
@@ -1462,14 +1450,12 @@
               >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.name:'暂无'}}</span
             >
           </li>
-          <li
-            class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag"
-          >
-            <strong>电话：</strong
-            ><span
-              >{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span
-            >
+          {{if incident.directProcess != 1}}
+          <li class="pop1-hd__itemList pop1-hd__itemList--five pop1-hd__itemList--tag">
+            <strong>电话：</strong>
+            <span>{{incident.handlingPersonnelUser?incident.handlingPersonnelUser.phone:'暂无'}}</span>
           </li>
+          {{/if}}
           <li class="pop1-hd__itemList">
             <strong>处理进度：</strong>
             <div class="pop1-hd__itemListProcess clearfix">

js/index.js

@@ -1282,7 +1282,6 @@ $(function () {
     if (type === 0) {
       $(".opcBg_searchBox").hide();
       postData = {
-        assignee: loginUser.account,
         state: 0,
         idx: bx_pageNum,
         sum: 10,
@@ -1720,7 +1719,7 @@ $(function () {
       sessionStorage.removeItem("loginUser");
       sessionStorage.removeItem("repair_main");
       sessionStorage.removeItem("isSSo");
-      location.href = "http://" + location.hostname + ":8080/pcreq_logout.jsp";
+      location.href = "http://" + location.hostname + "/pcreq_logout.jsp";
     } else {
       $.ajax({
         type: "POST",

js/login.js

@@ -18,9 +18,9 @@ $(function () {
   $("#head").append(
     template("favicon_temp", { isVersion: sessionStorage.getItem("version_qd") })
   );
-  $("#logo").html(
-    template("logo_temp", { isVersion: sessionStorage.getItem("version_qd") })
-  );
+  // $("#logo").html(
+  //   template("logo_temp", { isVersion: sessionStorage.getItem("version_qd") })
+  // );
   var isSSo = location.search.length > 0; //是否单点登录
   if (isSSo) {
     $(".container").hide();

login.html

@@ -16,29 +16,7 @@
   </head>
 
   <body>
-    <div class="container">
-      <div class="content">
-        <div class="logo" id="logo">
-          <!-- <img src="./imgs/logo.png" alt="" />
-          <span>网络与信息运维报修平台</span> -->
-        </div>
-        <div class="login">
-          <div class="title">用户登录</div>
-          <input id="name" type="text" placeholder="请输入用户名" />
-          <input id="pwd" type="password" placeholder="请输入密码" />
-          <button id="login">登录</button>
-          <p>推荐使用Google浏览器，其他浏览器可能出现兼容性问题</p>
-          <!-- <p class="login_reset" style="color: #005395;">账号为您的学工号，初始密码为您的学工号后4位</p> -->
-        </div>
-        <div class="shadow">
-          <img src="./imgs/shadow_login.png" alt="" />
-        </div>
-      </div>
-      <div class="camp">
-        <img src="./imgs/logo-ds.png" alt="" />
-        <span>武汉大势恒通科技有限责任公司</span>
-      </div>
-    </div>
+
   </body>
   <script src="./libs/template-web.min.js"></script>
   <!-- favicon -->
@@ -61,17 +39,6 @@
     />
     {{/if}}
   </script>
-  <!-- logo -->
-  <script id="logo_temp" type="text/html">
-    {{if isVersion === 'isZncd'}}
-    <img src="./imgs/logo_zuel.png" alt="" />
-    {{else if isVersion === 'isHk'}}
-    <img src="./imgs/logo_hk.png" alt="" />
-    {{else}}
-    <img src="./imgs/logo_default.png" alt="" />
-    {{/if}}
-    <span>网络与信息运维报修平台</span>
-  </script>
   <script src="./js/base.js"></script>
   <script src="./js/login.js"></script>
 </html>

upload/development.js

@@ -4,7 +4,7 @@ const config = {
   ip: "192.168.3.110", // ssh地址
   username: "root", // ssh 用户名
   port: 22,      //端口
-  password: "DStech@123", // ssh 密码
+  password: "123456", // ssh 密码
   path: '/home/itsm/project/web/pcReq', // 上传地址,删除地址
   buildPath: '../dist' // 本地打包后文件地址
 }