zhangyu vor 5 Jahren
Ursprung
Commit
bfc3480f53

+ 10 - 10
config/index.js

@@ -17,20 +17,20 @@ module.exports = {
                     "^/admin": "/"
                 }
             },
-            // '/api/datacenter/': {
-            //     target: 'http://192.168.20.179:8081',
-            //     changeOrigin: true,
-            //     pathRewrite: {
-            //         "^/api/datacenter": "/"
-            //     }
-            // },
-            '/api': {
-                target: 'http://192.168.20.235:8080',
+            '/api/datacenter/': {
+                target: 'http://192.168.20.179:8081',
                 changeOrigin: true,
                 pathRewrite: {
-                    "^/api": "/"
+                    "^/api/datacenter": "/"
                 }
             },
+            // '/api': {
+            //     target: 'http://192.168.20.235:8080',
+            //     changeOrigin: true,
+            //     pathRewrite: {
+            //         "^/api": "/"
+            //     }
+            // },
             '/data-platform-3': {
                 // 目标 API 地址
                 target: 'http://192.168.20.225:8080/',

+ 7 - 3
src/components/data_admin/buildTask/detail/assetsDetail.vue

@@ -13,8 +13,9 @@
           <el-form-item label="设备本地编码:">{{ detail.EquipLocalID || '--' }}</el-form-item>
           <el-form-item label="设计图纸中编码:">{{ detail.CadId || '--' }}</el-form-item>
           <el-form-item label="安装位置:">{{ detail.InstallLocation || '--' }}</el-form-item>
-          <el-form-item label="生产厂家:">{{ detail.Equipment.DpSupplierID || '--' }}</el-form-item>
-          <el-form-item label="型号:">{{ detail.Equipment.DpManufacturerID || '--' }}</el-form-item>
+          <el-form-item label="生产厂家:">{{ detail.Manufacturer || '--' }}</el-form-item>
+          <el-form-item label="型号:">{{ detail.Specification || '--' }}</el-form-item>
+          <el-form-item label="供应商:">{{ detail.Supplier || '--' }}</el-form-item>
           <el-form-item label="包含设备:">
             <div v-if="detail.Equipment.Component && detail.Equipment.Component.length">
               <p v-for="(item, index) in detail.Equipment.Component" :key="index" show-overflow-tooltip>
@@ -130,7 +131,10 @@ export default {
       url1: 'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
       url2: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
       url3: 'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg',
-      urls: ['https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg', 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', 'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg']
+      urls: ['https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
+             'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', 
+             'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
+            ]
     };
   },
   created() {

+ 3 - 2
src/components/data_admin/buildTask/detail/deviceDetail.vue

@@ -13,8 +13,9 @@
           <el-form-item label="设备本地编码:">{{ detail.EquipLocalID || '--' }}</el-form-item>
           <el-form-item label="设计图纸中编码:">{{ detail.CadId || '--' }}</el-form-item>
           <el-form-item label="安装位置:">{{ detail.InstallLocation || '--' }}</el-form-item>
-          <el-form-item label="生产厂家:">{{ detail.Equipment?detail.Equipment.DpSupplierID?detail.Equipment.DpSupplierID:'':'' || '--' }}</el-form-item>
-          <el-form-item label="型号:">{{ detail.Equipment.DpManufacturerID || '--' }}</el-form-item>
+          <el-form-item label="生产厂家:">{{ detail.Manufacturer || '--' }}</el-form-item>
+          <el-form-item label="型号:">{{ detail.Specification || '--' }}</el-form-item>
+          <el-form-item label="供应商:">{{ detail.Supplier || '--' }}</el-form-item>
           <el-form-item label="包含部件:">
             <div v-if="detail.Equipment.Component && detail.Equipment.Component.length">
               <p v-for="(item, index) in detail.Equipment.Component" :key="index" show-overflow-tooltip>