Browse Source

modify some details

haojianlong 5 years ago
parent
commit
4626098615

+ 2 - 1
src/components/ledger/handsontables/device.vue

@@ -604,7 +604,8 @@ export default {
           readOnly: true
         }, {
           data: "Count",
-          readOnly: true
+          readOnly: true,
+          renderer: tools.lookDetails
         }
       );
       //   data.splice(1, 0, {

+ 0 - 1
src/components/ledger/lib/qrcode.vue

@@ -38,7 +38,6 @@ export default {
   },
   created() {
     console.log(this.qrcodeUrl)
-    debugger
    },
   mounted() {
   },

+ 12 - 4
src/views/ledger/facility/parts/index.vue

@@ -97,7 +97,7 @@ export default {
         "L2",
         "X"
       ],
-      qrcodeUrl:'',
+      qrcodeUrl: "",
       myDialog: {
         qrcode: false, //二维码弹窗
         firm: false, //厂商弹窗
@@ -134,7 +134,7 @@ export default {
       };
       await getEquipPartsType(params).then(res => {
         this.partsTypeList = res.data.Content;
-        if(this.partsTypeList.length){
+        if (this.partsTypeList.length) {
           this.tabVal = this.partsTypeList[0].Category;
           this.getTableHeader();
         }
@@ -302,13 +302,21 @@ export default {
     getInfors(infos, row) {
       //其他的开始判断
       let val = this.tableExample.colToProp(row.col);
+      if (val == "caozuo") {
+        window.open(
+          `http://47.94.89.44:8058/spread?id=${infos.EquipID}&pid=${
+            this.projectId
+          }&secret=${this.secret}`,
+          "_blank"
+        );
+      }
       //设备二维码图片
       if (val == "EquipQRCode") {
-        this.qrcodeUrl = this.tableData[row.row].EquipQRCode
+        this.qrcodeUrl = this.tableData[row.row].EquipQRCode;
         if (!!this.qrcodeUrl) {
           this.myDialog.qrcode = true;
         } else {
-          this.$message("此设备没有设备二维码")
+          this.$message("此设备没有设备二维码");
         }
       }
       //关联系统

+ 8 - 0
src/views/ledger/facility/partsmanage/index.vue

@@ -586,6 +586,14 @@ export default {
     getInfors(infos, row) {
       //其他的开始判断
       let val = this.tableExample.colToProp(row.col);
+      if (val == "caozuo") {
+        window.open(
+          `http://47.94.89.44:8058/spread?id=${infos.EquipID}&pid=${
+            this.projectId
+          }&secret=${this.secret}`,
+          "_blank"
+        );
+      }
       //设备二维码图片
       if (val == "EquipQRCode") {
         this.qrcodeUrl = this.tableData[row.row].EquipQRCode