Merge branch 'master' of http://gitea.yxtsoft.com/jianguan/supervise-monitor-ui

2 years ago · e68b0bf282
7 changed files with 351 additions and 279 deletions
--- a/.gitignore
+++ b/.gitignore
@ -96,4 +96,6 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser

+package-lock.json
+node_modules/
 monitor-ui/
--- a/package.json
+++ b/package.json
@ -17,6 +17,7 @@
    "axios": "^0.24.0",
    "bpmn-js": "^9.2.2",
    "core-js": "^2.6.12",
+    "echarts": "^5.4.2",
    "ejs": "^2.7.4",
    "element-ui": "2.15.13",
    "js-cookie": "2.2.0",
@ -33,8 +34,8 @@
    "vue-router": "3.0.6",
    "vuex": "3.1.0",
    "vuex-persistedstate": "^4.0.0",
-    "xcrud": "^0.4.19",
-    "web-control": "^1.0.2"
+    "web-control": "^1.0.2",
+    "xcrud": "^0.4.19"
  },
  "devDependencies": {
    "@vue/cli-plugin-babel": "4.4.4",
--- a/public/image/yujing.png
+++ b/public/image/yujing.png
--- a/src/views/index.vue
+++ b/src/views/index.vue
@ -224,6 +224,12 @@
    components: {
      PieChartrenyuan
    },
+    created() {
+      var _self = this
+      setInterval(function () {
+        _self.getMessage();
+      }, 20000)
+    },
    data() {
      return {
        ruqinbaojing_Chart: ruqinbaojing_Chart, // 1.1
@ -246,6 +252,21 @@
      }
    },
    methods: {
+      getMessage() {
+        this.$notify({
+          title: '报警消息',
+          dangerouslyUseHTMLString: true,
+          // // message: "<img src='" + warningIcon + "'>" + data.messageContent,
+          message: "<img style='width:50px' src='/image/yujing.png'>" + "新的报警待处理",
+          position: 'bottom-right',
+          onClick: () => {
+            alert("这是一条新订单")
+            // this.playText('你有一条报警信息未读')
+            // this.getServicePageLists()
+          },
+          duration: 3000,
+        })
+      },
      //  	getToken(){
      //  		let params = {
      //  			password: "329653",
@ -265,51 +286,68 @@

 <style lang="scss" scoped>
  .webindex {
-    width: 100%; padding: 20px;
+    width: 100%;
+    padding: 20px;
    height: 100%;
    background: radial-gradient(#fff, #f5f7f4, #fff);
  }
+
  .tops {
    display: flex;
    flex-direction: row;
    flex-wrap: nowrap;
-  justify-content: flex-start;align-items: flex-start;
+    justify-content: flex-start;
+    align-items: flex-start;
    padding: 0px;
    margin: 0px;
  }
+
  .tops .topbox {
    width: 25%;
    margin: 0 20px 0 0;
    background-color: #fff;
-  box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px;
+    box-shadow: 0px 0px 10px #E9E9E9;
+    border-radius: 5px;
    padding: 10px;
  }
+
  .tops .topbox:last-of-type {
    margin: 0;
  }
+
  .tops .topbox .toptitle {
    font-size: 20px;
    padding: 10px 20px;
-  font-weight: bold;  color: #333;font-size: 16px;
+    font-weight: bold;
+    color: #333;
+    font-size: 16px;
    border-bottom: 1px solid #ececee;
  }
+
  .tops .topbox .mids {
    display: flex;
    flex-direction: row;
    flex-wrap: nowrap;
-  justify-content: flex-start;align-items: center;
+    justify-content: flex-start;
+    align-items: center;
    margin: 0;
    padding: 20px;
  }
-.tops .topbox .mids .lefts{width: 100px;}
+
+  .tops .topbox .mids .lefts {
+    width: 100px;
+  }
+
  .tops .topbox .mids .lefts .iconbox {
    border-radius: 10px;
    line-height: 80px;
    width: 80px;
    height: 80px;
    color: #fff;
-		font-size: 36px;text-align: center;
+    font-size: 36px;
+    text-align: center;
  }
+
  .iconbox_red {
    background-color: #df2f07;
  }
@ -322,9 +360,11 @@
  .iconbox_green {
    background-color: #07C160;
  }
+
  .iconbox_blue {
    background-color: #3f9bfa;
  }
+
  .iconbox_zi {
    background-color: #6421ff;
  }
@ -332,14 +372,18 @@
  .iconbox_fen {
    background-color: #9b2efb;
  }
-.tops .topbox .mids .rights {flex: 1;
+
+  .tops .topbox .mids .rights {
+    flex: 1;
    padding: 2px 0 2px 10px;
  }
+
  .tops .topbox .mids .rights .note {
    color: #333;
    font-size: 14px;
    padding: 0 0 3px 0;
  }
+
  .tops .topbox .mids .rights .note span {
    font-size: 20px;
    padding: 0 5px;
@ -350,42 +394,54 @@
    display: flex;
    flex-direction: row;
    flex-wrap: nowrap;
-  justify-content: flex-start;align-items: flex-start;
+    justify-content: flex-start;
+    align-items: flex-start;
    margin: 0;
    padding: 20px 0 0 0;
  }
+
  .tbar {
    width: 25%;
    margin: 0 20px 0 0;
    background-color: #fff;
-  box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px;
+    box-shadow: 0px 0px 10px #E9E9E9;
+    border-radius: 5px;
    padding: 10px;
  }
+
  .tbar:last-of-type {
    margin: 0;
  }
+
  .tbar0 {
    border-bottom: 0px solid #032ab8;
  }
+
  .tbar .title {
    font-size: 20px;
    padding: 10px 20px;
-  font-weight: bold;  color: #333;font-size: 16px;
+    font-weight: bold;
+    color: #333;
+    font-size: 16px;
    border-bottom: 1px solid #ececee;
  }
+
  .tbar .title span {
    padding: 0 10px 0 0;
  }
+
  .tbar .bar {
    display: flex;
    flex-direction: row;
    flex-wrap: nowrap;
-  justify-content: flex-start;align-items: center;
+    justify-content: flex-start;
+    align-items: center;
    margin: 0;
    padding: 0px;
    height: 190px;

  }
+
  .con {
    padding: 20px 0;
    display: flex;
@ -393,16 +449,20 @@
    flex-wrap: nowrap;
    justify-content: space-around;
  }
+
  .news {
    width: 25%;
    margin: 0 20px 0 0;
    background-color: #fff;
-  box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px;
+    box-shadow: 0px 0px 10px #E9E9E9;
+    border-radius: 5px;
    padding: 10px;
  }
+
  .news:last-of-type {
    margin: 0;
  }
+
  .news .title {
    display: flex;
    flex-direction: row;
@ -414,11 +474,16 @@
  }

  .news .title .newstits {
-  font-weight: bold;  color: #333;font-size: 16px;
+    font-weight: bold;
+    color: #333;
+    font-size: 16px;
  }

-.news .title .more {text-align: right;
-  cursor: pointer;color: #6c6a6a;font-size: 14px;
+  .news .title .more {
+    text-align: right;
+    cursor: pointer;
+    color: #6c6a6a;
+    font-size: 14px;
  }

  .news .content {
@ -436,12 +501,15 @@
    padding: 5px 10px;
    border-bottom: 1px solid #ececee;
  }
+
  .news .content .newsli .dot {
    padding: 0px 8px 0 0;
    font-size: 18px;
    height: 25px;
-  line-height: 25px;color: #047cf7;
+    line-height: 25px;
+    color: #047cf7;
  }
+
  .news .content .newsli .tit {
    padding: 0px 0;
    font-size: 14px;
@ -456,7 +524,8 @@
  .news .content .newsli .time {
    padding: 0px 0;
    color: #666666;
-  text-align: right;font-size: 14px;
+    text-align: right;
+    font-size: 14px;
    width: 100px;
    height: 25px;
    line-height: 25px;
--- a/src/views/shebeirizhi/shebeirizhiList.vue
+++ b/src/views/shebeirizhi/shebeirizhiList.vue
@ -12,7 +12,7 @@
                  maxlength="20"></el-date-picker>
              </el-form-item>
              <el-form-item label="设备名称">
-                <el-select v-model="listQuery.params.supplierType" filterable clearable placeholder="请选择设备名称">
+                <el-select v-model="listQuery.params.supplierType1" filterable clearable placeholder="请选择设备名称">
                  <el-option v-for="item in supplierType_list" :key="item.id" :label="item.title" :value="item.id" />
                </el-select>
              </el-form-item>
--- a/src/views/shebeitaizhang/shebeitaizhangList.vue
+++ b/src/views/shebeitaizhang/shebeitaizhangList.vue
@ -43,7 +43,7 @@
                </el-select>
              </el-form-item>
              <el-form-item label="选择楼层">
-                <el-select v-model="listQuery.params.supplierType" filterable clearable placeholder="请选择楼层">
+                <el-select v-model="listQuery.params.supplierType1" filterable clearable placeholder="请选择楼层">
                  <el-option v-for="item in floor_list" :key="item.id" :label="item.title" :value="item.id" />
                </el-select>
              </el-form-item>
--- a/vue.config.js
+++ b/vue.config.js
@ -24,7 +24,7 @@ module.exports = {
   *在大多数情况下，请使用“/”！！！
   *详细信息：https://cli.vuejs.org/config/#publicpath
   */
-  publicPath: process.env.NODE_ENV === 'production' ? '/monitor/' : '/',
+  publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
  outputDir: 'monitor-ui',
  assetsDir: 'static',
  lintOnSave: process.env.NODE_ENV === 'development',