瀏覽代碼

拉代码

shaun-sheep 4 年之前
父節點
當前提交
cb57174d93

+ 35 - 12
src/api/equipmentList.js

@@ -1,50 +1,73 @@
 import httputils from '@/api/httputils'
 
 // 设备设施-主要设备清单
-export function queryEquipmentList({ data, postParams }) {
+export function queryEquipmentList({
+    data,
+    postParams
+}) {
     return httputils.fetchJson(`/api/data/glsms_asset/queryStatistics`, data, postParams)
 }
 
 // 设备设施-主要设备清单详情
-export function queryAsset({ data, postParams }) {
+export function queryAsset({
+    data,
+    postParams
+}) {
     return httputils.fetchJson(`/api/data/glsms_asset/query`, data, postParams)
 }
 // 设备设施-主要材料清单
-export function queryMaterialList({ getParams }) {
+export function queryMaterialList({
+    getParams
+}) {
     return httputils.getJson(`/api/data/gcglsms_material/query`, getParams)
 }
 
 // 设备设施-维保事项
-export function queryWbsms({ getParams }) {
-    return httputils.getJson(`/api/data/glsms_wbsms/query`, getParams)
+export function queryWbsms({
+    data,
+    getParams
+}) {
+    return httputils.getJson(`/api/data/v_glsms_wbsms/query`, data, getParams)
 }
 
 // 设备设施-维修事项
-export function queryWx({ getParams }) {
+export function queryWx({
+    getParams
+}) {
     return httputils.getJson(`/api/data/glsms_wx/query`, getParams)
 }
 
 // 设备设施-专维
-export function queryZw({ getParams }) {
+export function queryZw({
+    getParams
+}) {
     return httputils.getJson(`/api/data/glsms_zw/query`, getParams)
 }
 
 // 设备设施-其他事项
-export function queryQtsx({ getParams }) {
+export function queryQtsx({
+    getParams
+}) {
     return httputils.getJson(`/api/data/glsms_qtsx/query`, getParams)
 }
 
 // 设备设施-记录事项
-export function queryxx({ getParams }) {
+export function queryxx({
+    getParams
+}) {
     return httputils.getJson(`/api/xx`, getParams)
 }
 
 // 设备设施=查看图纸
-export function queryxxx({ getParams }) {
+export function queryxxx({
+    getParams
+}) {
     return httputils.getJson(`/api/xxX`, getParams)
 }
 
 // 设备设施-楼层电井口(间)控制商铺范围清单
-export function queryx({ getParams }) {
+export function queryx({
+    getParams
+}) {
     return httputils.getJson(`/api/X`, getParams)
-}
+}

+ 1 - 1
src/views/equipment/eqDialog.vue

@@ -29,7 +29,7 @@
                         <tableList v-else-if='value.id.slice(0,4)=="NTQD"' :param='param' ref='list2' major='暖通'></tableList>
                         <wb-table v-else-if='value.id.slice(2,4)=="WX"' param major='维修'></wb-table>
                         <zw-table v-else-if='value.id.slice(2,4)=="ZW"' param major='专维'></zw-table>
-                        <wb-table v-else-if='value.id.slice(2,4)=="WB"' param major='维保'></wb-table>
+                        <wb-table v-else-if='value.id.slice(2,4)=="WB"' param major='维保' :systemName='systemName'></wb-table>
                     </el-tab-pane>
                 </el-tabs>
             </div>

+ 1 - 0
src/views/equipment/index.vue

@@ -116,6 +116,7 @@ export default {
         },
         dialogVisible(eve) {
             console.log(eve)
+
             this.$refs.dialog.showModal(eve)
             // this.dialogInfo = eve
         }

+ 25 - 11
src/views/equipment/table/wbTable.vue

@@ -33,7 +33,7 @@
     </div>
 </template>
 <script>
-import { queryEquipmentList } from '@/api/equipmentList.js'
+import { queryEquipmentList, queryWbsms } from '@/api/equipmentList.js'
 export default {
     data() {
         return {
@@ -44,7 +44,7 @@ export default {
             size: 10
         }
     },
-    props: ['major'],
+    props: ['major', 'systemName'],
     methods: {
         onSearch() {},
         pageChanged(page, size) {
@@ -53,22 +53,36 @@ export default {
             this.getList()
         },
         getList() {
-            let postParams = {}
-            let data = {
-                page: this.currentPage,
-                size: this.size,
-                plazaId: this.$store.state.plazaId,
-                major: this.major
+            // let postParams = {}
+            // let data = {
+            //     page: this.currentPage,
+            //     size: this.size,
+            //     plazaId: this.$store.state.plazaId,
+            //    major: this.major,
+
+            // }
+            // queryEquipmentList({ data, postParams }).then(res => {
+            //     console.log(res)
+            //     this.tableData = res.data.data
+            //     this.total = res.data.count
+            // })
+            let getParams = {
+                data: {
+                    system: this.systemName,
+                    tab: this.major,
+                    plazaId: this.$store.state.plazaId,
+                    page: this.currentPage,
+                    size: this.size
+                }
             }
-            queryEquipmentList({ data, postParams }).then(res => {
-                console.log(res)
+            queryWbsms(getParams).then(res => {
                 this.tableData = res.data.data
                 this.total = res.data.count
             })
         }
     },
     mounted() {
-        // this.getList()
+        this.getList()
     }
 }
 </script>

+ 0 - 1
src/views/legendLibrary/addForm.vue

@@ -167,7 +167,6 @@ export default {
             uploadImg({ postParams }).then(res => {
                 if (res.Result == 'success') {
                     this.imgSrc = res.EntityList[0]
-
                     this.$message.success('图标上传成功!')
                 }
             })