报修功能

angular.json

@@ -34,7 +34,8 @@
             ],
             "styles": [
               "src/styles.less",
-              "src/assets/iconfont/iconfont.css"
+              "src/assets/iconfont/iconfont.css",
+              "node_modules/viewerjs/dist/viewer.min.css"
             ],
             "scripts": [
               "node_modules/echarts/dist/echarts.min.js"
@@ -103,7 +104,8 @@
             ],
             "styles": [
               "src/styles.less",
-              "src/assets/iconfont/iconfont.css"
+              "src/assets/iconfont/iconfont.css",
+              "node_modules/viewerjs/dist/viewer.min.css"
             ],
             "scripts": [
               "node_modules/echarts/dist/echarts.min.js"

package-lock.json

@@ -33,6 +33,7 @@
         "rxjs": "~6.4.0",
         "sortablejs": "^1.14.0",
         "tslib": "^1.9.0",
+        "viewerjs": "^1.10.5",
         "zone.js": "^0.9.1"
       },
       "devDependencies": {
@@ -15946,6 +15947,11 @@
         "extsprintf": "^1.2.0"
       }
     },
+    "node_modules/viewerjs": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmmirror.com/viewerjs/-/viewerjs-1.10.5.tgz",
+      "integrity": "sha512-QwKrmXlSfKg5x4y74F/jicpHIRqBMMfHXyboOxHDi5n4XAaejjpalphPq4/HW6venQAoMiD57HpVwBk0JvqpSA=="
+    },
     "node_modules/vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz",
@@ -16993,8 +16999,7 @@
     "node_modules/zone.js": {
       "version": "0.9.1",
       "resolved": "https://registry.npm.taobao.org/zone.js/download/zone.js-0.9.1.tgz",
-      "integrity": "sha1-43xuXFTBP65N4mtf/o2OkhLabZs=",
-      "dev": true
+      "integrity": "sha1-43xuXFTBP65N4mtf/o2OkhLabZs="
     },
     "node_modules/zrender": {
       "version": "4.3.2",
@@ -18070,7 +18075,8 @@
       "version": "4.0.0",
       "resolved": "https://registry.npm.taobao.org/acorn-dynamic-import/download/acorn-dynamic-import-4.0.0.tgz",
       "integrity": "sha1-SCIQFAWCo2uDw+NC4c/ryqkkCUg=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -18124,13 +18130,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/ajv-errors/download/ajv-errors-1.0.1.tgz",
       "integrity": "sha1-81mGrOuRr63sQQL72FAUlQzvpk0=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1616882384060&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz",
       "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "amdefine": {
       "version": "1.0.1",
@@ -19231,7 +19239,8 @@
       "version": "5.0.2",
       "resolved": "https://registry.npm.taobao.org/circular-dependency-plugin/download/circular-dependency-plugin-5.0.2.tgz",
       "integrity": "sha1-2haMCzfntDVj+5+RLBwAfCEzie8=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "class-utils": {
       "version": "0.3.6",
@@ -22626,7 +22635,8 @@
       "version": "1.7.0",
       "resolved": "https://registry.nlark.com/karma-jasmine-html-reporter/download/karma-jasmine-html-reporter-1.7.0.tgz",
       "integrity": "sha1-UsSJp012CTShCJv6XqSo/LhMwos=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "karma-source-map-support": {
       "version": "1.4.0",
@@ -26956,7 +26966,8 @@
     "overlayscrollbars-ngx": {
       "version": "0.1.1",
       "resolved": "https://registry.nlark.com/overlayscrollbars-ngx/download/overlayscrollbars-ngx-0.1.1.tgz",
-      "integrity": "sha1-APyVynU9vV7by2Njp9AokJJVIow="
+      "integrity": "sha1-APyVynU9vV7by2Njp9AokJJVIow=",
+      "requires": {}
     },
     "p-defer": {
       "version": "1.0.0",
@@ -29910,6 +29921,11 @@
         "extsprintf": "^1.2.0"
       }
     },
+    "viewerjs": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmmirror.com/viewerjs/-/viewerjs-1.10.5.tgz",
+      "integrity": "sha512-QwKrmXlSfKg5x4y74F/jicpHIRqBMMfHXyboOxHDi5n4XAaejjpalphPq4/HW6venQAoMiD57HpVwBk0JvqpSA=="
+    },
     "vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz",
@@ -30769,8 +30785,7 @@
     "zone.js": {
       "version": "0.9.1",
       "resolved": "https://registry.npm.taobao.org/zone.js/download/zone.js-0.9.1.tgz",
-      "integrity": "sha1-43xuXFTBP65N4mtf/o2OkhLabZs=",
-      "dev": true
+      "integrity": "sha1-43xuXFTBP65N4mtf/o2OkhLabZs="
     },
     "zrender": {
       "version": "4.3.2",

package.json

@@ -38,6 +38,7 @@
     "rxjs": "~6.4.0",
     "sortablejs": "^1.14.0",
     "tslib": "^1.9.0",
+    "viewerjs": "^1.10.5",
     "zone.js": "^0.9.1"
   },
   "devDependencies": {

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://weixintest15.ngser.dashitech.com",
+    "target": "http://192.168.3.108",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/services/httpInterceptor.service.ts

@@ -31,7 +31,7 @@ export class HttpInterceptorService implements HttpInterceptor {
       tap(
         (event) => {
           if (event instanceof HttpResponse) {
-            console.log(event);
+            // console.log(event);
           }
         },
         (error) => {

src/app/services/main.service.ts

@@ -492,6 +492,12 @@ export class MainService {
       headers: this.headers,
     });
   }
+  //获取附件图片
+  wechatRequesterIncident(id) {
+    return this.http.get(host.host + "/itsm/common/listAttachment/wechatRequesterIncident/" + id, {
+      headers: this.headers,
+    });
+  }
   //查报修流程时间
   getProcessTime(data,processInstanceId) {
     return this.http.post(host.host + "/itsm/bpm/flowTracing/"+processInstanceId, data, {
@@ -528,6 +534,12 @@ export class MainService {
       headers: this.headers,
     });
   }
+  //报修评价
+  degree(data) {
+    return this.http.post(host.host + "/itsm/bpm/degree", data, {
+      headers: this.headers,
+    });
+  }
   //复制院区
   copyHosTaskType(data) {
     return this.http.post(host.host + "/api/copyHosTaskType", data, {

src/app/share/detail-bx/detail-bx.component.html

@@ -1,345 +1,331 @@
 <!-- 报修信息 -->
 <div class="detail" *ngIf="!maskFlag">
-    <div class="title">报修信息<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
-    <overlay-scrollbars #osComponentRef1 style="height: 90%; flex: 1">
-      <div class="content">
-        <div class="top" *ngIf="amplificationShow">
-          <div class="num">
-            <span class="left">报修编号：{{orderInfo.bxcode}}</span>
-            <span class="right">{{orderInfo.incidentState?orderInfo.incidentState.name:''}}</span>
-          </div>
-          <div class="info" nz-row>
-            <div nz-col nzSpan="8">报修类别：{{orderInfo.category?orderInfo.category.category:''}}</div>
-            <div nz-col nzSpan="8">报修地址：<ng-container *ngIf="orderInfo.place">{{ orderInfo.place.area.area }} {{ orderInfo.place.place }} {{ orderInfo.address }}</ng-container></div>
-            <div nz-col nzSpan="24">报修内容：{{orderInfo.description}}</div>
-            <div nz-col nzSpan="24">报修图片：{{orderInfo.description}}</div>
-            <div nz-col nzSpan="8">维修人：<ng-container *ngIf="orderInfo.incident&&orderInfo.incident.handlingPersonnelUser">{{ orderInfo.incident.handlingPersonnelUser.name }}</ng-container></div>
-            <div nz-col nzSpan="8">维修人电话：<ng-container *ngIf="orderInfo.incident&&orderInfo.incident.handlingPersonnelUser">{{ orderInfo.incident.handlingPersonnelUser.phone }}</ng-container></div>
-            <div nz-col nzSpan="24" *ngIf="processData == '已撤回'">撤回原因：{{ orderInfo.retractReason }}</div>
-            <div nz-col nzSpan="24" *ngIf="processData == '不受理'">不受理原因：{{ orderInfo.rejectRemark }}</div>
+  <div class="title">报修信息<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
+  <overlay-scrollbars #osComponentRef1 style="height: 90%; flex: 1">
+    <div class="content">
+      <div class="top" *ngIf="amplificationShow">
+        <div class="num">
+          <span class="left">报修编号：{{orderInfo.bxcode}}</span>
+          <span class="right">{{orderInfo.incidentState?orderInfo.incidentState.name:''}}</span>
+        </div>
+        <div class="info" nz-row>
+          <div nz-col nzSpan="8">报修类别：{{orderInfo.category?orderInfo.category.category:''}}</div>
+          <div nz-col nzSpan="8">报修地址：<ng-container *ngIf="orderInfo.place">{{ orderInfo.place.area.area }} {{ orderInfo.place.place }} {{ orderInfo.address }}</ng-container></div>
+          <div nz-col nzSpan="24">报修内容：{{orderInfo.description}}</div>
+          <div nz-col nzSpan="24">报修图片：
+            <!-- <div class="imgViewHelp">
+              <ul id="ljImgViewerId" class="list">
+                <img class="mr8" *ngFor="let img of imgs;let i = index;" width="100px" [src]="img" alt="" />
+              </ul>
+            </div> -->
+            <app-image-viewer [imageUrl]="imgs" *ngIf="imgs.length"></app-image-viewer>
           </div>
+          <div nz-col nzSpan="8">维修人：<ng-container *ngIf="orderInfo.incident&&orderInfo.incident.handlingPersonnelUser">{{ orderInfo.incident.handlingPersonnelUser.name }}</ng-container></div>
+          <div nz-col nzSpan="8">维修人电话：<ng-container *ngIf="orderInfo.incident&&orderInfo.incident.handlingPersonnelUser">{{ orderInfo.incident.handlingPersonnelUser.phone }}</ng-container></div>
+          <div nz-col nzSpan="24" *ngIf="processData == '已撤回'">撤回原因：{{ orderInfo.retractReason }}</div>
+          <div nz-col nzSpan="24" *ngIf="processData == '不受理'">不受理原因：{{ orderInfo.rejectRemark }}</div>
         </div>
-        <div class="center" *ngIf="amplificationShow">
-          <div class="box">
-            <!-- <div class="steps" *ngFor="let step of logList;let i = index;">
-              <div class="step">
-                <div class="info">
-                  <i
-                    [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
-                  <p>{{step.operationName}}</p>
-                  <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
-                  <p *ngIf="step.record[0]&&step.record[0].dept">
-                    <span *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span>
-                  </p>
-                  <p *ngIf="i!=0&&step.record&&step.record.length">耗时{{filterTime(step.record)}}</p>
-                </div>
-                <div class="line"></div>
+      </div>
+      <div class="center" *ngIf="amplificationShow">
+        <div class="box">
+          <!-- 流程图 start -->
+          <div class="processBox">
+            <div
+              class="process"
+              *ngIf="
+                processData == '不受理' ||
+                  processData == '结束' ||
+                  processData == '已撤回' ||
+                  processData == '重复事件'
+              "
+            >
+              <div class="status">
+                {{ processMessage[4] ? processMessage[4].name : "" }}
               </div>
-            </div> -->
-            <!-- 流程图 start -->
-            <div class="processBox">
-              <div
-                class="process"
-                *ngIf="
-                  processData == '不受理' ||
-                    processData == '结束' ||
-                    processData == '已撤回' ||
-                    processData == '重复事件'
-                "
-              >
-                <div class="status">
-                  {{ processMessage[4] ? processMessage[4].name : "" }}
-                </div>
-                <div class="ico">
-                  <i class="icon_transport transport-icon_liucheng last"></i>
-                </div>
-                <div class="time">
-                  <ng-container *ngIf="processTime[4]">
-                    {{processTime[4].startTime | date:"MM-dd HH:mm:ss"}}
-                  </ng-container>
-                </div>
+              <div class="ico">
+                <i class="icon_transport transport-icon_liucheng last"></i>
               </div>
-              <div
-                class="processCont"
-                *ngIf="
-                  processData == '不受理' ||
-                    processData == '结束' ||
-                    processData == '已撤回' ||
-                    processData == '重复事件'
-                "
-              >
-                <div class="status"></div>
-                <div
-                  class="conents"
-                  v-html="processMessage[4] ? processMessage[4].desc : ''"
-                ></div>
+              <div class="time">
+                <ng-container *ngIf="processTime[4]">
+                  {{processTime[4].startTime | date:"MM-dd HH:mm:ss"}}
+                </ng-container>
               </div>
+            </div>
+            <div
+              class="processCont"
+              *ngIf="
+                processData == '不受理' ||
+                  processData == '结束' ||
+                  processData == '已撤回' ||
+                  processData == '重复事件'
+              "
+            >
+              <div class="status"></div>
               <div
-                class="process"
-                *ngIf="
-                  processData == '评价' ||
-                    (processData == '结束' && processData != '重复事件')
-                "
-              >
-                <div class="status">
-                  {{ processMessage[3] ? processMessage[3].name : "" }}
-                </div>
-                <div class="ico">
-                  <i
-                    class="icon_transport transport-icon_liucheng green now"
-                    *ngIf="processData == '评价'"
-                  ></i>
-                  <i
-                    class="icon_transport transport-icon_liucheng last"
-                    *ngIf="processData != '评价'"
-                  ></i>
-                </div>
-                <div class="time">
-                  <ng-container *ngIf="processTime[3]">
-                    {{processTime[3].startTime | date:"MM-dd HH:mm:ss"}}
-                  </ng-container>
-                </div>
+                class="conents"
+                [innerHTML]="processMessage[4] ? processMessage[4].desc : ''"
+              ></div>
+            </div>
+            <div
+              class="process"
+              *ngIf="
+                processData == '评价' ||
+                  (processData == '结束' && processData != '重复事件')
+              "
+            >
+              <div class="status">
+                {{ processMessage[3] ? processMessage[3].name : "" }}
+              </div>
+              <div class="ico">
+                <i
+                  class="icon_transport transport-icon_liucheng green now"
+                  *ngIf="processData == '评价'"
+                ></i>
+                <i
+                  class="icon_transport transport-icon_liucheng last"
+                  *ngIf="processData != '评价'"
+                ></i>
               </div>
+              <div class="time">
+                <ng-container *ngIf="processTime[3]">
+                  {{processTime[3].startTime | date:"MM-dd HH:mm:ss"}}
+                </ng-container>
+              </div>
+            </div>
+            <div
+              class="processCont"
+              *ngIf="
+                processData == '评价' ||
+                  (processData == '结束' && processData != '重复事件')
+              "
+            >
+              <div class="status"></div>
               <div
-                class="processCont"
-                *ngIf="
-                  processData == '评价' ||
-                    (processData == '结束' && processData != '重复事件')
-                "
-              >
-                <div class="status"></div>
+                class="conents"
+                [innerHTML]="processMessage[3] ? processMessage[3].desc : ''"
+              ></div>
+            </div>
+            <!-- 处理日志 start -->
+            <ng-container *ngIf="orderInfo.incident">
+              <div *ngFor="let item of orderInfo.incident.handlerLogs;let i = index;">
                 <div
-                  class="conents"
-                  v-html="processMessage[3] ? processMessage[3].desc : ''"
-                ></div>
-              </div>
-              <!-- 处理日志 start -->
-              <ng-container *ngIf="orderInfo.incident">
-                <div *ngFor="let item of orderInfo.incident.handlerLogs;let i = index;">
-                  <div
-                    class="process"
-                    *ngIf="
-                      processData == '处理' ||
-                        processData == '评价' ||
-                        (processData == '结束' && processData != '重复事件')
-                    "
-                  >
-                    <div class="status">
-                      {{ processMessage[2] ? processMessage[2].name : "" }}
-                    </div>
-                    <div class="ico">
-                      <i
-                        class="icon_transport transport-icon_liucheng green now"
-                        *ngIf="processData == '处理' && i === 0"
-                      ></i>
-                      <i
-                        class="icon_transport transport-icon_liucheng last"
-                        v-else
-                      ></i>
-                    </div>
-                    <div class="time">
-                      {{ item.opTime | date:"MM-dd HH:mm:ss"}}，{{ item.userName }}
-                    </div>
+                  class="process"
+                  *ngIf="
+                    processData == '处理' ||
+                      processData == '评价' ||
+                      (processData == '结束' && processData != '重复事件')
+                  "
+                >
+                  <div class="status">
+                    {{ processMessage[2] ? processMessage[2].name : "" }}
                   </div>
-                  <div
-                    class="processCont"
-                    *ngIf="
-                      processData == '处理' ||
-                        processData == '评价' ||
-                        (processData == '结束' && processData != '重复事件')
-                    "
-                  >
-                    <div class="status"></div>
-                    <div class="conents">{{ item.opValue }}</div>
+                  <div class="ico">
+                    <i
+                      class="icon_transport transport-icon_liucheng green now"
+                      *ngIf="processData == '处理' && i === 0"
+                    ></i>
+                    <i
+                      class="icon_transport transport-icon_liucheng last"
+                      *ngIf="!(processData == '处理' && i === 0)"
+                    ></i>
+                  </div>
+                  <div class="time">
+                    {{ item.opTime | date:"MM-dd HH:mm:ss"}}，{{ item.userName }}
                   </div>
                 </div>
-              </ng-container>
-              <!-- 处理日志 end -->
-              <div
-                class="process"
-                *ngIf="
-                  processData == '处理' ||
-                    processData == '评价' ||
-                    (processData == '结束' && processData != '重复事件')
-                "
-              >
-                <div class="status">
-                  {{ processMessage[2] ? processMessage[2].name : "" }}
-                </div>
-                <div class="ico">
-                  <i
-                    class="icon_transport transport-icon_liucheng green now"
-                    *ngIf="processData == '处理' && orderInfo.incident && !orderInfo.incident.handlerLogs"
-                  ></i>
-                  <i
-                    class="icon_transport transport-icon_liucheng last"
-                    v-else
-                  ></i>
-                </div>
-                <div class="time">
-                  <ng-container *ngIf="processTime[2]">
-                    {{processTime[2].startTime | date:"MM-dd HH:mm:ss"}}
-                  </ng-container>
+                <div
+                  class="processCont"
+                  *ngIf="
+                    processData == '处理' ||
+                      processData == '评价' ||
+                      (processData == '结束' && processData != '重复事件')
+                  "
+                >
+                  <div class="status"></div>
+                  <div class="conents">{{ item.opValue }}</div>
                 </div>
               </div>
+            </ng-container>
+            <!-- 处理日志 end -->
+            <div
+              class="process"
+              *ngIf="
+                processData == '处理' ||
+                  processData == '评价' ||
+                  (processData == '结束' && processData != '重复事件')
+              "
+            >
+              <div class="status">
+                {{ processMessage[2] ? processMessage[2].name : "" }}
+              </div>
+              <div class="ico">
+                <i
+                  class="icon_transport transport-icon_liucheng green now"
+                  *ngIf="processData == '处理' && orderInfo.incident && !orderInfo.incident.handlerLogs"
+                ></i>
+                <i
+                  class="icon_transport transport-icon_liucheng last"
+                  v-else
+                ></i>
+              </div>
+              <div class="time">
+                <ng-container *ngIf="processTime[2]">
+                  {{processTime[2].startTime | date:"MM-dd HH:mm:ss"}}
+                </ng-container>
+              </div>
+            </div>
+            <div
+              class="processCont"
+              *ngIf="
+                processData == '处理' ||
+                  processData == '评价' ||
+                  (processData == '结束' && processData != '重复事件')
+              "
+            >
+              <div class="status"></div>
               <div
-                class="processCont"
-                *ngIf="
+                class="conents"
+                [innerHTML]="processMessage[2] ? processMessage[2].desc : ''"
+              ></div>
+            </div>
+            <div
+              class="process"
+              *ngIf="
+                processData == '受理' ||
                   processData == '处理' ||
-                    processData == '评价' ||
-                    (processData == '结束' && processData != '重复事件')
-                "
-              >
-                <div class="status"></div>
-                <div
-                  class="conents"
-                  v-html="processMessage[2] ? processMessage[2].desc : ''"
-                ></div>
+                  processData == '评价' ||
+                  (processData == '结束' && processData != '重复事件')
+              "
+            >
+              <div class="status">
+                {{ processMessage[1] ? processMessage[1].name : "" }}
               </div>
-              <div
-                class="process"
-                *ngIf="
-                  processData == '受理' ||
-                    processData == '处理' ||
-                    processData == '评价' ||
-                    (processData == '结束' && processData != '重复事件')
-                "
-              >
-                <div class="status">
-                  {{ processMessage[1] ? processMessage[1].name : "" }}
-                </div>
-                <div class="ico">
-                  <i
-                    class="icon_transport transport-icon_liucheng green now"
-                    *ngIf="processData == '受理'"
-                  ></i>
-                  <i
-                    class="icon_transport transport-icon_liucheng last"
-                    *ngIf="processData != '受理'"
-                  ></i>
-                </div>
-                <div class="time">
-                  <ng-container *ngIf="processTime[1]">
-                    {{processTime[1].startTime | date:'MM-dd HH:mm:ss'}}
-                  </ng-container>
-                </div>
+              <div class="ico">
+                <i
+                  class="icon_transport transport-icon_liucheng green now"
+                  *ngIf="processData == '受理'"
+                ></i>
+                <i
+                  class="icon_transport transport-icon_liucheng last"
+                  *ngIf="processData != '受理'"
+                ></i>
+              </div>
+              <div class="time">
+                <ng-container *ngIf="processTime[1]">
+                  {{processTime[1].startTime | date:'MM-dd HH:mm:ss'}}
+                </ng-container>
               </div>
+            </div>
+            <div
+              class="processCont"
+              *ngIf="
+                processData == '受理' ||
+                  processData == '处理' ||
+                  processData == '评价' ||
+                  (processData == '结束' && processData != '重复事件')
+              "
+            >
+              <div class="status"></div>
               <div
-                class="processCont"
-                *ngIf="
-                  processData == '受理' ||
-                    processData == '处理' ||
-                    processData == '评价' ||
-                    (processData == '结束' && processData != '重复事件')
-                "
-              >
-                <div class="status"></div>
-                <div
-                  class="conents"
-                  v-html="processMessage[1] ? processMessage[1].desc : ''"
-                ></div>
+                class="conents"
+                [innerHTML]="processMessage[1] ? processMessage[1].desc : ''"
+              ></div>
+            </div>
+            <div class="process">
+              <div class="status">
+                {{ processMessage[0] ? processMessage[0].name : "" }}
               </div>
-              <div class="process">
-                <div class="status">
-                  {{ processMessage[0] ? processMessage[0].name : "" }}
-                </div>
-                <div class="ico">
-                  <i
-                    class="icon_transport transport-icon_liucheng green now"
-                    *ngIf="processData == '申请'"
-                  ></i>
-                  <i
-                    class="icon_transport transport-icon_liucheng last"
-                    *ngIf="processData != '申请'"
-                  ></i>
-                </div>
-                <div class="time">
-                  <ng-container *ngIf="processTime[0]">
-                    {{processTime[0].startTime | date:"MM-dd HH:mm:ss"}}
-                  </ng-container>
-                </div>
+              <div class="ico">
+                <i
+                  class="icon_transport transport-icon_liucheng green now"
+                  *ngIf="processData == '申请'"
+                ></i>
+                <i
+                  class="icon_transport transport-icon_liucheng last"
+                  *ngIf="processData != '申请'"
+                ></i>
               </div>
-              <div class="processCont">
-                <div class="status"></div>
-                <div
-                  class="conents lastConents"
-                  v-html="processMessage[0] ? processMessage[0].desc : ''"
-                ></div>
+              <div class="time">
+                <ng-container *ngIf="processTime[0]">
+                  {{processTime[0].startTime | date:"MM-dd HH:mm:ss"}}
+                </ng-container>
               </div>
             </div>
-            <!-- 流程图 end -->
+            <div class="processCont">
+              <div class="status"></div>
+              <div
+                class="conents lastConents"
+                [innerHTML]="processMessage[0] ? processMessage[0].desc : ''"
+              ></div>
+            </div>
           </div>
+          <!-- 流程图 end -->
         </div>
-        <div class="bottom" *ngIf="orderInfo.urgentDetails&&showCoop">
-          <div class="urgent">
-            <div>
-              <ng-container *ngIf="amplificationShow&&orderInfo.urgentDetails&&showCoop">
-                  加急原因：{{orderInfo.urgentDetails.urgentReason}}
-                <button *ngIf="orderInfo.urgentDetails.checkStatus.id==329" class=" btn default" nz-button nzType="primary"
-                  [nzLoading]="urgentLoading" nzGhost (click)="urgent()">确认加急</button>
-              </ng-container>
-            </div>
-            <div class="amplification">
-              <button
-                nz-button
-                nzType="primary"
-                class="btn default"
-                (click)="amplification()"
-              >
-                {{ amplificationShow ? "放大" : "还原" }}
-              </button>
-            </div>
+      </div>
+      <div class="bottom" *ngIf="orderInfo.urgentDetails&&showCoop">
+        <div class="urgent">
+          <div>
+            <ng-container *ngIf="amplificationShow&&orderInfo.urgentDetails&&showCoop">
+                加急原因：{{orderInfo.urgentDetails.urgentReason}}
+              <button *ngIf="orderInfo.urgentDetails.checkStatus.id==329" class=" btn default" nz-button nzType="primary"
+                [nzLoading]="urgentLoading" nzGhost (click)="urgent()">确认加急</button>
+            </ng-container>
+          </div>
+          <div class="amplification">
+            <button
+              nz-button
+              nzType="primary"
+              class="btn default"
+              (click)="amplification()"
+            >
+              {{ amplificationShow ? "放大" : "还原" }}
+            </button>
           </div>
         </div>
       </div>
-    </overlay-scrollbars>
-    <div class="btns display_flex justify-content_flex-center">
-      <!-- <button *ngIf="showCoop&&orderInfo.gdState.id==69" nz-button nzType="primary" [nzLoading]="isOkLoading"
-        (click)='allotWorker()'>派单</button>
-      <button *ngIf="showCoop&&(orderInfo.gdState.id==70||orderInfo.gdState.id==71)" nz-button nzType="primary" nzGhost
-        (click)="openRecallModal()">撤回</button>
-      <button *ngIf="showCoop&&(orderInfo.gdState.id==69||orderInfo.gdState.id==70||orderInfo.gdState.id==71)" nz-button
-        nzType="danger" (click)="openDelModal()">删除</button> -->
-      <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
     </div>
+  </overlay-scrollbars>
+  <div class="btns display_flex justify-content_flex-center">
+    <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
   </div>
+</div>
   
-  <!-- 撤回工单 -->
-  <div class="recallOrder" *ngIf="recallOrderShow">
-    <div class="modalBody">
-      <div class="title">提示<i class="icon_transport transport-guanbi" (click)="closeRecallOrderModal()"></i></div>
-      <div class="content">
-        <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
-        <div class="defeat">您确认要撤回此工单吗？</div>
-      </div>
-      <div class="btns display_flex justify-content_flex-center">
-        <button nz-button nzType="primary" [nzLoading]='btnLoading' (click)="confirmRec()">确认</button>
-        <button nz-button nzType="primary" [nzLoading]='recLoading' nzGhost (click)="recAndDel()">撤回并删除</button>
-        <button class=" btn cancel" nz-button nzType="default" (click)="closeRecallOrderModal()">取消</button>
-      </div>
+<!-- 撤回工单 -->
+<div class="recallOrder" *ngIf="recallOrderShow">
+  <div class="modalBody">
+    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="closeRecallOrderModal()"></i></div>
+    <div class="content">
+      <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
+      <div class="defeat">您确认要撤回此工单吗？</div>
+    </div>
+    <div class="btns display_flex justify-content_flex-center">
+      <button nz-button nzType="primary" [nzLoading]='btnLoading' (click)="confirmRec()">确认</button>
+      <button nz-button nzType="primary" [nzLoading]='recLoading' nzGhost (click)="recAndDel()">撤回并删除</button>
+      <button class=" btn cancel" nz-button nzType="default" (click)="closeRecallOrderModal()">取消</button>
     </div>
   </div>
-  
-  <!-- 删除工单 -->
-  <div class="recallOrder delModel" *ngIf="delOrderShow">
-    <div class="modalBody">
-      <div class="title">提示<i class="icon_transport transport-guanbi" (click)="closeDelOrderModal()"></i></div>
-      <div class="content">
-        <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
-        <div class="defeat">您确认要删除此工单吗？</div>
-      </div>
-      <div class="btns display_flex justify-content_flex-center">
-        <button nz-button nzType="primary" [nzLoading]='btnLoading' (click)="confirmDel()">确认</button>
-        <button class="btn cancel" nz-button nzType="default" (click)="closeDelOrderModal()">关闭</button>
-      </div>
+</div>
+
+<!-- 删除工单 -->
+<div class="recallOrder delModel" *ngIf="delOrderShow">
+  <div class="modalBody">
+    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="closeDelOrderModal()"></i></div>
+    <div class="content">
+      <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
+      <div class="defeat">您确认要删除此工单吗？</div>
+    </div>
+    <div class="btns display_flex justify-content_flex-center">
+      <button nz-button nzType="primary" [nzLoading]='btnLoading' (click)="confirmDel()">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="closeDelOrderModal()">关闭</button>
     </div>
   </div>
-  
-  <!-- 操作成功/失败提示框 -->
-  <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
-    [info]="promptInfo" (closeModel)="close()">
-    <!-- 2.父组件调用子组件时绑定到这个事件属性，并在事件发生时作出回应。(closeModel)="close()" -->
-  </app-prompt-modal>
-  <!-- 遮罩 -->
-  <app-mask *ngIf="maskFlag"></app-mask>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo" (closeModel)="close()">
+  <!-- 2.父组件调用子组件时绑定到这个事件属性，并在事件发生时作出回应。(closeModel)="close()" -->
+</app-prompt-modal>
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>
   

src/app/share/detail-bx/detail-bx.component.less

@@ -25,17 +25,28 @@
   position: relative;
   padding-bottom: 70px;
 
+  .imgViewHelp {
+    ul {
+      margin: 0;
+      padding: 0;
+      img {
+        margin-right: 8px;
+      }
+    }
+  }
+
   // 流程 start
   .processBox {
-    margin-top: 0.24rem;
+    width: 100%;
+    margin-top: 12px;
   }
   .process {
-    padding: 0 0.24rem;
+    padding: 0 12px;
     display: flex;
   }
   .process .status {
     width: 12%;
-    font-size: 0.28rem;
+    font-size: 14px;
     text-align: center;
   }
   .process .ico {
@@ -43,7 +54,7 @@
     text-align: center;
   }
   .process .ico i {
-    font-size: 0.28rem;
+    font-size: 14px;
   }
   .process .last {
     color: #005359;
@@ -53,14 +64,14 @@
   }
   .process .time {
     width: 80%;
-    font-size: 0.25rem;
+    font-size: 12px;
     color: #999999;
     padding-left: 2%;
   }
   .processCont {
-    padding: 0 0.24rem;
+    padding: 0 12px;
     display: flex;
-    margin: 0.07rem 0;
+    margin: 4px 0;
   }
   .processCont .status {
     width: 12%;
@@ -68,16 +79,16 @@
   .processCont .conents {
     width: 80%;
     margin-left: 3%;
-    font-size: 0.25rem;
+    font-size: 12px;
     color: #666666;
-    padding: 0.07rem 0;
+    padding: 4px 0;
     padding-left: 5%;
-    border-left: 0.01rem #999999 solid;
-    line-height: 0.3rem;
+    border-left: 1px #999999 solid;
+    line-height: 15[x];
     word-break: break-all;
   }
   .processCont .lastConents {
-    border-left: 0ch;
+    border-left: none;
   }
   // 流程 end
 

src/app/share/detail-bx/detail-bx.component.ts

@@ -27,6 +27,7 @@ export class DetailBxComponent implements OnInit {
   processTime = [];
   processData = "";
   processMessage = [];
+  imgs = [];
 
   id: number; //工单id
   orderInfo: any; //工单详情信息
@@ -68,6 +69,7 @@ export class DetailBxComponent implements OnInit {
       this.orderInfo = res[1]["data"];
       this.getProcessTime();
       this.getProcessMessageData();
+      this.getImgsData();
       if (this.orderInfo.incident && !this.orderInfo.incident.handlerLogs) {
         this.orderInfo.incident.handlerLogs = [];
       } else {
@@ -75,21 +77,34 @@ export class DetailBxComponent implements OnInit {
       }
       if (this.orderInfo.incident && this.orderInfo.incident.repeat) {
         this.processData = "重复事件";
-      } else if (this.orderInfo.state.name == "不受理") {
+      } else if (this.orderInfo.incidentState.name == "不受理") {
         this.processData = "不受理";
-      } else if (this.orderInfo.state.name == "未受理") {
+      } else if (this.orderInfo.incidentState.name == "未受理") {
         this.processData = "申请";
-      } else if (this.orderInfo.state.name == "处理中") {
+      } else if (this.orderInfo.incidentState.name == "处理中") {
         this.processData = "处理";
-      } else if (this.orderInfo.state.name == "待评价") {
+      } else if (this.orderInfo.incidentState.name == "待评价") {
         this.processData = "评价";
-      } else if (this.orderInfo.state.name == "已解决") {
+      } else if (this.orderInfo.incidentState.name == "已解决") {
         this.processData = "结束";
-      } else if (this.orderInfo.state.name == "已撤回") {
+      } else if (this.orderInfo.incidentState.name == "已撤回") {
         this.processData = "已撤回";
       }
     });
   }
+
+  // 获取图片信息
+  getImgsData() {
+    this.mainService
+      .wechatRequesterIncident(this.orderInfo.id)
+      .subscribe((res:any)=> {
+        this.imgs = ['https://img2.woyaogexing.com/2022/08/19/1f5e056b1d076920!400x400.jpg','https://img2.woyaogexing.com/2022/08/19/359346943c3c489f!400x400.jpg']
+        // for (var i = 0; i < res.data.length; i++) {
+        //   this.imgs.push(res.data[i].previewUrl);
+        // }
+      });
+  }
+
   //获取流程节点时间
   getProcessTime() {
     if (this.orderInfo.incident && this.orderInfo.incident.processInstanceId) {

src/app/share/image-viewer/image-viewer.component.html

@@ -0,0 +1,11 @@
+<div class="imgViewHelp">
+  <ul id="ljImgViewerId" #ljImgViewerId class="list">
+    <img
+      class="image"
+      [src]="item"
+      *ngFor="let item of imageUrl"
+      [width]="width"
+      [height]="height"
+    />
+  </ul>
+</div>

src/app/share/image-viewer/image-viewer.component.less

@@ -0,0 +1,9 @@
+.imgViewHelp {
+  ul {
+    margin: 0;
+    padding: 0;
+    img {
+      margin-right: 8px;
+    }
+  }
+}

src/app/share/image-viewer/image-viewer.component.ts

@@ -0,0 +1,29 @@
+import { Component, ElementRef, Input, OnInit, ViewChild } from "@angular/core";
+import Viewer from 'viewerjs';
+@Component({
+  selector: "app-image-viewer",
+  templateUrl: "./image-viewer.component.html",
+  styleUrls: ["./image-viewer.component.less"],
+})
+export class ImageViewerComponent implements OnInit {
+  @ViewChild("ljImgViewerId", { static: false }) ljImgViewer: ElementRef;
+  // 图片地址
+  @Input() imageUrl: any = [];
+  // 默认预览图大小 (单位px)
+  @Input() width: any = 100;
+  @Input() height: any = 100;
+
+  constructor() {}
+
+  ngOnInit(): void {
+    console.log('初始化')
+    // 传入是单条转换为数租
+    if (typeof this.imageUrl == "string") {
+      this.imageUrl = [this.imageUrl];
+    }
+  }
+
+  ngAfterViewInit(): void {
+    new Viewer(this.ljImgViewer["nativeElement"]);
+  }
+}

src/app/share/share.module.ts

@@ -32,6 +32,7 @@ import { ExcelExportComponent } from './excel-export/excel-export.component';
 import { FilterSelfPipe } from '../pipes/filter-self.pipe';
 import { LogPromptModalComponent } from './log-prompt-modal/log-prompt-modal.component';
 import { DetailBxComponent } from './detail-bx/detail-bx.component';
+import { ImageViewerComponent } from './image-viewer/image-viewer.component';
 
 @NgModule({
   declarations: [
@@ -62,6 +63,7 @@ import { DetailBxComponent } from './detail-bx/detail-bx.component';
     ExcelExportComponent,
     LogPromptModalComponent,
     DetailBxComponent,
+    ImageViewerComponent,
   ],
   imports: [
     CommonModule,
@@ -107,6 +109,7 @@ import { DetailBxComponent } from './detail-bx/detail-bx.component';
     ExcelExportComponent,
     LogPromptModalComponent,
     DetailBxComponent,
+    ImageViewerComponent,
   ]
 })
 export class ShareModule { }

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1780,7 +1780,7 @@
                           <td>
                             {{ data.requester ? data.requester.name : "无" }}
                           </td>
-                          <td>{{ data.serviceState?data.serviceState.name:'无' }}</td>
+                          <td>{{ data.state?data.state.name:'无' }}</td>
                           <td>
                             {{
                               data.incident
@@ -1793,7 +1793,7 @@
                           <td>
                             <!-- <button (click)="viewBx(data)">查看</button> -->
                             <button (click)="detailBx(data)" class="mr8">查看</button>
-                            <button (click)="detailBx(data)">评价</button>
+                            <button (click)="showAppraiseBx(data.id)" *ngIf="data.state.name  == '待评价'">评价</button>
                           </td>
                         </tr>
                       </tbody>
@@ -2938,6 +2938,65 @@
   </div>
 </div>
 
+<!-- 报修评价模态框 -->
+<div
+  class="save display_flex align-items_center justify-content_flex-center appraise"
+  *ngIf="appraiseModalBx"
+>
+  <div class="modalBody">
+    <div class="title">
+      评价<i
+        class="icon_transport transport-guanbi"
+        (click)="hideAppraiseBx()"
+      ></i>
+    </div>
+    <div class="content">
+      <div class="jiTit borderB">您的评价对我们至关重要，感谢您！</div>
+      <br />
+      <div class="star">
+        <div
+          nz-row
+          class="alignC display_flex justify-content_flex-center align-items_center"
+        >
+          <div nz-col nzSpan="4">星级：</div>
+          <div nz-col nzSpan="20">
+            <nz-rate [(ngModel)]="starNumBx"></nz-rate>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="4">评级：</div>
+          <div nz-col nzSpan="20">
+            <textarea
+              rows="4"
+              nz-input
+              [(ngModel)]="appraiseContentBx"
+            ></textarea>
+          </div>
+        </div>
+      </div>
+      <br />
+    </div>
+    <div class="btns display_flex justify-content_flex-center">
+      <button
+        nz-button
+        nzType="primary"
+        [nzLoading]="btnLoading"
+        (click)="confirmAppraiseBx()"
+      >
+        确认
+      </button>
+      <button
+        class="btn cancel"
+        nz-button
+        nzType="default"
+        (click)="hideAppraiseBx()"
+      >
+        关闭
+      </button>
+    </div>
+  </div>
+</div>
+
 <!-- 意见箱查看 -->
 <div
   class="save display_flex align-items_center justify-content_flex-center advice"

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -157,7 +157,6 @@ export class HushijiandanComponent implements OnInit {
     this.getUpdateTipsForNurses();
     this.getSpecimenButton();
     this.getCloseTimeFlag();
-    this.getBxlb();
     this.currentUser = this.tool.getCurrentUserDept();
     console.log(this.currentUser, this.tabSearchCont);
     //防抖
@@ -415,6 +414,7 @@ export class HushijiandanComponent implements OnInit {
             ];
             this.smallTabId = 2;
             this.getQuickBxlb();
+            this.getBxlb();
           } else {
             this.smallTabs = [{ id: 1, name: "综合日志" }];
             this.smallTabId = 1;
@@ -915,11 +915,11 @@ export class HushijiandanComponent implements OnInit {
       }
     });
   }
-  // 获取事件状态liaomingming
-  incidentStateList = [];
+  // 获取事件状态
   incidentStateId = undefined;
+  incidentStateList = [];
   getIncidentState() {
-    let postData = { type: "list", key: "service_state" };
+    let postData = { type: "list", key: "wxincident_state" };
     this.iLoading = true;
     this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
       this.iLoading = false;
@@ -928,7 +928,19 @@ export class HushijiandanComponent implements OnInit {
       }
     });
   }
-  // 获取故障现象（三级）liaoming
+  // 获取星级
+  degrees = [];
+  getDegrees() {
+    let postData = { type: "list", key: "incident_degree" };
+    this.iLoading = true;
+    this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
+      this.iLoading = false;
+      if (data.status == 200) {
+        this.degrees = data.data || [];
+      }
+    });
+  }
+  // 获取故障现象（三级）
   incidentList = [];
   iLoading = false;
   getIncidentcategory(key = "") {
@@ -2541,6 +2553,7 @@ export class HushijiandanComponent implements OnInit {
     } else if (type === "bxlb" && this.isShowBx) {
       this.getBxlb();
       this.getIncidentState();
+      this.getDegrees();
     } else if (type === "kjbx" && this.isShowBx) {
       // this.getQuickBxlb();
       this.getIncidentcategory();
@@ -2727,7 +2740,7 @@ export class HushijiandanComponent implements OnInit {
     this.mainService
       .listWxIncident({
         assignee: current.user.account,
-        service_state: this.incidentStateId?parseInt(this.incidentStateId):undefined,
+        state: this.incidentStateId?parseInt(this.incidentStateId):undefined,
         idx: this.bxlbPageIndex - 1,
         sum: this.bxlbPageSize,
       })
@@ -3058,6 +3071,44 @@ export class HushijiandanComponent implements OnInit {
     this.appraiseModal = false;
   }
 
+  // 报修评价
+  appraiseModalBx: boolean = false;
+  starNumBx: number = 5; //评价星
+  appraiseContentBx: string = ""; //评级
+  appraiseIdBx: number;
+  showAppraiseBx(id) {
+    this.appraiseIdBx = id;
+    this.appraiseModalBx = true;
+    this.starNumBx = 5;
+    this.appraiseContentBx = "";
+  }
+  // 保存评价
+  confirmAppraiseBx() {
+    console.log(this.starNumBx, this.appraiseContentBx);
+    if (!this.starNumBx) return;
+    this.btnLoading = true;
+    let id = this.degrees.find(v=>v.value == this.starNumBx).id;
+    let postData = {
+      degree: id,
+      degreeRemark: this.appraiseContentBx,
+      id: this.appraiseIdBx,
+    };
+    this.mainService
+      .degree(postData)
+      .subscribe((data:any) => {
+        this.hideAppraiseBx();
+        if (data.state == 200) {
+          this.getBxlb();
+          this.showPromptModal("评价", true, "");
+        } else {
+          this.showPromptModal("评价", false, "");
+        }
+      });
+  }
+  hideAppraiseBx() {
+    this.appraiseModalBx = false;
+  }
+
   // 审核状态
   checkStatusLis: any = [];
   getCheckStatusLis() {