Skip to content

W
work-order-system
Commit 15737fda by 洪晓珍
Options

merge code

parents 14f0078d 52c56b49
Showing with 259 additions and 98 deletions
index.html
...@@ -6,25 +6,21 @@ ...@@ -6,25 +6,21 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>回访工单</title> <title>回访工单</title>
<!-- Bootstrap 核心 CSS 文件 --> <!-- Bootstrap 核心 CSS 文件 -->
<link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" <link rel="stylesheet" href="./css/bootstrap.min.css">
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> <link rel="stylesheet" href="./css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="./css/return-order-index.css"> <link rel="stylesheet" href="./css/return-order-index.css">
<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.js"></script>
<script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script>
<script src="./js/commonfilter.js"></script>
<!--<script src="./js/vue-2.5.6-min.js"></script>-->
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script> <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
<script src="./js/index.js"></script> <script src="js/jquery-1.11.2.min.js"></script>
<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" <script src="js/jquery.cookie.js"></script>
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" <script src="js/bootstrap.min.js"></script>
crossorigin="anonymous"></script> <script src="js/commonfilter.js"></script>
<script src="js/index.js"></script>
</head> </head>
<body> <body>
<!-- 头部 --> <!-- 头部 -->
<header> <header>
<div class="container-fluid"> <div class="container-fluid" id="user">
<div class="row"> <div class="row">
<div class="col-xs-4 col-sm-4 col-md-3"> <div class="col-xs-4 col-sm-4 col-md-3">
<a href="#" class="home"><i class="fa fa-home" aria-hidden="true"></i>YiDianLing.com</a> <a href="#" class="home"><i class="fa fa-home" aria-hidden="true"></i>YiDianLing.com</a>
...@@ -176,7 +172,7 @@ ...@@ -176,7 +172,7 @@
</select> </select>
</div> </div>
<ul id="statusTab" class="nav nav-tabs" role="tablist"> <ul id="statusTab" class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#home" id="home-tab" role="tab" data-toggle="tab" <li role="presentation" class="active"><a href="#" id="home-tab" role="tab" data-toggle="tab"
aria-controls="home" aria-expanded="true" aria-controls="home" aria-expanded="true"
v-on:click="unprocessed()">未受理</a></li> v-on:click="unprocessed()">未受理</a></li>
<!--<li role="presentation" class=""><a href="#profile" role="tab" id="profile-tab" data-toggle="tab" <!--<li role="presentation" class=""><a href="#profile" role="tab" id="profile-tab" data-toggle="tab"
...@@ -239,11 +235,13 @@ ...@@ -239,11 +235,13 @@
$('.bar').click(function () { $('.bar').click(function () {
$('.aside').toggleClass('visible'); $('.aside').toggleClass('visible');
$('.digital-container').toggleClass('width'); $('.digital-container').toggleClass('width');
console.log("test");
}); });
$('.nav-tabs a').click(function (e) { $('.nav-tabs a').click(function (e) {
e.preventDefault(); e.preventDefault();
$(this).tab('show'); // this.tab('show');
}); });
}); });
......
js/commonfilter.js
$(document).ready(function(){ $(document).ready(function () {
if($.cookie("SESSIONID")){ if ($.cookie('SESSIONID')) {
console.log("logined"); console.log("logined");
}else{ } else {
var ticket = getQueryString("ticket"); var ticket = getQueryString("ticket");
if (! ticket) { if (!ticket) {
window.location.href="http://testcas.yidianling.com/login.html?url="+window.location.href; window.location.href = "http://testcas.yidianling.com/login.html?url=" + window.location.href;
}else{ } else {
$.ajax({ $.ajax({
url:"http://47.97.49.44:8085/validate/ticket/"+ticket, url: "/work/cas/validate/ticket/" + ticket,
contentType:"application/json", contentType: "application/json",
xhrFields: { xhrFields: {
withCredentials: true withCredentials: true
}, },
async:false, async: false,
method:"POST", method: "POST",
crossDomain: true, crossDomain: true,
success:function(data,status){ success: function (data, status) {
if(data.code != 200){ if (data.code != 200) {
alert(data.msg); alert(data.msg);
}else{
console.log("success"); } else {
window.location.href= removedParameter(window.location.href,"ticket"); console.log("success");
} window.location.href = removedParameter(window.location.href, "ticket");
}}); }
} }
} });
}
}
}); });
function removedParameter(url, ref) { function removedParameter(url, ref) {
// 如果不包括此参数 // 如果不包括此参数
if (url.indexOf(ref) == -1) if (url.indexOf(ref) == -1)
return url; return url;
var arr_url = url.split('?'); var arr_url = url.split('?');
var base = arr_url[0]; var base = arr_url[0];
var arr_param = arr_url[1].split('&'); var arr_param = arr_url[1].split('&');
var index = -1; var index = -1;
for (i = 0; i < arr_param.length; i++) { for (i = 0; i < arr_param.length; i++) {
var paired = arr_param[i].split('='); var paired = arr_param[i].split('=');
if (paired[0] == ref) { if (paired[0] == ref) {
index = i; index = i;
break; break;
}
} }
}
if (index == -1) { if (index == -1) {
return url; return url;
} else { } else {
arr_param.splice(index, 1); arr_param.splice(index, 1);
return base + "?" + arr_param.join('&'); return base + "?" + arr_param.join('&');
}
}
function getQueryString(name) {
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
var r = window.location.search.substr(1).match(reg);
if (r != null) {
return unescape(r[2]);
}
return null;
}
function logout(){
$.ajax({
url: "/work/cas/logout",
contentType: "application/json",
xhrFields: {
withCredentials: true
},
async: false,
method: "POST",
crossDomain: true,
success: function (data, status) {
if (data.code != 200) {
alert(data.msg);
window.location.href = "http://testcas.yidianling.com/login.html?url=" + window.location.href;
} else {
console.log("success");
window.location.href=removedParameter(window.location.href, "ticket");
}
} }
} });
\ No newline at end of file }
\ No newline at end of file
js/jquery-3.3.1.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
js/jquery.cookie.js 0 → 100644
/*!
* jQuery Cookie Plugin v1.4.1
* https://github.com/carhartl/jquery-cookie
*
* Copyright 2013 Klaus Hartl
* Released under the MIT license
*/
(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD
define(['jquery'], factory);
} else if (typeof exports === 'object') {
// CommonJS
factory(require('jquery'));
} else {
// Browser globals
factory(jQuery);
}
}(function ($) {
var pluses = /\+/g;
function encode(s) {
return config.raw ? s : encodeURIComponent(s);
}
function decode(s) {
return config.raw ? s : decodeURIComponent(s);
}
function stringifyCookieValue(value) {
return encode(config.json ? JSON.stringify(value) : String(value));
}
function parseCookieValue(s) {
if (s.indexOf('"') === 0) {
// This is a quoted cookie as according to RFC2068, unescape...
s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
}
try {
// Replace server-side written pluses with spaces.
// If we can't decode the cookie, ignore it, it's unusable.
// If we can't parse the cookie, ignore it, it's unusable.
s = decodeURIComponent(s.replace(pluses, ' '));
return config.json ? JSON.parse(s) : s;
} catch(e) {}
}
function read(s, converter) {
var value = config.raw ? s : parseCookieValue(s);
return $.isFunction(converter) ? converter(value) : value;
}
var config = $.cookie = function (key, value, options) {
// Write
if (value !== undefined && !$.isFunction(value)) {
options = $.extend({}, config.defaults, options);
if (typeof options.expires === 'number') {
var days = options.expires, t = options.expires = new Date();
t.setTime(+t + days * 864e+5);
}
return (document.cookie = [
encode(key), '=', stringifyCookieValue(value),
options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
options.path ? '; path=' + options.path : '',
options.domain ? '; domain=' + options.domain : '',
options.secure ? '; secure' : ''
].join(''));
}
// Read
var result = key ? undefined : {};
// To prevent the for loop in the first place assign an empty array
// in case there are no cookies at all. Also prevents odd result when
// calling $.cookie().
var cookies = document.cookie ? document.cookie.split('; ') : [];
for (var i = 0, l = cookies.length; i < l; i++) {
var parts = cookies[i].split('=');
var name = decode(parts.shift());
var cookie = parts.join('=');
if (key && key === name) {
// If second argument (value) is a function it's a converter...
result = read(cookie, value);
break;
}
// Prevent storing a cookie that we couldn't decode.
if (!key && (cookie = read(cookie)) !== undefined) {
result[name] = cookie;
}
}
return result;
};
config.defaults = {};
$.removeCookie = function (key, options) {
if ($.cookie(key) === undefined) {
return false;
}
// Must not alter options, thus extending a fresh object...
$.cookie(key, '', $.extend({}, options, { expires: -1 }));
return !$.cookie(key);
};
}));
js/sysWoConfig.js
...@@ -6,6 +6,7 @@ jQuery(document).ready(function ($) { ...@@ -6,6 +6,7 @@ jQuery(document).ready(function ($) {
data: { data: {
deptId: 0, deptId: 0,
addDeptId:0, addDeptId:0,
woId:0,
deptNames: [ deptNames: [
{value: 0, text: "请选择"}, {value: 0, text: "请选择"},
{value: 1, text: "好柿"}, {value: 1, text: "好柿"},
...@@ -101,8 +102,25 @@ jQuery(document).ready(function ($) { ...@@ -101,8 +102,25 @@ jQuery(document).ready(function ($) {
} }
}); });
}, },
querySysCfg: function (sysCfg) { querySysCfg: function () {
console.log('querySysCfg: ' + sysCfg.id); console.log('querySysCfg: ' + app.deptId);
console.log("woId: " + app.woId);
var data = JSON.stringify(
{
"woId": app.woId,
"deptId": app.deptId,
"creator":1,
"creatorName":'sys',
"deptId": app.addDeptId,
"deptName": app.deptNames[app.addDeptId].text,
"duringTime": parseInt(app.duringTimeMin) + parseInt(app.duringTimeHour * 60),
"remindTime": app.remindTime,
"assignLimit": parseInt(app.assignLimit),
"urgentLevel":app.addUrgentLevel
}
);
}, },
queryAuditTrace: function (sysCfg) { queryAuditTrace: function (sysCfg) {
console.log('queryAuditTrace: ' + sysCfg.id); console.log('queryAuditTrace: ' + sysCfg.id);
......
js/woDetail.js
...@@ -207,8 +207,7 @@ jQuery(document).ready(function ($) { ...@@ -207,8 +207,7 @@ jQuery(document).ready(function ($) {
}); });
processButton.disabled = false; processButton.disabled = false;
} }
initDetail(); initDetail();
console.log('Finished.');
}); });
return-order-detail.html
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>回访工单</title> <title>回访工单</title>
<!-- Bootstrap 核心 CSS 文件 --> <!-- Bootstrap 核心 CSS 文件 -->
<link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> <link rel="stylesheet" href="./css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="./css/font-awesome.min.css">
<link rel="stylesheet" href="./css/return-order-index.css"> <link rel="stylesheet" href="./css/return-order-index.css">
<link rel="stylesheet" href="./css/return-order-detail.css"> <link rel="stylesheet" href="./css/return-order-detail.css">
<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.js"></script> <script src="./js/jquery-3.3.1.js"></script>
<script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script> <script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script>
<script src="./js/commonfilter.js"></script> <script src="./js/commonfilter.js"></script>
<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
......
sysWoConfig.html
...@@ -10,17 +10,17 @@ ...@@ -10,17 +10,17 @@
<link rel="stylesheet" href="./css/font-awesome.min.css"> <link rel="stylesheet" href="./css/font-awesome.min.css">
<link rel="stylesheet" href="./css/return-order-index.css"> <link rel="stylesheet" href="./css/return-order-index.css">
<link rel="stylesheet" href="./css/return-order-detail.css"> <link rel="stylesheet" href="./css/return-order-detail.css">
<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.js"></script> <script src="./js/jquery-1.11.2.min.js"></script>
<script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script>
<script src="./js/commonfilter.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script> <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
<script src="./js/sysWoConfig.js"></script> <script src="./js/sysWoConfig.js"></script>
<script src="./js/jquery.cookie.js"></script>
<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
</head> </head>
<body> <body>
<!-- 头部 --> <!-- 头部 -->
<header> <header>
<div class="container-fluid"> <div class="container-fluid" id="user">
<div class="row"> <div class="row">
<div class="col-xs-4 col-sm-4 col-md-3"> <div class="col-xs-4 col-sm-4 col-md-3">
<a href="#" class="home"><i class="fa fa-home" aria-hidden="true"></i>YiDianLing.com</a> <a href="#" class="home"><i class="fa fa-home" aria-hidden="true"></i>YiDianLing.com</a>
...@@ -348,8 +348,8 @@ ...@@ -348,8 +348,8 @@
}) })
$('.nav-tabs a').click(function (e) { $('.nav-tabs a').click(function (e) {
e.preventDefault() e.preventDefault();
$(this).tab('show') // $(this).tab('show');
}) })
</script> </script>
</body> </body>
......
woDetail.html
...@@ -2,26 +2,22 @@ ...@@ -2,26 +2,22 @@
<html lang="en" xmlns:v-on="http://www.w3.org/1999/xhtml" <html lang="en" xmlns:v-on="http://www.w3.org/1999/xhtml"
xmlns:v-bind="http://www.w3.org/1999/xhtml"> xmlns:v-bind="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>回访工单</title> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<!-- Bootstrap 核心 CSS 文件 --> <title>回访工单</title>
<link rel="stylesheet" <!-- Bootstrap 核心 CSS 文件 -->
href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" <link rel="stylesheet" href="./css/bootstrap.min.css" >
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" <link rel="stylesheet" href="./css/font-awesome.min.css">
crossorigin="anonymous"> <link rel="stylesheet" href="./css/return-order-index.css">
<link rel="stylesheet" <link rel="stylesheet" href="./css/return-order-type.css">
href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css"> <script src="./js/jquery-3.3.1.js"></script>
<link rel="stylesheet" href="./css/return-order-index.css"> <script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script>
<link rel="stylesheet" href="./css/return-order-type.css"> <script src="./js/commonfilter.js"></script>
<script src="./js/jquery-1.11.2.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script> <script src="./js/woDetail.js"></script>
<script src="./js/woDetail.js"></script> <script src="./js/bootstrap.min.js"></script>
<script
src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
crossorigin="anonymous"></script>
</head> </head>
<body> <body>
<!-- 头部 --> <!-- 头部 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment