展示资产

package-lock.json

@@ -15,7 +15,8 @@
         "lodash": "^4.17.21",
         "vue": "^2.5.2",
         "vue-axios": "^2.1.4",
-        "vue-router": "^3.0.1"
+        "vue-router": "^3.0.1",
+        "weixin-jsapi": "^1.1.0"
       },
       "devDependencies": {
         "autoprefixer": "^7.1.2",
@@ -14375,6 +14376,11 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/weixin-jsapi": {
+      "version": "1.1.0",
+      "resolved": "https://registry.nlark.com/weixin-jsapi/download/weixin-jsapi-1.1.0.tgz",
+      "integrity": "sha1-UalaIiTFnR2PAv3bxt5S2hazRLM="
+    },
     "node_modules/when": {
       "version": "3.6.4",
       "resolved": "https://registry.npm.taobao.org/when/download/when-3.6.4.tgz",
@@ -18873,24 +18879,28 @@
       "dependencies": {
         "abbrev": {
           "version": "1.1.1",
+          "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "ansi-regex": {
           "version": "2.1.1",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "aproba": {
           "version": "1.2.0",
+          "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "are-we-there-yet": {
           "version": "1.1.5",
+          "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -18901,12 +18911,14 @@
         },
         "balanced-match": {
           "version": "1.0.0",
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
+          "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -18917,36 +18929,42 @@
         },
         "chownr": {
           "version": "1.1.4",
+          "integrity": "sha1-b8nXtC0ypYNZYzdmbn0ICE2izGs=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "code-point-at": {
           "version": "1.1.0",
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "debug": {
           "version": "3.2.6",
+          "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -18956,24 +18974,28 @@
         },
         "deep-extend": {
           "version": "0.6.0",
+          "integrity": "sha1-xPp8lUBKF6nD6Mp+FTcxK3NjMKw=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "delegates": {
           "version": "1.0.0",
+          "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "detect-libc": {
           "version": "1.0.3",
+          "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "fs-minipass": {
           "version": "1.2.7",
+          "integrity": "sha1-zP+FcIQef+QmVpPaiJNsVa7X98c=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -18983,12 +19005,14 @@
         },
         "fs.realpath": {
           "version": "1.0.0",
+          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "gauge": {
           "version": "2.7.4",
+          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19005,6 +19029,7 @@
         },
         "glob": {
           "version": "7.1.6",
+          "integrity": "sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19019,12 +19044,14 @@
         },
         "has-unicode": {
           "version": "2.0.1",
+          "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "iconv-lite": {
           "version": "0.4.24",
+          "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19034,6 +19061,7 @@
         },
         "ignore-walk": {
           "version": "3.0.3",
+          "integrity": "sha1-AX4kRxhL/q3nwjjkrv3R6PlbHjc=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19043,6 +19071,7 @@
         },
         "inflight": {
           "version": "1.0.6",
+          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19053,18 +19082,21 @@
         },
         "inherits": {
           "version": "2.0.4",
+          "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "ini": {
           "version": "1.3.5",
+          "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19074,12 +19106,14 @@
         },
         "isarray": {
           "version": "1.0.0",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "minimatch": {
           "version": "3.0.4",
+          "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19089,12 +19123,14 @@
         },
         "minimist": {
           "version": "1.2.5",
+          "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "minipass": {
           "version": "2.9.0",
+          "integrity": "sha1-5xN2Ln0+Mv7YAxFc+T4EvKn8yaY=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19105,6 +19141,7 @@
         },
         "minizlib": {
           "version": "1.3.3",
+          "integrity": "sha1-IpDeloGKNMKVUcio0wEha9Zahh0=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19114,6 +19151,7 @@
         },
         "mkdirp": {
           "version": "0.5.3",
+          "integrity": "sha1-WlFLcXklkoeVKIHpRBDsVGVln4w=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19123,12 +19161,14 @@
         },
         "ms": {
           "version": "2.1.2",
+          "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "needle": {
           "version": "2.3.3",
+          "integrity": "sha1-oEGtHQSocbDrtmb0C6rx+0eGcRc=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19140,6 +19180,7 @@
         },
         "node-pre-gyp": {
           "version": "0.14.0",
+          "integrity": "sha1-mgWWUzuHcom8rU4UOYLKPZBN3IM=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19158,6 +19199,7 @@
         },
         "nopt": {
           "version": "4.0.3",
+          "integrity": "sha1-o3XK2dAv2SEnjZVMIlTVqlfhXkg=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19168,6 +19210,7 @@
         },
         "npm-bundled": {
           "version": "1.1.1",
+          "integrity": "sha1-Ht1XCGWpTNsbyCIHdeKUZsn7I0s=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19177,12 +19220,14 @@
         },
         "npm-normalize-package-bin": {
           "version": "1.0.1",
+          "integrity": "sha1-bnmkHyP9I1wGIyGCKNp9nCO49uI=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "npm-packlist": {
           "version": "1.4.8",
+          "integrity": "sha1-Vu5swTW5+YrT1Rwcldoiu7my7z4=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19194,6 +19239,7 @@
         },
         "npmlog": {
           "version": "4.1.2",
+          "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19206,18 +19252,21 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "once": {
           "version": "1.4.0",
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19227,18 +19276,21 @@
         },
         "os-homedir": {
           "version": "1.0.2",
+          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "os-tmpdir": {
           "version": "1.0.2",
+          "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "osenv": {
           "version": "0.1.5",
+          "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19249,18 +19301,21 @@
         },
         "path-is-absolute": {
           "version": "1.0.1",
+          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "process-nextick-args": {
           "version": "2.0.1",
+          "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "rc": {
           "version": "1.2.8",
+          "integrity": "sha1-zZJL9SAKB1uDwYjNa54hG3/A0+0=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19273,6 +19328,7 @@
         },
         "readable-stream": {
           "version": "2.3.7",
+          "integrity": "sha1-Hsoc9xGu+BTAT2IlKjamL2yyO1c=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19288,6 +19344,7 @@
         },
         "rimraf": {
           "version": "2.7.1",
+          "integrity": "sha1-NXl/E6f9rcVmFCwp1PB8ytSD4+w=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19297,42 +19354,49 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
+          "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
+          "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "sax": {
           "version": "1.2.4",
+          "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "semver": {
           "version": "5.7.1",
+          "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "set-blocking": {
           "version": "2.0.0",
+          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "signal-exit": {
           "version": "3.0.2",
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "string_decoder": {
           "version": "1.1.1",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19342,6 +19406,7 @@
         },
         "string-width": {
           "version": "1.0.2",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19353,6 +19418,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19362,12 +19428,14 @@
         },
         "strip-json-comments": {
           "version": "2.0.1",
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "tar": {
           "version": "4.4.13",
+          "integrity": "sha1-Q7NkvFKIjVVSmGN7ENYHkCVKtSU=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19383,12 +19451,14 @@
         },
         "util-deprecate": {
           "version": "1.0.2",
+          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "wide-align": {
           "version": "1.1.3",
+          "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -19398,12 +19468,14 @@
         },
         "wrappy": {
           "version": "1.0.2",
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "yallist": {
           "version": "3.1.1",
+          "integrity": "sha1-27fa+b/YusmrRev2ArjLrQ1dCP0=",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -26730,6 +26802,11 @@
       "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=",
       "dev": true
     },
+    "weixin-jsapi": {
+      "version": "1.1.0",
+      "resolved": "https://registry.nlark.com/weixin-jsapi/download/weixin-jsapi-1.1.0.tgz",
+      "integrity": "sha1-UalaIiTFnR2PAv3bxt5S2hazRLM="
+    },
     "when": {
       "version": "3.6.4",
       "resolved": "https://registry.npm.taobao.org/when/download/when-3.6.4.tgz",

package.json

@@ -17,7 +17,8 @@
     "lodash": "^4.17.21",
     "vue": "^2.5.2",
     "vue-axios": "^2.1.4",
-    "vue-router": "^3.0.1"
+    "vue-router": "^3.0.1",
+    "weixin-jsapi": "^1.1.0"
   },
   "compileDependencies": [
     "cube-ui"

src/http/http.js

@@ -0,0 +1,34 @@
+import wx from 'weixin-jsapi'
+// 扫一扫
+export function SM(Vue) {
+  return new Promise((resolve, reject) => {
+    let param = {
+      requestUrl: location.href.split('#')[0]
+    };
+    Vue.$http.post("service/wechat/getJsConfig", param).then(res => {
+      res = res.data;
+      if (res) {
+        wx.config({
+          debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+          appId: res.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
+          timestamp: res.timestamp, // 必填，生成签名的时间戳
+          nonceStr: res.nonceStr, // 必填，生成签名的随机串
+          signature: res.signature, // 必填，签名，见附录1
+          jsApiList: res.jsApiList // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+        });
+        wx.ready(function() {
+          wx.scanQRCode({
+            desc: "scanQRCode desc",
+            needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+            scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+            success: function(res) {
+              // 当needResult 为 1 时，扫码返回的结果
+              let str = res.resultStr.replace(/[\s\/]/g, '') || 'none';
+              resolve(str);
+            }
+          });
+        });
+      }
+    })
+  });
+}

src/views/Login.vue

@@ -35,17 +35,17 @@ export default {
       zhanghao: "",
       mima: "",
       requesterLgoinType: "",
-      isSSo: true // 是否单点登录
+      isSSo: true, // 是否单点登录
     };
   },
   components: {
-    LoadIng
+    LoadIng,
   },
   methods: {
     // 登陆
     login() {
       var that = this;
-      that.$http.post("service/auth/wechatAuth", {}).then(res => {
+      that.$http.post("service/auth/wechatAuth", {}).then((res) => {
         if (res.data.url) {
           window.location.href = res.data.url;
         } else {
@@ -70,7 +70,7 @@ export default {
           code: url[1],
           // name: "微信报修"
         };
-        that.$http.post("service/auth/wechatLoginEncrypt", code).then(res => {
+        that.$http.post("service/auth/wechatLoginEncrypt", code).then((res) => {
           if (res.data.state == 200) {
             if (res.data.user) {
               localStorage.setItem(
@@ -84,7 +84,7 @@ export default {
               .$createDialog({
                 type: "alert",
                 title: "您的账号被删除，请联系管理员",
-                icon: "cubeic-alert"
+                icon: "cubeic-alert",
               })
               .show();
           } else {
@@ -92,7 +92,7 @@ export default {
               .$createDialog({
                 type: "alert",
                 title: res.data.remarks,
-                icon: "cubeic-alert"
+                icon: "cubeic-alert",
               })
               .show();
           }
@@ -106,39 +106,41 @@ export default {
         .post("service/sysinfo/data/fetchDataList/systemConfiguration", {
           idx: 0,
           sum: 1000,
-          systemConfiguration: { keyconfig: "repairMain" }
         })
-        .then(result => {
+        .then((result) => {
           if (result.data.status == 200) {
-            var repairMain = result.data.list[0];
-            window.localStorage.setItem(
+            let list = result.data.list;
+            let repairMain = list.find((v) => v.keyconfig == "repairMain"); //报修主体
+            let incidentWithConsumable = list.find(
+              (v) => v.keyconfig == "incidentWithConsumable"
+            ); //是否绑定耗材
+            let wxIncidentWithCmdb = list.find(
+              (v) => v.keyconfig == "wxIncidentWithCmdb"
+            ); //是否绑定资产
+            let reqHasCategory = list.find(
+              (v) => v.keyconfig == "reqHasCategory"
+            ); //获取是否自动建单
+            localStorage.setItem(
               "repairMain",
               JSON.stringify(repairMain)
             );
-            // 获取是否自动建单
-            this.$http
-              .post("service/sysinfo/data/fetchDataList/systemConfiguration", {
-                idx: 0,
-                sum: 1000,
-                systemConfiguration: { keyconfig: "reqHasCategory" }
-              })
-              .then(result => {
-                if (result.data.status == 200) {
-                  var reqHasCategory = result.data.list[0];
-                  window.localStorage.setItem(
-                    "reqHasCategory",
-                    JSON.stringify(reqHasCategory)
-                  );
-                  this.$router.push({ path: "/main" });
-                }
-              });
+            localStorage.setItem(
+              "incidentWithConsumable",
+              incidentWithConsumable.valueconfig
+            );
+            localStorage.setItem(
+              "wxIncidentWithCmdb",
+              wxIncidentWithCmdb.valueconfig
+            );
+            localStorage.setItem("reqHasCategory", JSON.stringify(reqHasCategory));
+            this.$router.push({ path: "/main" });
           }
         });
       // seimin
     },
     // 获取报修人登录方式
     getLoginType() {
-      this.$http.post("service/wechat/getLoginType", {}).then(result => {
+      this.$http.post("service/wechat/getLoginType", {}).then((result) => {
         if (result.data.status == 200) {
           this.requesterLgoinType = result.data.data;
           window.localStorage.setItem(
@@ -160,17 +162,14 @@ export default {
       var ssoStr = "";
       var ssoJson;
       if (this.isSSo) {
-        ssoStr = location.search
-          .replace("?", "")
-          .split("&")[0]
-          .split("=")[1];
+        ssoStr = location.search.replace("?", "").split("&")[0].split("=")[1];
         ssoStr = decode(decodeURIComponent(ssoStr));
         ssoJson = JSON.parse(ssoStr);
       }
       var postData = this.isSSo
         ? { username: ssoJson.a, password: ssoJson.r, t: false }
         : { username: this.zhanghao, password: this.mima };
-      this.$http.post("service/auth/reqlogin", postData).then(res => {
+      this.$http.post("service/auth/reqlogin", postData).then((res) => {
         that.loading = false;
         if (res.data && res.data.state == 200) {
           localStorage.setItem(
@@ -195,7 +194,7 @@ export default {
               title: "系统错误",
               content: "请稍后再试",
               icon: "cubeic-wrong",
-              color: "red"
+              color: "red",
             })
             .show();
         }
@@ -203,9 +202,9 @@ export default {
     },
     // 获取查询参数
     getQueryString(name) {
-  　　var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
-  　　var r = window.location.search.substr(1).match(reg);
-  　　if (r != null){
+      var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+      var r = window.location.search.substr(1).match(reg);
+      if (r != null) {
         return unescape(r[2]);
       }
       return null;
@@ -213,16 +212,16 @@ export default {
   },
   created() {
     localStorage.clear();
-    if(location.search.length > 0){
-      this.isSSo = Boolean(this.getQueryString('t'));
-    }else{
+    if (location.search.length > 0) {
+      this.isSSo = Boolean(this.getQueryString("t"));
+    } else {
       this.isSSo = false;
     }
     if (this.isSSo) {
       this.zlogin();
     }
     this.getLoginType();
-  }
+  },
 };
 </script>
 

src/views/incidentDetails.vue

@@ -47,6 +47,14 @@
           {{ data.address }}
         </div>
       </div>
+      <div class="faultLocation" v-if="wxIncidentWithCmdb == 1">
+        <div>
+          资产:
+        </div>
+        <div>
+          {{ data.assetId}}
+        </div>
+      </div>
     </div>
     <div class="repairProgress">
       <div class="label">
@@ -392,6 +400,8 @@ import LoadIng from "./../views/loading.vue";
 export default {
   data() {
     return {
+      incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
+      wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
       data: "",
       initialIndex: 0,
       imgs: [],

src/views/incidentList.vue

@@ -1,487 +1,587 @@
 <template>
-    <div class="bgColor">
-        <div slot="content" class="scroll-wrapper">
-            <div class="demo">
-                <div class="scroll-list-wrap">
-                    <cube-scroll ref="scroll" :data="items" :options="options" @pulling-down="onPullingDown" @pulling-up="onPullingUp">
-                        <cube-select
-                          v-model="stateValue"
-                          :options="stateData"
-                          @change="stateChange()">
-                        </cube-select>
-                        <ul class="foods-wrapper">
-                            <li v-for="data in items" class="food-item border-1px" @click="toIncidentDetails(data)">
-                                <div class="food-content">
-                                    <div class="title">
-                                      <div><i class="iconfont icon-baoxiuliebiao"></i><span>报修编号:&nbsp;{{data.bxcode||"暂无"}}</span></div>
-                                      <div :class="stateClassFn(data.state.name)">{{data.state.name}}</div>
-                                    </div>
-                                    <div class="conent">
-                                      {{data.description}}
-                                    </div>
-                                    <div class="timeBox">
-                                      <div>
-                                        维修人:&nbsp;{{data.incident.handlingPersonnelUser?data.incident.handlingPersonnelUser.name:"暂无"}}
-                                      </div>
-                                      <div>
-                                        报修时间:&nbsp;{{data.createTime}}
-                                      </div>
-                                    </div>
-                                </div>
-                            </li>
-                            <div class="wushuju" v-show="wushuju">
-                              <img src="./../../static/images/wushuju.svg" alt="">
-                              <div class="noDataFont">暂无数据</div>
-                          </div>
-                        </ul>
-                        <template v-if="customPullDown" slot="pulldown" slot-scope="props">
-                            <div v-if="props.pullDownRefresh" class="cube-pulldown-wrapper" :style="props.pullDownStyle">
-                                <div v-show="props.beforePullDown" class="before-trigger" :style="{paddingTop: props.bubbleY + 'px'}">
-                                    <span :class="{rotate: props.bubbleY > pullDownRefreshThreshold - 40}">↓</span>
-                                </div>
-                                <div class="after-trigger" v-show="!props.beforePullDown">
-                                    <div v-show="props.isPullingDown" class="loading">
-                                        <cube-loading></cube-loading>
-                                    </div>
-                                    <div v-show="!props.isPullingDown" class="text">
-                                        <span class="refresh-text">更新成功</span>
-                                    </div>
-                                </div>
-                            </div>
-                        </template>
-                    </cube-scroll>
+  <div class="bgColor">
+    <div slot="content" class="scroll-wrapper">
+      <div class="demo">
+        <div class="scroll-list-wrap">
+          <cube-scroll
+            ref="scroll"
+            :data="items"
+            :options="options"
+            @pulling-down="onPullingDown"
+            @pulling-up="onPullingUp"
+          >
+            <cube-select
+              v-model="stateValue"
+              :options="stateData"
+              @change="stateChange()"
+            >
+            </cube-select>
+            <ul class="foods-wrapper">
+              <li
+                v-for="data in items"
+                class="food-item border-1px"
+                @click="toIncidentDetails(data)"
+              >
+                <div class="food-content">
+                  <div class="title">
+                    <div>
+                      <i class="iconfont icon-baoxiuliebiao"></i
+                      ><span>报修编号:&nbsp;{{ data.bxcode || "暂无" }}</span>
+                    </div>
+                    <div :class="stateClassFn(data.state.name)">
+                      {{ data.state.name }}
+                    </div>
+                  </div>
+                  <div class="conent">
+                    {{ data.description }}
+                  </div>
+                  <div class="timeBox">
+                    <div>
+                      维修人：&nbsp;{{
+                        data.incident.handlingPersonnelUser
+                          ? data.incident.handlingPersonnelUser.name
+                          : "暂无"
+                      }}
+                    </div>
+                    <div>报修时间：&nbsp;{{ data.createTime }}</div>
+                  </div>
+                  <div
+                    class="timeBox noneBorder"
+                    v-if="wxIncidentWithCmdb == 1"
+                  >
+                    <div>资产：&nbsp;{{ data.assetId || "无" }}</div>
+                  </div>
                 </div>
-            </div>
+              </li>
+              <div class="wushuju" v-show="wushuju">
+                <img src="./../../static/images/wushuju.svg" alt="" />
+                <div class="noDataFont">暂无数据</div>
+              </div>
+            </ul>
+            <template v-if="customPullDown" slot="pulldown" slot-scope="props">
+              <div
+                v-if="props.pullDownRefresh"
+                class="cube-pulldown-wrapper"
+                :style="props.pullDownStyle"
+              >
+                <div
+                  v-show="props.beforePullDown"
+                  class="before-trigger"
+                  :style="{ paddingTop: props.bubbleY + 'px' }"
+                >
+                  <span
+                    :class="{
+                      rotate: props.bubbleY > pullDownRefreshThreshold - 40,
+                    }"
+                    >↓</span
+                  >
+                </div>
+                <div class="after-trigger" v-show="!props.beforePullDown">
+                  <div v-show="props.isPullingDown" class="loading">
+                    <cube-loading></cube-loading>
+                  </div>
+                  <div v-show="!props.isPullingDown" class="text">
+                    <span class="refresh-text">更新成功</span>
+                  </div>
+                </div>
+              </div>
+            </template>
+          </cube-scroll>
         </div>
-        <load-ing v-show="loadShow"></load-ing>
+      </div>
     </div>
+    <load-ing v-show="loadShow"></load-ing>
+  </div>
 </template>
 <script>
-import Vue from 'vue'
-import CubePage from '../components/cube-page.vue'
-import SwitchOption from '../components/switch-option'
-import InputOption from '../components/input-option'
-import SelectOption from '../components/select-option'
-import {formatDate} from './../components/js/date.js';
-import LoadIng from './../views/loading.vue'
+import Vue from "vue";
+import CubePage from "../components/cube-page.vue";
+import SwitchOption from "../components/switch-option";
+import InputOption from "../components/input-option";
+import SelectOption from "../components/select-option";
+import { formatDate } from "./../components/js/date.js";
+import LoadIng from "./../views/loading.vue";
 export default {
   data() {
     return {
-    //   items: _foods,
-    loginUser:JSON.parse(localStorage.getItem("loginUser")),
-        items:[],
+      //   items: _foods,
+      incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
+      wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
+      loginUser: JSON.parse(localStorage.getItem("loginUser")),
+      items: [],
       pullDownRefresh: true,
       pullDownRefreshThreshold: 60,
       pullDownRefreshStop: 40,
-      pullDownRefreshTxt: 'Refresh success',
+      pullDownRefreshTxt: "Refresh success",
       pullUpLoad: true,
       pullUpLoadThreshold: 0,
-      pullUpLoadMoreTxt: 'Load more',
-      pullUpLoadNoMoreTxt: '没有更多数据',
+      pullUpLoadMoreTxt: "Load more",
+      pullUpLoadNoMoreTxt: "没有更多数据",
       customPullDown: true,
-      wushuju:false,
-      stateData:[
+      wushuju: false,
+      stateData: [
         {
-          text:"全部",
-          value:0
-        },{
-          text:"未转换",
-          value:1592
-        },{
-          text:"不受理",
-          value:1593
-        },{
-          text:"处理中",
-          value:1594
-        },{
-          text:"待评价",
-          value:1595
-        },{
-          text:"已解决",
-          value:1596
-        },{
-          text:"已撤回",
-          value:1597
-        }
+          text: "全部",
+          value: 0,
+        },
+        {
+          text: "未转换",
+          value: 1592,
+        },
+        {
+          text: "不受理",
+          value: 1593,
+        },
+        {
+          text: "处理中",
+          value: 1594,
+        },
+        {
+          text: "待评价",
+          value: 1595,
+        },
+        {
+          text: "已解决",
+          value: 1596,
+        },
+        {
+          text: "已撤回",
+          value: 1597,
+        },
       ],
-      stateValue:0,
-      sum:10,
-      idx:0,
-      stateClass:"",
-      loadShow:true
-    }
+      stateValue: 0,
+      sum: 10,
+      idx: 0,
+      stateClass: "",
+      loadShow: true,
+    };
   },
   components: {
     CubePage,
     SwitchOption,
     InputOption,
     SelectOption,
-    LoadIng
+    LoadIng,
   },
   computed: {
     options() {
       return {
         pullDownRefresh: this.pullDownRefreshObj,
         pullUpLoad: this.pullUpLoadObj,
-        scrollbar: true
-      }
+        scrollbar: true,
+      };
     },
-    pullDownRefreshObj: function() {
-      return this.pullDownRefresh ? {
-        threshold: parseInt(this.pullDownRefreshThreshold),
-        txt: this.pullDownRefreshTxt
-      } : false
+    pullDownRefreshObj: function () {
+      return this.pullDownRefresh
+        ? {
+            threshold: parseInt(this.pullDownRefreshThreshold),
+            txt: this.pullDownRefreshTxt,
+          }
+        : false;
+    },
+    pullUpLoadObj: function () {
+      return this.pullUpLoad
+        ? {
+            threshold: parseInt(this.pullUpLoadThreshold),
+            txt: {
+              more: this.pullUpLoadMoreTxt,
+              noMore: this.pullUpLoadNoMoreTxt,
+            },
+          }
+        : false;
     },
-    pullUpLoadObj: function() {
-      return this.pullUpLoad ? {
-        threshold: parseInt(this.pullUpLoadThreshold),
-        txt: {
-          more: this.pullUpLoadMoreTxt,
-          noMore: this.pullUpLoadNoMoreTxt
-        }
-      } : false
-    }
   },
   methods: {
-    getParamsState(){
-      if(this.$route.params.state){
-        this.stateValue=this.$route.params.state
+    getParamsState() {
+      if (this.$route.params.state) {
+        this.stateValue = this.$route.params.state;
       }
     },
-    stateClassFn(data){
-      if(data=="未转换"){
-        return "weishouli"
-      }else if(data=="不受理"){
-        return "bushouli"
-      }else if(data=="处理中"){
-        return "chulizhong"
-      }else if(data=="待评价"){
-        return "daipingjia"
-      }else if(data=="已解决"){
-        return "yijiejue"
-      }else if(data=="已撤回"){
-        return "yichehui"
-      }else{
-        return "yichehui"
+    stateClassFn(data) {
+      if (data == "未转换") {
+        return "weishouli";
+      } else if (data == "不受理") {
+        return "bushouli";
+      } else if (data == "处理中") {
+        return "chulizhong";
+      } else if (data == "待评价") {
+        return "daipingjia";
+      } else if (data == "已解决") {
+        return "yijiejue";
+      } else if (data == "已撤回") {
+        return "yichehui";
+      } else {
+        return "yichehui";
       }
     },
-    stateChange(){
-      var that=this;
-      this.loadShow=true;
-      that.items=[];
-      this.$http.post('service/apply/bpm/fetchServiceTasks',{
-          'assignee':that.loginUser.account,
-          'state':that.stateValue,
-          'idx':0,
-          'sum':10
-          }).then(function(res){
-            if(res.data.data.length>0){
-              for(var i=0;i<res.data.data.length;i++){
-                res.data.data[i].createTime=formatDate(new Date(res.data.data[i].createTime), 'yyyy-MM-dd hh:mm');
-              }
-              that.items=res.data.data;
-              that.wushuju=false
-            }else{
-              that.wushuju=true
-            }
-            that.loadShow=false
+    stateChange() {
+      var that = this;
+      this.loadShow = true;
+      that.items = [];
+      this.$http
+        .post("service/apply/bpm/fetchServiceTasks", {
+          assignee: that.loginUser.account,
+          state: that.stateValue,
+          idx: 0,
+          sum: 10,
         })
+        .then(function (res) {
+          if (res.data.data.length > 0) {
+            for (var i = 0; i < res.data.data.length; i++) {
+              res.data.data[i].createTime = formatDate(
+                new Date(res.data.data[i].createTime),
+                "yyyy-MM-dd hh:mm"
+              );
+            }
+            that.items = res.data.data;
+            that.wushuju = false;
+          } else {
+            that.wushuju = true;
+          }
+          that.loadShow = false;
+        });
     },
-    toIncidentDetails(data){
+    toIncidentDetails(data) {
       this.$router.push({
-          name:'IncidentDetails',
-          params:{
-              data:JSON.stringify(data)
-          }
-      })
+        name: "IncidentDetails",
+        params: {
+          data: JSON.stringify(data),
+        },
+      });
     },
     onPullingDown() {
       // 模拟更新数据
-      this.idx=0;
+      this.idx = 0;
       setTimeout(() => {
-        var that=this;
+        var that = this;
         // that.items=[];
-        this.$http.post('service/apply/bpm/fetchServiceTasks',{
-          'assignee':that.loginUser.account,
-          'state':that.stateValue,
-          'idx':0,
-          'sum':10
-          }).then(function(res){
-            if(res.data.data.length>0){
-                that.wushuju=false;
-                for(var i=0;i<res.data.data.length;i++){
-                  res.data.data[i].createTime=formatDate(new Date(res.data.data[i].createTime), 'yyyy-MM-dd hh:mm');
-                }
-                that.items=res.data.data;
-            }else{
-                that.wushuju=true;
-                that.$refs.scroll.forceUpdate()
-            }
-        })
-      }, 1000)
-    },
-    getData(idx,sum){
-        var that=this;
-        this.$http.post('service/apply/bpm/fetchServiceTasks',{
-            'assignee':that.loginUser.account,
-            'state':that.stateValue,
-            'idx':idx,
-            'sum':sum
-        }).then(function(res){
-            if(res.data.data.length>0){
-              that.wushuju=false;
-              for(var i=0;i<res.data.data.length;i++){
-                res.data.data[i].createTime=formatDate(new Date(res.data.data[i].createTime), 'yyyy-MM-dd hh:mm');
+        this.$http
+          .post("service/apply/bpm/fetchServiceTasks", {
+            assignee: that.loginUser.account,
+            state: that.stateValue,
+            idx: 0,
+            sum: 10,
+          })
+          .then(function (res) {
+            if (res.data.data.length > 0) {
+              that.wushuju = false;
+              for (var i = 0; i < res.data.data.length; i++) {
+                res.data.data[i].createTime = formatDate(
+                  new Date(res.data.data[i].createTime),
+                  "yyyy-MM-dd hh:mm"
+                );
               }
-              that.items=res.data.data;
-            }else{
-              that.wushuju=true
+              that.items = res.data.data;
+            } else {
+              that.wushuju = true;
+              that.$refs.scroll.forceUpdate();
             }
-            that.loadShow=false
+          });
+      }, 1000);
+    },
+    getData(idx, sum) {
+      var that = this;
+      this.$http
+        .post("service/apply/bpm/fetchServiceTasks", {
+          assignee: that.loginUser.account,
+          state: that.stateValue,
+          idx: idx,
+          sum: sum,
         })
+        .then(function (res) {
+          if (res.data.data.length > 0) {
+            that.wushuju = false;
+            for (var i = 0; i < res.data.data.length; i++) {
+              res.data.data[i].createTime = formatDate(
+                new Date(res.data.data[i].createTime),
+                "yyyy-MM-dd hh:mm"
+              );
+            }
+            that.items = res.data.data;
+          } else {
+            that.wushuju = true;
+          }
+          that.loadShow = false;
+        });
     },
     onPullingUp() {
-      var that=this;
-      that.idx=that.idx+1;
-        this.$http.post('service/apply/bpm/fetchServiceTasks',{
-          'assignee':that.loginUser.account,
-          'state':that.stateValue,
-          'idx':that.idx,
-          'sum':that.sum,
-          }).then(function(res){
-            for(var i=0;i<res.data.data.length;i++){
-              res.data.data[i].createTime=formatDate(new Date(res.data.data[i].createTime), 'yyyy-MM-dd hh:mm');
-            }
-            setTimeout(() => {
-                if(res.data.data.length>0){
-                    that.items=that.items.concat(res.data.data);
-                }else{
-                    that.$refs.scroll.forceUpdate()
-                }
-            }, 1000)
+      var that = this;
+      that.idx = that.idx + 1;
+      this.$http
+        .post("service/apply/bpm/fetchServiceTasks", {
+          assignee: that.loginUser.account,
+          state: that.stateValue,
+          idx: that.idx,
+          sum: that.sum,
         })
+        .then(function (res) {
+          for (var i = 0; i < res.data.data.length; i++) {
+            res.data.data[i].createTime = formatDate(
+              new Date(res.data.data[i].createTime),
+              "yyyy-MM-dd hh:mm"
+            );
+          }
+          setTimeout(() => {
+            if (res.data.data.length > 0) {
+              that.items = that.items.concat(res.data.data);
+            } else {
+              that.$refs.scroll.forceUpdate();
+            }
+          }, 1000);
+        });
     },
     updatePullDownRefresh(val) {
-      this.pullDownRefresh = val
+      this.pullDownRefresh = val;
     },
     updatePullDownRefreshThreshold(val) {
-      this.pullDownRefreshThreshold = val
+      this.pullDownRefreshThreshold = val;
     },
     updatePullDownRefreshTxt(val) {
-      this.pullDownRefreshTxt = val
+      this.pullDownRefreshTxt = val;
     },
     updatePullUpLoad(val) {
-      this.pullUpLoad = val
+      this.pullUpLoad = val;
     },
     updatePullUpLoadThreshold(val) {
-      this.pullUpLoadThreshold = val
+      this.pullUpLoadThreshold = val;
     },
     updatePullUpLoadMoreTxt(val) {
-      this.pullUpLoadMoreTxt = val
+      this.pullUpLoadMoreTxt = val;
     },
     updatePullUpLoadNoMoreTxt(val) {
-      this.pullUpLoadNoMoreTxt = val
+      this.pullUpLoadNoMoreTxt = val;
     },
     updateCustomPullDown(val) {
-      this.customPullDown = val
+      this.customPullDown = val;
     },
     rebuildScroll() {
       Vue.nextTick(() => {
-        this.$refs.scroll.destroy()
-        this.$refs.scroll.initScroll()
-      })
-    }
+        this.$refs.scroll.destroy();
+        this.$refs.scroll.initScroll();
+      });
+    },
   },
-  created(){
-      this.getParamsState();
-      this.getData(this.idx,this.sum);
-  }
-}
+  created() {
+    this.getParamsState();
+    this.getData(this.idx, this.sum);
+  },
+};
 </script>
 <style lang="stylus" rel="stylesheet/stylus" scoped>
-.scroll-list-wrap
+.scroll-list-wrap {
   /* height: 350px */
-  height:95vh
+  height: 95vh;
   /* border: 1px solid rgba(0, 0, 0, 0.1) */
-  border-radius: 5px
-  transform: rotate(0deg) // fix 子元素超出边框圆角部分不隐藏的问题
-  overflow: hidden
+  border-radius: 5px;
+  transform: rotate(0deg); // fix 子元素超出边框圆角部分不隐藏的问题
+  overflow: hidden;
+}
+
+.foods-wrapper {
+  .food-item {
+    display: flex;
 
-.foods-wrapper
-  .food-item
-    display: flex
     /* padding: 18px */
     /* border-bottom: 1px solid rgba(7, 17, 27, 0.1) */
     /* border-top: 1px solid rgba(7, 17, 27, 0.1)!important */
+    &:last-child {
+      border-none();
+      margin-bottom: 0;
+    }
 
-    &:last-child
-      border-none()
-      margin-bottom: 0
-    .icon
-      flex: 0 0 57px
-      margin-right: 10px
+    .icon {
+      flex: 0 0 57px;
+      margin-right: 10px;
+    }
 
-    .food-content
-      flex: 1
-      .name
-        margin: 2px 0 8px 0
-        height: 14px
-        line-height: 14px
-        font-size: 14px
-        color: rgb(7, 17, 27)
-      .description, .extra
-        line-height: 10px
-        font-size: 10px
-        color: rgb(147, 153, 159)
-      .description
-        line-height: 12px
-        margin-bottom: 8px
-      .extra
-        .count
-          margin-right: 12px
-      .price
-        font-weight: 700
-        line-height: 24px
-        .now
-          margin-right: 8px
-          font-size: 14px
-          color: rgb(240, 20, 20)
-        .old
-          text-decoration: line-through
-          font-size: 10px
-          color: rgb(147, 153, 159)
-      .cartcontrol-wrapper
-        position: absolute
-        right: 0
-        bottom: 12px
-        .scroll-wrapper{
-  .cube-pulldown-wrapper{
-    .before-trigger{
-      font-size: 30px;
-      line-height: 30px;
-      align-self: flex-end;
-      span{
-        display: inline-block;
-        transition: all 0.3s;
-        color: #666;
-        &.rotate{
-            transform: rotate(180deg)
-          }
+    .food-content {
+      flex: 1;
+
+      .name {
+        margin: 2px 0 8px 0;
+        height: 14px;
+        line-height: 14px;
+        font-size: 14px;
+        color: rgb(7, 17, 27);
       }
-    }
-    .after-trigger{
-      .refresh-text{
-        color: grey
+
+      .description, .extra {
+        line-height: 10px;
+        font-size: 10px;
+        color: rgb(147, 153, 159);
+      }
+
+      .description {
+        line-height: 12px;
+        margin-bottom: 8px;
+      }
+
+      .extra {
+        .count {
+          margin-right: 12px;
+        }
+      }
+
+      .price {
+        font-weight: 700;
+        line-height: 24px;
+
+        .now {
+          margin-right: 8px;
+          font-size: 14px;
+          color: rgb(240, 20, 20);
+        }
+
+        .old {
+          text-decoration: line-through;
+          font-size: 10px;
+          color: rgb(147, 153, 159);
+        }
+      }
+
+      .cartcontrol-wrapper {
+        position: absolute;
+        right: 0;
+        bottom: 12px;
+
+        .scroll-wrapper {
+          .cube-pulldown-wrapper {
+            .before-trigger {
+              font-size: 30px;
+              line-height: 30px;
+              align-self: flex-end;
+
+              span {
+                display: inline-block;
+                transition: all 0.3s;
+                color: #666;
+
+                &.rotate {
+                  transform: rotate(180deg);
+                }
+              }
+            }
+
+            .after-trigger {
+              .refresh-text {
+                color: grey;
+              }
+            }
+          }
+        }
       }
     }
- }
+  }
 }
 </style>
 <style scoped>
-.bgColor{
-    background-color: white
+.bgColor {
+  background-color: white;
 }
-.food-item{
-  border-top: .16rem rgb(238,238,238) solid;
+.food-item {
+  border-top: 0.16rem rgb(238, 238, 238) solid;
 }
-.food-content{
-  border-top: .01rem rgb(223, 222, 222) solid;
-  border-bottom: .01rem rgb(223, 222, 222) solid;
+.food-content {
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+  border-bottom: 0.01rem rgb(223, 222, 222) solid;
 }
-.cube-select{
-  height: .88rem;
-  line-height: .88rem;
-  padding: 0 .24rem;
-  font-size: .36rem;
-  color:#333333
+.cube-select {
+  height: 0.88rem;
+  line-height: 0.88rem;
+  padding: 0 0.24rem;
+  font-size: 0.36rem;
+  color: #333333;
 }
-.title{
+.title {
   display: flex;
-  justify-content:space-between;
-  height: .7rem;
-  line-height: .7rem;
-  border-top: .01rem rgb(223, 222, 222) solid;
-  padding: 0 .24rem;
-  border-bottom: .01rem rgb(223, 222, 222) solid;
+  justify-content: space-between;
+  height: 0.7rem;
+  line-height: 0.7rem;
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+  padding: 0 0.24rem;
+  border-bottom: 0.01rem rgb(223, 222, 222) solid;
 }
-.title i{
-  font-size: .32rem;
-  color: #005395
+.title i {
+  font-size: 0.32rem;
+  color: #005395;
 }
-.title div:nth-child(1){
-  font-size: .32rem;
+.title div:nth-child(1) {
+  font-size: 0.32rem;
 }
-.title div:nth-child(1) span{
+.title div:nth-child(1) span {
   display: inline-block;
-  margin-left: .08rem
+  margin-left: 0.08rem;
 }
-.title div:nth-child(2){
-  padding: .05rem .3rem;
+.title div:nth-child(2) {
+  padding: 0.05rem 0.3rem;
   /* border: 0.01rem rgb(0,0,255) solid; */
-  border-radius: 16px ;
+  border-radius: 16px;
   /* color: rgb(0,0,255); */
-  height: .25rem;
-  line-height: .25rem;
-  margin-top: .15rem;
-  font-size: .24rem
+  height: 0.25rem;
+  line-height: 0.25rem;
+  margin-top: 0.15rem;
+  font-size: 0.24rem;
 }
-.weishouli{
-  color:#991f00;
+.weishouli {
+  color: #991f00;
   border: 0.01rem #991f00 solid;
-  background-color: #f4e8e5
+  background-color: #f4e8e5;
 }
-.bushouli{
-  color:#666666;
+.bushouli {
+  color: #666666;
   background-color: #eeeeee;
   border: 0.01rem #666666 solid;
 }
-.chulizhong{
-  color:#003057;
+.chulizhong {
+  color: #003057;
   background-color: #e5eaee;
   border: 0.01rem #003057 solid;
 }
-.daipingjia{
-  color:#825b00;
+.daipingjia {
+  color: #825b00;
   background-color: #f2eee5;
   border: 0.01rem #825b00 solid;
 }
-.yijiejue{
-  color:#40a19c;
+.yijiejue {
+  color: #40a19c;
   background-color: #ebf5f5;
   border: 0.01rem #40a19c solid;
 }
-.yichehui{
-  color:#48a843;
+.yichehui {
+  color: #48a843;
   background-color: #ecf6ec;
   border: 0.01rem #48a843 solid;
 }
-.conent{
-  font-size: .28rem;
-  line-height: .39rem;
+.conent {
+  font-size: 0.28rem;
+  line-height: 0.39rem;
   overflow: hidden;
   display: -webkit-box;
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
   word-break: break-all;
-  padding: 0 .64rem;
-  margin: .24rem 0
+  padding: 0 0.64rem;
+  margin: 0.24rem 0;
 }
-.timeBox{
+.timeBox {
   display: flex;
-  justify-content:space-between;
-  font-size: .24rem;
+  justify-content: space-between;
+  font-size: 0.24rem;
   color: #999999;
-  border-top: .01rem rgb(223, 222, 222) solid;
-  height: .7rem;
-  line-height: .7rem;
-  padding: 0 .24rem 0 .64rem
+  height: 0.7rem;
+  line-height: 0.7rem;
+  padding: 0 0.24rem 0 0.24rem;
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+}
+.timeBox.noneBorder {
+  border-top: none;
 }
-.wushuju{
-    margin-top: 2.4rem;
-    text-align: center;
+.wushuju {
+  margin-top: 2.4rem;
+  text-align: center;
 }
-.wushuju img{
-    width: 5.12rem;
-    height: 2.84rem;
+.wushuju img {
+  width: 5.12rem;
+  height: 2.84rem;
 }
 </style>

src/views/repair.vue

@@ -42,6 +42,11 @@
         ></cube-form-item>
         <div class="label">报修信息</div>
         <cube-form-item :field="fields[4]"></cube-form-item>
+        <div class="label" v-if="wxIncidentWithCmdb == 1">资产</div>
+        <div class="zc" v-if="wxIncidentWithCmdb == 1">
+          <cube-form-item :field="fields[7]" class="zc-item"></cube-form-item>
+          <span class="icon dash dash-saoyisao zc-sao" @click="scan()"></span>
+        </div>
         <div class="label">
           报修图片
           <span>(最多可上传3张JPG或PNG,每张不能超过10M)</span>
@@ -76,6 +81,7 @@ import DatePicker from "./../components/date-picker.vue";
 import CubeExtendPopup from "./../components/extend-popup.vue";
 import LoadIng from "./../views/loading.vue";
 import PrompTing from "./../views/prompting.vue";
+import { SM } from "./../http/http";
 const PCA = {
   props: {
     value: {
@@ -183,6 +189,8 @@ const delay = (function() {
 export default {
   data() {
     return {
+      incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
+      wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
       loginUser: null,
       // 故障地点下拉数据
       // addressData: [],
@@ -223,7 +231,8 @@ export default {
         description: "",
         bxcode: "",
         deptId: "",
-        contacts: ""
+        contacts: "",
+        assetId:'',
       },
       // showPrompting:false,
       promptingConent: "",
@@ -310,11 +319,29 @@ export default {
           rules: {
             required: true
           }
-        }
+        },
+        {
+          type: "input",
+          modelKey: "assetId",
+          label: "资产:",
+          props: {
+            placeholder: "右侧扫一扫资产",
+            disabled:true
+          },
+          rules: {
+            required: false
+          },
+        },
       ]
     };
   },
   methods: {
+    //扫资产
+    scan(){
+      SM(this).then((ress1) => {
+        this.model.assetId = ress1;
+      })
+    },
     // -----------故障地点-----
     showAddressPicker() {
       if (!this.picker) {
@@ -617,6 +644,20 @@ export default {
 };
 </script>
 <style lang="stylus" rel="stylesheet/stylus" scoped>
+.zc{
+  display:flex;
+  position:relative;
+  .zc-item{
+    flex:7;
+  }
+  .zc-sao{
+    flex:3;
+    display:flex;
+    justify-content:center;
+    align-item:center;
+    font-size:0.6rem;
+  }
+}
 .form-custom {
   .cube-form-item {
     .cube-btn {

static/font/seimin/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon dash">&#xe8b5;</span>
+                <div class="name">扫一扫</div>
+                <div class="code-name">&amp;#xe8b5;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon dash">&#xe609;</span>
                 <div class="name">fangdajing</div>
                 <div class="code-name">&amp;#xe609;</div>
@@ -90,9 +96,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'dash';
-  src: url('iconfont.woff2?t=1638846521111') format('woff2'),
-       url('iconfont.woff?t=1638846521111') format('woff'),
-       url('iconfont.ttf?t=1638846521111') format('truetype');
+  src: url('iconfont.woff2?t=1641526164246') format('woff2'),
+       url('iconfont.woff?t=1641526164246') format('woff'),
+       url('iconfont.ttf?t=1641526164246') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -119,6 +125,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon dash dash-saoyisao"></span>
+            <div class="name">
+              扫一扫
+            </div>
+            <div class="code-name">.dash-saoyisao
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon dash dash-fangdajing"></span>
             <div class="name">
               fangdajing
@@ -174,6 +189,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#dash-saoyisao"></use>
+                </svg>
+                <div class="name">扫一扫</div>
+                <div class="code-name">#dash-saoyisao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#dash-fangdajing"></use>
                 </svg>
                 <div class="name">fangdajing</div>

static/font/seimin/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "dash"; /* Project id 2879659 */
-  src: url('iconfont.woff2?t=1638846521111') format('woff2'),
-       url('iconfont.woff?t=1638846521111') format('woff'),
-       url('iconfont.ttf?t=1638846521111') format('truetype');
+  src: url('iconfont.woff2?t=1641526164246') format('woff2'),
+       url('iconfont.woff?t=1641526164246') format('woff'),
+       url('iconfont.ttf?t=1641526164246') format('truetype');
 }
 
 .dash {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.dash-saoyisao:before {
+  content: "\e8b5";
+}
+
 .dash-fangdajing:before {
   content: "\e609";
 }

static/font/seimin/iconfont.json

@@ -6,6 +6,13 @@
   "description": "引入一个新的字体图标",
   "glyphs": [
     {
+      "icon_id": "11372685",
+      "name": "扫一扫",
+      "font_class": "saoyisao",
+      "unicode": "e8b5",
+      "unicode_decimal": 59573
+    },
+    {
       "icon_id": "463375",
       "name": "fangdajing",
       "font_class": "fangdajing",