Browse Source

Merge branch 'master' of http://39.106.8.246:3003/BDTP/adm-frontend

qule 3 years ago
parent
commit
45fc527609

+ 11 - 0
babel.config.js

@@ -1,5 +1,16 @@
 module.exports = {
   presets: [
     '@vue/cli-plugin-babel/preset'
+  ],
+  plugins: [
+    [
+      "component",
+      {
+        "libraryName": "meri-design",
+        "camel2Dash": false,
+        "libDir": "dist",
+        "styleLibrary": { "name": "theme", "base": true }
+      }
+    ]
   ]
 }

+ 2 - 0
package.json

@@ -14,6 +14,7 @@
     "@saga-web/graph": "^2.1.139",
     "font-awesome": "^4.7.0",
     "handsontable-pro": "^3.0.0",
+    "meri-design": "^1.5.515",
     "vue-router": "^3.5.3",
     "vuex": "^3.6.2"
   },
@@ -22,6 +23,7 @@
     "@vue/cli-plugin-typescript": "^4.5.13",
     "@vue/cli-service": "~4.5.0",
     "axios": "^0.21.1",
+    "babel-plugin-component": "^1.1.1",
     "core-js": "^3.6.5",
     "element-ui": "^2.15.6",
     "less": "3.9.0",

+ 9 - 1
public/systemConf.js

@@ -32,7 +32,15 @@ var __systemConf = {
       "orders": 5,
       "url": "/relation/overview",
       "icon": "icon-jiqixuexi-"
-    }]
+    }
+    ,{
+      "id": "projectmanage",
+      "name": "项目信息管理",
+      "orders": 6,
+      "url": "/project/manage",
+      "icon": "icon-jiqixuexi-"
+    }
+  ]
   }, {
     "id": "xianchangjiaofugongjv",
     "name": "现场交付工具",

+ 2 - 4
src/components/old-adm/ledger/components/details/detail/cruxDialog.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import { setDataDictionary } from "@/api/scan/request";
+import Dic from "@/controller/old-adm/dicController";
 
 export default {
   name: "cruxDialog",
@@ -96,7 +96,7 @@ export default {
             groupCode: i.groupCode
           }
         })
-        setDataDictionary(param, res => {
+        Dic.setDataDictionary(param, res => {
           this.dialogFormVisible = false
           this.$emit('cruxSuccess')
           this.$message.success('保存成功')
@@ -104,8 +104,6 @@ export default {
         });
 
       }
-
-
     }
   }
 }

+ 14 - 14
src/components/old-adm/ledger/facility/details/index.vue

@@ -70,18 +70,18 @@
 </template>
 
 <script>
-import exhibitionBaseInformation from "@/components/old-adm/ledger/details/detail/exhibitionBaseInformation";
-import exhibitionFile from "@/components/old-adm/ledger/details/detail/exhibitionFile";
-import exhibitionImage from "@/components/old-adm/ledger/details/detail/exhibitionImage";
-import exhibitionVideo from "@/components/old-adm/ledger/details/detail/exhibitionVideo";
-import exhibitionCrux from "@/components/old-adm/ledger/details/detail/exhibitionCrux";
-import exhibitionEnergy from "@/components/old-adm/ledger/details/detail/exhibitionEnergy";
-import exhibitionMaintain from "@/components/old-adm/ledger/details/detail/exhibitionMaintain";
-import selectRadio from "@/components/old-adm/ledger/details/detail/selectRadio";
+import exhibitionBaseInformation from "@/components/old-adm/ledger/components/details/detail/exhibitionBaseInformation";
+import exhibitionFile from "@/components/old-adm/ledger/components/details/detail/exhibitionFile";
+import exhibitionImage from "@/components/old-adm/ledger/components/details/detail/exhibitionImage";
+import exhibitionVideo from "@/components/old-adm/ledger/components/details/detail/exhibitionVideo";
+import exhibitionCrux from "@/components/old-adm/ledger/components/details/detail/exhibitionCrux";
+import exhibitionEnergy from "@/components/old-adm/ledger/components/details/detail/exhibitionEnergy";
+import exhibitionMaintain from "@/components/old-adm/ledger/components/details/detail/exhibitionMaintain";
+import selectRadio from "@/components/old-adm/ledger/components/details/detail/selectRadio";
 import tools from "@/utils/old-adm/scan/tools"
-import {BeatchQueryParam} from "@/api/scan/request";
-import {getDataDictionary} from "@/api/dict";
-import {queryEquip} from "@/api/object/equip"
+import ScanController from "@/controller/old-adm/ScanController";
+import Dic from "@/controller/old-adm/dicController";
+import EquipController from "@/controller/old-adm/equipController";
 import {mapGetters} from "vuex";
 
 export default {
@@ -191,12 +191,12 @@ export default {
         filters: `id='${this.id}'`,
       };
       let promise1 = new Promise((resolve, reject) => {
-        getDataDictionary(params1, res => {
+        Dic.getDataDictionary(params1, res => {
           resolve(res)
         })
       })
       let promise2 = new Promise((resolve, reject) => {
-        queryEquip(params2, res => {
+        EquipController.queryEquip(params2).then(res => {
           resolve(res)
         })
       })
@@ -239,7 +239,7 @@ export default {
         }
         params.data = this.criterias
         if (this.criterias.length) {
-          BeatchQueryParam(params, res => {
+          ScanController.BeatchQueryParam(params, res => {
             this.criteriasArray = res.data;
             res.data.length && res.data.map(child => {
               this.pointData.map(head => {

+ 16 - 0
src/components/project-manage/index.vue

@@ -0,0 +1,16 @@
+<template>
+    <div>
+        <Button>123123</Button>
+    </div>
+</template>
+<script>
+export default {
+    mounted() {
+        
+    },
+    methods: {
+
+    }
+}
+</script>
+<style lang="less" scoped></style>

+ 12 - 0
src/controller/old-adm/dicController.ts

@@ -45,6 +45,18 @@ class Dic {
   static async queryPhysicsAllType(params) {
     return await Dic.http.postRequest("/datacenter/dict/category", params);
   }
+  /**
+   *  @description: 设置项目数据字典显隐 --列表表头 api/dict
+   *  @param {*}
+   *  @return {*}
+   */
+  static async setDataDictionary(params, fn) {
+    const res = await Dic.http.postRequest(
+      dict_pre + "/setting-dic-project",
+      params
+    );
+    return fn ? fn(res) : res;
+  }
 }
 
 export default Dic;

+ 4 - 0
src/main.js

@@ -4,7 +4,11 @@ import router from './router'
 import vueStore from './store'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
+import './meri'
+// import {Button} from 'meri-design'
+// import 'meri-design/dist/index.css'
 Vue.use(ElementUI, { size: "small", zIndex: 1000 })
+// Vue.use(Button)
 
 import 'font-awesome/less/font-awesome.less'
 import '@/assets/style/main.less'

+ 4 - 0
src/meri.js

@@ -0,0 +1,4 @@
+import Vue from 'vue'
+import {Button} from 'meri-design'
+
+Vue.use(Button)

+ 22 - 0
src/router/system.js

@@ -8,6 +8,7 @@ import systemGraph from "@/components/systemGraph";
 import systemGraphEdit from "@/components/systemGraph/edit";
 
 import facilityLedger from "@/components/old-adm/ledger/facility/index";
+import deviceDetails from "@/components/old-adm/ledger/facility/details/index";
 // 系统台账
 import systemLedger from '@/components/old-adm/ledger/system/index';
 import batchPointAssets from '@/components/old-adm/ledger/facility/batchPoint' //批量维护设备位置
@@ -21,6 +22,9 @@ import overView from '@/components/old-adm/relation/overview'
 //cad核查图纸管理
 import cadDrawingManage from '@/components/cadDrawingManage'
 
+// 项目信息管理
+import projectManage from '@/components/project-manage/index'
+
 export default [
   {
     path: logicConfig.routerNameConfig.loginRouteName,
@@ -71,6 +75,24 @@ export default [
         }
       },
       {
+        path: '/ledger/deviceDetails',
+        name: 'deviceDetails',
+        component: deviceDetails,
+        meta: {
+          keepAlive: false,
+          breadcrumbs: [
+            {label: '台账管理', path: '/ledger/facility'},
+            {label: '设备台账', path: '/ledger/facility'},
+            {label: '台账详情'}
+          ]
+        }
+      },
+      {
+        path: "/project/manage",
+        name: "项目信息管理",
+        component: projectManage,
+      },
+      {
         path: "/ledger/list",
         name: "系统台账",
         component: systemLedger,