Quellcode durchsuchen

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

zhulizhen1111 vor 4 Jahren
Ursprung
Commit
581048d983

+ 10 - 6
src/lib/items/SImageLegendItem.ts

@@ -85,11 +85,11 @@ export class SImageLegendItem extends SIconTextItem {
         if (data.Properties && data.Properties.Url) {
             this.img.url = data.Properties.Url;
         }
-        if (data.Properties && data.Properties.sWidth) {
-            this.sWidth = data.Properties.sWidth;
+        if (data.Properties && data.Properties.Size && data.Properties.Size.Width) {
+            this.sWidth = data.Properties.Size.Width;
         }
-        if (data.Properties && data.Properties.sHeight) {
-            this.sHeight = data.Properties.sHeight;
+        if (data.Properties && data.Properties.Size && data.Properties.Size.Height) {
+            this.sHeight = data.Properties.Size.Height;
         }
         if (data.Properties.ImgPos) {
             this.img.moveTo(data.Properties.ImgPos.X, data.Properties.ImgPos.Y);
@@ -125,10 +125,14 @@ export class SImageLegendItem extends SIconTextItem {
         this.data.Properties.Url = this.img.url;
         this.data.Properties.TextPos = { X: this.textItem.x, Y: this.textItem.y };
         this.data.Properties.ImgPos = { X: this.img.x, Y: this.img.y };
-        this.data.Properties.sWidth = this.sWidth;
-        this.data.Properties.sHeight = this.sHeight;
+        this.data.Properties.Size = {
+            Width: this.sWidth,
+            Height: this.sHeight
+        };
         this.data.Properties.font = this.font.size;
         this.data.Properties.color = this.color.value;
+        this.data.Properties.Font = this.font.size;
+        this.data.Properties.Coler = this.color.value;
         this.data.Properties.FrameColor = this.activeColor.value;
         this.data.Properties.IsActive = this.isActive;
         this.data.AnchorList = this.anchorList.map(t => {

Datei-Diff unterdrückt, da er zu groß ist
+ 721 - 697
src/views/analysis/CoreDeviceReport.vue


+ 10 - 4
src/views/analysis/SpecificationUpdateRecord.vue

@@ -173,7 +173,6 @@ export default {
      * 跳转到工程信息化系统
      */
     changeToSystem(row) {
-      console.log('row', row)
       const { objtype } = row;
       let url;
       switch (objtype) {
@@ -181,14 +180,21 @@ export default {
           url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=GCZXWXLINE&uniqueid=${row.id}`;
           break
         case 1: // 维保
-          url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.id}`;
+          let value;
+          if (row.apptype === '外委' || row.apptype === '自维') {
+            value = 'WB_GZGL';
+          } else if (row.apptype === '安全维保') {
+            value = 'AQ_WB_GZGL';
+          } else {
+            return
+          }
+          url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=${value}&uniqueid=${row.id}`;
           break
         case 2: // 第三方视图
           url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=DSF_GZGL&uniqueid=${row.id}`;
           break
       }
-      console.log('url', url)
-      // window.open(url, '_blank');
+      window.open(url, '_blank');
     }
   },
 }