异物功能新增字段

src/views/yhlywsytst/yhlywsytst/index.vue

@@ -123,7 +123,8 @@
                     v-for="item in jxlistData">
                     <div style="color: #68D8FE  ;width: 120px;"
                       v-text="$moment(item.jxsj).format('YYYY-MM-DD HH:mm:ss')   "></div>
-                    <div style="color: #68D8FE  ;width: calc(100% - 120px);text-align: left;padding-left: 5px;" v-text="item.jxnr"></div>
+                    <div style="color: #68D8FE  ;width: calc(100% - 120px);text-align: left;padding-left: 5px;"
+                      v-text="item.jxnr"></div>
                   </div>
                 </div>
               </ScrollSeamless>
@@ -134,7 +135,7 @@
         </div>
 
       </div>
-        <div class="flex1" style="height: 50%;overflow: hidden;">
+      <div class="flex1" style="height: 50%;overflow: hidden;">
         <!-- 设备检修-->
         <div class="full">
           <div class="mktitle">
@@ -669,7 +670,7 @@
         const viewer = this.viewer;
         const points = positions.map(
           /* 根据本身的模型定位来*/
-          (item) => new THREE.Vector3(item[0] / 1000 - 42, item[2] / 1000 - 10, -item[1] / 1000)
+          (item) => new THREE.Vector3(item[0] / 1000, item[2] / 1000, -item[1] / 1000)
         );
         const flowObject = new VT.TubeLine({
           points: points,

src/views/ywxxgl/ywxxgl/edit.vue

@@ -2,13 +2,14 @@
   <RelDialog width="50%" :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
     <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
       <el-row :gutter="20" :app="this">
-        <EditColItem  :required="item.required||false" :readonly="item.readonly?true:false "  v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label" :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule"  />
+        <EditColItem :required="item.required||false" :readonly="item.readonly?true:false "
+          v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label"
+          :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
       </el-row>
     </el-form>
   </RelDialog>
 </template>
 <script>
-
   import {
     editMixin
   } from 'common'
@@ -18,49 +19,63 @@
       return {
         editColItemList: [
 
-         {
-           label: '名称',
-           prop: 'name',
-           span: 12,
-           type: 'input',
-           required:true,
-         },
-         {
-           label: '规格',
-           prop: 'ggxh',
-           span: 12,
-           type: 'input',
-         },
-         {
-           label: '尺寸',
-           prop: 'cc',
-           span: 12,
-           type: 'input',
-         },
-         {
-           label: '材质',
-           prop: 'cz',
-           span: 12,
-           type: 'input',
-         },
-         {
-           label: "地点",
-           prop: "dd",
-          span: 24,
-          type: 'input',
-         },
-         {
-           label: "标高",
-           prop: "bg",
-          span: 12,
-          type: 'input',
-         },
-         {
-           label: "放射性强度",
-           prop: "fsxqd",
-          span: 12,
-          type: 'input',
-         },
+          {
+            label: '名称',
+            prop: 'name',
+            span: 12,
+            type: 'input',
+            required: true,
+          },
+          {
+            label: '流向特性',
+            prop: 'ldtx',
+            span: 12,
+            "type": "RelSelect",
+            "typeConfig": {
+              "src": "ywxxgl/uywxx/init/ldtx",
+              "match": {
+                "value": "id",
+                "label": "name"
+              }
+            },
+            required: true,
+          },
+          {
+            label: '规格',
+            prop: 'ggxh',
+            span: 12,
+            type: 'input',
+          },
+          {
+            label: '尺寸',
+            prop: 'cc',
+            span: 12,
+            type: 'input',
+          },
+          {
+            label: '材质',
+            prop: 'cz',
+            span: 12,
+            type: 'input',
+          },
+          {
+            label: "地点",
+            prop: "dd",
+            span: 24,
+            type: 'input',
+          },
+          {
+            label: "标高",
+            prop: "bg",
+            span: 12,
+            type: 'input',
+          },
+          {
+            label: "放射性强度",
+            prop: "fsxqd",
+            span: 12,
+            type: 'input',
+          },
           {
             label: '备注',
             prop: 'bz',

src/views/ywxxgl/ywxxgl/index.vue

@@ -26,6 +26,17 @@
               fieldType: "ftString",
               width: 120
             },
+            {
+              label: "流向特性",
+              prop: "lxtx",
+              width: 120,
+              transform: {
+                "url": "ywxxgl/uywxx/init/ldtx",
+                "label": "name",
+                "value": "id"
+              }
+            },
+
             {
               label: "规格",
               prop: "ggxh",
@@ -97,8 +108,7 @@
             }
           ],
           queryParams: [
-            [
-              {
+            [{
                 label: '名称',
                 prop: 'name',
                 span: 6,