Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

66b7669d · renjintao · c234145c · 897fdd3b · 66b7669d · 66b7669d
Commit 66b7669d authored Jul 22, 2020 by renjintao
13 changed files
--- a/assets/images/close.png
+++ b/assets/images/close.png
--- a/assets/images/demo/bg.png
+++ b/assets/images/demo/bg.png
--- a/assets/images/demo/legend.png
+++ b/assets/images/demo/legend.png
--- a/libs/henq.js
+++ b/libs/henq.js
@@ -200,4 +200,18 @@ henq.getArry = (arryList) => {//得到数据字典对应的label和value，用
  });
  return arry;
 }
+henq.random=(minNum, maxNum)=> {
+  switch (arguments.length) {
+    case 1:
+      return parseInt(Math.random() * minNum + 1, 10);
+      break;
+    case 2:
+      return parseInt(Math.random() * ( maxNum - minNum + 1 ) + minNum, 10);
+      //或者 Math.floor(Math.random()*( maxNum - minNum + 1 ) + minNum );
+      break;
+    default:
+      return 0;
+      break;
+  }
+} 
 export default henq;
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -29,8 +29,12 @@ export default {
      }
    ],
    script: [{
-      src: '/config.js'
+      src: '/config.js'      
-    }],
+    }
+    // ,{
+    //   src:'http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js'
+    // }
+  ],
    link: [{
      rel: 'icon',
      type: 'image/x-icon',

--- a/package-lock.json
+++ b/package-lock.json
@@ -3492,6 +3492,34 @@
      "resolved": "http://r.cnpmjs.org/bluebird/download/bluebird-3.7.2.tgz",
      "integrity": "sha1-nyKcFb4nJFT/qXOs4NvueaGww28="
    },
+    "bmaplib.curveline": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/bmaplib.curveline/-/bmaplib.curveline-1.0.0.tgz",
+      "integrity": "sha512-9wcFMVhiYxNPqpvsLDAADn3qDhNzXp2mA6VyHSHg2XOAgSooC7ZiujdFhy0sp+0QYjTfJ/MjmLuNoUg2HHxH4Q=="
+    },
+    "bmaplib.heatmap": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/bmaplib.heatmap/-/bmaplib.heatmap-1.0.4.tgz",
+      "integrity": "sha512-rmhqUARBpUSJ9jXzUI2j7dIOqnc38bqubkx/8a349U2qtw/ulLUwyzRD535OrA8G7w5cz4aPKm6/rNvUAarg/Q=="
+    },
+    "bmaplib.lushu": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/bmaplib.lushu/-/bmaplib.lushu-1.0.7.tgz",
+      "integrity": "sha512-LVvgpESPii6xGxyjnQjq8u+ic4NjvhdCPV/RiSS/PGTUdZKeTDS7prSpleJLZH3ES0+oc0gYn8bw0LtPYUSz2w=="
+    },
+    "bmaplib.markerclusterer": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/bmaplib.markerclusterer/-/bmaplib.markerclusterer-1.0.13.tgz",
+      "integrity": "sha512-VrLyWSiuDEVNi0yUfwOhFQ6z1oEEHS4w36GNu3iASu6p52QIx9uAXMUkuSCHReNR0bj2Cp9SA1dSx5RpojXajQ==",
+      "requires": {
+        "bmaplib.texticonoverlay": "^1.0.2"
+      }
+    },
+    "bmaplib.texticonoverlay": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bmaplib.texticonoverlay/-/bmaplib.texticonoverlay-1.0.2.tgz",
+      "integrity": "sha512-4ZTWr4ZP3B6qEWput5Tut16CfZgII38YwM3bpyb4gFTQyORlKYryFp9WHWrwZZaHlOyYDAXG9SX0hka43jTADg=="
+    },
    "bn.js": {
      "version": "4.11.8",
      "resolved": "http://r.cnpmjs.org/bn.js/download/bn.js-4.11.8.tgz",
@@ -11304,6 +11332,14 @@
      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
      "dev": true
    },
+    "linkify-it": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
+      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
    "lint-staged": {
      "version": "7.3.0",
      "resolved": "http://r.cnpmjs.org/lint-staged/download/lint-staged-7.3.0.tgz",
@@ -11923,6 +11959,25 @@
        "object-visit": "^1.0.0"
      }
    },
+    "markdown-it": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
+      "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
+      "requires": {
+        "argparse": "^1.0.7",
+        "entities": "~1.1.1",
+        "linkify-it": "^2.0.0",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+        }
+      }
+    },
    "marked": {
      "version": "0.3.19",
      "resolved": "http://r.cnpmjs.org/marked/download/marked-0.3.19.tgz",
@@ -11949,6 +12004,11 @@
      "resolved": "http://r.cnpmjs.org/mdn-data/download/mdn-data-2.0.4.tgz",
      "integrity": "sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs="
    },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
+    },
    "media-typer": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -21853,6 +21913,11 @@
      "resolved": "http://r.cnpmjs.org/ua-parser-js/download/ua-parser-js-0.7.21.tgz",
      "integrity": "sha1-hTz5zpP2QvZxdCc8w0Vlrm8wh3c="
    },
+    "uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
+    },
    "uglify-js": {
      "version": "3.4.10",
      "resolved": "http://r.cnpmjs.org/uglify-js/download/uglify-js-3.4.10.tgz",
@@ -22193,6 +22258,18 @@
      "resolved": "http://r.cnpmjs.org/vue/download/vue-2.6.11.tgz",
      "integrity": "sha1-dllNh31LEiNEBuhONSdcbVFBJcU="
    },
+    "vue-baidu-map": {
+      "version": "0.21.22",
+      "resolved": "https://registry.npmjs.org/vue-baidu-map/-/vue-baidu-map-0.21.22.tgz",
+      "integrity": "sha512-WQMPCih4UTh0AZCKKH/OVOYnyAWjfRNeK6BIeoLmscyY5aF8zzlJhz/NOHLb3mdztIpB0Z6aohn4Jd9mfCSjQw==",
+      "requires": {
+        "bmaplib.curveline": "^1.0.0",
+        "bmaplib.heatmap": "^1.0.4",
+        "bmaplib.lushu": "^1.0.7",
+        "bmaplib.markerclusterer": "^1.0.13",
+        "markdown-it": "^8.4.0"
+      }
+    },
    "vue-class-component": {
      "version": "7.2.3",
      "resolved": "https://registry.npm.taobao.org/vue-class-component/download/vue-class-component-7.2.3.tgz",

--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
    "ua-parser-js": "^0.7.18",
    "v-viewer": "^1.5.1",
    "view-design": "^4.1.3",
+    "vue-baidu-map": "^0.21.22",
    "vue-echarts": "^4.0.3",
    "vue-i18n": "^8.15.5",
    "vue-json-viewer": "^2.2.8",

--- a/pages/demo/Fax/index.vue
+++ b/pages/demo/Fax/index.vue
+<template>
+  <div class="fax">
+    <Form ref="formInline" :model="formInline" inline>
+      <FormItem prop="name" label="名称">
+        <Input type="text" v-model="formInline.name" placeholder="请输入名称"></Input>
+      </FormItem>
+      <FormItem prop="company" label="出发单位">
+        <Select v-model="formInline.company" style="width:200px">
+          <Option value="beijing">New York</Option>
+          <Option value="shanghai">London</Option>
+          <Option value="shenzhen">Sydney</Option>
+        </Select>
+      </FormItem>
+      <FormItem prop="date1" label="出发时间">
+        <DatePicker type="date" style="width: 200px" placeholder="请选择" v-model="formInline.date1"></DatePicker>
+      </FormItem>
+      <FormItem prop="date2" label="接受时间">
+        <DatePicker type="date" placeholder="请选择" style="width: 200px" v-model="formInline.date2"></DatePicker>
+      </FormItem>
+      <FormItem prop="user" label="接受人">
+        <Input type="text" v-model="formInline.user" placeholder="请输入接受人"></Input>
+      </FormItem>
+      <FormItem>
+        <Button type="primary" @click="handleSubmit('formInline')">查询</Button>
+      </FormItem>
+      <FormItem>
+        <Button @click="reset('formInline')">重置</Button>
+      </FormItem>
+      <FormItem>
+        <Button type="primary" @click="add('formInline')">新建</Button>
+      </FormItem>
+    </Form>
+    <Table border :columns="columns" :data="data"></Table>
+    <Modal v-model="modal" title="新建" @on-ok="ok" @on-cancel="cancel">
+      <Form :model="formItem" :label-width="80">
+        <FormItem label="名称">
+          <Input v-model="formItem.input" placeholder="请输入名称"></Input>
+        </FormItem>
+        <FormItem label="出发单位">
+          <Select v-model="formItem.select">
+            <Option value="beijing">New York</Option>
+            <Option value="shanghai">London</Option>
+            <Option value="shenzhen">Sydney</Option>
+          </Select>
+        </FormItem>
+        <FormItem label="出发时间">
+          <DatePicker
+            type="date"
+            placeholder="Select date"
+            v-model="formItem.date"
+            style="width: 408px"
+          ></DatePicker>
+        </FormItem>
+        <FormItem label="接收时间">
+          <TimePicker
+            type="time"
+            placeholder="Select time"
+            v-model="formItem.time"
+            style="width: 408px"
+          ></TimePicker>
+        </FormItem>
+        <FormItem label="接受人">
+          <Input v-model="formItem.input" placeholder="请输入接受人"></Input>
+        </FormItem>
+        <FormItem label="主要内容">
+          <Input
+            v-model="formItem.textarea"
+            type="textarea"
+            :autosize="{minRows: 2,maxRows: 5}"
+            placeholder="Enter something..."
+          ></Input>
+        </FormItem>
+        <FormItem label="原始文件">
+          <Upload action="//jsonplaceholder.typicode.com/posts/">
+            <Button icon="ios-cloud-upload-outline">上传文件</Button>
+          </Upload>
+        </FormItem>
+      </Form>
+    </Modal>
+    <Modal v-model="modal1" title="详情" footer-hide>
+      <p style="line-height:40px;text-indent:2em;">
+        (八)0C6692次出库径路为:成都东动车所I场→成都东城际场经成都东城际动走上行线,按自动站间方式行车。二、加开贵阳北至成都东C6694/3次事宜2020年5月10日至31日,加开贵阳北—成都东C6694次、成都东贵阳北C6693次,经渝贵线、成渝高速线运行,使用CRH380D型单组动车组运行,定员556人。由贵阳客运段、贵阳车辆段担当。(一)列车编组:贵阳北开首位ZES1(45,其中商务座5)、ZE2(85)、ZYSI(33,其中商务座
+        5)计8辆,车厢顺号8-1号。(二)动车客运业务办理站、运行时刻、运行径路、动车固定股道、乘务交路:C6694次:贵阳北渝贵贵广场10:35开(9道),贵阳北渝贵贵广场—成都东城际场间比照2020年第二季度调整列车运行图中G2886次办理,成都东城际场14:40到(11道);C6693次:成都东城际场15:03开(11道),成都东城际场—贵阳北渝贵贵广场间比照2020年第二季度调整列车运行图中G2887次办理,贵阳北渝贵贵广场19:06到(10道)。
+      </p>
+    </Modal>
+  </div>
+</template>
+<script>
+export default {
+  name: "",
+  data() {
+    return {
+      formInline: {
+        user: "",
+        password: ""
+      },
+      formItem: {
+        input: "",
+        select: "",
+        radio: "male",
+        checkbox: [],
+        switch: true,
+        date: "",
+        time: "",
+        slider: [20, 50],
+        textarea: ""
+      },
+      modal: false,
+      modal1: false,
+      columns: [
+        {
+          title: "序号",
+          type: "index",
+          width: 60,
+          align: "center"
+        },
+        {
+          title: "名称",
+          key: "name",
+          width: 440
+        },
+        {
+          title: "出发时间",
+          key: "startTime"
+        },
+        {
+          title: "接收时间",
+          key: "a1"
+        },
+        {
+          title: "发出单位",
+          key: "a2"
+        },
+        {
+          title: "接收部门",
+          key: "a3"
+        },
+        {
+          title: "接收人",
+          key: "a4"
+        },
+        {
+          title: "主要内容",
+          key: "a5",
+          width: 400
+        },
+        {
+          title: "备注",
+          key: "a6"
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 120,
+          align: "center",
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "op",
+                {
+                  props: {
+                    type: "detail",
+                    size: "small"
+                  },
+                  style: {
+                    marginRight: "5px"
+                  },
+                  on: {
+                    click: () => {
+                      this.show(params.index);
+                    }
+                  }
+                },
+                "查看详情"
+              )
+            ]);
+          }
+        }
+      ],
+      data: [
+        {
+          name: "成都局集团公司关于五月继续加开、重联部分客车等事宜的通知",
+          startTime: "2020.05.09",
+          a1: "2020.05.09",
+          a2: "成都局集团公司",
+          a3: "成都双流整备所",
+          a4: "张三",
+          a5: "成都局集团公司关于五月继续加开、重联部分客车等事宜",
+          a6: ""
+        },
+        {
+          name: "成都局集团公司关于五月继续加开、重联部分客车等事宜的通知",
+          startTime: "2020.05.09",
+          a1: "2020.05.09",
+          a2: "成都局集团公司",
+          a3: "成都双流整备所",
+          a4: "张三",
+          a5: "成都局集团公司关于五月继续加开、重联部分客车等事宜",
+          a6: ""
+        },
+        {
+          name: "成都局集团公司关于五月继续加开、重联部分客车等事宜的通知",
+          startTime: "2020.05.09",
+          a1: "2020.05.09",
+          a2: "成都局集团公司",
+          a3: "成都双流整备所",
+          a4: "张三",
+          a5: "成都局集团公司关于五月继续加开、重联部分客车等事宜",
+          a6: ""
+        },
+        {
+          name: "成都局集团公司关于五月继续加开、重联部分客车等事宜的通知",
+          startTime: "2020.05.09",
+          a1: "2020.05.09",
+          a2: "成都局集团公司",
+          a3: "成都双流整备所",
+          a4: "张三",
+          a5: "成都局集团公司关于五月继续加开、重联部分客车等事宜",
+          a6: ""
+        }
+      ]
+    };
+  },
+  methods: {
+    handleSubmit(name) {
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          this.$Message.success("Success!");
+        } else {
+          this.$Message.error("Fail!");
+        }
+      });
+    },
+    reset() {},
+    add() {
+      this.modal = true;
+    },
+    show() {
+      this.modal1 = true;
+    },
+    ok() {
+      this.$Message.info("Clicked ok");
+    },
+    cancel() {
+      this.$Message.info("Clicked cancel");
+    }
+  }
+};
+</script>
+<style lang="less">
+.fax {
+  .ivu-form-item-content {
+    float: left;
+  }
+}
+</style>
\ No newline at end of file
--- a/pages/demo/index.vue
+++ b/pages/demo/index.vue
--- a/pages/demo/monitoringWarning/index.vue
+++ b/pages/demo/monitoringWarning/index.vue
+<template>
+  <div class="monitoring-warning">
+    <Tabs type="card" @on-click="tab" value="0">
+      <TabPane label="修程信息" name="0">
+        <Info></Info>
+      </TabPane>
+      <TabPane label="修程统计" name="1">
+        <Statistics></Statistics>
+      </TabPane>
+    </Tabs>
+  </div>
+</template>
+<script>
+import Info from "./info";
+import Statistics from "./statistics";
+export default {
+  name: "",
+  components: {
+    Info,
+    Statistics
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    tab(data) {}
+  }
+};
+</script>
+<style lang="less">
+</style>
\ No newline at end of file
--- a/pages/demo/monitoringWarning/info.vue
+++ b/pages/demo/monitoringWarning/info.vue
+<template>
+  <div class="info">
+    <Form ref="formInline" :model="formInline" inline>
+      <Row :gutter="16">
+        <Col span="4">
+          <FormItem prop="name" label="车辆编号">
+            <Input type="text" v-model="formInline.name" placeholder="请输入车辆编号"></Input>
+          </FormItem>
+        </Col>
+        <Col span="4">
+          <FormItem prop="company" label="车辆厂家">
+            <Select v-model="formInline.company" style="width:200px">
+              <Option value="beijing">New York</Option>
+              <Option value="shanghai">London</Option>
+              <Option value="shenzhen">Sydney</Option>
+            </Select>
+          </FormItem>
+        </Col>
+        <Col span="4">
+          <FormItem prop="date1" label="临近修程（天数）">
+            <InputNumber v-model="formInline.a1" :min="0" style="width:150px" />
+          </FormItem>
+        </Col>
+        <Col span="4">
+          <FormItem prop="date1" label="临近修程（公里）">
+            <InputNumber v-model="formInline.a2" :min="0" style="width:150px" />
+          </FormItem>
+        </Col>
+        <Col span="8">
+          <FormItem>
+            <Button type="primary" @click="handleSubmit('formInline')">查询</Button>
+          </FormItem>
+          <FormItem>
+            <Button @click="reset('formInline')">重置</Button>
+          </FormItem>
+          <FormItem>
+            <Button type="primary" @click="add('formInline')">设置</Button>
+          </FormItem>
+        </Col>
+      </Row>
+    </Form>
+    <Table border :columns="columns" :data="data"></Table>
+    <Modal v-model="modal" title="修程报警设置" @on-ok="ok" @on-cancel="cancel">
+      <Form :model="formItem" :label-width="200">
+        <FormItem label="临近修程天数 （天）">
+          <InputNumber v-model="formItem.a2" :min="0" style="width:150px" />
+        </FormItem>
+        <FormItem label="临近修程公里数（km）">
+          <InputNumber v-model="formItem.a3" :min="0" style="width:150px" />
+        </FormItem>
+        <FormItem label="出发时间">
+          <RadioGroup v-model="formItem.radio">
+            <Radio label="0">是</Radio>
+            <Radio label="1">否</Radio>
+          </RadioGroup>
+        </FormItem>
+      </Form>
+    </Modal>
+    <Modal v-model="modal1" title="详情" footer-hide width="1000">
+      <Row :gutter="16" v-for="(item,index) in listDetail" :key="index" class="row-b">
+        <Col span="2">
+          <div class="d1">D{{index+1}}</div>
+        </Col>
+        <Col span="7">
+          <div>{{item.b1}}</div>
+        </Col>
+        <Col span="8">
+          <div>{{item.b2}}</div>
+        </Col>
+        <Col span="7">
+          <div>{{item.b3}}</div>
+        </Col>
+      </Row>
+    </Modal>
+  </div>
+</template>
+<script>
+export default {
+  name: "",
+  data() {
+    return {
+      formInline: {
+        user: "",
+        company: "",
+        a1: "",
+        a2: ""
+      },
+      formItem: {
+        input: "",
+        select: "",
+        radio: "1",
+        checkbox: [],
+        switch: true,
+        date: "",
+        time: "",
+        slider: [20, 50],
+        textarea: ""
+      },
+      modal: false,
+      modal1: false,
+      columns: [
+        {
+          title: "序号",
+          type: "index",
+          width: 60,
+          align: "center"
+        },
+        {
+          title: "车辆编号",
+          key: "name",
+          width: 170
+        },
+        {
+          title: "车辆厂家",
+          key: "startTime"
+        },
+        {
+          title: "出厂时间",
+          key: "a1"
+        },
+        {
+          title: "配属时间",
+          key: "a2"
+        },
+        {
+          title: "运行总里程数（公里）",
+          key: "a3"
+        },
+        {
+          title: "运行总时长（月）",
+          key: "a4"
+        },
+        {
+          title: "累计检修里程数",
+          key: "a5"
+        },
+        {
+          title: "检修后运行里程数",
+          key: "a6"
+        },
+        {
+          title: "累计检修时长（天）",
+          key: "a7"
+        },
+        {
+          title: "检修后运行时长（天）",
+          key: "a8"
+        },
+        {
+          title: "第一修剩余公里数",
+          key: "a9"
+        },
+        {
+          title: "第二修剩余公里数",
+          key: "a10"
+        },
+        {
+          title: "临近修程",
+          key: "a11"
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 120,
+          align: "center",
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "op",
+                {
+                  props: {
+                    type: "detail",
+                    size: "small"
+                  },
+                  style: {
+                    marginRight: "5px"
+                  },
+                  on: {
+                    click: () => {
+                      this.show(params.index);
+                    }
+                  }
+                },
+                "查看详情"
+              )
+            ]);
+          }
+        }
+      ],
+      data: [
+        {
+          name: "CR200J1029+1028",
+          startTime: "唐厂",
+          a1: "2019.01.03",
+          a2: "2019.02.05",
+          a3: "3900",
+          a4: "0.23",
+          a5: "0",
+          a6: "3900",
+          a7: "0",
+          a8: "7",
+          a9: "500",
+          a10: "326100",
+          a11: "D1修"
+        },
+        {
+          name: "CR200J 3001+3003",
+          startTime: "长客",
+          a1: "2018.05.02",
+          a2: "2018.06.01",
+          a3: "28500",
+          a4: "11",
+          a5: "26000",
+          a6: "2500",
+          a7: "330",
+          a8: "2",
+          a9: "1900",
+          a10: "4500",
+          a11: "D2修"
+        }
+      ],
+      listDetail: [
+        {
+          b1:
+            "（动力车及控制车机务设备由机务检修，拖车及控制车（不含机务设备）由车辆检修）",
+          b2:
+            "动力车及控制车机务设备对应实施机车一级整备，拖车和控制车（不含机务设备）对应实施客车日常检修。",
+          b3: "运行不超过4000+400公里"
+        },
+        {
+          b1:
+            "（动力车及控制车机务设备由机务检修，拖车及控制车（不含机务设备）由车辆检修）",
+          b2:
+            "动力车及控制车机务设备对应实施专项检修（对应机车二级整备、C1修、C2修、C3修），拖车和控制车（不含机务设备）对应实施客车专项检修，A1修。",
+          b3:
+            "动力车、 控制车机务设备检修周期为1年的专项检修项目及拖车、车控制车(不含机务设备）按客车A1修项目:运行30±3万公里或距上次Ｄ2修以上修程1年；动力车、控制车机务设备其他专项检修项目和拖车控制（不含机务设) 专项检修项目按附件3规定的时间周期"
+        },
+        {
+          b1: "（动力车由机车检修单位检修，拖车、控制车由客车检修单位负责）",
+          b2: "分别对应实施机车C4修和客车A2修。",
+          b3: "运行60±6万公里或距上次D3修以上修程2年"
+        },
+        {
+          b1: "（动力车由机车检修单位检修，拖车、控制车由客车检修单位负责）",
+          b2: "分别对应实施机车C6修和客车A4修。",
+          b3: "运行220±22万公里或距上次D6修以上修程8年"
+        },
+        {
+          b1: "（动力车由机车检修单位检修，拖车、控制车由客车检修单位负责）",
+          b2: "分别对应实施机车C6修和客车A5修。",
+          b3: "运行440±22万公里或距上次D5修以上修程8年"
+        }
+      ]
+    };
+  },
+  methods: {
+    handleSubmit(name) {
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          this.$Message.success("Success!");
+        } else {
+          this.$Message.error("Fail!");
+        }
+      });
+    },
+    reset() {},
+    add() {
+      this.modal = true;
+    },
+    show() {
+      this.modal1 = true;
+    },
+    ok() {
+      this.$Message.info("Clicked ok");
+    },
+    cancel() {
+      this.$Message.info("Clicked cancel");
+    }
+  }
+};
+</script>
+<style lang="less">
+.info {
+  .ivu-form-item-content {
+    float: left;
+  }
+}
+.d1 {
+  color: #333333;
+  font-size: 48px;
+}
+.row-b {
+  background: #eee;
+  border-radius: 5px;
+  margin: 15px;
+  padding: 10px;
+}
+</style>
\ No newline at end of file
--- a/pages/demo/monitoringWarning/statistics.vue
+++ b/pages/demo/monitoringWarning/statistics.vue
+<template>
+  <div>
+    <Row :gutter="16">
+      <Col span="12">
+        <v-chart :options="braking" class="echarts-map" style="width:100%;height:800px;" />
+      </Col>
+      <Col span="12">
+        <v-chart :options="braking1" class="echarts-map" style="width:100%;height:800px;" />
+      </Col>
+    </Row>
+  </div>
+</template>
+<script>
+import ECharts from "vue-echarts";
+import echarts from "echarts/lib/echarts";
+import "echarts/lib/chart/pie";
+import "echarts/lib/chart/bar";
+import "echarts/lib/component/tooltip";
+import "echarts/lib/component/title";
+import "echarts/lib/component/legend";
+import "echarts/lib/component/grid";
+export default {
+  name: "echarts",
+  components: {
+    "v-chart": ECharts
+  },
+  mounted() {
+    this.statistics();
+    this.statistics1();
+  },
+  data() {
+    return {
+      braking: {},
+      braking1: {}
+    };
+  },
+  methods: {
+    statistics1() {
+      this.braking1 = {
+        xAxis: {
+          type: "value"
+        },
+        yAxis: {
+          type: "category",
+          data: ["D6", "D5", "D4", "D3", "D2", "D1"]
+        },
+        grid: {
+          left: "3%",
+          right: "4%",
+          bottom: "3%",
+          containLabel: true
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "shadow"
+          }
+        },
+        color: ["#73DDFF"],
+        series: [
+          {
+            data: [120, 200, 150, 80, 70, 110],
+            type: "bar",
+            barWidth: 30, //柱图宽度
+            barGap: "-50%" //柱图间距
+          }
+        ]
+      };
+    },
+    statistics() {
+      var colorList = ["#73DDFF", "#73ACFF", "#FDD56A"];
+      this.braking = {
+        // title: {
+        //   //   text: "PieChart",
+        //   x: "center",
+        //   y: "center",
+        //   textStyle: {
+        //     fontSize: 20
+        //   }
+        // },
+        legend: {
+          // orient: "vertical",
+          bottom: 50,
+          left: "center",
+          data: ["正常", "临近", "到达"]
+        },
+        tooltip: {
+          trigger: "item",
+          formatter: "{b}: {c} ({d}%)"
+        },
+        series: [
+          {
+            type: "pie",
+            center: ["50%", "50%"],
+            radius: ["24%", "45%"],
+            clockwise: true,
+            avoidLabelOverlap: true,
+            hoverOffset: 15,
+            itemStyle: {
+              normal: {
+                color: function(params) {
+                  return colorList[params.dataIndex];
+                }
+              }
+            },
+            label: {
+              show: true,
+              position: "outside",
+              formatter: "{a|{b}：{d}%}\n{hr|}",
+              rich: {
+                hr: {
+                  backgroundColor: "t",
+                  borderRadius: 3,
+                  width: 3,
+                  height: 3,
+                  padding: [3, 3, 0, -12]
+                },
+                a: {
+                  padding: [-30, 15, -20, 15]
+                }
+              }
+            },
+            labelLine: {
+              normal: {
+                length: 20,
+                length2: 30,
+                lineStyle: {
+                  width: 1
+                }
+              }
+            },
+            data: [
+              {
+                name: "正常",
+                value: 5600
+              },
+              {
+                name: "临近",
+                value: 3600
+              },
+              {
+                name: "到达",
+                value: 1500
+              }
+            ]
+          }
+        ]
+      };
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.early-warning {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file
--- a/plugins/iview.js
+++ b/plugins/iview.js
@@ -37,7 +37,7 @@ import ResourceSelect from '@/components/page/resourceSelect.vue'
 import StoreTree from '@/components/page/storeTree.vue'
 import StoreSelect from '@/components/page/storeSelect.vue'
 import clipboard from 'clipboard';
+import BaiduMap from 'vue-baidu-map'
 // import i18n from '@/i18n';
 import radioButton from '@/components/page/radioButton.vue'
 import InputIcon from '@/components/page/inputIcon.vue'
@@ -147,7 +147,10 @@ export default ({
    i18n: (key, value) => app.i18n.t(key, value)
  })
  Vue.use(iViewPro);
+  Vue.use(BaiduMap, {
+    // ak 是在百度地图开发者平台申请的密钥 详见 http://lbsyun.baidu.com/apiconsole/key */
+    ak: 'NMVkIGzyFBL6g3ekXIZqIYMCnvz74YOc'
+  })
  Vue.prototype.$log = {
    ...util.log,
    push(data) {