服务台大改

assets/fonts/seimin/font_new/demo.css

@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时，垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}

assets/fonts/seimin/font_new/demo_index.html

@@ -0,0 +1,211 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=4503805" target="_blank" class="nav-more">查看项目</a>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe606;</span>
+                <div class="name">图片</div>
+                <div class="code-name">&amp;#xe606;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
+            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下：</p>
+          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@font-face {
+  font-family: 'newicon';
+  src: url('iconfont.woff2?t=1712822449676') format('woff2'),
+       url('iconfont.woff?t=1712822449676') format('woff'),
+       url('iconfont.ttf?t=1712822449676') format('truetype');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.newicon {
+  font-family: "newicon" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="newicon"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"newicon" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon newicon newicon-a-11111"></span>
+            <div class="name">
+              图片
+            </div>
+            <div class="code-name">.newicon-a-11111
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比，具有如下特点：</p>
+        <ul>
+          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下：</p>
+        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;span class="newicon newicon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            newicon" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-a-11111"></use>
+                </svg>
+                <div class="name">图片</div>
+                <div class="code-name">#newicon-a-11111</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
+          <ul>
+            <li>支持多色图标了，不再受单色限制。</li>
+            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
+          </ul>
+          <p>使用步骤如下：</p>
+          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>

assets/fonts/seimin/font_new/iconfont.css

@@ -0,0 +1,19 @@
+@font-face {
+  font-family: "newicon"; /* Project id 4503805 */
+  src: url('iconfont.woff2?t=1712822449676') format('woff2'),
+       url('iconfont.woff?t=1712822449676') format('woff'),
+       url('iconfont.ttf?t=1712822449676') format('truetype');
+}
+
+.newicon {
+  font-family: "newicon" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.newicon-a-11111:before {
+  content: "\e606";
+}
+

assets/fonts/seimin/font_new/iconfont.json

@@ -0,0 +1,16 @@
+{
+  "id": "4503805",
+  "name": "新ITSM PC端",
+  "font_family": "newicon",
+  "css_prefix_text": "newicon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "39056749",
+      "name": "图片",
+      "font_class": "a-11111",
+      "unicode": "e606",
+      "unicode_decimal": 58886
+    }
+  ]
+}

assets/js/controllers/incident/incidentCtrl.js

@@ -340,7 +340,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 displayName: '最近维修记录',
                 width: 140,
                 cellTemplate: '<div style="width: 100%;">' +
-                    '<div class="ui-grid-cell-contents" ng-bind-html="grid.appScope.transferHandlerLog(row.entity.handlerLogs)"></div>' +
+                    '<div class="ui-grid-cell-contents" ng-bind-html="grid.appScope.transferHandlerLog(row.entity.currentLog)"></div>' +
                     '</div>'
             },
             {
@@ -360,15 +360,13 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             return '无';
         }
     }
-    $scope.transferHandlerLog = function (handlerLogs) {
-        handlerLogs = angular.copy(handlerLogs);
-        handlerLogs = handlerLogs.reverse();
-        if(handlerLogs.length){
-            if(handlerLogs[0].repairType && handlerLogs[0].expectedDate){
-                return handlerLogs[0].repairType.name+"<br>"+ moment(handlerLogs[0].expectedDate).format('MM月DD日前完成');
-            }else{
-                return '无';
-            }
+    $scope.transferHandlerLog = function (currentLog) {
+        if(!currentLog){
+            return '无';
+        }
+        currentLog = angular.copy(currentLog);
+        if(currentLog.extra1DTO && currentLog.extra2 && currentLog.startTime){
+            return currentLog.extra1DTO.name+"<br>"+ moment(currentLog.startTime).add(+currentLog.extra2, 'days').format('MM月DD日前完成');
         }else{
             return '无';
         }

assets/views/desk/chart.html

@@ -1,18 +1,4 @@
-<!-- <section id="page-title">
-    <div class="row">
-        <div class="col-sm-8">
-            <h1 class="mainTitle">事件请求列表</h1><span class="mainDescription">事件请求列表,点击操作处理任务</span></div>
-    </div>
-</section> -->
 <style>
-  /* .btn {
-        transition: all 0.3s ease 0s !important;
-        background-image: none !important;
-        outline: none !important;
-        position: relative;
-        padding: 6px 10px;
-        border-radius: 2px;
-    } */
   .incidentsearch {
     width: 30% !important;
     margin-right: 16px;
@@ -60,14 +46,25 @@
     white-space: nowrap;
   }
 
-  #bx_ks_ul li:hover {
-    /* background-color: #005395; */
-    /* color: #fff; */
-  }
-
   #bx_ks_ul li:last-child {
     border-bottom: none;
   }
+  .ui-grid-row:nth-child(even) .ui-grid-cell {
+        background: #fafafa !important;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .ui-grid-row:nth-child(odd) .ui-grid-cell {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .ui-grid-row .ui-grid-cell:last-of-type {
+        justify-content: flex-start;
+    }
 </style>
 <section id="page-title">
   <div class="row">
@@ -83,21 +80,9 @@
   <div class="listbote">
     <div class="list-controls clearfix">
       <div class="btn-group">
-        <button class="btn btn-statebutton statebutton  keepleftbottom" ng-click="onChange('')"
-          ng-class="{'statecolor':searchstate==''}">
-          全部
-        </button>
-        <button class="btn btn-statebutton statebutton" ng-class="{'statecolor':searchstate==1650}"
-          ng-click="onChange(1650)">
-          未受理
-        </button>
-        <button class="btn btn-statebutton statebutton" ng-class="{'statecolor':searchstate==1651}"
-          ng-click="onChange(1651)">
-          已受理
-        </button>
-        <button class="btn btn-statebutton statebutton keeprightbottom" ng-class="{'statecolor':searchstate==1652}"
-          ng-click="onChange(1652)">
-          不受理
+        <button class="btn btn-statebutton statebutton" ng-click="onChange(tab.key)"
+          ng-class="{'statecolor':searchstate == tab.key}" ng-repeat="tab in tabs">
+          {{tab.value}}
         </button>
       </div>
     </div>
@@ -112,18 +97,18 @@
                     联系人:
                   </div>
                   <input class="form-control pull-right inputcolor iptSize"
-                    style="border-color: #dedede;color: #93989e;" type="text" ng-model="fileData.wxincident.contacts"
+                    style="border-color: #dedede;color: #93989e;" type="text" ng-model="fileData.incident.contacts"
                     placeholder="" />
                 </div>
               </div>
               <div class="form-group incidentsearch">
                 <div>
                   <div class="control-label pull-left margin-top-5 margin-right-5">
-                    报修时间:
+                    申请时间:
                   </div>
                   <input type="text" class="form-control pull-right incidentsearchsize iptSize"
                     style="border-color: #dedede;" datepicker-popuptime="yyyy-MM-dd"
-                    ng-model="fileData.wxincident.createTime" max-date="searchkeys.createTimeEnd" is-open="startOpened"
+                    ng-model="fileData.incident.startDate_start" max-date="searchkeys.startDate_end" is-open="startOpened"
                     hour-time="true" ng-init="startOpened = false" close-text="关闭" ng-click="startOpen($event)"
                     placeholder="" />
                 </div>
@@ -133,7 +118,7 @@
                 <div>
                   <input type="text" class="form-control selectzise pull-right incidentsearchsize iptSize"
                     style="border-color: #dedede;" datepicker-popuptime="yyyy-MM-dd"
-                    ng-model="fileData.wxincident.createTimeEnd" hour-time="true" min-date="searchkeys.createTime"
+                    ng-model="fileData.incident.startDate_end" hour-time="true" min-date="searchkeys.startDate_start"
                     is-open="endOpened" ng-init="endOpened = false" close-text="关闭" ng-click="endOpen($event)"
                     placeholder="" />
                 </div>
@@ -145,7 +130,7 @@
                   </div>
                   <input class="form-control pull-right inputcolor iptSize"
                     style="border-color: #dedede;color: #93989e;" type="text"
-                    ng-model="fileData.wxincident.contactsInformation" placeholder="" />
+                    ng-model="fileData.incident.contactsInformation" placeholder="" />
                 </div>
               </div>
               <div class="form-group incidentsearch ksInput" ng-show="repairMain.valueconfig == 2">
@@ -162,18 +147,6 @@
                   </div>
                 </div>
               </div>
-              <div class="form-group incidentsearch">
-                <div class="control-label pull-left margin-top-5 margin-right-5">来源:</div>
-                <ui-select class="pull-right iptSize" ng-model="seiminObj.sourceType"
-                    theme="bootstrap" ng-change="changeSourceType(seiminObj.sourceType)">
-                    <ui-select-match placeholder="请选择来源">
-                        {{$select.selected.name}}
-                    </ui-select-match>
-                    <ui-select-choices repeat="item in sourceTypes | filter: $select.search">
-                        <div ng-bind-html="item.name | highlight: $select.search"></div>
-                    </ui-select-choices>
-                </ui-select>
-            </div>
             </form>
           </div>
           <div class="col-xs-2">

assets/views/incident/tpl/doing.tpl.html

@@ -42,7 +42,7 @@
             <div class="control-label pull-left margin-top-5 margin-right-5">
                 <label class="demoincident"><span class="red">*</span>处理方案</label>:</div>
             <div class="pull-right">
-                <textarea rows="3" style="resize: none;width:220px" placeholder="" ng-model="postData.handleDescription"></textarea>
+                <textarea rows="6" style="resize: none;width:220px" placeholder="" ng-model="postData.handleDescription"></textarea>
             </div>
         </div>
     </div>

assets/views/incident/tpl/reject.tpl.html

@@ -0,0 +1,21 @@
+<!-- 不受理 -->
+<div class="modal-header">
+    <div class="modal-title fontcolor-two fontsizes-14">不受理
+        <button type="button" class="close pull-right" ng-click="cancel()">×</button>
+    </div>
+</div>
+<div class="modal-body center">
+    <div class="form-group" style="margin:0 auto;width: 300px;">
+        <div class=" input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident"><span class="red">*</span>不受理原因</label>:</div>
+            <div class="pull-right">
+                <textarea rows="3" style="resize: none;width:210px" placeholder="" ng-model="postData.rejectRemark"></textarea>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal-footer modelfooter-hint" style="cursor: pointer;">
+    <div class="hintfooterleft pull-left" ng-click="ok()" style="cursor: pointer;">确定</div>
+    <div class="hintfooterright pull-right" ng-click="cancel()" style="cursor: pointer;">取消</div>
+</div>

assets/views/showPictrueList.html

@@ -0,0 +1,16 @@
+<div class="modal-header">
+    <div class="modal-title fontcolor-two fontsizes-14">{{title}}<button type="button" class="close pull-right" ng-click="cancel()">×</button></div>
+</div>
+<div class="modal-body center">
+    <div class="col-xs-12 padding-top-15 padding-bottom-15">
+        <div class="col-xs-12 btn-group padding-15 tipopenback">
+            <h2 class="hint">{{content}}</h2>
+            <div class="imgs-container shucenter" style="flex-wrap: wrap;justify-content: flex-start;">
+                <img ng-src="{{img.previewUrl}}" ng-repeat="(idx,img) in repairImgs" class="imgs" style="margin: 2px;max-width: 90px;max-height: 90px;" ng-click="preview(img.relativeFilePath,idx)" />
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal-footer modelfooter-hint pointfont padding-bottom-15">
+    <div type="button" class=" btn btn-default" ng-click="cancel() " translate="modal.button.CANCEL ">Cancel</div>
+</div>

index.html

@@ -37,6 +37,7 @@
     <link rel="stylesheet" type="text/css" href="assets/fonts/fontcvg/iconfont.css" />
     <link rel="stylesheet" type="text/css" href="assets/fonts/fontcvg/demo.css" />
     <link rel="stylesheet" type="text/css" href="assets/fonts/seimin/font/iconfont.css" />
+    <link rel="stylesheet" type="text/css" href="assets/fonts/seimin/font_new/iconfont.css" />
     <!-- <link rel="stylesheet" type="text/css" href="assets/css/svgIconFont/iconfont.css" />
     <link rel="stylesheet" type="text/css" href="assets/css/svgIconFont/demo.css" /> -->
     <link rel="stylesheet" type="text/css" href="assets/css/demo/demo3.css" />