3/7

src/views/setting/add/comp/leakyCable.vue

@@ -49,9 +49,9 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="所在监测设备：" prop="monitor">
+      <el-form-item label="所在监测设备：" prop="equipId">
         <el-select
-          v-model="leakyCableForm.monitor"
+          v-model="leakyCableForm.equipId"
           placeholder="请选择监测设备"
         >
           <el-option
@@ -136,6 +136,7 @@ import {
   selectForSite,
   selectForFsu,
   selectForEquip,
+  railWaylist
 } from "../../api";
 import { successAlert, warningAlert } from "@/utils/alert";
 export default {
@@ -154,10 +155,12 @@ export default {
         size: 10,
       },
       rules: {
-        parentId: [
-          { required: true, message: "请选择铁路线", trigger: "blur" },
-        ],
-
+      
+   wayId: [{ required: true, message: "请选择铁路线", trigger: "blur" }],
+        siteId: [{ required: true, message: "请选择站点", trigger: "blur" }],
+        fsuId: [{ required: true, message: "请选择FSU", trigger: "blur" }],
+        equipId: [{ required: true, message: "请选择监测设备", trigger: "blur" }],
+      
         antennaFeederLength: [
           { required: true, message: "请输入天馈线长度", trigger: "blur" },
         ],
@@ -256,7 +259,7 @@ function formInit(data = {}) {
     parentId: "",
     siteId: "",
     fsuId: "",
-    monitor: "",
+    equipId: "",
     antennaFeederLength: 0,
     hundredMetersLoss: 0,
     inserterLength: 0,

src/views/setting/add/comp/monitorEquip.vue

@@ -155,9 +155,10 @@ export default {
         size: 10,
       },
       rules: {
-        parentId: [
-          { required: true, message: "请选择铁路线", trigger: "blur" },
-        ],
+           wayId: [{ required: true, message: "请选择铁路线", trigger: "blur" }],
+        siteId: [{ required: true, message: "请选择站点", trigger: "blur" }],
+        fsuId: [{ required: true, message: "请选择FSU", trigger: "blur" }],
+      
         equipCode: [
           { required: true, message: "请输入设备身份编号", trigger: "blur" },
         ],

src/views/setting/add/comp/railWay.vue

@@ -38,18 +38,15 @@
 <script>
 import { railWaysave } from "../../api";
 import { successAlert, warningAlert } from "@/utils/alert";
-import { mapGetters, mapActions } from "vuex";
+
 export default {
   props: [],
   components: {},
   data() {
     return {
-      formData:formInit(),
-       rules: {
-        name: [
-          { required: true, message: "请输入铁路名", trigger: "blur" },
-         
-        ],
+      formData: formInit(),
+      rules: {
+        name: [{ required: true, message: "请输入铁路名", trigger: "blur" }],
         startPointName: [
           { required: true, message: "请输入铁路线起点站名", trigger: "blur" },
         ],
@@ -67,9 +64,6 @@ export default {
   },
   computed: {},
   methods: {
-    ...mapActions({
-      asyncrailWayList: "railWay/asyncList",
-    }),
     reset() {
       this.$refs.form.resetFields();
     },
@@ -79,9 +73,8 @@ export default {
           railWaysave(this.formData).then((res) => {
             if (res.code == 200) {
               successAlert("添加成功");
-              this.asyncrailWayList();
             } else {
-              warning("添加失败");
+              warningAlert("添加失败");
             }
           });
         }
@@ -93,10 +86,10 @@ export default {
 };
 function formInit(data = {}) {
   return {
-      endPointName: "",
-          name: "",
-          startPointName: "",
-          totalLong: "",
+    endPointName: "",
+    name: "",
+    startPointName: "",
+    totalLong: "",
     ...data,
   };
 }

src/views/setting/statistics/comp/fsuTable.vue

@@ -105,7 +105,7 @@
       />
       <el-table-column prop="railWayName" label="所在铁路线" align="center" />
       <el-table-column
-        prop="siteId"
+        prop="siteName"
         label="所在站点"
         show-overflow-tooltip
         align="center"
@@ -183,7 +183,7 @@ export default {
       fsubatchDelete({ ids }).then((res) => {
         if (res.code == 200) {
           successAlert("删除成功");
-          this.asyncfsuList();
+        
           this.getTableData();
         } else {
           warningAlert("删除失败");

src/views/setting/statistics/comp/leakyTable.vue

@@ -154,6 +154,9 @@
       />
       
       <el-table-column prop="railWayName" label="所在铁路线" align="center" />
+      <el-table-column prop="siteName" label="所在站点" align="center" />
+      <el-table-column prop="fsuName" label="所在FSU" align="center" />
+      <el-table-column prop="equipName" label="所在监测设备" align="center" />
      
     
       <el-table-column
@@ -241,7 +244,7 @@ export default {
       leakyCablebatchDelete({ ids }).then((res) => {
         if (res.code == 200) {
           successAlert("删除成功");
-          this.asyncleakyList();
+        
           this.getTableData();
         } else {
           warningAlert("删除失败");
@@ -286,7 +289,7 @@ export default {
         let list = res.records || [];
         this.tableData = list;
         this.total = res.total;
-        console.log(this.tableData );
+     
         if (this.istrue == 1) {
           if (this.tableData.length) {
             successAlert("查询成功");
@@ -337,7 +340,7 @@ function formInit(data = {}) {
     monitor: "",
     leakyCableCode: "",
     leakyCableDescribe: "",
-
+siteName:"",
     leakyCableMode: "",
     current: 1,
     size: 10,

src/views/setting/statistics/comp/monitorTable.vue

@@ -115,6 +115,8 @@
       <el-table-column prop="equipCode" label="设备身份编号" align="center" />
       <el-table-column prop="ip" label="IP" align="center" />
       <el-table-column prop="railWayName" label="所在铁路线" align="center" />
+      <el-table-column prop="siteName" label="所在站点" align="center" />
+      <el-table-column prop="fsuName" label="所在FSU" align="center" />
       <el-table-column
         prop="action"
         label="详细信息"
@@ -193,7 +195,7 @@ export default {
       monitorEquipbatchDelete({ ids }).then((res) => {
         if (res.code == 200) {
           successAlert("删除成功");
-          this.asyncmonitorList();
+     
           this.getTableData();
         } else {
           warningAlert("删除失败");
@@ -275,7 +277,7 @@ export default {
 };
 function formInit(data = {}) {
   return {
-    wayId: "",
+ 
     wayId: "",
     parentId: "",
     ip: "",

src/views/setting/statistics/comp/railWayTable.vue

@@ -147,7 +147,7 @@ export default {
       railWaybatchDelete({ ids }).then((res) => {
         if (res.code == 200) {
           successAlert("删除成功");
-          this.asyncrailWayList();
+       
           this.getTableData();
         } else {
           warningAlert("删除失败");

src/views/setting/statistics/comp/stationTable.vue

@@ -131,7 +131,7 @@ export default {
       siteForm: formInit(),
       railWaySelect: [],
       visible: false,
-      Info: [],
+   
       tableData: [],
       params: {
         current: 1,
@@ -154,10 +154,10 @@ export default {
     },
     del() {
       let ids = this.ids;
-      sitebatchDelete({ ids }).then((res) => {
+      sitebatchDelete({ids}).then((res) => {
         if (res.code == 200) {
           successAlert("删除成功");
-          this.asyncstationList();
+       
           this.getTableData();
         } else {
           warningAlert("删除失败");