Merge branch 'hdw' of http://118.89.139.230:10101/r/equip_system_web into hdw

whychdw

2020-07-16 02447175025d27f03b2e742f5170592e00735681

Merge branch 'hdw' of http://118.89.139.230:10101/r/equip_system_web into hdw

 package-lock.json

@@ -6656,6 +6656,7 @@
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/json2csv/-/json2csv-5.0.1.tgz",
      "integrity": "sha512-QFMifUX1y8W2tKi2TwZpnzf2rHdZvzdmgZUMEMDF46F90f4a9mUeWfx/qg4kzXSZYJYc3cWA5O+eLXk5lj9g8g==",
      "dev": true,
      "requires": {
        "commander": "^5.0.0",
        "jsonparse": "^1.3.1",
@@ -6665,7 +6666,8 @@
        "commander": {
          "version": "5.1.0",
          "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
          "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="
          "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
          "dev": true
        }
      }
    },
@@ -6696,7 +6698,8 @@
    "jsonparse": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
      "dev": true
    },
    "jsprim": {
      "version": "1.4.1",
@@ -6876,7 +6879,8 @@
    "lodash.get": {
      "version": "4.4.2",
      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
      "dev": true
    },
    "lodash.kebabcase": {
      "version": "4.1.1",

 package.json

@@ -14,7 +14,6 @@
    "el-tree-transfer": "^2.2.9",
    "element-ui": "^2.13.2",
    "file-saver": "^2.0.2",
    "json2csv": "^5.0.1",
    "vue": "^2.6.11",
    "vue-layer": "^1.2.0",
    "vue-router": "^3.3.1",
@@ -28,6 +27,7 @@
    "babel-eslint": "^10.1.0",
    "eslint": "^6.7.2",
    "eslint-plugin-vue": "^6.2.2",
    "json2csv": "^5.0.1",
    "script-loader": "^0.7.2",
    "vue-template-compiler": "^2.6.11"
  },

 src/api/services/file/index.js

@@ -14,6 +14,18 @@
    },

    /**
     * 查询所有的设备
     * 无参
     */
    searchAllDevice () {
        return axios({
            method: 'post',
            url: 'Device_infAction!serchAllFile',
            data: null
        });
    }

    /**
     * 文件下载
     * PageName:fileout
     * dev_id:1001

 src/pages/file/index.vue

@@ -115,27 +115,12 @@
                this.$refs.export.submit();
            });
        },
        // 多个下载
        downloadMult () {
            let arr = [];
            if (this.selection.length == 0) {
                this.$message({
                    type: 'warning',
                    message: '请选择要下载的文件'
                });
        treeClick(data) {
            console.log(data, 'data');
            if (!data.end){
                return false;
            }
            this.selection.forEach((v) => {
                arr.push(v.table_date);
            });
            this.tableName = arr.join(',');
            // console.log(this.tableName);

            this.$nextTick(()=>{
                this.$refs.export.submit();
            });
        },
        treeClick(data) {
            data.dev_id = data.dev_id || data._dev_id;
            const sys_name = data.txt;
            data.cfg = data.cfg.map((v) => {
                var reg = /^(\S*?)(?=&&)|^[^&]+$/;
@@ -167,27 +152,70 @@
            });
        },
        getSysList () {
            this.$api.batt.searchAll()
            this.$api.file.searchAllDevice()
            .then((res) => {
                const data = JSON.parse(res.data.result);
                // console.log(data);
                console.log(data);
                let List = [];
                let obj = {};
                if (data.code == 1) {
                    List = data.data;
                }
                List.forEach((v) => {
                    if (!obj[v.sys_name]) {
                    /*if (!obj[v.sys_name]) {
                        obj[v.sys_name] = {
                            dev_id: v.dev_id,
                            txt: v.sys_name,
                            active: false,
                            cfg: v.cfg
                        };
                    }*/
                    obj[v.sys_name] = obj[v.sys_name] || {};
                    obj[v.sys_name][v.dev_id] = obj[v.sys_name][v.dev_id] || {
                        _dev_id: v.dev_id,
                        txt: v.sys_name,
                        dev_name: v.dev_name,
                        sys_name: v.sys_name,
                        active: false,
                        open: false,
                        end: true,
                        cfg: v.cfg
                    }
                });

                // console.log(obj, '===obj');
                Object.keys(obj).forEach((v) => {
                    this.treeData.push(obj[v]);
                    let len = Object.keys(obj[v]).length;
                    if(len == 1) {
                        Object.keys(obj[v]).forEach((value) => {
                            // console.log(obj[v][value], '1');
                            this.treeData.push(obj[v][value]);
                        });
                    } else {
                        let children = [];
                        let idx = '';
                        Object.keys(obj[v]).forEach((val) => {
                            // console.log(obj[v][val], 2);
                            children.push({
                                dev_id: obj[v][val]._dev_id,
                                txt: obj[v][val].dev_name,
                                active: false,
                                open: false,
                                end: true,
                                cfg: obj[v][val].cfg
                            });
                            idx = val;
                        });
                        this.treeData.push({
                            dev_id: obj[v][idx]._dev_id + '_1',
                            txt: obj[v][idx].sys_name,
                            active: false,
                            open: false,
                            end: false,
                            children
                        });
                    }
                    console.log(this.treeData, '====treeData');
                });
            }).catch(() => {
                this.$message({