From 1f2b7958a59831aeaa7414bf8fc8276cae8ab778 Mon Sep 17 00:00:00 2001
From: jakcic <63526115+jakcic@users.noreply.github.com>
Date: Tue, 21 Dec 2021 11:59:37 +0800
Subject: [PATCH] =?UTF-8?q?myDialog=E7=BB=84=E4=BB=B6=E9=87=8D=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/.babelrc                             |   4 +
 ruoyi-ui/.env.production                      |   6 +-
 ruoyi-ui/.eslintignore                        |   4 +-
 ruoyi-ui/babel.config.js                      |   5 +-
 ruoyi-ui/package.json                         |   9 +
 ruoyi-ui/src/config.js                        |   2 +-
 .../src/layout/components/InnerLink/index.vue |   4 +-
 ruoyi-ui/src/main.js                          |  24 +-
 ruoyi-ui/src/mixins/index.js                  |  36 +-
 ruoyi-ui/src/option/components/table.vue      |  50 +--
 ruoyi-ui/src/page/group/container.vue         |  83 ++--
 ruoyi-ui/src/page/group/myDialog.vue          | 349 +++++++++--------
 ruoyi-ui/src/page/group/subgroup.vue          |  20 +-
 ruoyi-ui/src/router/index.js                  | 134 ++++---
 ruoyi-ui/src/styles/style.scss                |   2 +-
 ruoyi-ui/src/utils/time.js                    |  10 +
 ruoyi-ui/src/views/screen/page/build.vue      | 361 +-----------------
 .../views/screen/page/group/contentmenu.vue   |   3 +-
 ruoyi-ui/vue.config.js                        |  11 +-
 .../controller/FactorIconController.java      | 103 +++++
 .../com/ruoyi/system/domain/FactorIcon.java   |  79 ++++
 .../ruoyi/system/mapper/FactorIconMapper.java |  61 +++
 .../system/service/IFactorIconService.java    |  61 +++
 .../service/impl/FactorIconServiceImpl.java   |  93 +++++
 .../mapper/system/FactorIconMapper.xml        |  66 ++++
 25 files changed, 867 insertions(+), 713 deletions(-)
 create mode 100644 ruoyi-ui/.babelrc
 create mode 100644 ruoyi-ui/src/utils/time.js
 create mode 100644 src/main/java/com/ruoyi/system/controller/FactorIconController.java
 create mode 100644 src/main/java/com/ruoyi/system/domain/FactorIcon.java
 create mode 100644 src/main/java/com/ruoyi/system/mapper/FactorIconMapper.java
 create mode 100644 src/main/java/com/ruoyi/system/service/IFactorIconService.java
 create mode 100644 src/main/java/com/ruoyi/system/service/impl/FactorIconServiceImpl.java
 create mode 100644 src/main/resources/mapper/system/FactorIconMapper.xml

diff --git a/ruoyi-ui/.babelrc b/ruoyi-ui/.babelrc
new file mode 100644
index 000000000..1e5e4d639
--- /dev/null
+++ b/ruoyi-ui/.babelrc
@@ -0,0 +1,4 @@
+{
+  "presets":["@babel/preset-env"],
+  "plugins":["transform-vue-jsx"]
+}
\ No newline at end of file
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index c446eb32a..8764b6660 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -6,10 +6,10 @@ ENV = 'production'
 
 # 若依管理系统/生产环境
 # VUE_APP_BASE_API = 'prod-api'
-VUE_APP_BASE_API = 'http://192.168.1.183:8080'
+VUE_APP_BASE_API = 'http://172.17.172.240:8080'
 
 # 图片上传接口
-VUE_APP_IMAGE_API = 'http://192.168.1.183:8080/system/visualImage/upload'
+VUE_APP_IMAGE_API = 'http://172.17.172.240:8080/system/visualImage/upload'
 
 # 图片上传文件夹
-VUE_APP_IMAGE_PATH ='http://192.168.1.183:8080/profile/images/'
+VUE_APP_IMAGE_PATH ='http://172.17.172.240:8080/profile/images/'
diff --git a/ruoyi-ui/.eslintignore b/ruoyi-ui/.eslintignore
index 89be6f659..09bfa9361 100644
--- a/ruoyi-ui/.eslintignore
+++ b/ruoyi-ui/.eslintignore
@@ -7,4 +7,6 @@ public
 # 忽略当前目录下为js的文件的语法检查
 *.js
 # 忽略当前目录下为vue的文件的语法检查
-*.vue
\ No newline at end of file
+*.vue
+
+*.babelrc
\ No newline at end of file
diff --git a/ruoyi-ui/babel.config.js b/ruoyi-ui/babel.config.js
index b99f00148..485a9a2f3 100644
--- a/ruoyi-ui/babel.config.js
+++ b/ruoyi-ui/babel.config.js
@@ -1,7 +1,8 @@
 module.exports = {
   presets: [
     // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
-    '@vue/cli-plugin-babel/preset'
+    '@vue/cli-plugin-babel/preset',
+    // '@vue/babel-preset-jsx'
   ],
   'env': {
     'development': {
@@ -9,5 +10,5 @@ module.exports = {
       // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
       'plugins': ['dynamic-import-node']
     }
-  }
+  },
 }
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index fd3d96488..99ef64e7b 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -36,7 +36,10 @@
     "url": "https://gitee.com/y_project/RuoYi-Vue.git"
   },
   "dependencies": {
+    "@babel/preset-env": "^7.16.5",
     "@riophae/vue-treeselect": "0.4.0",
+    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
+    "@vue/babel-preset-jsx": "^1.2.4",
     "axios": "0.21.0",
     "clipboard": "2.0.6",
     "codemirror": "^5.63.3",
@@ -49,6 +52,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "2.2.1",
     "jsencrypt": "3.0.0-rc.1",
+    "lodash": "^4.17.21",
     "mockjs": "^1.1.0",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
@@ -68,6 +72,11 @@
     "@vue/cli-plugin-eslint": "4.4.6",
     "@vue/cli-service": "4.4.6",
     "babel-eslint": "10.1.0",
+    "babel-helper-vue-jsx-merge-props": "^2.0.3",
+    "babel-plugin-jsx-v-model": "^2.0.3",
+    "babel-plugin-syntax-jsx": "^6.18.0",
+    "babel-plugin-transform-vue-jsx": "^3.7.0",
+    "babel-preset-env": "^1.7.0",
     "chalk": "4.1.0",
     "connect": "3.6.6",
     "echarts": "^4.9.0",
diff --git a/ruoyi-ui/src/config.js b/ruoyi-ui/src/config.js
index ebe694016..34e00dd42 100644
--- a/ruoyi-ui/src/config.js
+++ b/ruoyi-ui/src/config.js
@@ -13,4 +13,4 @@ export default {
 }
 // export const url = 'https://data.bladex.vip/blade-visual'
 // export const url = 'http://localhost:8080/avue/api'
-export const url = 'http://192.168.1.183:8080/avue/api'
+export const url = 'http://172.17.172.240:8080/avue/api'
diff --git a/ruoyi-ui/src/layout/components/InnerLink/index.vue b/ruoyi-ui/src/layout/components/InnerLink/index.vue
index a45d1a4a4..c6372ff20 100644
--- a/ruoyi-ui/src/layout/components/InnerLink/index.vue
+++ b/ruoyi-ui/src/layout/components/InnerLink/index.vue
@@ -1,9 +1,9 @@
 <script>
 export default {
-  data() {
+  data () {
     return {};
   },
-  render() {
+  render (h) {
     const { $route: { meta: { link } }, } = this;
     if ({ link }.link === "") {
       return "404";
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index 2cb5c2136..0655c68b9 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -6,6 +6,7 @@ import './assets/styles/element-variables.scss'
 
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
+import '@/styles/style.scss'
 import App from './App'
 import store from './store'
 import router from './router'
@@ -15,9 +16,20 @@ import plugins from './plugins' // plugins
 import '@/mock/'
 import './assets/icons' // icon
 import './permission' // permission control
-import { getDicts } from "@/api/system/dict/data";
-import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+import {
+  getDicts
+} from "@/api/system/dict/data";
+import {
+  getConfigKey
+} from "@/api/system/config";
+import {
+  parseTime,
+  resetForm,
+  addDateRange,
+  selectDictLabel,
+  selectDictLabels,
+  handleTree
+} from "@/utils/ruoyi";
 // 分页组件
 import Pagination from "@/components/Pagination";
 // 自定义表格工具组件
@@ -81,14 +93,16 @@ Vue.config.productionTip = false
 //注册自定义组件
 import '@/components/'
 
-import { url } from '@/config'
+import {
+  url
+} from '@/config'
 import 'element-ui/lib/theme-chalk/index.css';
 Vue.prototype.url = url;
 // import '@/theme/index.js'
 // import './styles/common.scss'
 // Vue.prototype.$echarts = echarts
 
-import  panoramaProcess  from "@/utils/panoramaProcess"
+import panoramaProcess from "@/utils/panoramaProcess"
 Vue.prototype.panoramaProcess = panoramaProcess;
 
 import echarts from 'echarts'
diff --git a/ruoyi-ui/src/mixins/index.js b/ruoyi-ui/src/mixins/index.js
index b08012072..211751988 100644
--- a/ruoyi-ui/src/mixins/index.js
+++ b/ruoyi-ui/src/mixins/index.js
@@ -1,20 +1,24 @@
 // 查看页面和编辑页面公用的参数和方法
 import common from '@/config'
-import { config } from '@/option/config'
+import {
+  config
+} from '@/option/config'
 import container from '@/page/group/container'
-import { getList } from '@/api/map'
+import {
+  getList
+} from '@/api/map'
 export default {
   components: {
     container
   },
-  props:['id','panoramaId'],
-  provide () {
+  props: ['id', 'panoramaId'],
+  provide() {
     return {
       main: this,
       contain: this
     };
   },
-  data () {
+  data() {
     return {
       DIC: {
         MAP: []
@@ -31,7 +35,7 @@ export default {
     }
   },
   computed: {
-    list () {
+    list() {
       let result = [];
       //循环处理数据
       const detail = (item) => {
@@ -53,7 +57,7 @@ export default {
       return result
     }
   },
-  created () {
+  created() {
     this.initDic();
     this.handleCheckExpire()
   },
@@ -62,7 +66,7 @@ export default {
   },
   methods: {
     //初始化字典
-    initDic () {
+    initDic() {
       getList({
         pageNum: 1,
         pageSize: 100,
@@ -76,7 +80,7 @@ export default {
         });
       })
     },
-    findnav (id, type) {
+    findnav(id, type) {
       //循环处理数据
       let obj = undefined;
       let count = 0;
@@ -110,26 +114,26 @@ export default {
         parent
       }
     },
-    findlist (index) {
+    findlist(index) {
       return this.list.find(ele => ele.index == index) || {}
     },
-    handleInitActive () {
+    handleInitActive() {
       this.active = []
     },
-    handleMouseDown () {
+    handleMouseDown() {
       this.handleInitActive();
     },
-    handleCheckExpire(){
+    handleCheckExpire() {
       this.timer = setInterval(() => {
         setTimeout(() => {
-          checkExpire(this.id,this.panoramaId).then(res=>{
+          checkExpire(this.id, this.panoramaId).then(res => {
             console.log('权限正常')
-          }).catch(err=>{
+          }).catch(err => {
             alert('您的权限已过期')
             window.close()
           })
         }, 0)
-      }, 1000*60*60)
+      }, 10000 * 60 * 60)
     }
   }
 }
diff --git a/ruoyi-ui/src/option/components/table.vue b/ruoyi-ui/src/option/components/table.vue
index b4921323f..b636d3f18 100644
--- a/ruoyi-ui/src/option/components/table.vue
+++ b/ruoyi-ui/src/option/components/table.vue
@@ -75,7 +75,8 @@
                :data="main.activeOption.column"
                @row-save="rowSave"
                @row-del="rowDel"
-               @row-update="rowUpdate">
+               @row-update="rowUpdate"
+               class="test">
       <template slot="menu"
                 slot-scope="{row,index,size,type}">
         <el-button @click="trigger(index)"
@@ -207,18 +208,6 @@ export default {
       this.allTriggerVisible = true;
 
     },
-    // rowSaveTrigger (row, done) {
-    //   console.log(this.main.activeOption.triggerColumn);
-    //   this.main.activeOption.triggerColumn.push(row);
-    //   done()
-    // },
-    // rowDelTrigger (row, index) {
-    //   this.main.activeOption.triggerColumn.splice(index, 1);
-    // },
-    // rowUpdateTrigger (row, index, done) {
-    //   this.main.activeOption.triggerColumn.splice(index, 1, row);
-    //   done()
-    // },
     rowSave (row, done) {
       console.log(this.main.activeOption.column);
       this.main.activeOption.column.push(row);
@@ -234,37 +223,4 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-el-dialog__body {
-  background: #141d4d;
-}
-
-.el-table__cell {
-  background-color: #1d1f26 !important;
-  color: #bcc8d4 !important;
-}
-.el-dialog__body {
-  background-color: #1d1f26;
-  color: #bcc8d4;
-}
-.el-dialog__header {
-  background-color: #1d1f26;
-  color: #bcc8d4;
-}
-.avue-dialog .el-dialog__title,
-.avue-dialog .el-drawer__header {
-  color: #bcc8d4;
-}
-.avue-form__group--flex {
-  background-color: #1d1f26;
-  color: #bcc8d4;
-}
-.avue-dialog__footer {
-  margin-top: 10px;
-}
-.test {
-  background-color: #1d1f26;
-  color: #bcc8d4;
-}
-</style>
+<style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/page/group/container.vue b/ruoyi-ui/src/page/group/container.vue
index d4cb528cd..c5d90d002 100644
--- a/ruoyi-ui/src/page/group/container.vue
+++ b/ruoyi-ui/src/page/group/container.vue
@@ -12,19 +12,22 @@
              :style="styleName"
              id="container"
              ref="container">
-          <showPanoramaInScreen  v-if="handleShowPanorama()" ref="showThumbs">
+          <showPanoramaInScreen v-if="handleShowPanorama()"
+                                ref="showThumbs">
 
           </showPanoramaInScreen>
           <myDialog></myDialog>
-          <div id="snece-container" v-if="show()">
+          <div id="snece-container"
+               v-if="show()">
             <div style="text-align:center">
-              <div style="display:inline-block;width: 100px; height: 100px;margin-right: 20px;" v-for="(thumb,index) in thumbs" :key="index">
+              <div style="display:inline-block;width: 100px; height: 100px;margin-right: 20px;"
+                   v-for="(thumb,index) in thumbs"
+                   :key="index">
                 <!-- 这里index为什么不报错？ -->
-                <el-image
-                  @click="handleChangePanorama(thumb.index)"
-                  style="cursor: pointer;"
-                  :src="thumb.thumb"
-                  :fit="fits[0]">
+                <el-image @click="handleChangePanorama(thumb.index)"
+                          style="cursor: pointer;"
+                          :src="thumb.thumb"
+                          :fit="fits[0]">
                 </el-image>
               </div>
             </div>
@@ -48,7 +51,7 @@ import common from '@/config'
 import { getObj } from '@/api/visual'
 import jq from 'jquery';
 import showPanoramaInScreen from "@/page/group/showPanoramaInScreen";
-import {getPanorama} from "@/api/system/panorama";
+import { getPanorama } from "@/api/system/panorama";
 import myDialog from "@/page/group/myDialog";
 export default {
   name: 'contents',
@@ -70,11 +73,11 @@ export default {
       selectCount: {},
       scale: 1,
       gradeFlag: false,
-      dialog_visible:false,
-      panorama_visible:false,
-      thumbs:[],
+      dialog_visible: false,
+      panorama_visible: false,
+      thumbs: [],
       fits: ['fill', 'contain', 'cover', 'none', 'scale-down'],
-      ans:0,
+      ans: 0,
     }
   },
   computed: {
@@ -90,16 +93,8 @@ export default {
         width: this.setPx(this.contain.config.width),
         height: this.setPx(this.contain.config.height),
         backgroundColor: this.contain.config.backgroundColor,
-          'transform-origin': '0 0',
-        },
-      //  (() => {
-      //   if (this.contain.config.backgroundImage) {
-      //     return {
-      //       background: `url(${this.contain.config.backgroundImage}) 0% 0% / 100% 100% rgb(3, 12, 59)`,
-      //     }
-      //   }
-      //   return
-      // })()
+        'transform-origin': '0 0',
+      },
       )
     },
     gradeLenStyle () {
@@ -112,35 +107,36 @@ export default {
     this.showThumbs();
     this.initData();
     this.initFun();
+    console.log(this.contain, 'contain')
     // this.hidePanorama();
 
   },
   methods: {
 
-    handleChangePanorama(index){
+    handleChangePanorama (index) {
       // console.log(index);
       this.$refs.showThumbs.changePanorama(index);
     },
-    show(){
+    show () {
       const id = this.$route.params.panoramaId;
-      if(id==="null") return false;
+      if (id === "null") return false;
       return true;
     },
 
-    async showThumbs(){
+    async showThumbs () {
       const id = this.$route.params.panoramaId;
-      if(id==="null") return false;
+      if (id === "null") return false;
       // console.log(id);
       await getPanorama(id).then(response => {
         // console.log(response);
-        this.formDB=response.data;
+        this.formDB = response.data;
       });
-      this.message=JSON.parse(this.formDB.component) || [];
-      var objects=JSON.parse(this.formDB.component) || [];
+      this.message = JSON.parse(this.formDB.component) || [];
+      var objects = JSON.parse(this.formDB.component) || [];
       // console.log("json文件");
       // console.log(objects);
       // 先遍历场景，再遍历传感器和场景变换
-      for(var obj of objects) {
+      for (var obj of objects) {
         if (obj.type === "scene") {
           // console.log("这这里");
           obj["index"] = this.ans;
@@ -157,12 +153,12 @@ export default {
         this[ele] = this.$refs.subgroup[ele]
       });
     },
-    hidePanorama(){
-        // 原来是block
-        let canvas = jq('canvas');
-        // console.log(canvas);
-        canvas.css({"display":"none"});
-      },
+    hidePanorama () {
+      // 原来是block
+      let canvas = jq('canvas');
+      // console.log(canvas);
+      canvas.css({ "display": "none" });
+    },
     //初始化数据
     initData () {
 
@@ -318,11 +314,11 @@ export default {
         }
       })
     },
-    handleShowPanorama(){
-      const id=this.$route.params.panoramaId;
+    handleShowPanorama () {
+      const id = this.$route.params.panoramaId;
       // console.log(id);
       // console.log("这里执行了");
-      if(id==="null") return false;
+      if (id === "null") return false;
       else return true;
     }
 
@@ -331,7 +327,7 @@ export default {
 </script>
 
 <style scoped>
-#snece-container{
+#snece-container {
   position: absolute;
   bottom: 4rem;
   border-radius: 0px;
@@ -339,8 +335,7 @@ export default {
   background: rgba(39, 39, 39, 0.25);
   box-shadow: 0 3px 14px rgb(128 128 128 / 50%);
   width: 100%;
-  height:130px;
+  height: 130px;
   background-repeat: repeat-x;
 }
-
 </style>
diff --git a/ruoyi-ui/src/page/group/myDialog.vue b/ruoyi-ui/src/page/group/myDialog.vue
index 9319f6e71..f072dff88 100644
--- a/ruoyi-ui/src/page/group/myDialog.vue
+++ b/ruoyi-ui/src/page/group/myDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="测点信息"
+    <el-dialog :title="title"
                :visible.sync="dialogTableVisible"
                :modal="false">
       <el-image style="width:267px; height: 220px"
@@ -8,28 +8,35 @@
                 fit="fill">
       </el-image>
       <el-table :data="gridData"
-                style="display: inline-block;width: calc(100% - 267px);">
+                style="display: inline-block;width: calc(100% - 267px);"
+                max-height="217">
         <el-table-column property="time"
-                         label=时间></el-table-column>
-        <el-table-column property="x"
-                         label="X角度变化"></el-table-column>
-        <el-table-column property="y"
-                         label="Y角度变化"></el-table-column>
+                         label=时间
+                         width="160"
+                         fixed
+                         :render-header="renderHeader"></el-table-column>
+        <el-table-column v-for="(sensorWarning,index) in sensorWarningList"
+                         :key="index"
+                         :property="`${sensorWarning['factors_name']}_calc`"
+                         :label="sensorWarning['factors_name']"
+                         width="160">
+          <template slot-scope="scope">
+            <div :style="{'color':textStyle(scope)}">
+              {{scope.row[scope.column.property]}}
+            </div>
+          </template>
+        </el-table-column>
       </el-table>
-
-      <!--    <div id="myChart" style="width:900px; height:500px" ></div>-->
       <div ref="chart"
-           style="width:670px; height:372px"></div>
+           style="width:100%; height:372px"></div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { ref } from 'vue'
-import editPanorama from "@/page/group/editPanorama";
 import { globalBus } from "@/page/group/globalBus";
 import { getMonitorData } from "@/api/monitor";
-import { listVisualImage } from "@/api/system/visualImage";
+import { formatDate } from "@/utils/time.js"
 export default {
   name: "myDialog",
   data () {
@@ -37,27 +44,8 @@ export default {
       dialogTableVisible: false,
       url: require("../../../public/icon/test.jpg"),
       gridData: [],
-      //   [{
-      //   time: '2021-11-14 11:00:00',
-      //   x: '0.07',
-      //   y: '0.69'
-      // }, {
-      //   time: '2021-11-14 13:00:00',
-      //   x: '0.08',
-      //   y: '0.70'
-      // }, {
-      //   time: '2021-11-14 15:00:00',
-      //   x: '0.09',
-      //   y: '0.69'
-      // }, {
-      //   time: '2021-11-14 17:00:00',
-      //   x: '0.08',
-      //   y: '0.68'
-      // }],
+      title: '监测信息',
       option: {
-        // title: {
-        //   text: 'Test'
-        // },
         tooltip: {
           trigger: 'axis'
         },
@@ -66,7 +54,6 @@ export default {
           type: 'category',
           boundaryGap: false,
           data: []
-          // data: ['2021-11-14\n11:00:00', '2021-11-14\n13:00:00', '2021-11-14\n15:00:00', '2021-11-14\n17:00:00', '2021-11-14\n19:00:00', '2021-11-14\n21:00:00', '2021-11-14\n23:00:00']
         },
         yAxis: {
           type: 'value',
@@ -75,163 +62,191 @@ export default {
           }
         },
         series: [
-          {
-            name: 'Y角度变化',
-            type: 'line',
-            data: []
-            // data: [10, 11, 13, 11, 12, 12, 9],
-          },
-          {
-            name: 'X角度变化',
-            type: 'line',
-            data: []
-            // data: [1, 3, 2, 5, 3, 2, 0],
-          }
         ]
       },
-      monitorRecord: []
-      // [{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"16.2","root.ovmr.fehy.znna.temperature":"662.0","Time":"1638750600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"15.5","root.ovmr.fehy.znna.temperature":"655.0","Time":"1638748800000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23715.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.3","root.ovmr.fehy.znna.temperature":"653.0","Time":"1638747000000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26184.0","root.ovmr.fehy.znna.temperature_calc":"17.7","root.ovmr.fehy.znna.temperature":"677.0","Time":"1638705600000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23721.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"18.3","root.ovmr.fehy.znna.temperature":"683.0","Time":"1638703800000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23720.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"18.3","root.ovmr.fehy.znna.temperature":"683.0","Time":"1638702000000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23720.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26187.0","root.ovmr.fehy.znna.temperature_calc":"18.5","root.ovmr.fehy.znna.temperature":"685.0","Time":"1638700200000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23722.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26191.0","root.ovmr.fehy.znna.temperature_calc":"18.6","root.ovmr.fehy.znna.temperature":"686.0","Time":"1638698400000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23721.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"18.8","root.ovmr.fehy.znna.temperature":"688.0","Time":"1638696600000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23722.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"19.0","root.ovmr.fehy.znna.temperature":"690.0","Time":"1638694800000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23722.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"19.3","root.ovmr.fehy.znna.temperature":"693.0","Time":"1638691200000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23723.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"19.5","root.ovmr.fehy.znna.temperature":"695.0","Time":"1638689400000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23723.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26192.0","root.ovmr.fehy.znna.temperature_calc":"19.9","root.ovmr.fehy.znna.temperature":"699.0","Time":"1638687600000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23723.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26192.0","root.ovmr.fehy.znna.temperature_calc":"20.1","root.ovmr.fehy.znna.temperature":"701.0","Time":"1638685800000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23723.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"20.3","root.ovmr.fehy.znna.temperature":"703.0","Time":"1638684000000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23723.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"20.8","root.ovmr.fehy.znna.temperature":"708.0","Time":"1638682200000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23725.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"20.2","root.ovmr.fehy.znna.temperature":"702.0","Time":"1638680400000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23723.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"19.4","root.ovmr.fehy.znna.temperature":"694.0","Time":"1638678600000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23723.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"19.0","root.ovmr.fehy.znna.temperature":"690.0","Time":"1638676800000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23722.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26191.0","root.ovmr.fehy.znna.temperature_calc":"18.1","root.ovmr.fehy.znna.temperature":"681.0","Time":"1638675000000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23722.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26187.0","root.ovmr.fehy.znna.temperature_calc":"17.1","root.ovmr.fehy.znna.temperature":"671.0","Time":"1638673200000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23720.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"16.8","root.ovmr.fehy.znna.temperature":"668.0","Time":"1638671400000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23720.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.8","root.ovmr.fehy.znna.temperature":"658.0","Time":"1638669600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23719.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.9","root.ovmr.fehy.znna.temperature":"659.0","Time":"1638667800000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"15.0","root.ovmr.fehy.znna.temperature":"650.0","Time":"1638666000000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23717.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.2","root.ovmr.fehy.znna.temperature":"652.0","Time":"1638664200000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23715.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26186.0","root.ovmr.fehy.znna.temperature_calc":"14.7","root.ovmr.fehy.znna.temperature":"647.0","Time":"1638662400000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23717.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"14.5","root.ovmr.fehy.znna.temperature":"645.0","Time":"1638660600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23714.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"14.5","root.ovmr.fehy.znna.temperature":"645.0","Time":"1638658800000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23715.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"13.9","root.ovmr.fehy.znna.temperature":"639.0","Time":"1638657000000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23715.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"14.1","root.ovmr.fehy.znna.temperature":"641.0","Time":"1638655200000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26194.0","root.ovmr.fehy.znna.temperature_calc":"14.1","root.ovmr.fehy.znna.temperature":"641.0","Time":"1638653400000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23713.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"14.3","root.ovmr.fehy.znna.temperature":"643.0","Time":"1638651600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23714.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"14.5","root.ovmr.fehy.znna.temperature":"645.0","Time":"1638649800000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23713.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"14.4","root.ovmr.fehy.znna.temperature":"644.0","Time":"1638648000000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23714.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"14.4","root.ovmr.fehy.znna.temperature":"644.0","Time":"1638646200000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23712.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"14.9","root.ovmr.fehy.znna.temperature":"649.0","Time":"1638644400000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.2","root.ovmr.fehy.znna.temperature":"652.0","Time":"1638642600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23714.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26187.0","root.ovmr.fehy.znna.temperature_calc":"15.0","root.ovmr.fehy.znna.temperature":"650.0","Time":"1638640800000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23717.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.2","root.ovmr.fehy.znna.temperature":"652.0","Time":"1638639000000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23715.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26193.0","root.ovmr.fehy.znna.temperature_calc":"15.3","root.ovmr.fehy.znna.temperature":"653.0","Time":"1638637200000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23718.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.2","root.ovmr.fehy.znna.temperature":"652.0","Time":"1638635400000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"14.9","root.ovmr.fehy.znna.temperature":"649.0","Time":"1638633600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23715.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26191.0","root.ovmr.fehy.znna.temperature_calc":"14.8","root.ovmr.fehy.znna.temperature":"648.0","Time":"1638631800000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23714.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.4","root.ovmr.fehy.znna.temperature":"654.0","Time":"1638630000000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.6","root.ovmr.fehy.znna.temperature":"656.0","Time":"1638628200000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23715.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.8","root.ovmr.fehy.znna.temperature":"658.0","Time":"1638626400000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.9","root.ovmr.fehy.znna.temperature":"659.0","Time":"1638624600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.9","root.ovmr.fehy.znna.temperature":"659.0","Time":"1638622800000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23719.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.9","root.ovmr.fehy.znna.temperature":"659.0","Time":"1638621000000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26184.0","root.ovmr.fehy.znna.temperature_calc":"16.2","root.ovmr.fehy.znna.temperature":"662.0","Time":"1638619200000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23717.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"16.4","root.ovmr.fehy.znna.temperature":"664.0","Time":"1638617400000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23717.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"16.4","root.ovmr.fehy.znna.temperature":"664.0","Time":"1638615600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"16.5","root.ovmr.fehy.znna.temperature":"665.0","Time":"1638613800000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23720.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"16.6","root.ovmr.fehy.znna.temperature":"666.0","Time":"1638612000000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"16.7","root.ovmr.fehy.znna.temperature":"667.0","Time":"1638610200000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23718.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"17.1","root.ovmr.fehy.znna.temperature":"671.0","Time":"1638608400000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23720.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"17.3","root.ovmr.fehy.znna.temperature":"673.0","Time":"1638606600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23718.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26191.0","root.ovmr.fehy.znna.temperature_calc":"17.6","root.ovmr.fehy.znna.temperature":"676.0","Time":"1638604800000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23721.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26191.0","root.ovmr.fehy.znna.temperature_calc":"18.1","root.ovmr.fehy.znna.temperature":"681.0","Time":"1638603000000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23718.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"18.3","root.ovmr.fehy.znna.temperature":"683.0","Time":"1638601200000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23722.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"18.7","root.ovmr.fehy.znna.temperature":"687.0","Time":"1638599400000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23722.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26192.0","root.ovmr.fehy.znna.temperature_calc":"18.9","root.ovmr.fehy.znna.temperature":"689.0","Time":"1638597600000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23722.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"18.9","root.ovmr.fehy.znna.temperature":"689.0","Time":"1638595800000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23722.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"19.1","root.ovmr.fehy.znna.temperature":"691.0","Time":"1638594000000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23722.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26186.0","root.ovmr.fehy.znna.temperature_calc":"18.6","root.ovmr.fehy.znna.temperature":"686.0","Time":"1638592200000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23721.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"18.1","root.ovmr.fehy.znna.temperature":"681.0","Time":"1638590400000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23722.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26192.0","root.ovmr.fehy.znna.temperature_calc":"17.8","root.ovmr.fehy.znna.temperature":"678.0","Time":"1638588600000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23721.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"17.2","root.ovmr.fehy.znna.temperature":"672.0","Time":"1638586800000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23720.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"16.8","root.ovmr.fehy.znna.temperature":"668.0","Time":"1638585000000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23719.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"16.4","root.ovmr.fehy.znna.temperature":"664.0","Time":"1638583200000","root.ovmr.fehy.znna.Xangle_calc":"0.26","root.ovmr.fehy.znna.Xangle":"23721.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.2","root.ovmr.fehy.znna.temperature":"652.0","Time":"1638581400000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"14.1","root.ovmr.fehy.znna.temperature":"641.0","Time":"1638579600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23718.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26191.0","root.ovmr.fehy.znna.temperature_calc":"13.6","root.ovmr.fehy.znna.temperature":"636.0","Time":"1638577800000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23714.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26193.0","root.ovmr.fehy.znna.temperature_calc":"13.2","root.ovmr.fehy.znna.temperature":"632.0","Time":"1638576000000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23712.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"12.2","root.ovmr.fehy.znna.temperature":"622.0","Time":"1638572400000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23710.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26191.0","root.ovmr.fehy.znna.temperature_calc":"12.3","root.ovmr.fehy.znna.temperature":"623.0","Time":"1638570600000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23710.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26187.0","root.ovmr.fehy.znna.temperature_calc":"12.5","root.ovmr.fehy.znna.temperature":"625.0","Time":"1638568800000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23710.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26187.0","root.ovmr.fehy.znna.temperature_calc":"12.8","root.ovmr.fehy.znna.temperature":"628.0","Time":"1638567000000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23711.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26187.0","root.ovmr.fehy.znna.temperature_calc":"13.0","root.ovmr.fehy.znna.temperature":"630.0","Time":"1638565200000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23710.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"13.1","root.ovmr.fehy.znna.temperature":"631.0","Time":"1638563400000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23712.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26190.0","root.ovmr.fehy.znna.temperature_calc":"12.9","root.ovmr.fehy.znna.temperature":"629.0","Time":"1638561600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23713.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"12.9","root.ovmr.fehy.znna.temperature":"629.0","Time":"1638559800000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23711.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26191.0","root.ovmr.fehy.znna.temperature_calc":"13.0","root.ovmr.fehy.znna.temperature":"630.0","Time":"1638558000000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23712.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"13.2","root.ovmr.fehy.znna.temperature":"632.0","Time":"1638556200000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23712.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"13.2","root.ovmr.fehy.znna.temperature":"632.0","Time":"1638554400000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23711.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"13.5","root.ovmr.fehy.znna.temperature":"635.0","Time":"1638552600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23714.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"13.5","root.ovmr.fehy.znna.temperature":"635.0","Time":"1638550800000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23712.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"14.1","root.ovmr.fehy.znna.temperature":"641.0","Time":"1638549000000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23712.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26184.0","root.ovmr.fehy.znna.temperature_calc":"14.1","root.ovmr.fehy.znna.temperature":"641.0","Time":"1638547200000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23712.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"14.4","root.ovmr.fehy.znna.temperature":"644.0","Time":"1638545400000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23712.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"14.8","root.ovmr.fehy.znna.temperature":"648.0","Time":"1638543600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23713.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.2","root.ovmr.fehy.znna.temperature":"652.0","Time":"1638541800000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23715.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26193.0","root.ovmr.fehy.znna.temperature_calc":"15.4","root.ovmr.fehy.znna.temperature":"654.0","Time":"1638540000000","root.ovmr.fehy.znna.Xangle_calc":"0.24","root.ovmr.fehy.znna.Xangle":"23712.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26188.0","root.ovmr.fehy.znna.temperature_calc":"14.9","root.ovmr.fehy.znna.temperature":"649.0","Time":"1638538200000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23713.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26187.0","root.ovmr.fehy.znna.temperature_calc":"15.4","root.ovmr.fehy.znna.temperature":"654.0","Time":"1638536400000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23718.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.9","root.ovmr.fehy.znna.temperature":"659.0","Time":"1638534600000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23715.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.2","root.ovmr.fehy.znna.temperature":"652.0","Time":"1638532800000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23715.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.17","root.ovmr.fehy.znna.Yangle":"26189.0","root.ovmr.fehy.znna.temperature_calc":"15.9","root.ovmr.fehy.znna.temperature":"659.0","Time":"1638531000000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23717.0"},{"root.ovmr.fehy.znna.Yangle_calc":"0.16","root.ovmr.fehy.znna.Yangle":"26191.0","root.ovmr.fehy.znna.temperature_calc":"16.6","root.ovmr.fehy.znna.temperature":"666.0","Time":"1638529200000","root.ovmr.fehy.znna.Xangle_calc":"0.25","root.ovmr.fehy.znna.Xangle":"23716.0"}]
-      ,
+      monitorRecord: [],
+      sensorWarningList: [],
+      showLength: 10,
+      value1: [],
     };
   },
-  // setup(){
-  //   const showDialog = () =>{
-  //     this.dialogTableVisible=true;
-  //   }
-  //
-  //   return{
-  //     showDialog,
-  //   }
-  // },
   mounted () {
-    const _this = this;
-    globalBus.$on("show", (url) => {
+    globalBus.$on("show", this.init);
+  },
+  methods: {
+    init (url) {
+      // if (obj.name) {
+      //   this.title = obj.name + '_' + obj.location
+      // } else {
+      //   this.title = '监测信息'
+      // }
       getMonitorData(url).then(response => {
-        console.log(response);
+        // 获取数据
         this.monitorRecord = response.result.records;
-        console.log(this.monitorRecord);
-        // console.log(response.rows[0]);
-        // console.log(this.pending)
-        //赋值前先把所有都清空
-        this.gridData = [];
-        this.option.xAxis.data = [];
-        this.option.series[1].data = [];
-        this.option.series[0].data = [];
-        for (let i = 0; i < 4; i++) {
-          this.gridData[i] = {};
-          // console.log(this.monitorRecord[i]);
-          // const array=Object.values(this.monitorRecord[i]);
-          // Date.prototype.toLocaleString = function() {
-          //   return this.getFullYear() + "-" + (this.getMonth() + 1) + "-" + this.getDate()  +" "+ this.getHours() + ":" + this.getMinutes();
-          // };
-          this.gridData[i]["time"] = new Date(parseInt(this.monitorRecord[i].Time)).toLocaleString().replace(/:\d{1,2}$/, ' ');
-          // this.gridData[i]["time"]=this.monitorRecord[i].Time;
-          for (let item in this.monitorRecord[i]) {
-            // console.log(item);
-            if (item.indexOf("Xangle_calc") != -1) { this.gridData[i]["x"] = this.monitorRecord[i][item] }
-            if (item.indexOf("Yangle_calc") != -1) { this.gridData[i]["y"] = this.monitorRecord[i][item] }
+        this.sensorWarningList = response.result.sensorWarningList
+        this.makeData()
+      })
+    },
+    // 根据时间过滤
+    filterByTime () {
+      this.option.series.forEach(series => series.data = [])
+      this.option.xAxis.data = []
+      let time1 = this.value1[0]
+      let time2 = this.value1[1]
+      let dataFilter = this.gridData.filter(dataTable => {
+        return new Date(dataTable.time) >= new Date(time1) && new Date(dataTable.time) <= new Date(time2)
+      })
+      dataFilter.forEach(everyData => {
+        for (let key in everyData) {
+          if (key == 'time') {
+            this.option.xAxis.data.push(everyData[key])
+          } else {
+            let index = this.option.series.findIndex(everySeries => key.indexOf(everySeries.name) != -1)
+            this.option.series[index].data.push(everyData[key])
           }
-
-          // this.gridData[i]["x"]=this.monitorRecord[i]["root.ovmr.fehy.znna.Xangle_calc"];
-          // this.gridData[i]["y"]=this.monitorRecord[i]["root.ovmr.fehy.znna.Yangle_calc"];
         }
-        for (let i = 0; i < 10; i++) {
-          // Date.prototype.toLocaleString = function() {
-          //   return this.getFullYear() + "-" + (this.getMonth() + 1) + "-" + this.getDate()  +" "+ this.getHours() + ":" + this.getMinutes();
-          // };
-          this.option.xAxis.data[i] = new Date(parseInt(this.monitorRecord[i].Time)).toLocaleString().replace(/:\d{1,2}$/, ' ');
-          // this.gridData[i]["time"]=this.monitorRecord[i].Time;
-          for (let item in this.monitorRecord[i]) {
-            // console.log(item);
-            if (item.indexOf("Xangle_calc") != -1) { this.option.series[1].data[i] = this.monitorRecord[i][item] }
-            if (item.indexOf("Yangle_calc") != -1) { this.option.series[0].data[i] = this.monitorRecord[i][item] }
+      })
+      this.gridData = dataFilter
+    },
+    makeData () {
+      const that = this
+      //赋值前先把所有都清空
+      that.gridData = [];
+      that.option.xAxis.data = [];
+      that.option.series = []
+      for (let i = 0; i < that.showLength; i++) {
+        let columnData = {}
+        const formate_date = formatDate(parseInt(that.monitorRecord[i].Time))
+        columnData.time = formate_date
+        that.option.xAxis.data[i] = formate_date
+        for (let item in that.monitorRecord[i]) {
+          if (item.indexOf('_calc') != -1) {
+            // 此处的this为何是未定义？
+            console.log(this)
+            // 组织表格展示的数据
+            let splitTitle = item.split('.')
+            let newTitle = splitTitle[splitTitle.length - 1]
+            columnData[newTitle] = that.monitorRecord[i][item]
+            // 组织图表展示的数据
+            let seriesData = that.option.series.find((series) => {
+              return series.name == newTitle.split('_')[0]
+            })
+            // 如果存在，则先找到index，然后将数据添加到data里面。如果不存在，则新建一个对象添加到series里面，再将数据添加到新建对象的data里面
+            if (seriesData) {
+              let index = that.option.series.findIndex(item => item.name == seriesData.name)
+              that.option.series[index].data.push(that.monitorRecord[i][item])
+            } else {
+              let length = that.option.series.push({
+                name: newTitle.split('_')[0],
+                type: 'line',
+                data: []
+              })
+              that.option.series[length - 1].data.push(that.monitorRecord[i][item])
+            }
           }
-
-          // this.gridData[i]["x"]=this.monitorRecord[i]["root.ovmr.fehy.znna.Xangle_calc"];
-          // this.gridData[i]["y"]=this.monitorRecord[i]["root.ovmr.fehy.znna.Yangle_calc"];
         }
-        // console.log("------------------");
-        // console.log(this.gridData);
+        that.gridData.push(columnData)
+      }
+    },
+    renderHeader (h) {
+      return (
+        <span>
+          时间
+          <el-popover placement='bottom' trigger="click" >
+            <span slot="reference">
+              <i class="el-icon-date"></i>
+            </span>
+            <el-date-picker
+              value={this.value1}
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              onInput={value => this.value1 = value}
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
+            </el-date-picker>
+          </el-popover>
+          <el-popover placement='bottom' trigger="click" >
+            <span slot="reference">
+              <i class="el-icon-search"></i>
+            </span>
+            <el-input
+              value={this.showLength}
+              type='number'
+              onInput={value => this.showLength = value}
+            ></el-input>
+          </el-popover>
+        </span >
+      );
+    }
+  },
+  computed: {
+    textStyle () {
+      return function (scope) {
+        let property = scope.column.property
+        let data = scope.row[property]
+
+        if (property == 'temperature_calc') return
+        let warning = this.sensorWarningList.filter(sensorWarning => {
+          return property.indexOf(sensorWarning['factors_name']) != -1
+        })
+
+        const warning_up = parseInt(warning[0].threshold_warning_up)
+        const warning_lower = parseInt(warning[0].threshold_warning_lower)
+        const alarm_lower = parseInt(warning[0].threshold_alarm_lower)
+        const alarm_up = parseInt(warning[0].threshold_alarm_up)
+
+        if (data > warning_lower && data < warning_up) {
+          return 'green'
+        } else if ((data > warning_up && data < alarm_up) ||
+          (data < warning_lower && data > alarm_lower)) {
+          return 'orange'
+        } else {
+          return 'red'
+        }
+      }
+    }
+  },
+  watch: {
+    option: {
+      handler (newValue, oldValue) {
+        // echarts初始化
         this.dialogTableVisible = true;
-        //nexttick在dom更新完之后再调用其函数
+        //nextTick在dom更新完之后再调用其函数
         this.$nextTick(() => {
           const chart = this.$refs.chart;
-          console.log("chart");
-          console.log(chart);
           if (chart) {
             const myChart = this.$echarts.init(chart)
-            myChart.setOption(this.option)
-            window.addEventListener("resize", function () {
-              myChart.resize()
-            })
+            myChart.setOption(newValue)
+            // window.addEventListener("resize", function () {
+            //   myChart.resize()
+            // })
+            // this.$on('hook:destroyed', () => {
+            //   window.removeEventListener("resize", function () {
+            //     myChart.resize();
+            //   });
+            // })
           }
-          this.$on('hook:destroyed', () => {
-            window.removeEventListener("resize", function () {
-              myChart.resize();
-            });
-          })
-        }
-        )
-      })
-    });
-
-  },
-  method: {
-    getLocalTime (nS) {
-      return new Date(parseInt(nS) * 1000).toLocaleString().replace(/:\d{1,2}$/, ' ');
+        })
+      },
+      deep: true
     },
-    closeDialog () {
-      this.dialogTableVisible = false;
+    showLength (newValue, oldValue) {
+      this.makeData()
     },
-    getEchartData () {
-      // console.log(document.getElementById('myChart'));
-      let myChart = this.$echarts.init(document.getElementById('myChart'));
-      myChart.setOption(
-        {
-          // title: {
-          //   text: 'Test'
-          // },
-          tooltip: {
-            trigger: 'axis'
-          },
-          legend: {},
-          xAxis: {
-            type: 'category',
-            boundaryGap: false,
-            data: ['2021-11-14\n11:00:00', '2021-11-14\n13:00:00', '2021-11-14\n15:00:00', '2021-11-14\n17:00:00', '2021-11-14\n19:00:00', '2021-11-14\n21:00:00', '2021-11-14\n23:00:00']
-          },
-          yAxis: {
-            type: 'value',
-            axisLabel: {
-              formatter: '{value}'
-            }
-          },
-          series: [
-            {
-              name: 'Y角度变化',
-              type: 'line',
-              data: [10, 11, 13, 11, 12, 12, 9],
-            },
-            {
-              name: 'X角度变化',
-              type: 'line',
-              data: [1, 3, 2, 5, 3, 2, 0],
-            }
-          ]
-        });
-    },
-    showDialog () {
-      this.dialogTableVisible = true;
-      console.log(this.$parent);
-    },
-    test () {
-      alert(123);
+    value1 (newValue, oldValue) {
+      this.filterByTime()
+      document.body.click()
     }
+  },
+  beforeDestroy () {
+    globalBus.$off('show')
   }
 }
 </script>
 
-<style scoped>
+<style scoped lang='css'>
 .el-table__cell {
   background-color: #fff !important;
   color: #bcc8d4 !important;
diff --git a/ruoyi-ui/src/page/group/subgroup.vue b/ruoyi-ui/src/page/group/subgroup.vue
index e734ca192..6effd2638 100644
--- a/ruoyi-ui/src/page/group/subgroup.vue
+++ b/ruoyi-ui/src/page/group/subgroup.vue
@@ -41,18 +41,18 @@
 </template>
 
 <script>
-import {  ref  } from 'vue'
+import { ref } from 'vue'
 import { addUrlParam } from '@/utils/utils'
 import myDialog from '@/page/group/myDialog'
 import common from '@/config'
 
 import showPanoramaInScreen from "@/page/group/showPanoramaInScreen";
-import {globalBus} from "./globalBus.js"
+import { globalBus } from "./globalBus.js"
 export default {
   name: 'subgroup',
   inject: ["contain", 'container'],
   components: {
-    myDialog:myDialog
+    myDialog: myDialog
   },
   provide () {
     return {
@@ -74,18 +74,16 @@ export default {
     }
   },
   methods: {
-    showDialog(url){
-
-      globalBus.$emit("show",url);
+    showDialog (url) {
+      globalBus.$emit("show", url);
     },
-    rotation(){
+    rotation () {
       globalBus.$emit("rotation");
     },
-    music(){
+    music () {
       globalBus.$emit("music");
     },
-    fullscreen()
-    {
+    fullscreen () {
       globalBus.$emit("fullscreen");
     },
 
@@ -105,7 +103,7 @@ export default {
       if (typeof str == "string") {
         try {
           return JSON.parse(str);
-        } catch  {
+        } catch {
           return {}
         }
       }
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 802ba62f0..aa0d31984 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -1,6 +1,8 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-import {checkExpire} from '@/api/system/repo'
+import {
+  checkExpire
+} from '@/api/system/repo'
 
 Vue.use(Router)
 
@@ -28,17 +30,14 @@ import Layout from '@/layout'
  */
 
 // 公共路由
-export const constantRoutes = [
-  {
+export const constantRoutes = [{
     path: '/redirect',
     component: Layout,
     hidden: true,
-    children: [
-      {
-        path: '/redirect/:path(.*)',
-        component: (resolve) => require(['@/views/redirect'], resolve)
-      }
-    ]
+    children: [{
+      path: '/redirect/:path(.*)',
+      component: (resolve) => require(['@/views/redirect'], resolve)
+    }]
   },
   {
     path: '/login',
@@ -64,95 +63,103 @@ export const constantRoutes = [
     path: '',
     component: Layout,
     redirect: 'index',
-    children: [
-      {
-        path: 'index',
-        component: (resolve) => require(['@/views/index'], resolve),
-        name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
+    children: [{
+      path: 'index',
+      component: (resolve) => require(['@/views/index'], resolve),
+      name: 'Index',
+      meta: {
+        title: '首页',
+        icon: 'dashboard',
+        affix: true
       }
-    ]
+    }]
   },
   {
     path: '/user',
     component: Layout,
     hidden: true,
     redirect: 'noredirect',
-    children: [
-      {
-        path: 'profile',
-        component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
-        name: 'Profile',
-        meta: { title: '个人中心', icon: 'user' }
+    children: [{
+      path: 'profile',
+      component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
+      name: 'Profile',
+      meta: {
+        title: '个人中心',
+        icon: 'user'
       }
-    ]
+    }]
   },
   {
     path: '/system/user-auth',
     component: Layout,
     hidden: true,
-    children: [
-      {
-        path: 'role/:userId(\\d+)',
-        component: (resolve) => require(['@/views/system/user/authRole'], resolve),
-        name: 'AuthRole',
-        meta: { title: '分配角色', activeMenu: '/system/user'}
+    children: [{
+      path: 'role/:userId(\\d+)',
+      component: (resolve) => require(['@/views/system/user/authRole'], resolve),
+      name: 'AuthRole',
+      meta: {
+        title: '分配角色',
+        activeMenu: '/system/user'
       }
-    ]
+    }]
   },
   {
     path: '/system/role-auth',
     component: Layout,
     hidden: true,
-    children: [
-      {
-        path: 'user/:roleId(\\d+)',
-        component: (resolve) => require(['@/views/system/role/authUser'], resolve),
-        name: 'AuthUser',
-        meta: { title: '分配用户', activeMenu: '/system/role'}
+    children: [{
+      path: 'user/:roleId(\\d+)',
+      component: (resolve) => require(['@/views/system/role/authUser'], resolve),
+      name: 'AuthUser',
+      meta: {
+        title: '分配用户',
+        activeMenu: '/system/role'
       }
-    ]
+    }]
   },
   {
     path: '/system/dict-data',
     component: Layout,
     hidden: true,
-    children: [
-      {
-        path: 'index/:dictId(\\d+)',
-        component: (resolve) => require(['@/views/system/dict/data'], resolve),
-        name: 'Data',
-        meta: { title: '字典数据', activeMenu: '/system/dict'}
+    children: [{
+      path: 'index/:dictId(\\d+)',
+      component: (resolve) => require(['@/views/system/dict/data'], resolve),
+      name: 'Data',
+      meta: {
+        title: '字典数据',
+        activeMenu: '/system/dict'
       }
-    ]
+    }]
   },
   {
     path: '/monitor/job-log',
     component: Layout,
     hidden: true,
-    children: [
-      {
-        path: 'index',
-        component: (resolve) => require(['@/views/monitor/job/log'], resolve),
-        name: 'JobLog',
-        meta: { title: '调度日志', activeMenu: '/monitor/job'}
+    children: [{
+      path: 'index',
+      component: (resolve) => require(['@/views/monitor/job/log'], resolve),
+      name: 'JobLog',
+      meta: {
+        title: '调度日志',
+        activeMenu: '/monitor/job'
       }
-    ]
+    }]
   },
   {
     path: '/tool/gen-edit',
     component: Layout,
     hidden: true,
-    children: [
-      {
-        path: 'index',
-        component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
-        name: 'GenEdit',
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen'}
+    children: [{
+      path: 'index',
+      component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
+      name: 'GenEdit',
+      meta: {
+        title: '修改生成配置',
+        activeMenu: '/tool/gen'
       }
-    ]
+    }]
   },
-{
+  {
     path: '/',
     name: '列表页',
     component: () =>
@@ -165,9 +172,8 @@ export const constantRoutes = [
   }, {
     path: '/view/:id/:panoramaId',
     name: 'view',
-    component: () =>
-      import( /* webpackChunkName: "page" */ '@/views/screen/page/view'),
-    props:true
+    component: () => import( /* webpackChunkName: "page" */ '@/views/screen/page/view'),
+    props: true
   },
   {
     path: '/editpanorama/:id',
@@ -185,6 +191,8 @@ export const constantRoutes = [
 
 export default new Router({
   // mode: 'history', // 去掉url中的#
-  scrollBehavior: () => ({ y: 0 }),
+  scrollBehavior: () => ({
+    y: 0
+  }),
   routes: constantRoutes
 })
diff --git a/ruoyi-ui/src/styles/style.scss b/ruoyi-ui/src/styles/style.scss
index bc3720b8a..222ced648 100644
--- a/ruoyi-ui/src/styles/style.scss
+++ b/ruoyi-ui/src/styles/style.scss
@@ -312,4 +312,4 @@
   .middle{
     overflow: inherit;
   }
-}
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/utils/time.js b/ruoyi-ui/src/utils/time.js
new file mode 100644
index 000000000..4ef910ca4
--- /dev/null
+++ b/ruoyi-ui/src/utils/time.js
@@ -0,0 +1,10 @@
+export function formatDate(timeStamp) {
+  let date = new Date(timeStamp);
+  let YY = date.getFullYear() + '-';
+  let MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+  let DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
+  let hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+  let mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+  let ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+  return YY + MM + DD + " " + hh + mm + ss;
+}
diff --git a/ruoyi-ui/src/views/screen/page/build.vue b/ruoyi-ui/src/views/screen/page/build.vue
index d8414145e..b8c03678c 100644
--- a/ruoyi-ui/src/views/screen/page/build.vue
+++ b/ruoyi-ui/src/views/screen/page/build.vue
@@ -574,349 +574,24 @@ export default {
   }
 }
 </script>
-<style lang="scss">
-.build {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  .app {
-    width: 100%;
-    height: calc(100% - 45px);
-    display: flex;
-    box-sizing: border-box;
-  }
-  .selectall {
-    position: absolute;
-    border: 1px dotted #409eff;
-    z-index: 10000;
-  }
-  .icon {
-    font-size: 20px;
-    margin-right: 10px;
-  }
-  .selectbg {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    z-index: 9999;
-  }
-  .selectflag {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    z-index: 9999;
-    cursor: move;
-  }
-  .el-menu--horizontal .el-menu .el-menu-item,
-  .el-menu--horizontal .el-menu .el-submenu__title {
-    font-size: 12px;
-  }
-  .menu {
-    width: 180px;
-    height: 100%;
-    overflow: hidden;
-    overflow-y: auto;
-    color: #bcc8d4;
-    background: #1d1f26;
-  }
-  .menu__list {
-    padding-left: 10px;
-    box-sizing: border-box;
-  }
-  .menu__item--folder {
-    display: flex;
-    align-items: center;
-    padding: 6px 6px;
-    color: #bcc9d4;
-    font-size: 12px;
-    input {
-      border: none;
-      outline: none;
-    }
-    .icon-folder {
-      font-size: 16px;
-      margin-right: 5px;
-    }
-    .icon-fold {
-      font-size: 12px;
-      margin-right: 10px;
-      transform: rotate(90deg);
-      display: inline-block;
-      font-weight: bold;
-      &.is-active {
-        transform: rotate(180deg);
-      }
-    }
-    &.is-active {
-      color: #fff;
-      background: rgba(143, 225, 255, 0.1);
-    }
-    &:hover {
-      color: #fff;
-      background: rgba(143, 225, 255, 0.1);
-      cursor: pointer;
-    }
-  }
-  .menu__folder {
-    &.ghost {
-      opacity: 0.6;
-      color: #fff;
-      background: #409eff !important;
-      cursor: move;
-    }
-  }
-  .menu__item {
-    margin-bottom: 1px;
-    width: 100%;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    height: 48px;
-    padding: 0 6px;
-    position: relative;
-    background: #1b1f25;
-    cursor: pointer;
-    flex: none;
-    font-size: 12px;
-    &.is-over,
-    &:hover {
-      color: #fff;
-      background: rgba(143, 225, 255, 0.1);
-      cursor: pointer;
-    }
-    &.ghost {
-      opacity: 0.6;
-      color: #fff;
-      background: #409eff !important;
-      cursor: move;
-    }
-    &.is-active {
-      background: #409eff !important;
-      color: #373d41 !important;
-    }
-  }
-  .menu__icon {
-    color: #409eff;
-    margin-right: 10px;
-    width: 53px;
-    height: 30px;
-    line-height: 30px;
-    text-align: center;
-    display: block;
-    border: 1px solid #3a4659;
-    background: #282a30;
-  }
-  .top {
-    padding: 10px 20px;
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    z-index: 9999;
-    background-color: rgba(255, 255, 255, 0.4);
-  }
-  .middle {
-    background-color: #2a2d32;
-    flex: 1;
-    position: relative;
-    height: 100%;
-    overflow: auto;
-  }
-  .wrapper {
-    position: relative;
-    padding: 60px 0 0 0;
-    box-sizing: border-box;
-    width: 100%;
-    position: relative;
-    box-sizing: border-box;
-  }
-  .content {
-    transform-origin: 0 0;
-    background-color: #333;
-    position: relative;
-    box-sizing: border-box;
-  }
-  .footer__menu {
-    padding-top: 8px;
-    margin-right: 370px;
-    float: right;
-    width: 300px;
-  }
-  .app--none {
-    padding: 0;
-    height: 100%;
-  }
-  .app--none .wrapper {
-    position: relative;
-    padding: 0;
-    width: 100%;
-  }
-  .app--none .content {
-    width: 100%;
-    height: 100%;
-    border: none;
-  }
-  .container {
-    user-select: none;
-    transform-origin: 0 0;
-    position: relative;
-  }
-
-  .grade {
-    width: 100%;
-    height: 100%;
-    background-size: 30px 30px, 30px 30px;
-    background-image: linear-gradient(
-        rgba(255, 255, 255, 0.1) 1px,
-        transparent 0px
-      ),
-      linear-gradient(90deg, rgba(255, 255, 255, 0.1) 1px, transparent 0px);
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-  }
-  .wrapper__grade {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    height: 100%;
-    background: url(https://img.alicdn.com/tfs/TB184VLcPfguuRjSspkXXXchpXa-14-14.png)
-      repeat;
-  }
-
-  .title {
-    padding: 0 20px;
-    box-sizing: border-box;
-    margin-bottom: 10px;
-    line-height: 35px;
-    height: 35px;
-    text-align: center;
-    font-size: 13px;
-    letter-spacing: 2px;
-    text-indent: 2px;
-    background-color: #2d343c;
-    color: #fff;
-    &--left {
-      text-align: left;
-    }
-  }
-
-  .params {
-    width: 350px;
-  }
-
-  .tabs {
-    margin-top: -10px;
-    box-sizing: border-box;
-  }
-  .tabs .el-input-number {
-    width: 100%;
-  }
-  .tabs .el-tabs__header {
-    background: #27343e;
-    margin: 0 0 2px;
-  }
-  .tabs i {
-    color: #bcc9d4;
-    font-size: 14px;
-  }
-  .tabs .is-active i {
-    color: #409eff;
-  }
-  .tabs .el-tabs__nav-wrap::after {
-    background: #27343e;
-  }
-  .tabs .el-tabs__item {
-    padding: 0;
-    box-sizing: border-box;
-  }
-  .tabs .el-tabs__active-bar {
-    top: 0;
-  }
-
-  .el-collapse-item__header {
-    padding-left: 30px;
-  }
-  .el-switch__core {
-    width: 35px;
-    height: 16px;
-  }
-  .el-switch {
-    height: 10px;
-    line-height: 10px;
-  }
-  .el-switch__core:after {
-    top: -1px;
-    width: 16px;
-    height: 16px;
-  }
-  .el-slider__button-wrapper {
-    top: -17px;
-  }
-  .el-slider__button {
-    border-radius: 0;
-    width: 8px;
-    height: 8px;
-    border-width: 1px;
-  }
-  .el-slider__bar,
-  .el-slider__runway {
-    height: 2px;
-  }
-  .imgList {
-    height: 350px;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-  }
-  .imgList img {
-    width: 100px;
-    height: 100px;
-    margin: 20px 10px;
-  }
-  .el-input-number__decrease,
-  .el-input-number__increase {
-    background: transparent;
-  }
+<style lang="css" scoped>
+>>> .el-table__cell {
+  background-color: #1d1f26 !important;
+  color: #bcc8d4 !important;
 }
-.views {
-  .wrapper {
-    padding: 0;
-  }
-  .middle {
-    overflow: inherit;
-  }
+>>> .el-dialog__body {
+  background-color: #1d1f26;
+  color: #bcc8d4;
+}
+>>> .el-dialog__header {
+  background-color: #1d1f26;
+  color: #bcc8d4;
+}
+>>> .avue-form__group--flex {
+  background-color: #1d1f26;
+  color: #bcc8d4;
+}
+>>> .avue-dialog__footer {
+  margin-top: 10px;
 }
-
-// .el-table__cell {
-//   background-color: #1d1f26 !important;
-//   color: #bcc8d4 !important;
-// }
-// .el-dialog__body {
-//   background-color: #1d1f26;
-//   color: #bcc8d4;
-// }
-// .el-dialog__header {
-//   background-color: #1d1f26;
-//   color: #bcc8d4;
-// }
-// .avue-dialog .el-dialog__title,
-// .avue-dialog .el-drawer__header {
-//   color: #bcc8d4;
-// }
-// .avue-form__group--flex {
-//   background-color: #1d1f26;
-//   color: #bcc8d4;
-// }
-// .avue-dialog__footer {
-//   margin-top: 10px;
-// }
-// .test {
-//   background-color: #1d1f26;
-//   color: #bcc8d4;
-// }
 </style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/screen/page/group/contentmenu.vue b/ruoyi-ui/src/views/screen/page/group/contentmenu.vue
index 60f833831..cab268c2f 100644
--- a/ruoyi-ui/src/views/screen/page/group/contentmenu.vue
+++ b/ruoyi-ui/src/views/screen/page/group/contentmenu.vue
@@ -33,6 +33,7 @@
 </template>
 
 <script>
+import _ from 'lodash'
 import { uuid } from '@/utils/utils'
 export default {
   name: 'contentmenu',
@@ -137,7 +138,7 @@ export default {
       const params = this.contain.findnav(this.contain.active[0], true);
       this.contain.active.forEach(ele => {
         const item = this.contain.findnav(ele, true);
-        const obj = this.deepClone(item.obj);
+        const obj = _.cloneDeep(item.obj);
         obj.index = uuid();
         params.parent.push(obj)
       });
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 715a2f19a..32b9612bf 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -22,7 +22,7 @@ module.exports = {
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
   assetsDir: 'static',
   // 是否开启eslint保存检测，有效值：ture | false | 'error'
-  lintOnSave: process.env.NODE_ENV === 'development',
+  lintOnSave: false,
   // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
   productionSourceMap: false,
   // webpack-dev-server 相关配置
@@ -78,7 +78,7 @@ module.exports = {
             .plugin('ScriptExtHtmlWebpackPlugin')
             .after('html')
             .use('script-ext-html-webpack-plugin', [{
-            // `runtime` must same as runtimeChunk name. default is `runtime`
+              // `runtime` must same as runtimeChunk name. default is `runtime`
               inline: /runtime\..*\.js$/
             }])
             .end()
@@ -106,10 +106,9 @@ module.exports = {
                 }
               }
             })
-          config.optimization.runtimeChunk('single'),
-          {
-             from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-             to: './' //到根目录下
+          config.optimization.runtimeChunk('single'), {
+            from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+            to: './' //到根目录下
           }
         }
       )
diff --git a/src/main/java/com/ruoyi/system/controller/FactorIconController.java b/src/main/java/com/ruoyi/system/controller/FactorIconController.java
new file mode 100644
index 000000000..011d3de16
--- /dev/null
+++ b/src/main/java/com/ruoyi/system/controller/FactorIconController.java
@@ -0,0 +1,103 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.FactorIcon;
+import com.ruoyi.system.service.IFactorIconService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 因子图标Controller
+ * 
+ * @author ruoyi
+ * @date 2021-12-17
+ */
+@RestController
+@RequestMapping("/system/icon")
+public class FactorIconController extends BaseController
+{
+    @Autowired
+    private IFactorIconService factorIconService;
+
+    /**
+     * 查询因子图标列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:icon:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FactorIcon factorIcon)
+    {
+        startPage();
+        List<FactorIcon> list = factorIconService.selectFactorIconList(factorIcon);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出因子图标列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:icon:export')")
+    @Log(title = "因子图标", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(FactorIcon factorIcon)
+    {
+        List<FactorIcon> list = factorIconService.selectFactorIconList(factorIcon);
+        ExcelUtil<FactorIcon> util = new ExcelUtil<FactorIcon>(FactorIcon.class);
+        return util.exportExcel(list, "因子图标数据");
+    }
+
+    /**
+     * 获取因子图标详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:icon:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(factorIconService.selectFactorIconById(id));
+    }
+
+    /**
+     * 新增因子图标
+     */
+    @PreAuthorize("@ss.hasPermi('system:icon:add')")
+    @Log(title = "因子图标", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FactorIcon factorIcon)
+    {
+        return toAjax(factorIconService.insertFactorIcon(factorIcon));
+    }
+
+    /**
+     * 修改因子图标
+     */
+    @PreAuthorize("@ss.hasPermi('system:icon:edit')")
+    @Log(title = "因子图标", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FactorIcon factorIcon)
+    {
+        return toAjax(factorIconService.updateFactorIcon(factorIcon));
+    }
+
+    /**
+     * 删除因子图标
+     */
+    @PreAuthorize("@ss.hasPermi('system:icon:remove')")
+    @Log(title = "因子图标", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(factorIconService.deleteFactorIconByIds(ids));
+    }
+}
diff --git a/src/main/java/com/ruoyi/system/domain/FactorIcon.java b/src/main/java/com/ruoyi/system/domain/FactorIcon.java
new file mode 100644
index 000000000..43725459e
--- /dev/null
+++ b/src/main/java/com/ruoyi/system/domain/FactorIcon.java
@@ -0,0 +1,79 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 因子图标对象 factor_icon
+ * 
+ * @author ruoyi
+ * @date 2021-12-17
+ */
+public class FactorIcon extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 类型 */
+    @Excel(name = "类型")
+    private Long type;
+
+    /** 图片 */
+    @Excel(name = "图片")
+    private String icon;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setType(Long type) 
+    {
+        this.type = type;
+    }
+
+    public Long getType() 
+    {
+        return type;
+    }
+    public void setIcon(String icon) 
+    {
+        this.icon = icon;
+    }
+
+    public String getIcon() 
+    {
+        return icon;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("type", getType())
+            .append("icon", getIcon())
+            .toString();
+    }
+}
diff --git a/src/main/java/com/ruoyi/system/mapper/FactorIconMapper.java b/src/main/java/com/ruoyi/system/mapper/FactorIconMapper.java
new file mode 100644
index 000000000..dc358386f
--- /dev/null
+++ b/src/main/java/com/ruoyi/system/mapper/FactorIconMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.FactorIcon;
+
+/**
+ * 因子图标Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-12-17
+ */
+public interface FactorIconMapper 
+{
+    /**
+     * 查询因子图标
+     * 
+     * @param id 因子图标主键
+     * @return 因子图标
+     */
+    public FactorIcon selectFactorIconById(Long id);
+
+    /**
+     * 查询因子图标列表
+     * 
+     * @param factorIcon 因子图标
+     * @return 因子图标集合
+     */
+    public List<FactorIcon> selectFactorIconList(FactorIcon factorIcon);
+
+    /**
+     * 新增因子图标
+     * 
+     * @param factorIcon 因子图标
+     * @return 结果
+     */
+    public int insertFactorIcon(FactorIcon factorIcon);
+
+    /**
+     * 修改因子图标
+     * 
+     * @param factorIcon 因子图标
+     * @return 结果
+     */
+    public int updateFactorIcon(FactorIcon factorIcon);
+
+    /**
+     * 删除因子图标
+     * 
+     * @param id 因子图标主键
+     * @return 结果
+     */
+    public int deleteFactorIconById(Long id);
+
+    /**
+     * 批量删除因子图标
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFactorIconByIds(Long[] ids);
+}
diff --git a/src/main/java/com/ruoyi/system/service/IFactorIconService.java b/src/main/java/com/ruoyi/system/service/IFactorIconService.java
new file mode 100644
index 000000000..07dc67c77
--- /dev/null
+++ b/src/main/java/com/ruoyi/system/service/IFactorIconService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.FactorIcon;
+
+/**
+ * 因子图标Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-12-17
+ */
+public interface IFactorIconService 
+{
+    /**
+     * 查询因子图标
+     * 
+     * @param id 因子图标主键
+     * @return 因子图标
+     */
+    public FactorIcon selectFactorIconById(Long id);
+
+    /**
+     * 查询因子图标列表
+     * 
+     * @param factorIcon 因子图标
+     * @return 因子图标集合
+     */
+    public List<FactorIcon> selectFactorIconList(FactorIcon factorIcon);
+
+    /**
+     * 新增因子图标
+     * 
+     * @param factorIcon 因子图标
+     * @return 结果
+     */
+    public int insertFactorIcon(FactorIcon factorIcon);
+
+    /**
+     * 修改因子图标
+     * 
+     * @param factorIcon 因子图标
+     * @return 结果
+     */
+    public int updateFactorIcon(FactorIcon factorIcon);
+
+    /**
+     * 批量删除因子图标
+     * 
+     * @param ids 需要删除的因子图标主键集合
+     * @return 结果
+     */
+    public int deleteFactorIconByIds(Long[] ids);
+
+    /**
+     * 删除因子图标信息
+     * 
+     * @param id 因子图标主键
+     * @return 结果
+     */
+    public int deleteFactorIconById(Long id);
+}
diff --git a/src/main/java/com/ruoyi/system/service/impl/FactorIconServiceImpl.java b/src/main/java/com/ruoyi/system/service/impl/FactorIconServiceImpl.java
new file mode 100644
index 000000000..f01bd6ab3
--- /dev/null
+++ b/src/main/java/com/ruoyi/system/service/impl/FactorIconServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.FactorIconMapper;
+import com.ruoyi.system.domain.FactorIcon;
+import com.ruoyi.system.service.IFactorIconService;
+
+/**
+ * 因子图标Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-12-17
+ */
+@Service
+public class FactorIconServiceImpl implements IFactorIconService 
+{
+    @Autowired
+    private FactorIconMapper factorIconMapper;
+
+    /**
+     * 查询因子图标
+     * 
+     * @param id 因子图标主键
+     * @return 因子图标
+     */
+    @Override
+    public FactorIcon selectFactorIconById(Long id)
+    {
+        return factorIconMapper.selectFactorIconById(id);
+    }
+
+    /**
+     * 查询因子图标列表
+     * 
+     * @param factorIcon 因子图标
+     * @return 因子图标
+     */
+    @Override
+    public List<FactorIcon> selectFactorIconList(FactorIcon factorIcon)
+    {
+        return factorIconMapper.selectFactorIconList(factorIcon);
+    }
+
+    /**
+     * 新增因子图标
+     * 
+     * @param factorIcon 因子图标
+     * @return 结果
+     */
+    @Override
+    public int insertFactorIcon(FactorIcon factorIcon)
+    {
+        return factorIconMapper.insertFactorIcon(factorIcon);
+    }
+
+    /**
+     * 修改因子图标
+     * 
+     * @param factorIcon 因子图标
+     * @return 结果
+     */
+    @Override
+    public int updateFactorIcon(FactorIcon factorIcon)
+    {
+        return factorIconMapper.updateFactorIcon(factorIcon);
+    }
+
+    /**
+     * 批量删除因子图标
+     * 
+     * @param ids 需要删除的因子图标主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFactorIconByIds(Long[] ids)
+    {
+        return factorIconMapper.deleteFactorIconByIds(ids);
+    }
+
+    /**
+     * 删除因子图标信息
+     * 
+     * @param id 因子图标主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFactorIconById(Long id)
+    {
+        return factorIconMapper.deleteFactorIconById(id);
+    }
+}
diff --git a/src/main/resources/mapper/system/FactorIconMapper.xml b/src/main/resources/mapper/system/FactorIconMapper.xml
new file mode 100644
index 000000000..e03de238c
--- /dev/null
+++ b/src/main/resources/mapper/system/FactorIconMapper.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.FactorIconMapper">
+    
+    <resultMap type="FactorIcon" id="FactorIconResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="type"    column="type"    />
+        <result property="icon"    column="icon"    />
+    </resultMap>
+
+    <sql id="selectFactorIconVo">
+        select id, name, type, icon from factor_icon
+    </sql>
+
+    <select id="selectFactorIconList" parameterType="FactorIcon" resultMap="FactorIconResult">
+        <include refid="selectFactorIconVo"/>
+        <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="icon != null  and icon != ''"> and icon = #{icon}</if>
+        </where>
+    </select>
+    
+    <select id="selectFactorIconById" parameterType="Long" resultMap="FactorIconResult">
+        <include refid="selectFactorIconVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertFactorIcon" parameterType="FactorIcon" useGeneratedKeys="true" keyProperty="id">
+        insert into factor_icon
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
+            <if test="type != null">type,</if>
+            <if test="icon != null">icon,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
+            <if test="type != null">#{type},</if>
+            <if test="icon != null">#{icon},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFactorIcon" parameterType="FactorIcon">
+        update factor_icon
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="icon != null">icon = #{icon},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFactorIconById" parameterType="Long">
+        delete from factor_icon where id = #{id}
+    </delete>
+
+    <delete id="deleteFactorIconByIds" parameterType="String">
+        delete from factor_icon where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file