首次代码提交

.env

@@ -5,7 +5,7 @@ VUE_APP_TITLE=数量监测智能眼系统
 
 # 网络请求公用地址
 VUE_APP_API=/api/
-; VUE_APP_API=http://101.36.160.140:21023/
+; VUE_APP_API=http://101.36.160.140:31005/
 
 # 仓库地址
 VUE_APP_REPO=https://github.com/d2-projects/d2-admin-start-kit
@@ -15,4 +15,4 @@ VUE_APP_I18N_LOCALE=zh-chs
 VUE_APP_I18N_FALLBACK_LOCALE=en
 
 # element 颜色
-VUE_APP_ELEMENT_COLOR=#409EFF
+VUE_APP_ELEMENT_COLOR=#008775

package-lock.json

@@ -10373,6 +10373,11 @@
         "minimist": "^1.2.5"
       }
     },
+    "moment": {
+      "version": "2.29.3",
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.3.tgz",
+      "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz",

package.json

@@ -26,6 +26,7 @@
     "js-cookie": "^2.2.1",
     "lodash": "^4.17.19",
     "lowdb": "^1.0.0",
+    "moment": "^2.29.3",
     "nprogress": "^0.2.0",
     "screenfull": "^5.0.2",
     "sortablejs": "^1.10.1",

src/App.vue

@@ -25,7 +25,12 @@ export default {
 
 <style lang="scss">
 @import '~@/assets/style/public-class.scss';
+@import '~@/components/d2-icon/font-awesome-4.7.0/css/font-awesome.min.css';
 
-
-
+              .d2-container-full {
+                background-image: url("./assets/images/bj.png");
+                background-repeat: no-repeat;
+                background-size: 100% 100%;
+               
+              }
 </style>

src/api/modules/equipmentManage.api.js

@@ -0,0 +1,72 @@
+export default ({
+    request
+  }) => ({
+    /**
+     * @description 设备管理
+     * @param {Object} data 
+     */
+    //设备列表接口
+    equipmentList(data) {
+      return request({
+        url: '/device-info/getPageList',
+        method: 'post',
+        data
+      })
+    },
+    //设备保存/更新
+    equipmentSu(data) {
+      return request({
+        url: '/device-info/saveOrUpdate',
+        method: 'post',
+        data
+      })
+    },
+    //设备查看
+    equipmentDetail( id ) {
+      return request({
+        url: `/device-info/getById/${id}`,
+        method: 'get',
+      })
+    },
+    //设备删除
+    equipmentDel( id ) {
+      return request({
+        url: `/device-info/deleteById/${id}`,
+        method: 'get',
+      })
+    },
+    //设备标签列表接口
+    equipmentTagList(data) {
+        return request({
+          url: '/device-label/getPageList',
+          method: 'post',
+          data
+        })
+      },
+      //设备标签保存/更新
+      equipmentTagSu(data) {
+        return request({
+          url: '/device-label/saveOrUpdate',
+          method: 'post',
+          data
+        })
+      },
+      //设备标签查看
+      equipmentTagDetail( id ) {
+        return request({
+          url: `/device-label/getById/${id}`,
+          method: 'get',
+        })
+      },
+      //设备标签删除
+      equipmentTagDel( id ) {
+        return request({
+          url: `/device-label/deleteById/${id}`,
+          method: 'get',
+        })
+      },
+  
+  
+  
+  })
+  

src/api/modules/productManage.api.js

@@ -0,0 +1,74 @@
+export default ({
+    request
+  }) => ({
+    /**
+     * @description 产品管理
+     * @param {Object} data 
+     */
+    //产品列表接口
+    productList(data) {
+      return request({
+        url: '/productInfo/getListPage',
+        method: 'post',
+        data
+      })
+    },
+    //产品-保存
+    productSave(data) {
+        return request({
+          url: '/productInfo/save',
+          method: 'post',
+          data
+        })
+      },
+    //产品-修改
+    productUpdate(data) {
+      return request({
+        url: '/productInfo/update',
+        method: 'post',
+        data
+      })
+    },
+    //产品-详情
+    productDetail( id ) {
+      return request({
+        url: `/productInfo/getById/${id}`,
+        method: 'get',
+      })
+    },
+
+    //产品分类列表接口
+    productCategoryList(data) {
+      return request({
+        url: '/productCategory/getTreeList',
+        method: 'post',
+        data
+      })
+    },
+    //产品分类-保存
+    productCategorySave(data) {
+        return request({
+          url: '/productCategory/save',
+          method: 'post',
+          data
+        })
+      },
+    //产品分类-修改
+    productCategoryUpdate(data) {
+      return request({
+        url: '/productCategory/update',
+        method: 'post',
+        data
+      })
+    },
+    //产品分类-删除
+    productCategoryDel( id ) {
+      return request({
+        url: `/productCategory/deleteById/${id}`,
+        method: 'get',
+      })
+    },
+
+
+  })
+  

src/assets/style/public-class.scss

@@ -74,20 +74,20 @@ $sizes: (0, 5, 10, 15, 20);
     height: calc(100vh - 110px);
 
     overflow-y: auto;
-    background: #163d79;
+    background: #fff;
   }
 }
 
 .el-tree-node{
-  background: #163d79;
-  color:#fff;
+  // background: #163d79;
+  // color:#fff;
   font-size:12px;
 }
 
 //鼠标移到每行时的背景色
-.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
-  background:hsl(204, 66%, 23%) !important;
-}
+// .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
+//   background:hsl(204, 66%, 23%) !important;
+// }
 // //头部导航一级菜单的样式
 .theme-d2 .d2-theme-header .el-menu .el-menu-item{
   // border-right:linear-gradient(#193a6d, #487B98 20%,#193a6d 80%) !important;
@@ -105,14 +105,14 @@ $sizes: (0, 5, 10, 15, 20);
 }
 //头部导航二级菜单选中后整体的背景色
 .el-menu--horizontal .el-menu .el-menu-item{
-  background:#244e88 !important;
-  border:1px solid #346ebd;
+  background:#fff !important;
+  // border:1px solid #346ebd;
   text-align: center;
 }
 //头部导航二级菜单选中后每个的背景色
 .theme-d2 .el-menu--horizontal .el-menu-item:not(.is-disabled):hover{
-  background:#346ebd !important;
-  color: #fff !important;
+  // background:rgb(23, 105, 66) !important;
+  // color: #fff !important;
 }
 .el-menu--horizontal .el-menu--collapse .el-menu .el-submenu, .el-menu--popup {
   min-width: 142px !important;
@@ -127,9 +127,10 @@ $sizes: (0, 5, 10, 15, 20);
   color: #fff !important;
 }
 .el-menu--horizontal .el-menu .el-menu-item.is-active, .el-menu--horizontal .el-menu .el-submenu.is-active {
-  background-color:#346ebd !important  ;
+  background-color:rgb(23, 105, 66)   ;
 }
 
+
 //头部导航仓房展示icon的大小
 .fa-university{
   font-size:13px !important;
@@ -141,15 +142,17 @@ $sizes: (0, 5, 10, 15, 20);
 
 //主体内容样式
 .right_main {
-  border: 1px solid #67a7df;
-  background: #112f5d;
-
-  margin-top: 10px;
+  // border: 1px solid #67a7df;
+  background: #fff;
+  border-top-left-radius: 6px;
+  border-top-right-radius: 6px;
+  // margin-top: 10px;
   .right_title {
-    color: #fff;
-    border-bottom: 1px solid #67a7df;
+    // color: #fff;
+    // border-bottom: 1px solid #67a7df;
     padding: 10px;
     font-size: 14px;
+    margin-bottom: 10px;
   }
   .right_table {
     padding: 20px;
@@ -161,71 +164,86 @@ $sizes: (0, 5, 10, 15, 20);
   display: flex;
   justify-content: flex-end;
 }
-//分页总共几页样式
-.el-pagination__total {
-  color: #fff !important;
-}
-//label样式
-#formLabel .el-form-item__label {
-  color: #fff;
-}
-// 分页跳转颜色
-.el-pagination .el-pagination__jump {
-  color: #fff;
+.el-pagination .el-icon-arrow-right:before{
+  color:#303133
 }
-// 弹窗关闭icon颜色
-.el-dialog .el-dialog__headerbtn .el-dialog__close {
-color: #fff;
+.el-pagination button:disabled>.el-icon-arrow-right:before{
+  color:#C0C4CC
 }
+//分页总共几页样式
+// .el-pagination__total {
+//   color: #fff !important;
+// }
+// //label样式
+// #formLabel .el-form-item__label {
+//   color: #fff;
+// }
+// // 分页跳转颜色
+// .el-pagination .el-pagination__jump {
+//   color: #fff;
+// }
+// // 弹窗关闭icon颜色
+// .el-dialog .el-dialog__headerbtn .el-dialog__close {
+// color: #fff;
+// }
 //树形节点选中后的颜色
 .el-tree-node:focus > .el-tree-node__content {
-  background-color: #0064b9 !important;
-  border-radius: 20px;
+  // background-color: #0064b9 !important;
+  // border-radius: 20px;
 }
 //树形节点鼠标移上去的颜色
 .el-tree-node__content:hover {
   background-color: #91a8bc !important;
 }
 .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{
-  background-color: #0064b9 !important;
-  border-radius: 20px;
+  // background-color: #0064b9 !important;
+  // border-radius: 20px;
 }
 //table border
 
-.el-table td,
-.el-table th.is-leaf,
-.el-table-border,
-.el-table--group {
-  border-color: #67a7df !important;
-}
-.el-table th.el-table_cell.is-leaf {
-  border: #67a7df !important;
-}
-.el-table tr {
-  background: #00375e !important;
-}
+// .el-table td,
+// .el-table th.is-leaf,
+// .el-table-border,
+// .el-table--group {
+//   border-color: #67a7df !important;
+// }
+// .el-table th.el-table_cell.is-leaf {
+//   border: #67a7df !important;
+// }
+// .el-table tr {
+//   background: #00375e !important;
+// }
 
-.el-table--border {
-  border-color: #67a7df !important;
+// .el-table--border {
+//   border-color: #67a7df ;
   
-}
+// }
 //鼠标移到每行时的背景色
-.el-table__body tr.hover-row.current-row>td.el-table__cell,
-.el-table__body tr.hover-row.el-table__row--striped.current-row>td.el-table__cell,
-.el-table__body tr.hover-row.el-table__row--striped>td.el-table__cell,
-.el-table__body tr.hover-row>td.el-table__cell{
-  background:hsl(204, 66%, 23%) !important;
-}
+// .el-table__body tr.hover-row.current-row>td.el-table__cell,
+// .el-table__body tr.hover-row.el-table__row--striped.current-row>td.el-table__cell,
+// .el-table__body tr.hover-row.el-table__row--striped>td.el-table__cell,
+// .el-table__body tr.hover-row>td.el-table__cell{
+//   background:hsl(204, 66%, 23%) !important;
+// }
 //弹框样式
 #dialogStyle .el-dialog{
-  background: #092a51;
+  // background: #092a51;
 }
 #dialogStyle .el-dialog__header{
-  background:#3a8ee6;
+  background:rgba(233, 244, 243, 0.5);
+  padding: 10px;
+  .el-dialog__title{
+    color: #008775;
+    font-size: 16px ;
+    font-weight: bold;
+  }
+  .el-dialog__headerbtn{
+    top: 15px;
+  }
 }
 #dialogStyle .el-dialog__title,#dialogStyle .el-form-item__label{
   // color:#9bbbe3;
-  color:#fff;
+  // color:#fff;
 }
 // #dialogStyle .el-input__inner{
 //   background:#1d3b6b;
@@ -270,7 +288,7 @@ color: #fff;
 // }
 
 .el-button--text {
-  color: #fff !important;
+  // color: #fff !important;
 }
 // 编辑按钮
 .main #formLabel .editBtn {
@@ -314,13 +332,42 @@ button.el-button.el-button--delebtn.el-button--mini{
 }
 // table  表格展开图标颜色
 .el-icon-arrow-right {
-  color: #fff;
+  // color: #fff;
+}
+.d2-theme-header-menu{
+
+  .is-opened{
+    .el-menu-item:hover{
+      background-color: red !important;
+    }
+  }
 }
 //主体内容
 // .ztnr{
 //   padding-left: 10px;
 // }
+.el-button--primary{
+  background-color: #008775 !important;
+  border-color: #008775 !important;
+}
+.el-button--primary.is-plain{
+  color: #008775 !important;
+  background: rgba(7, 115, 94, 0.07) !important;
+  border: 1px solid #008775;
+  border-radius: 4px;
+}
+.el-button--primary.is-plain:focus, .el-button--primary.is-plain:hover{
+  color: #fff !important;
+  background-color: #008775 !important;
 
+}
+.el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+  background-color: #008775 !important;
+  border-color: #008775 !important;
+}
+.main .zt_right{
+  background-color: #fff;
+}
 
 
 

src/assets/style/public.scss

@@ -43,5 +43,5 @@ $prefix: d2;
   position: relative;
 }
 .el-table {
-  color: #fff;
+  // color: #fff;
 }

src/assets/style/theme/chester/setting.scss

@@ -27,7 +27,7 @@ $theme-multiple-page-control-background-color-active: #FFFFFF;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #CCCCCC;
-$theme-menu-item-background-color-hover: #2A2D2E;
+$theme-menu-item-background-color-hover: rgba(0, 255, 132, 1);
 
 // 顶栏上的文字颜色
 $theme-header-item-color: #CCCCCC;

src/assets/style/theme/d2/setting.scss

@@ -36,9 +36,9 @@ $theme-header-item-background-color: transparent;
 $theme-header-item-color-hover: #2f74ff;
 $theme-header-item-color-hover: #fff; // 顶栏上的项目在 hover 字体颜色
 $theme-header-item-background-color-hover: rgba(#FFF, .5);
-$theme-header-item-background-color-hover: #346ebd ;  // 顶栏上的项目在 hover  背景色
+$theme-header-item-background-color-hover: rgba(0, 255, 132, 0.3) ;  // 顶栏上的项目在 hover  背景色
 // 顶栏上的项目在 focus 时
-$theme-header-item-color-focus: #2f74ff;
+$theme-header-item-color-focus: #fff;
 $theme-header-item-background-color-focus: rgba(#FFF, .5);
 // 顶栏上的项目在 active 时
 $theme-header-item-color-active: #2f74ff;

src/assets/style/theme/theme-base.scss

@@ -308,7 +308,7 @@
                 overflow: auto;
                 // overflow-x: hidden;
                 position: relative;
-                background-color: #09163a;
+                background: none;
                
               }
               .d2-container-full__footer {

src/assets/style/unit/color.scss

@@ -1,5 +1,5 @@
 // 主色
-$color-primary: #409EFF;
+$color-primary: #008775;
 
 // 辅助色
 $color-info: #909399;

src/components/base-table/baseTable.vue

@@ -0,0 +1,375 @@
+/** * create by xinli ON 2022/03/29 * 公共表格 * */
+<template>
+  <div class="base-table-container">
+    <el-table
+      ref="baseTable"
+      :height="tableHeight"
+      :highlight-current-row="tableData.highlight"
+      :data="fontPagination ? fontPaginationTable : tableData.datas"
+      tooltip-effect="dark"
+      style="width: 100%"
+      @cell-click="cellClick"
+      @row-click="rowClick"
+      @sort-change="sortChange"
+      @filter-change="filterChange"
+      @selection-change="selectionChange"
+      :border="tableData.tableBorder"
+      :header-row-class-name="tableRowClassName"
+    >
+      <el-table-column
+        v-if="tableData.selection"
+        type="selection"
+        width="55"
+      ></el-table-column>
+      <el-table-column
+        v-if="tableData.index&&tableData.indexLeft"
+        :label="tableData.indexLable"
+        :align="tableData.indexAlign || 'center'"
+        fixed="left"
+        type="index"
+        width="65"
+        :index="indexMethod"
+      >
+        <template slot-scope="scope">
+          <span>{{ scope.row.simpleName=='合计'?'':scope.$index+=1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="tableData.index&&tableData.indexLeft==undefined"
+        :label="tableData.indexLable"
+        :align="tableData.indexAlign || 'center'"
+        type="index"
+        width="65"
+      >
+        <template slot-scope="scope">
+          <span>{{ scope.row.simpleName=='合计'?'':scope.$index+=1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :prop="column.prop"
+        :label="column.label"
+        :width="column.width"
+        :align="column.align || 'center'"
+        :fixed="column.fixed"
+        :filters="column.filters"
+        :filter-multiple="false"
+        :sortable="
+          column.columns ? false : column.sortable === false ? false : 'custom'
+        "
+        :column-key="column.columnKey"
+        :class-name="column.className"
+        :show-overflow-tooltip="column.overflowTooltip"
+        v-for="(column, index) in tableData.columns"
+        :key="index"
+        :min-width="column.minWidth ? column.minWidth : 120"
+      >
+        <!-- <template slot="header" v-if="column.renderHeader">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="column.label"
+            placement="top-start"
+            :offset="100"
+          >
+            <span>{{ column.label }}</span>
+          </el-tooltip>
+        </template> -->
+
+        <template slot-scope="scope">
+          <slot
+            v-if="column.slotName"
+            :name="column.slotName"
+            :data="scope"
+          ></slot>
+          <span v-else>{{ scope.row[column.prop] }}</span>
+        </template>
+        <template v-if="column.columns">
+          <el-table-column
+            :prop="col.prop"
+            :label="col.label"
+            :width="col.width"
+            :align="col.align || 'center'"
+            :fixed="col.fixed"
+            :filters="col.filters"
+            :filter-multiple="false"
+            :sortable="col.sortable != false && 'custom'"
+            :column-key="col.columnKey"
+            :class-name="col.className"
+            :show-overflow-tooltip="col.overflowTooltip"
+            v-for="(col, idx) in column.columns"
+            :key="idx"
+            :min-width="col.minWidth ? col.minWidth : 100"
+          >
+            <!-- <template slot="header" v-if="col.renderHeader">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="col.label"
+                placement="top-start"
+                :offset="100"
+              >
+                <span>{{ col.label }}</span>
+              </el-tooltip>
+            </template> -->
+            <template slot-scope="scope">
+              <slot
+                v-if="col.slotName"
+                :name="col.slotName"
+                :data="scope"
+              ></slot>
+              <span v-else>{{ scope.row[col.prop] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table-column>
+      <slot></slot>
+    </el-table>
+    <div
+      class="table-pagination"
+      v-if="paginationConfig.paginationShow && tableData.total > 0"
+    >
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="paginationConfig.currentPage"
+        :page-sizes="paginationConfig.pageSizes"
+        :page-size="paginationConfig.pageSize"
+        :layout="paginationConfig.layout"
+        :total="tableData.total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import moment from 'moment';
+
+export default {
+ props: {
+  tableData: {
+   type: Object,
+   default: () => {}
+  },
+  paginationConfig: {
+   type: Object,
+   default: () => {}
+  },
+  fontPagination: {
+   type: Boolean,
+   default: false
+  }
+ },
+ data() {
+  return {
+   tableHeight: '',
+   datas: this.tableData.datas
+  };
+ },
+ created() {
+  this.getTableHeight();
+ },
+ mounted() {
+  const _this = this;
+  window.onresize = () => {
+   if (_this.resizeFlag) {
+    clearTimeout(_this.resizeFlag);
+   }
+   _this.resizeFlag = setTimeout(() => {
+    _this.getTableHeight();
+    _this.resizeFlag = null;
+   }, 100);
+  };
+ },
+ methods: {
+    //表格序号
+    indexMethod(index) {
+      return (
+        (this.paginationConfig.currentPage - 1) * this.paginationConfig.pageSize + index + 1
+      );
+    },
+  // 计算table高度(动态设置table高度)
+  getTableHeight() {
+   const tableH = 230; // 距离页面下方的高度
+   const tableHeightDetil = window.innerHeight - tableH;
+   if (tableHeightDetil <= 300) {
+    this.tableHeight = 300;
+   } else {
+    this.tableHeight = window.innerHeight - tableH;
+   }
+  },
+  handleSizeChange(pageSize) {
+   this.paginationConfig.pageSize = pageSize;
+   this.$emit('sizeChange', pageSize);
+  },
+  handleCurrentChange(currentPage) {
+   this.paginationConfig.currentPage = currentPage;
+   this.$emit('currentChange', currentPage);
+  },
+  selectionChange(val) {
+   this.$emit('selectionChange', val);
+  },
+  cellClick(row, column, cell, event) {},
+  rowClick(row, column, event) {},
+  sortChange(column, prop, order) {
+   const fieldName = column.prop;
+   this.sortingType = column.order;
+   let sumData = {}; // 放置合计一行数据
+   this.tableData.datas.forEach((item) => {
+    if (item.simpleName == '合计') {
+     sumData = item;
+    }
+   });
+   if (this.sortingType == 'ascending') {
+    if (fieldName == 'submitDate' || fieldName == 'informationSystemConstructionBuildTime' || fieldName == 'orgBasisTime' || fieldName == 'issuingTime' || fieldName == 'studyDate' || fieldName == 'fileDate' || fieldName == 'reviewTime' || fieldName == 'meetingTime' || fieldName == 'conveningTime') {
+     this.tableData.datas.forEach((item1) => {
+      if (item1[fieldName]) {
+       item1[fieldName] = moment(item1[fieldName]).valueOf();
+      }
+     });
+    }
+    // 正序
+    this.tableData.datas = this.tableData.datas.sort((a, b) => {
+     return a[fieldName] - b[fieldName];
+    });
+    if (fieldName == 'submitDate' || fieldName == 'orgBasisTime' || fieldName == 'issuingTime' || fieldName == 'studyDate' || fieldName == 'fileDate' || fieldName == 'reviewTime' || fieldName == 'meetingTime' || fieldName == 'conveningTime') {
+     this.tableData.datas.forEach((item2) => {
+      if (item2[fieldName]) {
+       item2[fieldName] = moment(item2[fieldName]).format('YYYY-MM-DD');
+      }
+     });
+    } else if (fieldName == 'informationSystemConstructionBuildTime') {
+     this.tableData.datas.forEach((item2) => {
+      if (item2[fieldName]) {
+       item2[fieldName] = moment(item2[fieldName]).format('YYYY-MM');
+      }
+     });
+    }
+    // 删除table中的合计
+    this.tableData.datas.forEach((item, index) => {
+     if (item.simpleName == '合计') {
+      this.tableData.datas.splice(index, 1);
+     }
+     return item;
+    });
+    if (sumData.simpleName == '合计') {
+     this.tableData.datas.push(sumData);
+    }
+    // this.tableData.datas=[{simpleName:'1'},{simpleName:'2'},{simpleName:'3'},{simpleName:'合计'}]
+    console.log(this.tableData.datas);
+   } else if (this.sortingType == 'descending') {
+    if (fieldName == 'submitDate' || fieldName == 'informationSystemConstructionBuildTime' || fieldName == 'orgBasisTime' || fieldName == 'issuingTime' || fieldName == 'studyDate' || fieldName == 'fileDate' || fieldName == 'reviewTime' || fieldName == 'meetingTime' || fieldName == 'conveningTime') {
+     this.tableData.datas.forEach((item1) => {
+      if (item1[fieldName]) {
+       item1[fieldName] = moment(item1[fieldName]).valueOf();
+      }
+     });
+    }
+
+    // 倒序
+    this.tableData.datas = this.tableData.datas.sort((a, b) => {
+     return b[fieldName] - a[fieldName];
+    });
+    if (fieldName == 'submitDate' || fieldName == 'orgBasisTime' || fieldName == 'issuingTime' || fieldName == 'studyDate' || fieldName == 'fileDate' || fieldName == 'reviewTime' || fieldName == 'meetingTime' || fieldName == 'conveningTime') {
+     this.tableData.datas.forEach((item2) => {
+      if (item2[fieldName]) {
+       item2[fieldName] = moment(item2[fieldName]).format('YYYY-MM-DD');
+      }
+     });
+    } else if (fieldName == 'informationSystemConstructionBuildTime') {
+     this.tableData.datas.forEach((item2) => {
+      if (item2[fieldName]) {
+       item2[fieldName] = moment(item2[fieldName]).format('YYYY-MM');
+      }
+     });
+    }
+    this.tableData.datas.forEach((item, index) => {
+     if (item.simpleName == '合计') {
+      this.tableData.datas.splice(index, 1);
+     }
+     return item;
+    });
+    if (sumData.simpleName == '合计') {
+     this.tableData.datas.push(sumData);
+    }
+   }
+   this.$emit('sortChange', column);
+  },
+  filterChange(filters) {
+   let selectKey = '';
+   for (const key in filters) {
+    if (filters[key][0]) {
+     selectKey = filters[key][0];
+    } else {
+     selectKey = '全部';
+    }
+    // selectKey = filters[key][0] ? filters[key][0] : '全部';
+   }
+   // console.log(selectKey);
+   this.$emit('filterChange', selectKey);
+  },
+  tableRowClassName({ row, rowIndex }) {
+   return 'header-class';
+  },
+  renderHeader(h, { column }) {
+   console.log(column);
+
+   return h('div', {}, [
+    h(
+     'div',
+     {
+      class: 'cell'
+     },
+     [
+      column.label,
+      h(
+       'el-tooltip',
+       {
+        props: {
+         effect: 'dark',
+         content: '这是一个提示',
+         placement: 'top'
+        }
+       },
+       [
+        h('i', {
+         class: 'el-icon-question',
+         style: 'color:#333;margin-left:5px;cursor:pointer;'
+        })
+       ]
+      )
+     ]
+    )
+   ]);
+  }
+ },
+ computed: {
+  fontPaginationTable() {
+   let table = [];
+   const curPage = this.paginationConfig.currentPage;
+   const { pageSize } = this.paginationConfig;
+   table = this.datas.slice(pageSize * (curPage - 1), pageSize * curPage);
+   return table;
+  }
+ }
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep.base-table-container {
+  box-sizing: border-box;
+  .table-pagination {
+    text-align: right;
+    margin-top: 24px;
+    padding: 16px 0;
+  }
+  // .header-class {
+  //   th {
+  //     .cell {
+  //       white-space: nowrap;
+  //     }
+  //   }
+  // }
+}
+</style>

src/components/detailTable/index.vue

@@ -0,0 +1,190 @@
+/**
+* Create by: fenghaoyang
+* Time: 2021/07/27
+*  详情表格
+* */
+<template>
+  <div class="panel-height-add">
+
+    <div style="padding: 2px">
+      <div class="detBox">
+        <div
+          v-for="(item, i) in detailTable"
+          :key="i"
+          class="divF"
+          :style="{
+            'line-height':
+              (item.val.length == 0 ? 1 : item.val.length) * 48 + 'px',
+            height: (item.val.length == 0 ? 1 : item.val.length) * 48 + 'px',
+          }"
+        >
+          <div>
+            <el-tooltip
+              effect="dark"
+              :content="item.name"
+              :disabled="(item.name+'').length<13"
+              placement="top"
+            >
+              <div>{{ item.name }}</div>
+            </el-tooltip>
+          </div>
+          <div :class="item.name1==undefined?'long':''">
+            <el-tooltip
+              v-for="(data, len) in item.val"
+              :key="len"
+              effect="dark"
+              :content="data"
+              :disabled="(data+'').length<20"
+              placement="top"
+              
+            >
+              <div>{{ data==null?'':data }}</div>
+            </el-tooltip>
+          </div>
+          <div v-if="item.name1!=undefined">
+            <el-tooltip
+              effect="dark"
+              :content="item.name1"
+              :disabled="(item.name1+'').length<13"
+              placement="top"
+            >
+              <div>{{ item.name1 }}</div>
+            </el-tooltip>
+          </div>
+          <div v-if="item.name1!=undefined">
+            <el-tooltip
+              v-for="(data, index) in item.val1"
+              :key="index"
+              effect="dark"
+              :content="data"
+              :disabled="(data+'').length<22"
+              placement="top"
+            >
+              <div>{{ data==null?'':data }}</div>
+            </el-tooltip>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+ name: 'DetailTable',
+ props: {
+  detailTable: {
+   type: Array,
+   default: () => {
+    return []
+   }
+  },
+  title: {
+   type: String,
+   default: ''
+  }
+ },
+ data() {
+  return {}
+ },
+ watch: {},
+ created() {},
+ methods: {}
+}
+</script>
+
+<style lang="scss" scoped>
+.panel-height-add {
+//   overflow: auto;
+  background-color: #ffffff;
+//   box-shadow: 0px 4px 12px 0px rgba(0, 0, 0, 0.3);
+  margin-bottom: 20px;
+
+  .infoTitle {
+    width: 100%;
+    // border-bottom: 1px solid #e6e6e6;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    h5 {
+      margin: 0;
+      padding-left:20px;
+    }
+    i{
+        color: #008775;
+        padding-right: 20px;
+        padding-top: 10px;
+        font-size: 14px;
+        cursor: pointer;
+    }
+  }
+
+  .detBox {
+    width: 100%;
+    border-left: 1px solid #e6e6e6;
+    border-top: 1px solid #e6e6e6;
+    margin-bottom: 30px;
+    .one {
+      line-height: 48px;
+    }
+    .two {
+      line-height: 96px;
+    }
+    .divF {
+      width: 100%;
+
+      display: flex;
+      //   align-items: center;
+      border-bottom: 1px solid #e6e6e6;
+
+      > div {
+        > div:last-child {
+          border-bottom: none !important;
+        }
+
+        div {
+          line-height: 48px;
+          height: 48px;
+          border-bottom: 1px solid #e6e6e6;
+          // padding-left: 10px;
+        }
+      }
+    }
+
+    .divF > div > div:last-child {
+      border: none;
+    }
+
+    .divF > div:nth-child(odd) {
+      width: 15%;
+      text-align: center;
+      background: #fafafa;
+      font-size: 14px;
+      div {
+        width: 100%;
+        overflow: hidden; /*超出部分隐藏*/
+        white-space: nowrap; /*不换行*/
+        text-overflow: ellipsis; /*超出部分文字以...显示*/
+      }
+    }
+
+    .divF > div:nth-child(even) {
+      width: 35%;
+      border-right: 1px solid #e6e6e6;
+      border-left: 1px solid #e6e6e6;
+      text-align: center;
+      font-size: 14px;
+      div {
+        width: 100%;
+        overflow: hidden; /*超出部分隐藏*/
+        white-space: nowrap; /*不换行*/
+        text-overflow: ellipsis; /*超出部分文字以...显示*/
+      }
+    }
+    .long{
+        width: 85% !important;
+    }
+  }
+}
+</style>

src/layout/header-aside/components/footer/index.vue

@@ -14,7 +14,7 @@ export default {
         line-height:30px;
         text-align:center;
         // z-index: 999;
-        background:#002049;
+        background:#008775 !important;
         font-size:14px;
         color:#fff;
     }

src/layout/header-aside/layout.vue

@@ -183,20 +183,21 @@ export default {
 }
 //头部导航一级菜单选中后的样式
 .theme-d2 .d2-theme-header .el-menu .el-menu-item.is-active {
-  // background: #0068a0 !important;
+  background:  rgba(0, 255, 132, 0.3) ; 
   color: #fff !important;
-  background-image: url(../../assets/images/selected.png);
-  background-position: 50% 86%;
+  // background-image: url(../../assets/images/selected.png);
+  // background-position: 50% 86%;
 }
 //头部导航二级菜单选中后的样式
 .theme-d2 .d2-theme-header .el-menu .el-submenu.is-active .el-submenu__title {
   color: #fff !important;
-  background-image: url(../../assets/images/selected.png);
-  background-position: 50% 86%;
+  background:  rgba(0, 255, 132, 0.3) ;
+  // background-image: url(../../assets/images/selected.png);
+  // background-position: 50% 86%;
 }
 //整体内容背景色
 .d2-layout-header-aside-group {
-  background-image: url(../../assets/images/bg.png);
+  // background-image: url(../../assets/images/bg.jpg);
 }
 .imgFather {
   display: flex;
@@ -217,10 +218,17 @@ export default {
   background-color: none;
 }
 .el-menu--horizontal .el-menu .el-submenu__title:hover {
-
+  // color: #008775 !important;
 }
 // 导航菜单二级菜单字体颜色
 .el-menu--horizontal .el-menu .el-menu-item, .el-menu--horizontal .el-menu .el-submenu__title {
-  color: #f7fdfe;
+  color: #333;
+}
+.el-menu--horizontal .el-menu .el-menu-item.is-active{
+  color: #008775 !important;
+}
+.el-menu--horizontal .el-menu .el-menu-item:hover{
+  color: #008775 !important;
+  background: #F4F9F9 !important;
 }
 </style>

src/menu/index.js

@@ -28,6 +28,24 @@ export const menuHeader = supplementPath([
      
     ]
   },
+  {
+    title: '产品管理',
+    icon: 'product-hunt',
+    children: [
+      { path: '/product', title: '产品' },
+      { path: '/productClassify', title: '产品分类' },
+     
+    ]
+  },
+  {
+    title: '设备管理',
+    icon: 'university',
+    children: [
+      { path: '/equipment', title: '设备' },
+      { path: '/equipmentTag', title: '设备标签' },
+     
+    ]
+  },
   { path: '/alarmRecord', title: '报警记录', icon: 'file-text' },
   { path: '/dataQuery', title: '数据查询', icon: 'pie-chart' },
   {
@@ -50,6 +68,7 @@ export const menuHeader = supplementPath([
       { path: '/scanParame', title: '扫描参数' },
       { path: '/alarmParame', title: '报警参数' },
       { path: '/dataDictionary', title: '数据字典' },
+      { path: '/setTimeOut', title: '定时任务设置' },
     
      
     ]

src/router/routes.js

@@ -61,7 +61,66 @@ const frameIn = [
           },
           component: _import('demo/warehouseShow/warehouseInfo/warehouseInfo-check.vue')
         },
-
+        //  产品管理/产品
+        {
+          path: 'product',
+          name: 'product',
+          meta: {
+            title: '产品',
+            auth: true
+          },
+          component: _import('demo/productManage/product')
+        },
+        //  产品管理/产品详情
+        {
+          path: 'productInfo',
+          name: 'productInfo',
+          meta: {
+            title: '产品详情',
+            auth: true
+          },
+          component: _import('demo/productManage/productInfo')
+        },
+        //  产品管理/产品
+        {
+          path: 'productClassify',
+          name: 'productClassify',
+          meta: {
+            title: '产品分类',
+            auth: true
+          },
+          component: _import('demo/productManage/productClassify')
+        },
+        //  设备管理/设备
+        {
+          path: 'equipment',
+          name: 'equipment',
+          meta: {
+            title: '设备',
+            auth: true
+          },
+          component: _import('demo/equipmentManage/equipment')
+        },
+        //  设备管理/设备标签
+        {
+          path: 'equipmentTag',
+          name: 'equipmentTag',
+          meta: {
+            title: '设备标签',
+            auth: true
+          },
+          component: _import('demo/equipmentManage/equipmentTag')
+        },
+        //  设备管理/设备详情
+        {
+          path: 'equipmentInfo',
+          name: 'equipmentInfo',
+          meta: {
+            title: '产品详情',
+            auth: true
+          },
+          component: _import('demo/equipmentManage/equipmentInfo')
+        },
         //报警记录
         {
           path: 'alarmRecord',
@@ -170,7 +229,16 @@ const frameIn = [
               },
               component: _import('demo/parameManagement/dataDictionary')
             },
-
+            // 参数设置/定时任务设置
+            {
+              path: 'setTimeOut',
+              name: 'setTimeOut',
+              meta: {
+                title: '数据字典',
+                auth: true
+              },
+              component: _import('demo/parameManagement/setTimeOut')
+            },
       // 系统 前端日志
       {
         path: 'log',

src/views/demo/alarmRecord/index copy.vue

@@ -1024,7 +1024,7 @@ export default {
 }
 
 .uploadFile .el-icon-delete:hover {
-  color: #409eff;
+  color: #008775;
 }
 
 .uploadFile .el-icon-zoom-in {
@@ -1034,7 +1034,7 @@ export default {
 }
 
 .uploadFile .el-icon-zoom-in:hover {
-  color: #409eff;
+  color: #008775;
 }
 
 .checkUploadFile {

src/views/demo/alarmRecord/index.vue

@@ -7,10 +7,10 @@
           <!-- <template slot="header">首页/数据查询</template> -->
           <div class="nav">当前所在位置:首页>报警记录</div>
           <div class="right_main">
-            <div class="right_title">
+            <!-- <div class="right_title">
               <i class="fa fa-file-text" aria-hidden="true" style="padding-right: 5px"></i>
               报警记录
-            </div>
+            </div> -->
             <div class="right_table">
               <el-form
           :inline="true"
@@ -18,30 +18,65 @@
           class="demo-form-inline"
           id="formLabel"
         >
-          <el-form-item label="报警时间:">
-            <el-date-picker
-              v-model="formInline.scanTime"
-              type="daterange"
-              align="right"
-              unlink-panels
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :picker-options="pickerOptions"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="反馈状态:">
-            <el-select v-model="formInline.zskName" placeholder="请选择">
+                  <el-form-item label="组织名称:">
+                    <el-select
+                      v-model="formInline.house"
+                      
+                      placeholder="请选择"
+                       size="mini"
+                    >
+                      <el-option label="1号仓" value="first"></el-option>
+                      <el-option label="2号仓" value="second"></el-option>
+                      <el-option label="3号仓" value="third"></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="产品名称:">
+                    <el-select
+                      v-model="formInline.houseName"
+                      
+                      placeholder="请选择"
+                       size="mini"
+                    >
+                      <el-option label="1号仓" value="first"></el-option>
+                      <el-option label="2号仓" value="second"></el-option>
+                      <el-option label="3号仓" value="third"></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="设备名称:">
+                    <el-select
+                      v-model="formInline.houseNa"
+                      
+                      placeholder="请选择"
+                       size="mini"
+                    >
+                      <el-option label="1号仓" value="first"></el-option>
+                      <el-option label="2号仓" value="second"></el-option>
+                      <el-option label="3号仓" value="third"></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="设备标签:">
+                    <el-select
+                      v-model="formInline.houseN"
+                      
+                      placeholder="请选择"
+                       size="mini"
+                    >
+                      <el-option label="1号仓" value="first"></el-option>
+                      <el-option label="2号仓" value="second"></el-option>
+                      <el-option label="3号仓" value="third"></el-option>
+                    </el-select>
+                  </el-form-item>        
+          <el-form-item label="报警类型:">
+            <el-select v-model="formInline.zskName" size="mini" placeholder="请选择">
               <el-option label="全部" value="shanghai"></el-option>
               <el-option label="已反馈" value="beijing"></el-option>
               <el-option label="未反馈" value="beijing1"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="仓房名称:">
+          <el-form-item label="处理状态:">
             <el-select
               v-model="formInline.houseName"
-              multiple
+              size="mini"
               placeholder="请选择"
             >
               <el-option label="1号仓" value="first"></el-option>
@@ -58,13 +93,13 @@
           </el-form-item> -->
 
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="search"
+            <el-button type="primary" size="mini" icon="el-icon-search" @click="search"
               >查询</el-button
             >
           </el-form-item>
 
           <el-form-item>
-            <el-button type="primary" icon="el-icon-refresh-left" @click="reset"
+            <el-button type="primary" size="mini" icon="el-icon-refresh-left" @click="reset"
               >重置</el-button
             >
           </el-form-item>
@@ -74,7 +109,6 @@
           :data="alarmRecord"
           border
           style="width: 100%"
-          :header-cell-style="{ background: '#0064b9', color: '#c9f5fa' }"
         >
           <el-table-column
             align="center"
@@ -90,48 +124,48 @@
             align="center"
           > 
           </el-table-column>-->
-          <el-table-column prop="zskName" label="企业名称" align="center">
+          <el-table-column prop="policType" label="报警类型" align="center">
+            <template slot-scope="scope">
+              <div v-if="scope.row.policType === '1'">设备断开链接</div>
+              <div v-if="scope.row.policType === '2'">数量异动报警</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="zskName" label="报警设备ID" align="center">
           </el-table-column>
           <!-- <el-table-column prop="subTreasury" label="仓库名称" align="center">
           </el-table-column> -->
-          <el-table-column prop="houseName" label="仓房名称" align="center">
+          <el-table-column prop="houseName" label="报警设备名称" align="center">
           </el-table-column>
-          <el-table-column prop="operName" label="保管员" align="center">
+          <el-table-column prop="operName" label="所属产品名称" align="center">
           </el-table-column>
-          <el-table-column prop="phoneO" label="联系方式" align="center">
+          <el-table-column prop="phoneO" label="所属组织名称" align="center">
           </el-table-column>
 
-          <el-table-column prop="scanNum" label="扫描点数" align="center">
+          <el-table-column prop="scanNum" label="设备标签" align="center">
           </el-table-column>
 
-          <el-table-column prop="excNum" label="异常点数" align="center">
-          </el-table-column>
           <el-table-column prop="policTime" label="报警时间" align="center">
           </el-table-column>
-          <el-table-column prop="policType" label="报警类型" align="center">
-            <template slot-scope="scope">
-              <div v-if="scope.row.policType === '1'">设备断开链接</div>
-              <div v-if="scope.row.policType === '2'">数量异动报警</div>
-            </template>
+
+          <el-table-column prop="excNum" label="处理状态" align="center">
           </el-table-column>
-     <!-- <el-table-column align="center" label="处理" width="180">
+     <el-table-column align="center" label="操作" width="100">
             <template slot-scope="scope">
-              <el-button
+              <!-- <el-button
                 @click="handleCheck(scope.row)"
                 type="detailbtn"
                 class="fa fa-info-circle"
                 size="mini"
                 >查看</el-button
-              >
+              > -->
               <el-button
-                type="editbtn"
-                class="fa fa-edit"
+                type="text"
                 size="mini"
-                @click="fanKui(scope.row)"
-                >反馈</el-button
+                @click="chuli(scope.row)"
+                >处理</el-button
               >
             </template>
-          </el-table-column>  -->
+          </el-table-column> 
         </el-table>
         <el-pagination
           @size-change="handleSizeChange"
@@ -338,8 +372,85 @@
         </div>
       </el-dialog>
 
-      <el-dialog title="查看图片" :visible.sync="dialogVisible">
-        <img width="100%" :src="dialogImageUrl" alt />
+      <el-dialog :title="dialogTitle" :visible.sync="dialogVisible">
+        <el-form
+          :model="infoForm"
+          :rules="rules"
+          ref="infoForm"
+          label-width="120px"
+        >
+          <el-form-item label-width="0" v-if="dialogTitle=='处理报警结果'">
+            <el-input style="width:90%" v-model="infoForm.descrip" type="textarea" :rows="5"  placeholder="请输入处理结果"></el-input>
+          </el-form-item>
+
+        <div v-else>
+          <el-form-item label="报警类型：" prop="name">
+            <el-input style="width: 220px" v-model="infoForm.name"></el-input>
+            <!-- <el-select v-model="infoForm.name" placeholder="请选择">
+              <el-option label="区域一" value="shanghai"></el-option>
+              <el-option label="区域二" value="beijing"></el-option>
+            </el-select> -->
+          </el-form-item>
+          <el-form-item label="报警设备ID：" prop="name">
+            <el-input style="width: 220px" v-model="infoForm.name"></el-input>
+            <!-- <el-select v-model="infoForm.name" placeholder="请选择">
+              <el-option label="区域一" value="shanghai"></el-option>
+              <el-option label="区域二" value="beijing"></el-option>
+            </el-select> -->
+          </el-form-item>
+          <el-form-item label="报警设备名称：" prop="name">
+            <el-input style="width: 220px" v-model="infoForm.name"></el-input>
+            <!-- <el-select v-model="infoForm.name" placeholder="请选择">
+              <el-option label="区域一" value="shanghai"></el-option>
+              <el-option label="区域二" value="beijing"></el-option>
+            </el-select> -->
+          </el-form-item>
+          <el-form-item label="设备标签：" prop="name">
+            <el-input style="width: 220px" v-model="infoForm.name"></el-input>
+            <!-- <el-select v-model="infoForm.name" placeholder="请选择">
+              <el-option label="区域一" value="shanghai"></el-option>
+              <el-option label="区域二" value="beijing"></el-option>
+            </el-select> -->
+          </el-form-item>
+          <el-form-item label="报警状态：" prop="name">
+            <el-input style="width: 220px" v-model="infoForm.name"></el-input>
+            <!-- <el-select v-model="infoForm.name" placeholder="请选择">
+              <el-option label="区域一" value="shanghai"></el-option>
+              <el-option label="区域二" value="beijing"></el-option>
+            </el-select> -->
+          </el-form-item>
+          <el-form-item label="报警时间：" prop="name">
+              <el-date-picker
+                v-model="infoForm.time"
+                type="date"
+                format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              />
+          </el-form-item>
+          <el-form-item label="处理结果：">
+            <el-input
+              style="width: 80%"
+              type="textarea"
+              v-model.trim="infoForm.descrip"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="处理时间：" prop="name">
+              <el-date-picker
+                v-model="infoForm.time"
+                type="date"
+                format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              />
+          </el-form-item>
+
+
+        </div>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        </div>
       </el-dialog>
     </d2-container>
   </div>
@@ -352,6 +463,7 @@ export default {
 
   data() {
     return {
+      infoForm:{},
       dialogTitle: "",
       //头部查询条件
       formInline: {
@@ -367,7 +479,7 @@ export default {
       },
       dialogBreakFeedback: false,
       //表格字段
-      alarmRecord: [],
+      alarmRecord: [{}],
       //分页
       pagination: {
         // 每页显示的条数
@@ -439,6 +551,11 @@ export default {
     };
   },
   methods: {
+    chuli(row){
+      // this.dialogTitle='处理报警结果'
+      this.dialogTitle='报警详情'
+      this.dialogVisible=true
+    },
     search() {},
     reset() {},
     canvasDataURL(path, obj, callback) {
@@ -911,11 +1028,11 @@ export default {
     // width: calc(100% - 250px);
     .nav {
       padding: 10px 0 10px 10px;
-      color: #fff;
+      // color: #fff;
 
       font-size: 14px;
 
-      background: #004a93;
+      background: #fff;
     }
     // .right_main {
     //   border: 1px solid #67a7df;

src/views/demo/equipmentManage/compontents/addDialog.vue

@@ -0,0 +1,207 @@
+<template>
+  <div>
+
+      <el-dialog :title="dialogTitle"  :visible.sync="dialogFormVisible" id="dialogStyle">
+        <el-form
+          :model="addForm"
+          :rules="rules"
+          ref="addForm"
+          label-width="120px"
+          :disabled="dialogTitle=='查看设备'"
+        >
+
+          <el-form-item label="设备ID：">
+            <el-input
+              style="width: 220px"
+              v-model.trim="addForm.id"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="设备名称：" prop="eqName">
+            <!-- <el-select v-model="addForm.name" placeholder="请选择">
+              <el-option label="区域一" value="shanghai"></el-option>
+              <el-option label="区域二" value="beijing"></el-option>
+            </el-select> -->
+            <el-input v-model="addForm.eqName" placeholder="请输入" style="width:220px"></el-input>
+          </el-form-item>
+          <el-form-item label="设备标签：">
+            <el-select v-model="addForm.labelName" placeholder="请选择" >
+              <el-option v-for="item in tagLists" :key="item.id" :label="item.labelName" :value="item.labelName">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="所属产品：" prop="proName">
+          <el-select v-model="addForm.proName" placeholder="请选择" ref="selectTree">
+            <el-option
+              :key="addForm.proName"
+              :value="addForm.proName"
+              :label="addForm.label"
+              hidden
+            />
+            <el-tree
+              :data="typeLists"
+              :props="defaultProps"
+              node-key="id"
+              accordion
+              highlight-current
+              @node-click="handleNodeClick"
+            />
+          </el-select>
+          </el-form-item>
+          <el-form-item label="所属组织机构：">
+            <el-select v-model="addForm.orgName" placeholder="请选择" >
+              <el-option v-for="item in ckLists" :key="item.id" :label="item.orgName" :value="item.orgName">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="描述：">
+            <el-input
+              style="width: 80%"
+              type="textarea"
+              v-model.trim="addForm.eqRemark"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogFormVisible = false">取 消</el-button>
+          <el-button type="primary" @click="submitForm('addForm')"
+            >确 定</el-button
+          >
+        </div>
+      </el-dialog>
+  </div>
+</template>
+<script>
+import api from "@/api";
+
+export default {
+    props:{
+        dialogTitle:''
+    },
+  data() {
+    return {
+      defaultProps: {
+        children: "children",
+        label: "productCategoryName",
+      },
+      addForm: {},
+      ckLists:[],
+      typeLists:[],
+      dialogFormVisible: false,
+      rules: {
+        id: [{ required: true, message: "请输入产品ID", trigger: "blur" }],
+        eqName: [{ required: true, message: "请选择设备名称", trigger: "blur" }],
+        name1: [{ required: true, message: "请选择设备标签", trigger: "blur" }],
+        proName: [
+          { required: true, message: "请选择所属产品", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created(){
+    // this.ckList()
+  },
+  methods: {
+    getInfo(row) {
+      this.addForm = row;
+    },
+    //获取编辑数据
+    getEditRow(row){
+      this.addForm=JSON.parse(JSON.stringify(row))
+    },
+    handleNodeClick(data) {
+      console.log(data);
+      this.$set(this.addForm,'proName',data.productCategoryName)
+      this.$set(this.addForm,'label',data.productCategoryName)
+      console.log(this.addForm);
+      // 使 input 失去焦点，并隐藏下拉框
+      this.$refs.selectTree.blur();
+    },
+    ckList() {
+      console.log(this.$parent.$parent.$parent);
+      this.ckLists=this.$parent.$parent.$parent.ckLists
+      this.typeLists=this.$parent.$parent.$parent.typeLists
+      this.tagLists=this.$parent.$parent.$parent.tagLists
+      // var data = {
+      //   storeTypeCode: 300002,
+      // };
+
+      // api
+      //   .ckList(data)
+      //   .then((res) => {
+      //     if (res.code == 200) {
+      //       this.ckLists = res.data;
+      //     }
+      //   })
+      //   .catch((err) => {
+      //     console.log(err);
+      //   });
+
+      // api
+      //   .productCategoryList()
+      //   .then((res) => {
+      //     if (res.code == 200) {
+      //       this.typeLists = res.data;
+      //     }
+      //   })
+      //   .catch((err) => {
+      //     console.log(err);
+      //   });
+    },
+    //新建产品提交
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if(this.dialogTitle=='新建设备'){
+            this.addForm.id=""
+            api.equipmentSu(this.addForm).then(res=>{
+              if (res.code == 200) {
+                this.$message.success("新建成功");
+                this.$parent.$parent.$parent.getList()
+                this.dialogFormVisible=false;
+              }
+            })
+          }else{
+            api.equipmentSu(this.addForm).then(res=>{
+              if (res.code == 200) {
+                this.$message.success("编辑成功");
+                this.dialogFormVisible=false;
+                this.$parent.$parent.$parent.getList()
+              }
+            })
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #008775;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 100px;
+  height: 100px;
+  line-height: 100px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

src/views/demo/equipmentManage/compontents/addDialogC.vue

@@ -0,0 +1,118 @@
+<template>
+  <div>
+
+      <el-dialog @close="addForm={}" :title="dialogTitle"  :visible.sync="dialogFormVisible" id="dialogStyle">
+        <el-form
+          :model="addForm"
+          :rules="rules"
+          ref="addForm"
+          label-width="120px"
+          :disabled="dialogTitle=='查看设备标签'"
+        >
+          <el-form-item label="标签名称：" prop="labelName" >
+            <!-- <el-select v-model="addForm.name" placeholder="请选择" >
+              <el-option label="区域一" value="shanghai"></el-option>
+              <el-option label="区域二" value="beijing"></el-option>
+            </el-select> -->
+            <el-input
+            style="width:220px"
+           
+              v-model.trim="addForm.labelName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="备注：">
+            <el-input
+              style="width: 80%"
+              type="textarea"
+              v-model.trim="addForm.labelRemark"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogFormVisible = false">取 消</el-button>
+          <el-button type="primary" v-if="dialogTitle!='查看设备标签'" @click="submitForm('addForm')"
+            >确 定</el-button
+          >
+        </div>
+      </el-dialog>
+  </div>
+</template>
+<script>
+import api from "@/api";
+
+export default {
+    props:{
+        dialogTitle:'',
+        row:{}
+    },
+  data() {
+    return {
+      addForm: {},
+      dialogFormVisible: false,
+      rules: {
+        labelName: [{ required: true, message: "请输入标签名称", trigger: "blur" }],
+      },
+    };
+  },
+  methods: {
+    //获取编辑数据
+    getEditRow(row){
+      this.addForm=JSON.parse(JSON.stringify(row))
+    },
+    //新建产品提交
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if(this.dialogTitle=='新建设备标签'){
+            api.equipmentTagSu(this.addForm).then(res=>{
+              if (res.code == 200) {
+                this.$message.success("新建成功");
+                this.$parent.$parent.$parent.getList()
+                this.dialogFormVisible=false;
+              }
+            })
+          }else{
+            api.equipmentTagSu(this.addForm).then(res=>{
+              if (res.code == 200) {
+                this.$message.success("编辑成功");
+                this.dialogFormVisible=false;
+                this.$parent.$parent.$parent.getList()
+              }
+            })
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #008775;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 100px;
+  height: 100px;
+  line-height: 100px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

src/views/demo/equipmentManage/equipment/index.vue

@@ -0,0 +1,471 @@
+<template>
+  <div>
+    <d2-container>
+          <div class="nav">当前所在位置:首页>设备管理>设备</div>
+
+      <!-- <template slot="header">首页/数据查询</template> -->
+      <div class="main">
+        <div class="zt_right">
+          <!-- <template slot="header">首页/数据查询</template> -->
+          <div class="right_main">
+            <!-- <div class="right_title">
+              <i
+                class="fa fa-file-text"
+                aria-hidden="true"
+                style="padding-right: 5px"
+              ></i>
+              产品
+            </div> -->
+            <div class="right_title">
+              <span>设备</span> 
+            </div>
+            <div class="right_table">
+              <div class="flex-between">
+                <el-form
+                  :inline="true"
+                  :model="formInline"
+                  class="demo-form-inline"
+                  id="formLabel"
+                >
+                  <el-form-item label="组织名称:">
+                    <el-select size="mini" v-model="formInline.orgName" placeholder="请选择" >
+                      <el-option v-for="item in ckLists" :key="item.id" :label="item.orgName" :value="item.orgName">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="产品名称:">
+          <el-select size="mini" v-model="formInline.proCategory" placeholder="请选择" ref="selectTree">
+            <el-option
+              :key="addForm.proCategory"
+              :value="addForm.proCategory"
+              :label="addForm.label"
+              hidden
+            />
+            <el-tree
+              :data="typeLists"
+              :props="defaultProps"
+              node-key="id"
+              accordion
+              highlight-current
+              @node-click="handleNodeClick"
+            />
+          </el-select>
+                  </el-form-item>
+                  <el-form-item label="设备名称:">
+                    <!-- <el-select
+                      v-model="formInline.houseNa"
+                      multiple
+                      placeholder="请选择"
+                     
+                    >
+                      <el-option label="1号仓" value="first"></el-option>
+                      <el-option label="2号仓" value="second"></el-option>
+                      <el-option label="3号仓" value="third"></el-option>
+                    </el-select> -->
+                    <el-input size="mini" v-model="formInline.eqName" placeholder="请输入"></el-input>
+                  </el-form-item>
+                  <el-form-item label="设备标签:">
+                    <el-select size="mini" v-model="formInline.labelName" placeholder="请选择" >
+                      <el-option v-for="item in tagLists" :key="item.id" :label="item.labelName" :value="item.labelName">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button
+                   size="mini"
+                      type="primary"
+                      icon="el-icon-search"
+                      @click="search"
+                      >查询</el-button
+                    >
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button
+                 size="mini"
+                      type="primary"
+                      icon="el-icon-refresh-left"
+                      @click="reset"
+                      >重置</el-button
+                    >
+                  </el-form-item>
+                </el-form>
+                <div style="margin-top:-10px;margin-bottom:10px">
+                  <el-button type="primary" @click="goTag" size="mini"
+                    >设备标签</el-button
+                  >
+                  <el-button
+                 size="mini"
+                    type="primary"
+                    icon="el-icon-plus"
+                    @click="dialogTitle='新建设备';$refs.addDialog.dialogFormVisible = true;$refs.addDialog.ckList()"
+                    >新建设备</el-button
+                  >
+                </div>
+              </div>
+              <el-table
+                :data="tableData"
+                border
+                style="width: 100%"
+              >
+                <el-table-column
+                  align="center"
+                  label="序号"
+                  type="index"
+                  width="100px"
+                  :index="indexMethod"
+                  show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                  prop="id"
+                  label="设备ID"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="eqName"
+                  label="设备名称"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="proName"
+                  label="所属产品名称"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column prop="phoneO" label="设备数量" align="center">
+                </el-table-column>
+
+                <el-table-column
+                  prop="orgName"
+                  label="所属组织名称"
+                  align="center"
+                >
+                </el-table-column>
+
+                <el-table-column
+                  prop="labelName"
+                  label="设备标签"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="eqStatus"
+                  label="状态"
+                  align="center"
+                >
+                </el-table-column>
+
+                <el-table-column
+                  prop="registerTime"
+                  label="注册时间"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="lastOnlineTime"
+                  label="最后上线时间"
+                  align="center"
+                >
+                </el-table-column>
+
+                <el-table-column label="操作" width="240" align="center">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="primary"
+                      size="mini"
+                      plain
+                      @click="goDetail(scope.row)"
+                      >查看</el-button
+                    >
+                    <el-button type="warning" plain size="mini" @click="edit(scope.row)"
+                      >编辑</el-button
+                    >
+                    <el-button type="danger" plain size="mini" @click="del(scope.row)"
+                      >删除</el-button
+                    >
+                    <!-- <el-button @click="delecheck( scope.$index, scope.row)" type="detailbtn" class="fa fa-info-circle" size="mini">查看</el-button> -->
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="1"
+                :page-sizes="[10, 20, 30, 40]"
+                :page-size="pagination.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="pagination.total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </div>
+      <addDialog :dialogTitle="dialogTitle" ref="addDialog"/>
+    </d2-container>
+  </div>
+</template>
+<script>
+import addDialog from "../compontents/addDialog.vue";
+
+import api from "@/api";
+// 1  异常点   2  断开
+export default {
+  name: "product",
+  components: { addDialog },
+  data() {
+    return {
+            defaultProps: {
+        children: "children",
+        label: "productCategoryName",
+      },
+            ckLists:[],
+      typeLists:[],
+      tagLists:[],
+      addForm: {},
+      dialogFormVisible: false,
+      dialogTitle: "",
+      //头部查询条件
+      formInline: {
+      },
+
+      //表格字段
+      tableData: [{}],
+      //分页
+      pagination: {
+        // 每页显示的条数
+        pageSize: 10,
+        // 当前页
+        curPage: 1,
+        // 总数
+        total: 20,
+      },
+      rules: {
+        id: [{ required: true, message: "请输入产品ID", trigger: "blur" }],
+        name: [{ required: true, message: "请选择产品名称", trigger: "blur" }],
+        region: [
+          { required: true, message: "请选择产品分类", trigger: "blur" },
+        ],
+      },
+    };
+  },
+    created(){
+    this.ckList()
+  },
+  methods: {
+    //编辑
+    edit(row) {
+      this.$refs.addDialog.dialogFormVisible = true;
+      this.dialogTitle = "编辑设备";
+      this.editRow = row;
+      this.$refs.addDialog.getEditRow(row);
+    },
+    ckList() {
+      var data = {
+        storeTypeCode: 300002,
+      };
+
+      api
+        .ckList(data)
+        .then((res) => {
+          if (res.code == 200) {
+            this.ckLists = res.data;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+
+      api
+        .productCategoryList()
+        .then((res) => {
+          if (res.code == 200) {
+            this.typeLists = res.data;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+
+      api
+        .equipmentTagList({curPage:1,pageSize:99999})
+        .then((res) => {
+          if (res.code == 200) {
+            this.tagLists = res.data.records;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    handleNodeClick(data) {
+      console.log(data);
+      this.$set(this.formInline,'proCategory',data.productCategoryName)
+      this.$set(this.formInline,'label',data.productCategoryName)
+      console.log(this.formInline);
+      // 使 input 失去焦点，并隐藏下拉框
+      this.$refs.selectTree.blur();
+    },
+    //删除
+    del(row){
+        this.$confirm('确认进行删除操作吗?', '删除提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$message({
+            type: 'success',
+            message: '删除成功'
+          });
+        })
+    },
+    //查看
+    goDetail(row) {
+      this.$router.push({ path: "equipmentInfo",query:{id:row.id} });
+    },
+    //跳转产品分类
+    goTag() {
+      this.$router.push({ path: "equipmentTag" });
+    },
+    //图标上传
+    handleAvatarSuccess(res, file) {
+      this.imageUrl = URL.createObjectURL(file.raw);
+    },
+    // beforeAvatarUpload(file) {
+    //   const isJPG = file.type === 'image/jpeg';
+    //   const isLt2M = file.size / 1024 / 1024 < 2;
+
+    //   if (!isJPG) {
+    //     this.$message.error('上传头像图片只能是 JPG 格式!');
+    //   }
+    //   if (!isLt2M) {
+    //     this.$message.error('上传头像图片大小不能超过 2MB!');
+    //   }
+    //   return isJPG && isLt2M;
+    // },
+    //新建产品提交
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          alert("submit!");
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    search() {
+      this.getList()
+
+    },
+    reset() {
+      this.pagination.curPage=1;
+      this.pagination.pageSize=10;
+      this.formInline={}
+      this.getList()
+    },
+
+    //获取列表数据
+    getList() {
+      var condition = this.formInline;
+      condition = JSON.stringify(condition);
+      var data = {
+        pageIndex: this.pagination.curPage,
+        pageSize: this.pagination.pageSize,
+        condition: condition,
+      };
+      api.equipmentList(data)
+        .then((res) => {
+          if (res.code == 200) {
+            this.tableData = res.data.records;
+            this.pagination.pageSize = res.data.size;
+            this.pagination.total = res.data.total;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+
+    //表格序号
+    indexMethod(index) {
+      return (
+        (this.pagination.curPage - 1) * this.pagination.pageSize + index + 1
+      );
+    },
+    // 每页条数改变
+    handleSizeChange(val) {
+      this.pagination.pageSize = val;
+      this.getList();
+    },
+    // 当前页改变
+    handleCurrentChange(val) {
+      this.pagination.curPage = val;
+      this.getList();
+    },
+  },
+  mounted() {
+    this.getList();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.main {
+  height: 100%;
+  display: flex;
+
+  .zt_right {
+    width: 100%;
+border: 1px solid #DEDEDE;
+border-radius: 6px;
+    // margin-left: 20px;
+    // width: calc(100% - 250px);
+    .right_title{
+      font-weight: bold;
+      font-size: 16px;
+      border-bottom:1px solid #ebeef5;
+      background-color: rgba(233, 244, 243, 0.5);
+      border-top-left-radius: 6px;
+      border-top-right-radius: 6px;
+      color: #008775;
+      border-bottom: 1px solid rgba(1, 164, 143, 0.3);
+      padding-left: 0;
+      span{
+        padding: 10px;
+        padding-bottom: 9px;
+        border-bottom: 2px solid #01a48f;
+
+      }
+    }
+
+  }
+}
+     .nav {
+      padding: 10px 0 10px 10px;
+      margin-bottom: 20px;
+      // color: #fff;
+
+      font-size: 14px;
+
+      background: #FFFFFF;
+      border: 1px solid #DEDEDE;
+    }
+.float-left {
+  float: left;
+}
+.float-right {
+  float: right;
+}
+#dialogStyle .el-select {
+  width: 100%;
+}
+.flex-between {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+
+</style>

src/views/demo/equipmentManage/equipmentInfo/index.vue

@@ -0,0 +1,712 @@
+<template>
+  <div>
+    <d2-container>
+      <div class="main">
+        <div class="zt_right">
+          <!-- <template slot="header">首页/数据查询</template> -->
+          <div class="nav">当前所在位置:首页>设备管理>设备>设备详情</div>
+          <div class="">
+            <div class="nameTitle">
+              <i @click="goBack" class="el-icon-back"></i>
+              <span class="name">
+                产品名称：{{ info.proName }}</span
+              >
+              <!-- <span style="font-size:14px;margin-left:40px">设备数：<span style="color:#008775">30</span>
+              </span> -->
+            </div>
+            <el-tabs v-model="activeName" @tab-click="tabsClick">
+              <el-tab-pane label="基本信息" name="first">
+                <div class="infoTitle">
+                  <h5>设备信息</h5>
+                  <el-button
+                    icon="fa fa-edit"
+                    size="mini"
+                    type="primary"
+                    @click="$refs.addDialog.dialogFormVisible = true;$refs.addDialog.getInfo(this.info)"
+                    >编辑</el-button
+                  >
+                </div>
+                <detailTable
+                  ref="detailTable"
+                  :detail-table="basicInfo"
+                  :title="''"
+                />
+              </el-tab-pane>
+              <el-tab-pane label="运行数据" name="second">
+                <div class="topType">
+                  <span>测温湿度设备（原粮、原油）数据如下：</span>
+                  <span>测温湿度设备（成品原油）数据如下：</span>
+                  <span>空调设备参数如下：</span>
+                  <span>流量称设备参数如下：</span>
+                </div>
+                <div class="infoTitle">
+                  <h5>定时任务</h5>
+                  <el-button type="primary" size="mini">修改定时任务</el-button>
+                </div>
+                <div>任务一：</div>
+                <div>任务二：</div>
+                <h5 style="margin: 20px 0">运行数据</h5>
+                <div class="flex-between">
+                  <el-form
+                    :inline="true"
+                    :model="formTime"
+                    class="demo-form-inline"
+                    id="formLabel"
+                  >
+                    <el-form-item label="时间:">
+                      <el-select
+                        v-model="formTime.time"
+                        multiple
+                        placeholder="请选择"
+                        size="mini"
+                      >
+                        <el-option label="1号仓" value="first"></el-option>
+                        <el-option label="2号仓" value="second"></el-option>
+                        <el-option label="3号仓" value="third"></el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                      <el-button
+                        size="mini"
+                        type="primary"
+                        icon="el-icon-search"
+                        >查询</el-button
+                      >
+                    </el-form-item>
+
+                    <el-form-item>
+                      <el-button
+                        size="mini"
+                        type="primary"
+                        icon="el-icon-refresh-left"
+                        @click="formTime.time = ''"
+                        >重置</el-button
+                      >
+                    </el-form-item>
+                  </el-form>
+                  <div style="line-height: 40px">
+                    <el-button size="mini" type="primary" @click="checkStart()"
+                      >开始检测</el-button
+                    >
+                  </div>
+                </div>
+                <el-table
+                  :data="tableData"
+                  border
+                  style="width: 100%"
+                  height="500px"
+                >
+                  <el-table-column
+                    align="center"
+                    label="序号"
+                    type="index"
+                    width="100px"
+                    :index="indexMethod"
+                    show-overflow-tooltip
+                  ></el-table-column>
+                  <el-table-column prop="zskName" label="产品ID" align="center">
+                  </el-table-column>
+                  <el-table-column
+                    prop="houseName"
+                    label="检测时间"
+                    align="center"
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    prop="houseName"
+                    label="设备标签"
+                    align="center"
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    prop="operName"
+                    label="所属仓房编码"
+                    align="center"
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    prop="phoneO"
+                    label="设备数量"
+                    align="center"
+                  >
+                  </el-table-column>
+
+                  <el-table-column prop="scanNum" label="最高温" align="center">
+                  </el-table-column>
+
+                  <el-table-column prop="scanNum" label="最低温" align="center">
+                  </el-table-column>
+                  <el-table-column prop="scanNum" label="平均温" align="center">
+                  </el-table-column>
+                  <el-table-column label="操作" width="140" align="center">
+                    <template slot-scope="scope">
+                      <el-button
+                        type="text"
+                        size="mini"
+                        @click="checkDetail(scope.row)"
+                        >查看</el-button
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-tab-pane>
+              <el-tab-pane label="报警记录" name="fourth"></el-tab-pane>
+            </el-tabs>
+          </div>
+        </div>
+      </div>
+
+      <el-dialog
+        title="添加关联设备"
+        width="800px"
+        :visible.sync="dialogTableVisible"
+      >
+        <el-form
+          :inline="true"
+          :model="formInline"
+          class="demo-form-inline"
+          id="formLabel"
+        >
+          <el-form-item label="设备ID:">
+            <el-input
+              size="mini"
+              v-model="formInline.scanTime"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="设备名称:">
+            <el-select
+              size="mini"
+              v-model="formInline.houseName"
+              multiple
+              placeholder="请选择"
+            >
+              <el-option label="1号仓" value="first"></el-option>
+              <el-option label="2号仓" value="second"></el-option>
+              <el-option label="3号仓" value="third"></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-search"
+              @click="search"
+              >查询</el-button
+            >
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              type="primary"
+              size="mini"
+              icon="el-icon-refresh-left"
+              @click="reset"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-table :data="alarmRecord" border style="width: 100%">
+          <el-table-column type="selection" align="center" width="55">
+          </el-table-column>
+          <el-table-column prop="zskName" label="设备ID"> </el-table-column>
+          <el-table-column prop="houseName" label="设备名称" align="center">
+          </el-table-column>
+          <el-table-column prop="operName" label="产品名称" align="center">
+          </el-table-column>
+          <el-table-column prop="phoneO" label="设备标识" align="center">
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"
+          :current-page="1"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pagination1.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="pagination1.total"
+        >
+        </el-pagination>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogTableVisible = false">取 消</el-button>
+          <el-button type="primary" @click="sure">确 定</el-button>
+        </div>
+      </el-dialog>
+      <addDialog :dialogTitle="'设备基本信息'" ref="addDialog" />
+      <el-dialog title="检测详情" width="800px" :visible.sync="checkDialog">
+        <!-- <detailTable ref="detailTable" :detail-table="checkInfo" :title="''" /> -->
+        <div class="panel-height-add">
+          <div style="padding: 2px">
+            <div class="detBox">
+              <div
+                v-for="(item, i) in checkInfo"
+                :key="i"
+                class="divF"
+                :style="{
+                  'line-height':
+                    (item.val.length == 0 ? 1 : item.val.length) * 48 + 'px',
+                  height:
+                    (item.val.length == 0 ? 1 : item.val.length) * 48 + 'px',
+                }"
+              >
+                <div>
+                  <div>{{ item.name }}</div>
+                </div>
+                <div :class="item.name1 == undefined ? 'long' : ''">
+                  <el-tooltip
+                    v-for="(data, len) in item.val"
+                    :key="len"
+                    effect="dark"
+                    :content="data"
+                    :disabled="(data + '').length < 20"
+                    placement="top"
+                  >
+                    <div>{{ data == null ? "" : data }}</div>
+                  </el-tooltip>
+                </div>
+                <div v-if="item.name1 != undefined">
+                  <el-tooltip
+                    effect="dark"
+                    :content="item.name1"
+                    :disabled="(item.name1 + '').length < 13"
+                    placement="top"
+                  >
+                    <div>{{ item.name1 }}</div>
+                  </el-tooltip>
+                </div>
+                <div v-if="item.name1 != undefined">
+                  <el-tooltip
+                    v-for="(data, index) in item.val1"
+                    :key="index"
+                    effect="dark"
+                    :content="data"
+                    :disabled="(data + '').length < 22"
+                    placement="top"
+                  >
+                    <div>{{ data == null ? "" : data }}</div>
+                  </el-tooltip>
+                </div>
+                <div v-if="item.name1 != undefined">
+                  <el-tooltip
+                    effect="dark"
+                    :content="item.name2"
+                    :disabled="(item.name2 + '').length < 13"
+                    placement="top"
+                  >
+                    <div>{{ item.name2 }}</div>
+                  </el-tooltip>
+                </div>
+                <div v-if="item.name1 != undefined">
+                  <el-tooltip
+                    v-for="(data, index) in item.val2"
+                    :key="index"
+                    effect="dark"
+                    :content="data"
+                    :disabled="(data + '').length < 22"
+                    placement="top"
+                  >
+                    <div>{{ data == null ? "" : data }}</div>
+                  </el-tooltip>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <el-table :data="alarmRecord" border style="width: 100%">
+          <el-table-column prop="zskName" label="设备ID"> </el-table-column>
+          <el-table-column prop="houseName" label="设备名称" align="center">
+          </el-table-column>
+          <el-table-column prop="operName" label="产品名称" align="center">
+          </el-table-column>
+          <el-table-column prop="phoneO" label="设备标识" align="center">
+          </el-table-column>
+        </el-table>
+      </el-dialog>
+    </d2-container>
+  </div>
+</template>
+<script>
+import addDialog from "../compontents/addDialog.vue";
+import api from "@/api";
+
+import detailTable from "@/components/detailTable/index.vue";
+export default {
+  name: "productInfo",
+  components: { detailTable, addDialog },
+  data() {
+    return {
+      info:{},
+      checkDialog: false,
+      dialogTableVisible: false,
+      formInline: {},
+      formTime: {},
+      tableData: [{}],
+      productData: [{}],
+      activeName: "first",
+      basicInfo: [
+        {
+          name: "设备ID",
+          val: [""],
+          name1: "设备名称",
+          val1: [""],
+        },
+        {
+          name: "产品名称",
+          val: [""],
+          name1: "产品分类",
+          val1: [""],
+        },
+        {
+          name: "所属组织机构",
+          val: [""],
+          name1: "设备状态",
+          val1: [""],
+        },
+        {
+          name: "最后上线时间",
+          val: [""],
+          name1: "设备标签",
+          val1: [""],
+        },
+        {
+          name: "最后上线时间",
+          val: [""],
+          name1: "创建时间",
+          val1: [""],
+        },
+        {
+          name: "描述",
+          val: [""],
+        },
+      ],
+      checkInfo: [
+        {
+          name: "检测时间",
+          val: [""],
+        },
+        {
+          name: "最高温",
+          val: [""],
+          name1: "最低温",
+          val1: [""],
+          name2: "平均温",
+          val2: [""],
+        },
+        {
+          name: "1层均温",
+          val: [""],
+          name1: "2层均温",
+          val1: [""],
+          name2: "3层均温",
+          val2: [""],
+        },
+      ],
+      //分页
+      pagination: {
+        // 每页显示的条数
+        pageSize: 10,
+        // 当前页
+        curPage: 1,
+        // 总数
+        total: 20,
+      },
+      //弹框分页
+      pagination1: {
+        // 每页显示的条数
+        pageSize: 10,
+        // 当前页
+        curPage: 1,
+        // 总数
+        total: 20,
+      },
+    };
+  },
+  created(){
+    this.getBasic()
+  },
+  methods: {
+    getBasic(){
+            api.equipmentDetail(this.$route.query.id).then(res=>{
+          if(res.code==200){
+            this.info=res.data
+            this.basicInfo=[
+        {
+          name: "设备ID",
+          val: [this.info.id],
+          name1: "设备名称",
+          val1: [this.info.eqName],
+        },
+        {
+          name: "产品名称",
+          val: [this.info.proName],
+          name1: "产品分类",
+          val1: [this.info.proCategory],
+        },
+        {
+          name: "所属组织机构",
+          val: [this.info.orgName],
+          name1: "设备状态",
+          val1: [this.info.eqStatus],
+        },
+        {
+          name: "最后上线时间",
+          val: [this.info.lastOnlineTime],
+          name1: "设备标签",
+          val1: [this.info.labelName],
+        },
+        {
+          name: "最后上线时间",
+          val: [this.info.lastOnlineTime],
+          name1: "创建时间",
+          val1: [this.info.registerTime],
+        },
+        {
+          name: "描述",
+          val: [this.info.eqRemark],
+        },
+      ]
+          }
+        })
+    },
+    // 查看检测信息
+    checkDetail(row) {
+      this.checkDialog = true;
+    },
+    //检测开始
+    checkStart() {
+      this.$confirm("确认发送温湿度检测请求?", "检测操作提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.$message({
+          type: "success",
+          message: "发送成功",
+        });
+      });
+    },
+    //取消关联
+    cancelMatch(row) {
+      this.$confirm("确认进行取消关联操作吗?", "取消关联提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.$message({
+          type: "success",
+          message: "取消关联成功",
+        });
+      });
+    },
+    // 返回
+    goBack() {
+      this.$router.go(-1);
+    },
+    tabsClick() {},
+
+    //表格序号
+    indexMethod(index) {
+      return (
+        (this.pagination.curPage - 1) * this.pagination.pageSize + index + 1
+      );
+    },
+    // 每页条数改变
+    handleSizeChange(val) {
+      this.pagination.pageSize = val;
+      this.getList();
+    },
+    // 当前页改变
+    handleCurrentChange(val) {
+      this.pagination.curPage = val;
+      this.getList();
+    },
+    // 每页条数改变
+    handleSizeChange1(val) {
+      this.pagination1.pageSize = val;
+      this.getList();
+    },
+    // 当前页改变
+    handleCurrentChange1(val) {
+      this.pagination1.curPage = val;
+      this.getList();
+    },
+  },
+  mounted() {},
+};
+</script>
+<style lang="scss" scoped>
+.main {
+  height: 100%;
+  display: flex;
+
+  .zt_right {
+    width: 100%;
+    // margin-left: 20px;
+    // width: calc(100% - 250px);
+    .nav {
+      padding: 10px 0 10px 10px;
+
+      font-size: 14px;
+
+      background: #fff;
+    }
+    .nameTitle {
+      // width: 100%;
+      font-size: 14px;
+      background: #fff;
+      padding: 20px 0 30px 20px;
+      margin-top: 10px;
+      i {
+        font-weight: bold;
+        font-size: 16px;
+        cursor: pointer;
+      }
+      .name {
+        font-weight: bold;
+        border-bottom: 2px solid #008775;
+        color: #008775;
+      }
+    }
+  }
+}
+::v-deep .el-tabs {
+  background: #fff;
+  padding: 0 20px;
+}
+::v-deep .el-table--border {
+  border-color: none !important ;
+}
+
+.infoTitle {
+  width: 100%;
+  // border-bottom: 1px solid #e6e6e6;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-bottom: 10px;
+  h5 {
+    margin: 0;
+    // padding-left:20px;
+  }
+  i {
+    color: #008775;
+    padding-right: 20px;
+    padding-top: 10px;
+    font-size: 14px;
+    cursor: pointer;
+  }
+}
+.topType {
+  color: #f56c6c;
+  margin-bottom: 20px;
+  span {
+    margin-right: 30px;
+    display: inline-block;
+    padding-right: 50px;
+    background-color: #fbc4c4;
+    cursor: pointer;
+  }
+}
+.flex-between {
+  display: flex;
+  // align-items: center;
+  justify-content: space-between;
+  margin-bottom: -10px;
+}
+
+.panel-height-add {
+  //   overflow: auto;
+  background-color: #ffffff;
+  //   box-shadow: 0px 4px 12px 0px rgba(0, 0, 0, 0.3);
+  margin-bottom: 20px;
+
+  .infoTitle {
+    width: 100%;
+    // border-bottom: 1px solid #e6e6e6;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    h5 {
+      margin: 0;
+      padding-left: 20px;
+    }
+    i {
+      color: #008775;
+      padding-right: 20px;
+      padding-top: 10px;
+      font-size: 14px;
+      cursor: pointer;
+    }
+  }
+
+  .detBox {
+    width: 100%;
+    border-left: 1px solid #e6e6e6;
+    border-top: 1px solid #e6e6e6;
+    margin-bottom: 30px;
+    .one {
+      line-height: 48px;
+    }
+    .two {
+      line-height: 96px;
+    }
+    .divF {
+      width: 100%;
+
+      display: flex;
+      //   align-items: center;
+      border-bottom: 1px solid #e6e6e6;
+
+      > div {
+        > div:last-child {
+          border-bottom: none !important;
+        }
+
+        div {
+          line-height: 48px;
+          height: 48px;
+          border-bottom: 1px solid #e6e6e6;
+          // padding-left: 10px;
+        }
+      }
+    }
+
+    .divF > div > div:last-child {
+      border: none;
+    }
+
+    .divF > div:nth-child(odd) {
+      width: 15%;
+      text-align: center;
+      background: #fafafa;
+      font-size: 14px;
+      div {
+        width: 100%;
+        overflow: hidden; /*超出部分隐藏*/
+        white-space: nowrap; /*不换行*/
+        text-overflow: ellipsis; /*超出部分文字以...显示*/
+      }
+    }
+
+    .divF > div:nth-child(even) {
+      width: 35%;
+      border-right: 1px solid #e6e6e6;
+      border-left: 1px solid #e6e6e6;
+      text-align: center;
+      font-size: 14px;
+      div {
+        width: 100%;
+        overflow: hidden; /*超出部分隐藏*/
+        white-space: nowrap; /*不换行*/
+        text-overflow: ellipsis; /*超出部分文字以...显示*/
+      }
+    }
+    .long {
+      width: 136% !important;
+    }
+  }
+}
+</style>

src/views/demo/equipmentManage/equipmentTag/index.vue

@@ -0,0 +1,315 @@
+<template>
+  <div>
+    <d2-container>
+      <!-- <template slot="header">首页/数据查询</template> -->
+          <div class="nav">当前所在位置:首页>设备管理>设备标签</div>
+
+      <div class="main">
+        <div class="zt_right">
+          <!-- <template slot="header">首页/数据查询</template> -->
+          <div class="right_main">
+            <!-- <div class="right_title">
+              <i
+                class="fa fa-file-text"
+                aria-hidden="true"
+                style="padding-right: 5px"
+              ></i>
+              产品
+            </div> -->
+            <div class="right_title">
+              <span>设备标签</span> 
+            </div>
+            <div class="right_table">
+              <div class="flex-between">
+                <el-form></el-form>
+                <div style="margin-bottom: 20px">
+                  <el-button
+                    type="primary"
+                    icon="el-icon-plus"
+                    @click="
+                      $refs.addDialogC.dialogFormVisible = true;
+                      dialogTitle = '新建设备标签';
+                    "
+                    >新建设备标签</el-button
+                  >
+                </div>
+              </div>
+              <el-table
+                :data="tableData"
+                style="width: 100%"
+                row-key="id"
+                border
+                default-expand-all
+                :tree-props="{
+                  children: 'children',
+                  hasChildren: 'hasChildren',
+                }"
+              >
+                <el-table-column
+                  align="center"
+                  label="序号"
+                  type="index"
+                  width="100px"
+                  :index="indexMethod"
+                  show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column prop="labelName" label="标签名称" align="center">
+                </el-table-column>
+
+                <el-table-column
+                  prop="labelRemark"
+                  label="备注"
+                  align="center"
+                  show-overflow-tooltip
+                >
+                </el-table-column>
+                <el-table-column label="操作" width="240" align="center">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="primary"
+                      size="mini"
+                      plain
+                      @click="seeTag(scope.row)"
+                      >查看</el-button
+                    >
+                    <el-button type="warning" plain size="mini" @click="edit(scope.row)"
+                      >编辑</el-button
+                    >
+                    <el-button type="danger" plain size="mini" @click="del(scope.row)"
+                      >删除</el-button
+                    >
+                    <!-- <el-button @click="delecheck( scope.$index, scope.row)" type="detailbtn" class="fa fa-info-circle" size="mini">查看</el-button> -->
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="1"
+                :page-sizes="[10, 20, 30, 40]"
+                :page-size="pagination.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="pagination.total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </div>
+      <addDialogC :row="editRow" :dialogTitle="dialogTitle" ref="addDialogC" />
+    </d2-container>
+  </div>
+</template>
+<script>
+import addDialogC from "../compontents/addDialogC.vue";
+
+import api from "@/api";
+// 1  异常点   2  断开
+export default {
+  name: "product",
+  components: { addDialogC },
+  data() {
+    return {
+      editRow: {},
+      addForm: {},
+      dialogFormVisible: false,
+      dialogTitle: "",
+      //头部查询条件
+      formInline: {
+        cfName: "",
+        scanTime: "",
+      },
+
+      //表格字段
+      tableData: [{}],
+      //分页
+      pagination: {
+        // 每页显示的条数
+        pageSize: 10,
+        // 当前页
+        curPage: 1,
+        // 总数
+        total: 20,
+      },
+      rules: {
+        id: [{ required: true, message: "请输入产品ID", trigger: "blur" }],
+        name: [{ required: true, message: "请选择产品名称", trigger: "blur" }],
+        region: [
+          { required: true, message: "请选择产品分类", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  methods: {
+    //编辑
+    edit(row) {
+      this.$refs.addDialogC.dialogFormVisible = true;
+      this.dialogTitle = "编辑设备标签";
+      this.editRow = row;
+      this.$refs.addDialogC.getEditRow(row);
+    },
+    //删除
+    del(row) {
+      this.$confirm("确认进行删除操作吗?", "删除提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        api.equipmentTagDel(row.id).then(res=>{
+          if(res.code==200){
+            this.$message({
+              type: "success",
+              message: "删除成功",
+            });
+            this.getList()
+          }else{
+            this.$message({
+              type: "error",
+              message: res.msg,
+            });
+          }
+        })
+      });
+    },
+    //查看
+    seeTag(row) {
+      this.$refs.addDialogC.dialogFormVisible = true;
+      this.dialogTitle = '查看设备标签';
+      this.editRow = row;
+      this.$refs.addDialogC.getEditRow(row);
+    },
+    //跳转产品分类
+    goClassify() {
+      this.$router.push({ path: "productClassify" });
+    },
+    //图标上传
+    handleAvatarSuccess(res, file) {
+      this.imageUrl = URL.createObjectURL(file.raw);
+    },
+    // beforeAvatarUpload(file) {
+    //   const isJPG = file.type === 'image/jpeg';
+    //   const isLt2M = file.size / 1024 / 1024 < 2;
+
+    //   if (!isJPG) {
+    //     this.$message.error('上传头像图片只能是 JPG 格式!');
+    //   }
+    //   if (!isLt2M) {
+    //     this.$message.error('上传头像图片大小不能超过 2MB!');
+    //   }
+    //   return isJPG && isLt2M;
+    // },
+    //新建产品提交
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          alert("submit!");
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    search() {},
+    reset() {},
+
+    //获取列表数据
+    getList() {
+      var condition = {};
+      condition = JSON.stringify(condition);
+      var data = {
+        pageIndex: this.pagination.curPage,
+        pageSize: this.pagination.pageSize,
+        condition: condition,
+      };
+      api
+        .equipmentTagList(data)
+        .then((res) => {
+          if (res.code == 200) {
+            this.tableData = res.data.records;
+            this.pagination.pageSize = res.data.size;
+            this.pagination.total = res.data.total;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+
+    //表格序号
+    indexMethod(index) {
+      return (
+        (this.pagination.curPage - 1) * this.pagination.pageSize + index + 1
+      );
+    },
+    // 每页条数改变
+    handleSizeChange(val) {
+      this.pagination.pageSize = val;
+      this.getList();
+    },
+    // 当前页改变
+    handleCurrentChange(val) {
+      this.pagination.curPage = val;
+      this.getList();
+    },
+  },
+  mounted() {
+    this.getList();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.main {
+  height: 100%;
+  display: flex;
+
+  .zt_right {
+    width: 100%;
+border: 1px solid #DEDEDE;
+border-radius: 6px;
+    // margin-left: 20px;
+    // width: calc(100% - 250px);
+    .right_title{
+      font-weight: bold;
+      font-size: 16px;
+      border-bottom:1px solid #ebeef5;
+      background-color: rgba(233, 244, 243, 0.5);
+      border-top-left-radius: 6px;
+      border-top-right-radius: 6px;
+      color: #008775;
+      border-bottom: 1px solid rgba(1, 164, 143, 0.3);
+      padding-left: 0;
+      span{
+        padding: 10px;
+        padding-bottom: 9px;
+        border-bottom: 2px solid #01a48f;
+
+      }
+    }
+
+  }
+}
+     .nav {
+      padding: 10px 0 10px 10px;
+      margin-bottom: 20px;
+      // color: #fff;
+
+      font-size: 14px;
+
+      background: #FFFFFF;
+      border: 1px solid #DEDEDE;
+    }
+.float-left {
+  float: left;
+}
+.float-right {
+  float: right;
+}
+#dialogStyle .el-select {
+  width: 100%;
+}
+.flex-between {
+  display: flex;
+  // align-items: center;
+  justify-content: space-between;
+}
+</style>

src/views/demo/parameManagement/alarmParame/index.vue

@@ -2,12 +2,14 @@
   <div>
     <d2-container>
       <!-- <template slot="header">首页/报警参数</template> -->
+      <div class="nav">当前所在位置:首页>参数管理>报警参数</div>
+
       <div class="main">
         <div class="left">
           <!-- <el-input placeholder="输入关键字进行过滤" v-model="filterText">
           </el-input> -->
-
-        <el-tree
+          <div class="leftTitle">组织机构</div>
+          <el-tree
             class="filter-tree"
             :filter-node-method="filterNode"
             v-loading="loading"
@@ -22,94 +24,309 @@
             ref="tree"
           >
             <span class="custom-tree-node" slot-scope="{ node, data }">
-              <span v-if="node.level==1"> <i :class="node.icon"></i>{{ node.label }} </span>
-               <span v-if="node.level==2"> <i :class="node.icon"></i>{{ node.label }} </span>
-                <span v-if="node.level==3"> <i :class="node.icon"></i>{{ node.label }} </span>
-                 <span v-if="node.level==4"> <i></i>{{ node.label }} </span>
+              <span v-if="node.level == 1">
+                <i :class="node.icon"></i>{{ node.label }}
+              </span>
+              <span v-if="node.level == 2">
+                <i :class="node.icon"></i>{{ node.label }}
+              </span>
+              <span v-if="node.level == 3">
+                <i :class="node.icon"></i>{{ node.label }}
+              </span>
+              <span v-if="node.level == 4"> <i></i>{{ node.label }} </span>
             </span>
           </el-tree>
         </div>
         <div class="right">
-           <div class="nav">当前所在位置:首页>报警参数</div>
           <div class="right_main">
-            <div class="right_title"><i class="fa fa-lightbulb-o" aria-hidden="true" style="padding-right:5px"></i>报警参数</div>
+            <div class="right_title">
+              <span>报警配置参数列表</span>
+            </div>
             <div class="right_table">
-          <div class="addBtn">
-            <el-button type="primary" icon="el-icon-plus" @click="addTantou"
-              >修改新增报警规则</el-button
-            >
-          </div>
-          <el-form :model="formData" ref="formData" id="formLabel">
-            <el-row style="margin-top: 10px">
-              <el-col :span="12" :offset="2">
-                <el-form-item label="报警启用状态:">
-                  <el-radio-group v-model="formData.status">
-                    <el-radio :label="1" :disabled="disabled">开</el-radio>
-                    <el-radio :label="0" :disabled="disabled">关</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="10">
-              <el-col :span="10" :offset="2">
-                <h4>电话通知:</h4>
-                <p>
-                  电话1:
-                  <span>{{ formData.telephoneNumber1 }}</span>
-                </p>
-                <p>
-                  电话2:
-                  <span>{{ formData.telephoneNumber2 }}</span>
-                </p>
-              </el-col>
-              <el-col :span="10" :offset="2">
-                <h4>短信通知:</h4>
-                <p>
-                  电话1:
-                  <span>{{ formData.smsNumber1 }}</span>
-                </p>
-                <p>
-                  电话2:
-                  <span>{{ formData.smsNumber2 }}</span>
-                </p>
-              </el-col>
-            </el-row>
-          </el-form>
-          </div>
+              <div class="addBtn">
+                <el-button type="primary" icon="el-icon-plus" @click="addTantou"
+                  >新建温度报警装置</el-button
+                >
+              </div>
+              <el-table :data="alarmRecord" border style="width: 100%">
+                <el-table-column
+                  align="center"
+                  label="序号"
+                  type="index"
+                  width="100px"
+                  :index="indexMethod"
+                ></el-table-column>
+                <el-table-column prop="zskName" label="产品ID" align="center">
+                </el-table-column>
+                <el-table-column
+                  prop="houseName"
+                  label="预警名称"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="operName"
+                  label="是否开启"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column prop="phoneO" label="设备数量" align="center">
+                </el-table-column>
+
+                <el-table-column prop="scanNum" label="预警阈值" align="center">
+                </el-table-column>
+                <el-table-column label="操作" width="140" align="center">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      size="mini"
+                      @click="goDetail(scope.row)"
+                      >查看</el-button
+                    >
+                    <el-button type="text" size="mini">关闭</el-button>
+                    <el-button type="text" size="mini" @click="del(scope.row)"
+                      >删除</el-button
+                    >
+                    <!-- <el-button @click="delecheck( scope.$index, scope.row)" type="detailbtn" class="fa fa-info-circle" size="mini">查看</el-button> -->
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="1"
+                :page-sizes="[10, 20, 30, 40]"
+                :page-size="pagination.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="pagination.total"
+              >
+              </el-pagination>
+            </div>
           </div>
         </div>
       </div>
     </d2-container>
 
     <!-- //弹框 -->
-    <el-dialog title="新增修改报警规则" :visible.sync="dialogAlarm" id="dialogStyle">
-      <el-form :model="dialog">
-        <el-form-item label="报警启用状态:" :label-width="formLabelWidth">
-          <el-radio-group v-model="dialog.name">
-            <el-radio label="开"></el-radio>
-            <el-radio label="关"></el-radio>
-          </el-radio-group>
+    <el-dialog
+      title="新建温度报警配置信息"
+      :visible.sync="dialogAlarm"
+      id="dialogStyle"
+    >
+      <el-form :model="addForm" label-width="110px" :inline="true" :rules="rules"
+          ref="addForm">
+        <el-form-item
+          style="position: absolute; right: 48px; top: 2px"
+          label="温度预警阈值:"
+          
+          prop="wdyj"
+        >
+          <el-input
+            style="width: 100px"
+            size="mini"
+            v-model="dialog.name"
+            autocomplete="off"
+          ></el-input>
         </el-form-item>
-        <h4>电话通知:</h4>
-        <el-form-item label="电话1:" :label-width="formLabelWidth">
-          <el-input v-model="dialog.name" autocomplete="off"></el-input>
+        <el-form-item
+          style="position: absolute; right: 268px; top: 2px"
+          label="湿度预警阈值:"
+          
+          prop="sdyj"
+        >
+          <el-input
+            style="width: 100px"
+            size="mini"
+            v-model="dialog.name"
+            autocomplete="off"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="电话2:" :label-width="formLabelWidth">
-          <el-input v-model="dialog.name" autocomplete="off"></el-input>
+        <el-form-item label="报警类型:" prop="bjlx">
+          <el-select
+            v-model="addForm.houseName"
+            placeholder="请选择"
+          >
+            <el-option label="1号仓" value="first"></el-option>
+            <el-option label="2号仓" value="second"></el-option>
+            <el-option label="3号仓" value="third"></el-option>
+          </el-select>
         </el-form-item>
-         <h4>短信通知:</h4>
-        <el-form-item label="电话1:" :label-width="formLabelWidth">
-          <el-input v-model="dialog.name" autocomplete="off"></el-input>
+        <el-form-item
+          label="温度预警阈值:"
+          
+          prop="wdyj"
+        >
+          <el-input
+          style="width:220px"
+            v-model="dialog.name"
+            autocomplete="off"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="电话2:" :label-width="formLabelWidth">
-          <el-input v-model="dialog.name" autocomplete="off"></el-input>
+        <el-form-item label="是否开启:"  prop="sfkq">
+          <el-select
+            v-model="addForm.sfkq"
+            placeholder="请选择"
+          >
+            <el-option label="1号仓" value="first"></el-option>
+            <el-option label="2号仓" value="second"></el-option>
+            <el-option label="3号仓" value="third"></el-option>
+          </el-select>
         </el-form-item>
+        <div style="display:flex;justify-content: space-between">
+          <el-form-item label="预警设备:"  prop="sfkq">
+            <el-button type="primary" icon="el-icon-plus" @click="addSbDialog=true">选择设备</el-button>
+          </el-form-item>
+          <div style="line-height:40px">已选择<span style="color:#008775;padding-top:13px">12</span>个</div>
+        </div>
       </el-form>
+      <el-table
+        :data="tableData"
+        style="width: 100%">
+        <el-table-column
+          prop="date"
+           align="center"
+          label="设备ID">
+        </el-table-column>
+        <el-table-column
+          prop="name"
+           align="center"
+          label="设备名称">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+           align="center"
+           show-overflow-tooltip
+          min-width="100"
+          label="所属产品名称">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+           align="center"
+          label="设备标签">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          min-width="100"
+
+           align="center"
+          label="所属仓房编码">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+           align="center"
+          label="状态">
+        </el-table-column>
+                <el-table-column label="操作" width="80" align="center">
+                  <template slot-scope="scope">
+                    <el-button type="danger" plain size="mini" @click="del(scope.row)"
+                      >删除</el-button
+                    >
+                    <!-- <el-button @click="delecheck( scope.$index, scope.row)" type="detailbtn" class="fa fa-info-circle" size="mini">查看</el-button> -->
+                  </template>
+                </el-table-column>  
+      </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogAlarm = false">取 消</el-button>
         <el-button type="primary" @click="determine()">确 定</el-button>
       </div>
     </el-dialog>
+      <el-dialog
+        title="添加设备"
+        width="1100px"
+        :visible.sync="addSbDialog"
+        id="dialogStyle"
+      >
+        <el-form
+          :inline="true"
+          :model="addSbForm"
+          class="demo-form-inline"
+          id="formLabel"
+        >
+          <el-form-item label="产品名称:">
+            <el-select
+              size="mini"
+              v-model="addSbForm.houseName"
+              multiple
+              placeholder="请选择"
+            >
+              <el-option label="1号仓" value="first"></el-option>
+              <el-option label="2号仓" value="second"></el-option>
+              <el-option label="3号仓" value="third"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="设备名称:">
+            <el-select
+              size="mini"
+              v-model="addSbForm.houseName"
+              multiple
+              placeholder="请选择"
+            >
+              <el-option label="1号仓" value="first"></el-option>
+              <el-option label="2号仓" value="second"></el-option>
+              <el-option label="3号仓" value="third"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="设备标签:">
+            <el-select
+              size="mini"
+              v-model="addSbForm.houseName"
+              multiple
+              placeholder="请选择"
+            >
+              <el-option label="1号仓" value="first"></el-option>
+              <el-option label="2号仓" value="second"></el-option>
+              <el-option label="3号仓" value="third"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-search"
+              @click="search"
+              >查询</el-button
+            >
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              type="primary"
+              size="mini"
+              icon="el-icon-refresh-left"
+              @click="reset"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-table :data="alarmRecord" border style="width: 100%">
+          <el-table-column type="selection"  align="center" width="55">
+          </el-table-column>
+          <el-table-column prop="zskName" align="center" label="设备ID"> </el-table-column>
+          <el-table-column prop="houseName" label="设备名称" align="center">
+          </el-table-column>
+          <el-table-column prop="operName" label="产品名称" align="center">
+          </el-table-column>
+          <el-table-column prop="phoneO" label="设备标识" align="center">
+          </el-table-column>
+          <el-table-column prop="phoneO" label="所属仓房编码" align="center">
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"
+          :current-page="1"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pagination1.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="pagination1.total"
+        >
+        </el-pagination>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="addSbDialog = false">取 消</el-button>
+          <el-button type="primary" @click="sure">确 定</el-button>
+        </div>
+      </el-dialog>
   </div>
 </template>
 <script>
@@ -118,7 +335,41 @@ export default {
   name: "hardwareParame",
   data() {
     return {
-      disabled:false,
+      addSbForm:{},
+      addSbDialog:false,
+      tableData:[{}],
+      addForm:{},
+      rules: {
+        wdyj: [{ required: true, message: "请输入温度预警阈值", trigger: "blur" }],
+        sdyj: [{ required: true, message: "请输入湿度预警阈值", trigger: "blur" }],
+        bjlx: [
+          { required: true, message: "请选择报警类型", trigger: "blur" },
+        ],
+        sfkq: [
+          { required: true, message: "请选择是否开启", trigger: "blur" },
+        ],
+      },
+      //表格字段
+      alarmRecord: [{}],
+      //分页
+      pagination: {
+        // 每页显示的条数
+        pageSize: 10,
+        // 当前页
+        curPage: 1,
+        // 总数
+        total: 20,
+      },
+      //弹框分页
+      pagination1: {
+        // 每页显示的条数
+        pageSize: 10,
+        // 当前页
+        curPage: 1,
+        // 总数
+        total: 20,
+      },
+      disabled: false,
       // label宽度
       formLabelWidth: "120px",
       // 弹框默认关闭
@@ -129,18 +380,16 @@ export default {
         children: "children",
         label: "orgName",
       },
-       loading: false,
+      loading: false,
       //默认展开的节点
       defaultExpanded: [],
       cfbh: "",
       //左侧树数据
-      leftList: [
-        
-      ],
+      leftList: [],
       // 日期插件
       //
 
-      formInline: {
+      addForm: {
         sbNames: "",
       },
       formData: {
@@ -166,11 +415,29 @@ export default {
   //   },
   // },
   methods: {
+    // 每页条数改变
+    handleSizeChange1(val) {
+      this.pagination1.pageSize = val;
+    },
+    // 当前页改变
+    handleCurrentChange1(val) {
+      this.pagination1.curPage = val;
+    },
+    // 每页条数改变
+    handleSizeChange(val) {
+      this.pagination.pageSize = val;
+      this.getList();
+    },
+    // 当前页改变
+    handleCurrentChange(val) {
+      this.pagination.curPage = val;
+      this.getList();
+    },
     //获取左侧树
     getLeftTree() {
       this.loading = true;
       let params = {
-        orgName:this.orgName,
+        orgName: this.orgName,
       };
 
       api
@@ -181,7 +448,6 @@ export default {
             this.leftList = [];
             if (res.data) {
               this.leftList = res.data;
-           
 
               // if (res.data[0].id) {
               //   this.defaultExpanded.push(res.data[0].id);
@@ -192,7 +458,7 @@ export default {
 
               //     this.cfbh =
               //       res.data[0].children[0].children[0].children[0].id;
-                 
+
               //     setTimeout(() => {
               //          document.getElementsByClassName("el-tree-node__content")[0].style.display="none"
               //       document.getElementsByClassName("el-tree-node__content")[1].style.display="none"
@@ -203,19 +469,18 @@ export default {
               //       this.getList();
               //   }
               // }
-               var lastLevel=res.data;
-              if(lastLevel.length>0){
-                lastLevel=res.data[0]
-                while(lastLevel.children&&lastLevel.children.length>0){
-                  lastLevel=lastLevel.children[0];
+              var lastLevel = res.data;
+              if (lastLevel.length > 0) {
+                lastLevel = res.data[0];
+                while (lastLevel.children && lastLevel.children.length > 0) {
+                  lastLevel = lastLevel.children[0];
                 }
-           
+
                 this.defaultExpanded.push(lastLevel.id);
-                this.cfbh=lastLevel.id
-                setTimeout(()=>{
-                    this.$refs.tree.setCurrentKey(this.cfbh);
-                
-                },200)
+                this.cfbh = lastLevel.id;
+                setTimeout(() => {
+                  this.$refs.tree.setCurrentKey(this.cfbh);
+                }, 200);
                 this.getList();
               }
             }
@@ -232,21 +497,20 @@ export default {
           console.log(error);
         });
     },
-     //点击左侧树节点
-    handleNodeClick(data,node) {
-    
-    // if(node.level ===4){
-    //  this.cfbh=data.id;
-    //  console.log(  this.cfbh,";;;")
-    // }
-    // this.getList();
-      if(node.childNodes.length===0){
-            this.cfbh = data.id;
+    //点击左侧树节点
+    handleNodeClick(data, node) {
+      // if(node.level ===4){
+      //  this.cfbh=data.id;
+      //  console.log(  this.cfbh,";;;")
+      // }
+      // this.getList();
+      if (node.childNodes.length === 0) {
+        this.cfbh = data.id;
         console.log(this.cfbh, ";;;");
         this.getList();
       }
     },
-     filterNode(value, data) {
+    filterNode(value, data) {
       if (!value) return true;
       return data.orgName.indexOf(value) !== -1;
     },
@@ -254,16 +518,15 @@ export default {
     //   if (!value) return true;
     //   return data.label.indexOf(value) !== -1;
     // },
-     //获取列表数据
+    //获取列表数据
     getList() {
-     
-     var houseId=this.cfbh
-    
+      var houseId = this.cfbh;
+
       api
         .alarmParams(houseId)
         .then((res) => {
           if (res.code == 200) {
-            console.log(res,"报警参数")
+            console.log(res, "报警参数");
           }
         })
         .catch((err) => {
@@ -285,49 +548,82 @@ export default {
     //弹框确定按钮
     determine() {},
   },
-  mounted(){
+  mounted() {
     this.getLeftTree();
-  }
+  },
 };
 </script>
 <style lang="scss" scoped>
 .main {
   height: 100%;
   display: flex;
-  .left{
-    height:calc(100vh - 144px)
+  .left {
+    height: calc(100vh - 131px);
+    .leftTitle {
+      background: linear-gradient(0deg, #008574 0%, #01a48f 100%);
+      border-top-left-radius: 6px;
+      border-top-right-radius: 6px;
+      padding: 10px;
+      font-size: 16px;
+      color: #fff;
+      font-weight: bold;
+    }
   }
   .right {
     margin-left: 20px;
     width: calc(100% - 280px);
-    .nav {
-      padding: 10px 0 10px 10px;
-      color: #fff;
 
-      font-size: 14px;
-
-      background: #004a93;
+    border: 1px solid #dedede;
+    background-color: #fff;
+    border-radius: 6px;
+    .right_main {
+      border-top-left-radius: 6px;
+      border-top-right-radius: 6px;
+    }
+    .right_title {
+      font-weight: bold;
+      font-size: 16px;
+      border-bottom: 1px solid #ebeef5;
+      background-color: rgba(233, 244, 243, 0.5);
+      border-top-left-radius: 6px;
+      border-top-right-radius: 6px;
+      color: #008775;
+      border-bottom: 1px solid rgba(1, 164, 143, 0.3);
+      padding-left: 0;
+      span {
+        padding: 10px;
+        padding-bottom: 9px;
+        border-bottom: 2px solid #01a48f;
+      }
     }
   }
   .addBtn {
-    margin-bottom: 20px;
+    margin-bottom: 10px;
+    margin-top: -10px;
+    text-align: right;
   }
-   h4 {
+  h4 {
     font-size: 16px;
     font-weight: 700;
     line-height: 40px;
-    color:#fff;
+    // color:#fff;
   }
   p {
-    color: #525357;
+    // color: #525357;
     font-size: 14px;
     line-height: 40px;
     position: relative;
-    color:#fff;
+    color: #fff;
   }
 }
- 
- 
+.nav {
+  padding: 10px 0 10px 10px;
+  margin-bottom: 20px;
+  // color: #fff;
 
+  font-size: 14px;
 
+  background: #ffffff;
+  border: 1px solid #dedede;
+}
 </style>

src/views/demo/parameManagement/dataDictionary/index.vue

@@ -8,14 +8,14 @@
       <div class="zt_right">
         <div class="nav">当前所在位置:首页>数据字典</div>
         <div class="right_main">
-          <div class="right_title">
+          <!-- <div class="right_title">
             <i
               class="fa fa-book"
               aria-hidden="true"
               style="padding-right: 5px"
             ></i
             >数据字典
-          </div>
+          </div> -->
           <div class="right_table">
             <el-form
               :inline="true"
@@ -68,10 +68,7 @@
               border
               style="width: 100%"
               row-key="id"
-             
-              
               :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-              :header-cell-style="{ background: '#0064b9', color: '#c9f5fa' }"
             >
               <el-table-column
                 prop='enumName'
@@ -359,7 +356,7 @@ export default {
        this.title = "新增字典";
       this.dicDialog = true;
       this.parentId=0;
-      
+      this.btnType=1
       
     },
     //新建子项
@@ -424,11 +421,11 @@ export default {
     // width: calc(100% - 250px);
     .nav {
       padding: 10px 0 10px 10px;
-      color: #fff;
+      // color: #fff;
 
       font-size: 14px;
 
-      background: #004a93;
+      background: #fff;
     }
     // .right_main {
     //   border: 1px solid #67a7df;

src/views/demo/parameManagement/setTimeOut/index.vue

@@ -0,0 +1,630 @@
+<template>
+  <div>
+    <d2-container>
+      <!-- <template slot="header">首页/报警参数</template> -->
+      <div class="nav">当前所在位置:首页>参数管理>定时任务设置</div>
+
+      <div class="main">
+        <div class="left">
+          <!-- <el-input placeholder="输入关键字进行过滤" v-model="filterText">
+          </el-input> -->
+          <div class="leftTitle">组织机构</div>
+          <el-tree
+            class="filter-tree"
+            :filter-node-method="filterNode"
+            v-loading="loading"
+            :data="leftList"
+            node-key="id"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            @node-click="handleNodeClick"
+            default-expand-all
+            highlight-current
+            :default-expanded-keys="this.defaultExpanded"
+            ref="tree"
+          >
+            <span class="custom-tree-node" slot-scope="{ node, data }">
+              <span v-if="node.level == 1">
+                <i :class="node.icon"></i>{{ node.label }}
+              </span>
+              <span v-if="node.level == 2">
+                <i :class="node.icon"></i>{{ node.label }}
+              </span>
+              <span v-if="node.level == 3">
+                <i :class="node.icon"></i>{{ node.label }}
+              </span>
+              <span v-if="node.level == 4"> <i></i>{{ node.label }} </span>
+            </span>
+          </el-tree>
+        </div>
+        <div class="right">
+          <div class="right_main">
+            <div class="right_title">
+              <span>定时任务列表</span>
+            </div>
+            <div class="right_table">
+              <div class="addBtn">
+                <el-button type="primary" icon="el-icon-plus" @click="addTantou"
+                  >新建定时任务</el-button
+                >
+              </div>
+              <el-table :data="alarmRecord" border style="width: 100%">
+                <el-table-column
+                  align="center"
+                  label="序号"
+                  type="index"
+                  width="100px"
+                  :index="indexMethod"
+                ></el-table-column>
+                <el-table-column prop="zskName" label="任务名称" align="center">
+                </el-table-column>
+                <el-table-column
+                  prop="houseName"
+                  label="计划检测时间"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="operName"
+                  label="设备数量"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column prop="phoneO" label="创建时间" align="center">
+                </el-table-column>
+
+                <el-table-column prop="scanNum" label="是否开启" align="center">
+                </el-table-column>
+                <el-table-column label="操作" width="140" align="center">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      size="mini"
+                      @click="goDetail(scope.row)"
+                      >查看</el-button
+                    >
+                    <el-button type="text" size="mini">编辑</el-button>
+                    <el-button type="text" size="mini" @click="del(scope.row)"
+                      >删除</el-button
+                    >
+                    <!-- <el-button @click="delecheck( scope.$index, scope.row)" type="detailbtn" class="fa fa-info-circle" size="mini">查看</el-button> -->
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="1"
+                :page-sizes="[10, 20, 30, 40]"
+                :page-size="pagination.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="pagination.total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </div>
+    </d2-container>
+
+    <!-- //弹框 -->
+    <el-dialog
+      title="定时任务设置"
+      :visible.sync="dialogAlarm"
+      id="dialogStyle"
+    >
+      <el-form :model="addForm" label-width="110px" :inline="true" :rules="rules"
+          ref="addForm">
+        <!-- <el-form-item
+          style="position: absolute; right: 48px; top: 2px"
+          label="温度预警阈值:"
+          
+          prop="wdyj"
+        >
+          <el-input
+            style="width: 100px"
+            size="mini"
+            v-model="dialog.name"
+            autocomplete="off"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          style="position: absolute; right: 268px; top: 2px"
+          label="湿度预警阈值:"
+          
+          prop="sdyj"
+        >
+          <el-input
+            style="width: 100px"
+            size="mini"
+            v-model="dialog.name"
+            autocomplete="off"
+          ></el-input>
+        </el-form-item> -->
+        
+        <el-form-item
+          label="任务名称:"
+          prop="taskName"
+        >
+          <el-input
+          style="width:220px"
+          placeholder="请输入"
+            v-model="addForm.taskName"
+            autocomplete="off"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="是否开启:"  prop="sfkq">
+          <el-select
+            v-model="addForm.sfkq"
+            placeholder="请选择"
+          >
+            <el-option label="1号仓" value="first"></el-option>
+            <el-option label="2号仓" value="second"></el-option>
+            <el-option label="3号仓" value="third"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="任务触发时间:"  prop="sfkq">
+          <el-select
+            v-model="addForm.sfkq1"
+            placeholder="请选择"
+          >
+            <el-option label="每小时" value="first"></el-option>
+            <el-option label="2号仓" value="second"></el-option>
+            <el-option label="3号仓" value="third"></el-option>
+          </el-select>
+        </el-form-item>
+        <div style="display:flex;justify-content: space-between">
+          <el-form-item label="任务设备:"  prop="sfkq">
+            <el-button type="primary" icon="el-icon-plus" @click="addSbDialog=true">选择设备</el-button>
+          </el-form-item>
+          <div style="line-height:40px">已选择<span style="color:#008775;padding-top:13px">12</span>个</div>
+        </div>
+      </el-form>
+      <el-table
+        :data="tableData"
+        style="width: 100%">
+        <el-table-column
+          prop="date"
+           align="center"
+          label="设备ID">
+        </el-table-column>
+        <el-table-column
+          prop="name"
+           align="center"
+          label="设备名称">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+           align="center"
+           show-overflow-tooltip
+          min-width="100"
+          label="所属产品名称">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+           align="center"
+          label="设备标签">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          min-width="100"
+
+           align="center"
+          label="所属仓房编码">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+           align="center"
+          label="状态">
+        </el-table-column>
+                <el-table-column label="操作" width="80" align="center">
+                  <template slot-scope="scope">
+                    <el-button type="danger" plain size="mini" @click="del(scope.row)"
+                      >删除</el-button
+                    >
+                    <!-- <el-button @click="delecheck( scope.$index, scope.row)" type="detailbtn" class="fa fa-info-circle" size="mini">查看</el-button> -->
+                  </template>
+                </el-table-column>  
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogAlarm = false">取 消</el-button>
+        <el-button type="primary" @click="determine()">确 定</el-button>
+      </div>
+    </el-dialog>
+      <el-dialog
+        title="添加设备"
+        width="1100px"
+        :visible.sync="addSbDialog"
+        id="dialogStyle"
+      >
+        <el-form
+          :inline="true"
+          :model="addSbForm"
+          class="demo-form-inline"
+          id="formLabel"
+        >
+          <el-form-item label="产品名称:">
+            <el-select
+              size="mini"
+              v-model="addSbForm.houseName"
+              multiple
+              placeholder="请选择"
+            >
+              <el-option label="1号仓" value="first"></el-option>
+              <el-option label="2号仓" value="second"></el-option>
+              <el-option label="3号仓" value="third"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="设备名称:">
+            <el-select
+              size="mini"
+              v-model="addSbForm.houseName"
+              multiple
+              placeholder="请选择"
+            >
+              <el-option label="1号仓" value="first"></el-option>
+              <el-option label="2号仓" value="second"></el-option>
+              <el-option label="3号仓" value="third"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="设备标签:">
+            <el-select
+              size="mini"
+              v-model="addSbForm.houseName"
+              multiple
+              placeholder="请选择"
+            >
+              <el-option label="1号仓" value="first"></el-option>
+              <el-option label="2号仓" value="second"></el-option>
+              <el-option label="3号仓" value="third"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-search"
+              @click="search"
+              >查询</el-button
+            >
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              type="primary"
+              size="mini"
+              icon="el-icon-refresh-left"
+              @click="reset"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-table :data="alarmRecord" border style="width: 100%">
+          <el-table-column type="selection"  align="center" width="55">
+          </el-table-column>
+          <el-table-column prop="zskName" align="center" label="设备ID"> </el-table-column>
+          <el-table-column prop="houseName" label="设备名称" align="center">
+          </el-table-column>
+          <el-table-column prop="operName" label="产品名称" align="center">
+          </el-table-column>
+          <el-table-column prop="phoneO" label="设备标识" align="center">
+          </el-table-column>
+          <el-table-column prop="phoneO" label="所属仓房编码" align="center">
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"
+          :current-page="1"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pagination1.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="pagination1.total"
+        >
+        </el-pagination>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="addSbDialog = false">取 消</el-button>
+          <el-button type="primary" @click="sure">确 定</el-button>
+        </div>
+      </el-dialog>
+  </div>
+</template>
+<script>
+import api from "@/api";
+export default {
+  name: "setTimeOut",
+  data() {
+    return {
+      addSbForm:{},
+      addSbDialog:false,
+      tableData:[{}],
+      addForm:{},
+      rules: {
+        taskName: [{ required: true, message: "请输入任务名称", trigger: "blur" }],
+        sdyj: [{ required: true, message: "请输入湿度预警阈值", trigger: "blur" }],
+        bjlx: [
+          { required: true, message: "请选择报警类型", trigger: "blur" },
+        ],
+        sfkq: [
+          { required: true, message: "请选择是否开启", trigger: "blur" },
+        ],
+      },
+      //表格字段
+      alarmRecord: [{}],
+      //分页
+      pagination: {
+        // 每页显示的条数
+        pageSize: 10,
+        // 当前页
+        curPage: 1,
+        // 总数
+        total: 20,
+      },
+      //弹框分页
+      pagination1: {
+        // 每页显示的条数
+        pageSize: 10,
+        // 当前页
+        curPage: 1,
+        // 总数
+        total: 20,
+      },
+      disabled: false,
+      // label宽度
+      formLabelWidth: "120px",
+      // 弹框默认关闭
+      dialogAlarm: false,
+      filterText: "",
+      //默认展开的节点
+      defaultProps: {
+        children: "children",
+        label: "orgName",
+      },
+      loading: false,
+      //默认展开的节点
+      defaultExpanded: [],
+      cfbh: "",
+      //左侧树数据
+      leftList: [],
+      // 日期插件
+      //
+
+      addForm: {
+        sbNames: "",
+      },
+      formData: {
+        status: 0,
+        totalStatus: 0,
+        totalThreshold: "",
+        timeThreshold: "",
+        telephoneNumber1: "",
+        telephoneNumber2: "",
+        smsNumber1: "",
+        smsNumber2: "",
+        id: "",
+      },
+      //弹框字段
+      dialog: {
+        name: "",
+      },
+    };
+  },
+  // watch: {
+  //   filterTest(val) {
+  //     this.$refs.tree.filter(val);
+  //   },
+  // },
+  methods: {
+    // 每页条数改变
+    handleSizeChange1(val) {
+      this.pagination1.pageSize = val;
+    },
+    // 当前页改变
+    handleCurrentChange1(val) {
+      this.pagination1.curPage = val;
+    },
+    // 每页条数改变
+    handleSizeChange(val) {
+      this.pagination.pageSize = val;
+      this.getList();
+    },
+    // 当前页改变
+    handleCurrentChange(val) {
+      this.pagination.curPage = val;
+      this.getList();
+    },
+    //获取左侧树
+    getLeftTree() {
+      this.loading = true;
+      let params = {
+        orgName: this.orgName,
+      };
+
+      api
+        .leftTree(params)
+        .then((res) => {
+          if (res.code == 200) {
+            console.log(res);
+            this.leftList = [];
+            if (res.data) {
+              this.leftList = res.data;
+
+              // if (res.data[0].id) {
+              //   this.defaultExpanded.push(res.data[0].id);
+              //   if (res.data[0].children) {
+              //     this.defaultExpanded.push(
+              //       res.data[0].children[0].children[0].id
+              //     );
+
+              //     this.cfbh =
+              //       res.data[0].children[0].children[0].children[0].id;
+
+              //     setTimeout(() => {
+              //          document.getElementsByClassName("el-tree-node__content")[0].style.display="none"
+              //       document.getElementsByClassName("el-tree-node__content")[1].style.display="none"
+              //       this.$refs.tree.setCurrentKey(this.cfbh);
+              //       this.$refs.tree.setCurrentKey(this.cfbh);
+              //     }, 100);
+              //     console.log(this.leftList);
+              //       this.getList();
+              //   }
+              // }
+              var lastLevel = res.data;
+              if (lastLevel.length > 0) {
+                lastLevel = res.data[0];
+                while (lastLevel.children && lastLevel.children.length > 0) {
+                  lastLevel = lastLevel.children[0];
+                }
+
+                this.defaultExpanded.push(lastLevel.id);
+                this.cfbh = lastLevel.id;
+                setTimeout(() => {
+                  this.$refs.tree.setCurrentKey(this.cfbh);
+                }, 200);
+                this.getList();
+              }
+            }
+          } else {
+            this.$message({
+              type: "error",
+              message: res.msg,
+            });
+          }
+          this.loading = false;
+        })
+        .catch((error) => {
+          this.loading = false;
+          console.log(error);
+        });
+    },
+    //点击左侧树节点
+    handleNodeClick(data, node) {
+      // if(node.level ===4){
+      //  this.cfbh=data.id;
+      //  console.log(  this.cfbh,";;;")
+      // }
+      // this.getList();
+      if (node.childNodes.length === 0) {
+        this.cfbh = data.id;
+        console.log(this.cfbh, ";;;");
+        this.getList();
+      }
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.orgName.indexOf(value) !== -1;
+    },
+    // filterNode(value, data) {
+    //   if (!value) return true;
+    //   return data.label.indexOf(value) !== -1;
+    // },
+    //获取列表数据
+    getList() {
+      var houseId = this.cfbh;
+
+      api
+        .alarmParams(houseId)
+        .then((res) => {
+          if (res.code == 200) {
+            console.log(res, "报警参数");
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    search() {},
+    reset() {},
+    //新增
+    addTantou() {
+      this.dialogAlarm = true;
+    },
+    //表格序号
+    indexMethod(index) {
+      // return (
+      //   (this.pagination.curPage - 1) * this.pagination.pageSize + index + 1
+      // );
+    },
+    //弹框确定按钮
+    determine() {},
+  },
+  mounted() {
+    this.getLeftTree();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.main {
+  height: 100%;
+  display: flex;
+  .left {
+    height: calc(100vh - 131px);
+    .leftTitle {
+      background: linear-gradient(0deg, #008574 0%, #01a48f 100%);
+      border-top-left-radius: 6px;
+      border-top-right-radius: 6px;
+      padding: 10px;
+      font-size: 16px;
+      color: #fff;
+      font-weight: bold;
+    }
+  }
+  .right {
+    margin-left: 20px;
+    width: calc(100% - 280px);
+
+    border: 1px solid #dedede;
+    background-color: #fff;
+    border-radius: 6px;
+    .right_main {
+      border-top-left-radius: 6px;
+      border-top-right-radius: 6px;
+    }
+    .right_title {
+      font-weight: bold;
+      font-size: 16px;
+      border-bottom: 1px solid #ebeef5;
+      background-color: rgba(233, 244, 243, 0.5);
+      border-top-left-radius: 6px;
+      border-top-right-radius: 6px;
+      color: #008775;
+      border-bottom: 1px solid rgba(1, 164, 143, 0.3);
+      padding-left: 0;
+      span {
+        padding: 10px;
+        padding-bottom: 9px;
+        border-bottom: 2px solid #01a48f;
+      }
+    }
+  }
+  .addBtn {
+    margin-bottom: 10px;
+    margin-top: -10px;
+    text-align: right;
+  }
+  h4 {
+    font-size: 16px;
+    font-weight: 700;
+    line-height: 40px;
+    // color:#fff;
+  }
+  p {
+    // color: #525357;
+    font-size: 14px;
+    line-height: 40px;
+    position: relative;
+    color: #fff;
+  }
+}
+.nav {
+  padding: 10px 0 10px 10px;
+  margin-bottom: 20px;
+  // color: #fff;
+
+  font-size: 14px;
+
+  background: #ffffff;
+  border: 1px solid #dedede;
+}
+</style>

src/views/demo/productManage/compontents/addDialog.vue

@@ -0,0 +1,234 @@
+<template>
+  <div>
+    <el-dialog
+      :title="dialogTitle"
+      @close="addForm = {}"
+      :visible.sync="dialogFormVisible"
+      id="dialogStyle"
+    >
+      <el-form
+        :model="addForm"
+        :rules="rules"
+        ref="addForm"
+        label-width="120px"
+      >
+        <el-form-item label="产品图标：" prop="proIcons">
+          <el-upload
+            class="avatar-uploader"
+            action="api/minio/testupload"
+            :show-file-list="false"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+          >
+            <img
+              v-if="addForm.proIcons"
+              :src="addForm.proIcons"
+              class="avatar"
+            />
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="产品ID：" prop="proCode">
+          <el-input
+            style="width: 220px"
+            v-model.trim="addForm.proCode"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="产品名称：" prop="proName">
+          <el-input
+            style="width: 220px"
+            v-model.trim="addForm.proName"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="产品分类：" prop="proCategory">
+          <el-select
+            v-model="addForm.proCategory"
+            placeholder="请选择"
+            ref="selectTree"
+          >
+            <el-option
+              :key="addForm.proCategory"
+              :value="addForm.proCategory"
+              :label="addForm.label"
+              hidden
+            />
+            <el-tree
+              :data="typeLists"
+              :props="defaultProps"
+              node-key="id"
+              accordion
+              highlight-current
+              @node-click="handleNodeClick"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属组织机构：">
+          <el-select v-model="addForm.orgName" placeholder="请选择">
+            <el-option
+              v-for="item in ckLists"
+              :key="item.id"
+              :label="item.orgName"
+              :value="item.orgName"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="产品描述：">
+          <el-input
+            style="width: 80%"
+            type="textarea"
+            v-model.trim="addForm.proDescription"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm('addForm')"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import api from "@/api";
+import log from "@/libs/util.log";
+export default {
+  props: {
+    dialogTitle: "",
+  },
+  data() {
+    return {
+      defaultProps: {
+        children: "children",
+        label: "productCategoryName",
+      },
+      ckLists: [],
+      typeLists: [],
+      addForm: {},
+      dialogFormVisible: false,
+      rules: {
+        proCode: [{ required: true, message: "请输入产品ID", trigger: "blur" }],
+        proName: [
+          { required: true, message: "请输入产品名称", trigger: "blur" },
+        ],
+        proCategory: [
+          { required: true, message: "请选择产品分类", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.ckList();
+  },
+  methods: {
+    handleAvatarSuccess(res, file) {
+      this.$set(this.addForm,'proIcons',"http://101.36.160.140:31005/smart-grp-basic/minio/preViewPicture/" + res.data)
+      // this.addForm.proIcons =
+      //   "http://101.36.160.140:31005/smart-grp-basic/minio/preViewPicture/" + res.data;
+      //   console.log(this.addForm.proIcons);
+    },
+    getInfo(row) {
+      this.addForm = row;
+    },
+    handleNodeClick(data) {
+      console.log(data);
+      this.$set(this.addForm, "proCategory", data.productCategoryName);
+      this.$set(this.addForm, "label", data.productCategoryName);
+      console.log(this.addForm);
+      // 使 input 失去焦点，并隐藏下拉框
+      this.$refs.selectTree.blur();
+    },
+    //新增或编辑时仓房/仓库下拉选
+    ckList() {
+      var data = {
+        storeTypeCode: 300002,
+      };
+
+      api
+        .ckList(data)
+        .then((res) => {
+          if (res.code == 200) {
+            this.ckLists = res.data;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+
+      api
+        .productCategoryList()
+        .then((res) => {
+          if (res.code == 200) {
+            this.typeLists = res.data;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+
+    //新建产品提交
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        console.log(this.addForm);
+        if (valid) {
+          let params = JSON.parse(JSON.stringify(this.addForm));
+          params.label = undefined;
+
+          if (this.dialogTitle == "新建产品") {
+            params.id = "";
+            api.productSave(params).then((res) => {
+              if (res.code == 200) {
+                this.$message.success("新建成功");
+                this.$parent.$parent.$parent.getList();
+                this.dialogFormVisible = false;
+              }
+            });
+          } else {
+            api.productUpdate(params).then((res) => {
+              if (res.code == 200) {
+                this.$message.success("编辑成功");
+                this.dialogFormVisible = false;
+                this.$parent.$parent.$parent.getBasic();
+              }
+            });
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #008775;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 100px;
+  height: 100px;
+  line-height: 100px;
+  text-align: center;
+}
+.avatar {
+  width: 100px;
+  height: 100px;
+  display: block;
+}
+</style>

src/views/demo/productManage/compontents/addDialogC.vue

@@ -0,0 +1,176 @@
+<template>
+  <div>
+    <el-dialog
+      :title="dialogTitle"
+      :visible.sync="dialogFormVisible"
+      id="dialogStyle"
+      @close="addForm={}"
+    >
+      <el-form
+        :model="addForm"
+        :rules="rules"
+        ref="addForm"
+        label-width="120px"
+      >
+        <el-form-item label="产品分类名称：">
+          <el-input
+            style="width: 220px"
+            v-model.trim="addForm.productCategoryName"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="上级产品分类：">
+          <el-select clearable @clear="remove()" v-model="addForm.parentId" placeholder="请选择" ref="selectTree">
+            <el-option
+              :key="addForm.parentId"
+              :value="addForm.parentId"
+              :label="addForm.parentId==0?'无':addForm.label"
+              hidden
+            />
+            <el-tree
+              :data="data"
+              :props="defaultProps"
+              node-key="id"
+              accordion
+              highlight-current
+              @node-click="handleNodeClick"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注：">
+          <el-input
+            style="width: 80%"
+            type="textarea"
+            v-model.trim="addForm.proRemark"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm('addForm')"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import api from "@/api";
+
+export default {
+  props: {
+    dialogTitle: {
+      type: String,
+      default: () => ("")
+    },
+    row: {
+      type: Object,
+      default: () => ({})
+    },
+    data: {
+      type: Array,
+      default: () => ([])
+    }
+  },
+  data() {
+    return {
+      defaultProps: {
+        children: "children",
+        label: "productCategoryName",
+      },
+      addForm: {
+        parentId:'',
+        proRemark:'',
+        productCategoryName:'',
+      },
+      dialogFormVisible: false,
+      rules: {
+        id: [{ required: true, message: "请输入产品ID", trigger: "blur" }],
+        name: [{ required: true, message: "请选择产品名称", trigger: "blur" }],
+        region: [
+          { required: true, message: "请选择产品分类", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  methods: {
+    remove(){
+      this.$set(this.addForm,'label',undefined)
+      // this.$set(this.addForm,'parentId',0)
+    },
+    handleNodeClick(data) {
+      console.log(data);
+      this.$set(this.addForm,'parentId',data.id)
+      this.$set(this.addForm,'label',data.productCategoryName)
+      // 使 input 失去焦点，并隐藏下拉框
+      this.$refs.selectTree.blur();
+    },
+    //获取编辑数据
+    getEditRow(row) {
+      this.addForm.proRemark=row.proRemark
+      this.addForm.id=row.id
+      this.addForm.parentId=row.parentId
+      this.$set(this.addForm,'parentId',row.parentId)
+      this.addForm.productCategoryName=row.productCategoryName
+      this.addForm.productCategoryCode=row.productCategoryCode
+       console.log(123,this.addForm,this.data);
+    },
+    //新建产品提交
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+            let params=JSON.parse(JSON.stringify(this.addForm))
+            params.label=undefined
+          if(this.dialogTitle=='新建产品分类'){
+            params.productCategoryCode=""
+            api.productCategorySave(params).then(res=>{
+              if (res.code == 200) {
+                this.$message.success("新建成功");
+                this.$parent.$parent.$parent.getList()
+                this.dialogFormVisible=false;
+              }
+            })
+          }else{
+            api.productCategoryUpdate(params).then(res=>{
+              if (res.code == 200) {
+                this.$message.success("编辑成功");
+                this.dialogFormVisible=false;
+                this.$parent.$parent.$parent.getList()
+              }
+            })
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #008775;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 100px;
+  height: 100px;
+  line-height: 100px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

src/views/demo/productManage/product/index.vue

@@ -0,0 +1,351 @@
+<template>
+  <div>
+    <d2-container>
+          <div class="nav">当前所在位置:首页>产品管理>产品</div>
+
+      <!-- <template slot="header">首页/数据查询</template> -->
+      <div class="main">
+        <div class="zt_right">
+          <!-- <template slot="header">首页/数据查询</template> -->
+          <div class="right_main">
+            <!-- <div class="right_title">
+              <i
+                class="fa fa-file-text"
+                aria-hidden="true"
+                style="padding-right: 5px"
+              ></i>
+              产品
+            </div> -->
+            <div class="right_title">
+              <span>产品管理</span> 
+            </div>
+            <div class="right_table">
+              <div class="flex-between">
+                <el-form
+                  :inline="true"
+                  :model="formInline"
+                  class="demo-form-inline"
+                  id="formLabel"
+                >
+                  <el-form-item label="产品ID:">
+                    <el-input v-model="formInline.pro_code" placeholder="请输入"></el-input>
+                  </el-form-item>
+                  <el-form-item label="产品名称:">
+                    <el-input v-model="formInline.pro_name" placeholder="请输入"></el-input>
+<!-- 
+                    <el-select
+                      v-model="formInline.pro_name"
+                      placeholder="请选择"
+                    >
+                      <el-option label="1号仓" value="first"></el-option>
+                      <el-option label="2号仓" value="second"></el-option>
+                      <el-option label="3号仓" value="third"></el-option>
+                    </el-select> -->
+                  </el-form-item>
+                
+                  <el-form-item>
+                    <el-button
+                      type="primary"
+                      icon="el-icon-search"
+                      @click="search"
+                      >查询</el-button
+                    >
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button
+                      type="primary"
+                      icon="el-icon-refresh-left"
+                      @click="reset"
+                      >重置</el-button
+                    >
+                  </el-form-item>
+                </el-form>
+                <div>
+                  <el-button type="primary" @click="goClassify"
+                    >产品分类</el-button
+                  >
+                  <el-button
+                    type="primary"
+                    icon="el-icon-plus"
+                    @click="$refs.addDialog.dialogFormVisible = true"
+                    >新建产品</el-button
+                  >
+                </div>
+              </div>
+              <el-table
+                :data="alarmRecord"
+                border
+                style="width: 100%"
+              >
+                <el-table-column
+                  align="center"
+                  label="序号"
+                  type="index"
+                  width="100px"
+                  :index="indexMethod"
+                  show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column prop="zskName" label="产品ID" align="center">
+                </el-table-column>
+                <el-table-column
+                  prop="proName"
+                  label="产品名称"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="proCategory"
+                  label="产品分类"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column prop="eqTotal" label="设备数量" align="center">
+                </el-table-column>
+
+                <el-table-column
+                  prop="orgName"
+                  label="所属组织机构"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column label="操作" width="160" align="center">
+                  <template slot-scope="scope">
+                    <el-button type="primary" plain size="mini" @click="goDetail(scope.row)"
+                      >查看</el-button
+                    >
+                    <el-button type="danger" plain size="mini" @click="del(scope.row)"
+                      >删除</el-button
+                    >
+                    <!-- <el-button @click="delecheck( scope.$index, scope.row)" type="detailbtn" class="fa fa-info-circle" size="mini">查看</el-button> -->
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="1"
+                :page-sizes="[10, 20, 30, 40]"
+                :page-size="pagination.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="pagination.total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </div>
+      <addDialog :dialogTitle="'新建产品'" ref="addDialog"/>
+    </d2-container>
+  </div>
+</template>
+<script>
+import addDialog from "../compontents/addDialog.vue";
+
+import api from "@/api";
+// 1  异常点   2  断开
+export default {
+  name: "product",
+  components: { addDialog },
+  data() {
+    return {
+      addForm: {},
+      dialogFormVisible: false,
+      dialogTitle: "",
+      //头部查询条件
+      formInline: {
+        pro_name: "",
+        pro_code: "",
+      },
+
+      //表格字段
+      alarmRecord: [{}],
+      //分页
+      pagination: {
+        // 每页显示的条数
+        pageSize: 10,
+        // 当前页
+        curPage: 1,
+        // 总数
+        total: 20,
+      },
+      rules: {
+        id: [{ required: true, message: "请输入产品ID", trigger: "blur" }],
+        name: [{ required: true, message: "请选择产品名称", trigger: "blur" }],
+        region: [
+          { required: true, message: "请选择产品分类", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  methods: {
+
+    //删除
+    del(row){
+        this.$confirm('确认进行删除操作吗?', '删除提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+        api.productDetail(row.id).then(res=>{
+          if(res.code==200){
+            this.$message({
+              type: "success",
+              message: "删除成功",
+            });
+            this.getList()
+          }
+        })
+        })
+    },
+    //查看
+    goDetail(row) {
+      this.$router.push({ path: "productInfo",query:{id:row.id} });
+    },
+    //跳转产品分类
+    goClassify() {
+      this.$router.push({ path: "productClassify" });
+    },
+    //图标上传
+    handleAvatarSuccess(res, file) {
+      api.preViewPicture(res.data).then(res=>{})
+      this.imageUrl = URL.createObjectURL(file.raw);
+    },
+    // beforeAvatarUpload(file) {
+    //   const isJPG = file.type === 'image/jpeg';
+    //   const isLt2M = file.size / 1024 / 1024 < 2;
+
+    //   if (!isJPG) {
+    //     this.$message.error('上传头像图片只能是 JPG 格式!');
+    //   }
+    //   if (!isLt2M) {
+    //     this.$message.error('上传头像图片大小不能超过 2MB!');
+    //   }
+    //   return isJPG && isLt2M;
+    // },
+    //新建产品提交
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          alert("submit!");
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    search() {
+      this.getList()
+    },
+    reset() {
+      this.pagination.curPage=1;
+      this.pagination.pageSize=10;
+      this.formInline={
+        pro_name: "",
+        pro_code: "",
+      }
+      this.getList()
+    },
+
+    //获取列表数据
+    getList() {
+      var condition = {pro_name:this.formInline.pro_name,pro_code:this.formInline.pro_code};
+      condition = JSON.stringify(condition);
+      var data = {
+        pageIndex: this.pagination.curPage,
+        pageSize: this.pagination.pageSize,
+        condition: condition,
+      };
+      api
+        .productList(data)
+        .then((res) => {
+          if (res.code == 200) {
+            this.alarmRecord = res.data.records;
+            this.pagination.pageSize = res.data.size;
+            this.pagination.total = res.data.total;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+
+    //表格序号
+    indexMethod(index) {
+      return (
+        (this.pagination.curPage - 1) * this.pagination.pageSize + index + 1
+      );
+    },
+    // 每页条数改变
+    handleSizeChange(val) {
+      this.pagination.pageSize = val;
+      this.getList();
+    },
+    // 当前页改变
+    handleCurrentChange(val) {
+      this.pagination.curPage = val;
+      this.getList();
+    },
+  },
+  mounted() {
+    this.getList();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.main {
+  height: 100%;
+  display: flex;
+
+  .zt_right {
+    width: 100%;
+border: 1px solid #DEDEDE;
+border-radius: 6px;
+    // margin-left: 20px;
+    // width: calc(100% - 250px);
+    .right_title{
+      font-weight: bold;
+      font-size: 16px;
+      border-bottom:1px solid #ebeef5;
+      background-color: rgba(233, 244, 243, 0.5);
+      border-top-left-radius: 6px;
+      border-top-right-radius: 6px;
+      color: #008775;
+      border-bottom: 1px solid rgba(1, 164, 143, 0.3);
+      padding-left: 0;
+      span{
+        padding: 10px;
+        padding-bottom: 9px;
+        border-bottom: 2px solid #01a48f;
+
+      }
+    }
+
+  }
+}
+     .nav {
+      padding: 10px 0 10px 10px;
+      margin-bottom: 20px;
+      // color: #fff;
+
+      font-size: 14px;
+
+      background: #FFFFFF;
+      border: 1px solid #DEDEDE;
+    }
+.float-left {
+  float: left;
+}
+.float-right {
+  float: right;
+}
+#dialogStyle .el-select {
+  width: 100%;
+}
+.flex-between {
+  display: flex;
+  // align-items: center;
+  justify-content: space-between;
+}
+
+</style>

src/views/demo/productManage/productClassify/index.vue

@@ -0,0 +1,321 @@
+<template>
+  <div>
+    <d2-container>
+          <div class="nav">当前所在位置:首页>产品管理>产品分类</div>
+
+      <!-- <template slot="header">首页/数据查询</template> -->
+      <div class="main">
+        <div class="zt_right">
+          <!-- <template slot="header">首页/数据查询</template> -->
+          <div class="right_main">
+            <!-- <div class="right_title">
+              <i
+                class="fa fa-file-text"
+                aria-hidden="true"
+                style="padding-right: 5px"
+              ></i>
+              产品
+            </div> -->
+            <div class="right_title">
+              <span>产品管理</span> 
+            </div>
+            <div class="right_table">
+              <div class="flex-between">
+                <el-form></el-form>
+                <div style="margin-bottom: 20px">
+                  <el-button
+                    type="primary"
+                    icon="el-icon-plus"
+                    @click="
+                      $refs.addDialogC.dialogFormVisible = true;
+                      dialogTitle = '新建产品分类';
+                      $refs.addDialogC.addForm={
+                        parentId:undefined,
+                        proRemark:'',
+                        productCategoryName:'',
+                      }
+                    "
+                    >新建产品分类</el-button
+                  >
+                </div>
+              </div>
+              <el-table
+                :data="tableData"
+                style="width: 100%"
+                row-key="id"
+                border
+                default-expand-all
+                :tree-props="{
+                  children: 'children',
+                  hasChildren: 'hasChildren',
+                }"
+              >
+                <el-table-column
+                  align="center"
+                  label="序号"
+                  type="index"
+                  width="100px"
+                  :index="indexMethod"
+                  show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                  prop="productCategoryName"
+                  label="产品分类"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column prop="createTime" label="创建时间" align="center">
+                </el-table-column>
+
+                <el-table-column
+                  prop="proRemark"
+                  label="备注"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column label="操作" width="160" align="center">
+                  <template slot-scope="scope">
+                    <!-- <el-button
+                      type="text"
+                      size="mini"
+                      @click="goDetail(scope.row)"
+                      >查看</el-button
+                    > -->
+                    <el-button type="primary" plain size="mini" @click="edit(scope.row)"
+                      >编辑</el-button
+                    >
+                    <el-button type="danger" plain size="mini" @click="del(scope.row)"
+                      >删除</el-button
+                    >
+                    <!-- <el-button @click="delecheck( scope.$index, scope.row)" type="detailbtn" class="fa fa-info-circle" size="mini">查看</el-button> -->
+                  </template>
+                </el-table-column>
+              </el-table>
+              <!-- <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="1"
+                :page-sizes="[10, 20, 30, 40]"
+                :page-size="pagination.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="pagination.total"
+              >
+              </el-pagination> -->
+            </div>
+          </div>
+        </div>
+      </div>
+      <addDialogC :row="editRow" :data="tableData1" :dialogTitle="dialogTitle" ref="addDialogC" />
+    </d2-container>
+  </div>
+</template>
+<script>
+import addDialogC from "../compontents/addDialogC.vue";
+
+import api from "@/api";
+import log from '@/store/modules/d2admin/modules/log';
+// 1  异常点   2  断开
+export default {
+  name: "product",
+  components: { addDialogC },
+  data() {
+    return {
+      editRow: {},
+      addForm: {},
+      dialogFormVisible: false,
+      dialogTitle: "",
+      //头部查询条件
+      formInline: {
+        cfName: "",
+        scanTime: "",
+      },
+
+      //表格字段
+      tableData: [{}],
+      tableData1: [],
+      //分页
+      pagination: {
+        // 每页显示的条数
+        pageSize: 10,
+        // 当前页
+        curPage: 1,
+        // 总数
+        total: 20,
+      },
+      rules: {
+        id: [{ required: true, message: "请输入产品ID", trigger: "blur" }],
+        name: [{ required: true, message: "请选择产品名称", trigger: "blur" }],
+        region: [
+          { required: true, message: "请选择产品分类", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  methods: {
+    //编辑
+    edit(row) {
+      this.$refs.addDialogC.dialogFormVisible = true;
+      this.dialogTitle = "编辑产品分类";
+      this.editRow = row;
+      this.$refs.addDialogC.getEditRow(row);
+    },
+    //删除
+    del(row) {
+      this.$confirm("确认进行删除操作吗?", "删除提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        api.productCategoryDel(row.id).then(res=>{
+          if(res.code==200){
+            this.$message({
+              type: "success",
+              message: "删除成功",
+            });
+            this.getList()
+          }
+        })
+
+      });
+    },
+    //查看
+    goDetail(row) {
+      this.$router.push({ path: "productInfo", query: { productName: "" } });
+    },
+    //跳转产品分类
+    goClassify() {
+      this.$router.push({ path: "productClassify" });
+    },
+    //图标上传
+    handleAvatarSuccess(res, file) {
+      this.imageUrl = URL.createObjectURL(file.raw);
+    },
+    // beforeAvatarUpload(file) {
+    //   const isJPG = file.type === 'image/jpeg';
+    //   const isLt2M = file.size / 1024 / 1024 < 2;
+
+    //   if (!isJPG) {
+    //     this.$message.error('上传头像图片只能是 JPG 格式!');
+    //   }
+    //   if (!isLt2M) {
+    //     this.$message.error('上传头像图片大小不能超过 2MB!');
+    //   }
+    //   return isJPG && isLt2M;
+    // },
+    //新建产品提交
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          alert("submit!");
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    search() {},
+    reset() {},
+
+    //获取列表数据
+    getList() {
+      var condition = {};
+      condition = JSON.stringify(condition);
+      var data = {
+        pageIndex: this.pagination.curPage,
+        pageSize: this.pagination.pageSize,
+        condition: condition,
+      };
+      api
+        .productCategoryList()
+        .then((res) => {
+          if (res.code == 200) {
+            this.tableData = res.data;
+            // this.tableData1 = [].concat(res.data);
+          let arr=[{productCategoryName:'无',parentId:0,id:0}]
+            this.tableData1 = [...arr,...res.data];
+       // this.pagination.pageSize = res.data.size;
+            // this.pagination.total = res.data.total;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+
+    //表格序号
+    indexMethod(index) {
+      return (
+        (this.pagination.curPage - 1) * this.pagination.pageSize + index + 1
+      );
+    },
+    // 每页条数改变
+    handleSizeChange(val) {
+      this.pagination.pageSize = val;
+      this.getList();
+    },
+    // 当前页改变
+    handleCurrentChange(val) {
+      this.pagination.curPage = val;
+      this.getList();
+    },
+  },
+  mounted() {
+    this.getList();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.main {
+  height: 100%;
+  display: flex;
+
+  .zt_right {
+    width: 100%;
+border: 1px solid #DEDEDE;
+border-radius: 6px;
+    // margin-left: 20px;
+    // width: calc(100% - 250px);
+    .right_title{
+      font-weight: bold;
+      font-size: 16px;
+      border-bottom:1px solid #ebeef5;
+      background-color: rgba(233, 244, 243, 0.5);
+      border-top-left-radius: 6px;
+      border-top-right-radius: 6px;
+      color: #008775;
+      border-bottom: 1px solid rgba(1, 164, 143, 0.3);
+      padding-left: 0;
+      span{
+        padding: 10px;
+        padding-bottom: 9px;
+        border-bottom: 2px solid #01a48f;
+
+      }
+    }
+  }
+}
+     .nav {
+      padding: 10px 0 10px 10px;
+      margin-bottom: 20px;
+      // color: #fff;
+
+      font-size: 14px;
+
+      background: #FFFFFF;
+      border: 1px solid #DEDEDE;
+    }
+.float-left {
+  float: left;
+}
+.float-right {
+  float: right;
+}
+#dialogStyle .el-select {
+  width: 100%;
+}
+.flex-between {
+  display: flex;
+  // align-items: center;
+  justify-content: space-between;
+}
+</style>

src/views/demo/productManage/productInfo/index.vue

@@ -0,0 +1,423 @@
+<template>
+  <div>
+    <d2-container>
+      <div class="main">
+        <div class="zt_right">
+          <!-- <template slot="header">首页/数据查询</template> -->
+          <div class="nav">当前所在位置:首页>产品管理>产品>产品详情</div>
+          <div class="">
+            <div class="nameTitle">
+              <i @click="goBack" class="el-icon-back"></i> <span class="name"> 产品名称：{{$route.query.productName}}</span><span style="font-size:14px;margin-left:40px">设备数：<span style="color:#008775">30</span></span>
+            </div>
+            <el-tabs v-model="activeName" @tab-click="tabsClick">
+              <el-tab-pane label="基本信息" name="first">
+    <div class="infoTitle">
+      <h5>{{ title }}</h5>
+      <el-button icon="fa fa-edit" type="primary" size="mini" @click="edit">编辑</el-button>
+    </div>
+                <detailTable
+                  ref="detailTable"
+                  :detail-table="basicInfo"
+                  :title="''"
+                />
+              </el-tab-pane>
+              <el-tab-pane label="物模型" name="second"></el-tab-pane>
+              <el-tab-pane label="设备信息" name="third">
+                <div style="padding-bottom:20px">
+                    <div style="text-align:right;padding-bottom:20px">
+                        <el-button type="primary" size="mini" icon="el-icon-plus" @click="dialogTableVisible = true">添加关联设备</el-button>
+                    </div>
+                  <el-table
+                    :data="productData"
+                    border
+                    style="width: 100%"
+   
+                  >
+                    <el-table-column
+                      align="center"
+                      label="序号"
+                      type="index"
+                      width="100px"
+                      :index="indexMethod"
+                      show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                      prop="zskName"
+                      label="设备ID"
+                      align="center"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                      prop="houseName"
+                      label="设备名称"
+                      align="center"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                      prop="operName"
+                      label="所属产品名称"
+                      align="center"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                      prop="phoneO"
+                      label="所属组织机构"
+                      align="center"
+                    >
+                    </el-table-column>
+
+                    <el-table-column
+                      prop="scanNum"
+                      label="设备标签"
+                      align="center"
+                    >
+                    </el-table-column>
+
+                    <el-table-column
+                      prop="scanNum"
+                      label="状态"
+                      align="center"
+                    >
+                    </el-table-column>
+
+                    <el-table-column
+                      prop="scanNum"
+                      label="注册时间"
+                      align="center"
+                    >
+                    </el-table-column>
+
+                    <el-table-column
+                      prop="scanNum"
+                      label="最后联系时间"
+                      align="center"
+                    >
+                    </el-table-column>
+                    <el-table-column label="操作" width="120" align="center">
+                      <template slot-scope="scope">
+                        <el-button
+                          type="text"
+                          size="mini"
+                          >查看</el-button
+                        >
+                        <el-button type="text" size="mini" @click="cancelMatch(scope.row)"
+                          >取消关联</el-button
+                        >
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="1"
+                    :page-sizes="[10, 20, 30, 40]"
+                    :page-size="pagination.pageSize"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="pagination.total"
+                  >
+                  </el-pagination>
+                </div>
+              </el-tab-pane>
+              <el-tab-pane label="报警记录" name="fourth"></el-tab-pane>
+            </el-tabs>
+          </div>
+        </div>
+      </div>
+
+      <el-dialog title="添加关联设备" width="800px" :visible.sync="dialogTableVisible">
+                <el-form
+                  :inline="true"
+                  :model="formInline"
+                  class="demo-form-inline"
+                  id="formLabel"
+                >
+                  <el-form-item label="设备ID:">
+                    <el-input size="mini" v-model="formInline.scanTime" placeholder="请输入"></el-input>
+                  </el-form-item>
+                  <el-form-item label="设备名称:">
+                    <el-select 
+                      size="mini"
+                      v-model="formInline.houseName"
+                      multiple
+                      placeholder="请选择"
+                    >
+                      <el-option label="1号仓" value="first"></el-option>
+                      <el-option label="2号仓" value="second"></el-option>
+                      <el-option label="3号仓" value="third"></el-option>
+                    </el-select>
+                  </el-form-item>
+                
+                  <el-form-item>
+                    <el-button size="mini"
+                      type="primary"
+                      icon="el-icon-search"
+                      @click="search"
+                      >查询</el-button
+                    >
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button
+                      type="primary" size="mini"
+                      icon="el-icon-refresh-left"
+                      @click="reset"
+                      >重置</el-button
+                    >
+                  </el-form-item>
+                </el-form>
+            
+              <el-table
+                :data="alarmRecord"
+                border
+                style="width: 100%"
+              >
+    <el-table-column
+      type="selection" 
+      align="center"
+      width="55">
+    </el-table-column>
+                <el-table-column prop="zskName" label="设备ID">
+                </el-table-column>
+                <el-table-column
+                  prop="houseName"
+                  label="设备名称"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="operName"
+                  label="产品名称"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column prop="phoneO" label="设备标识" align="center">
+                </el-table-column>
+
+               
+              </el-table>
+              <el-pagination
+                @size-change="handleSizeChange1"
+                @current-change="handleCurrentChange1"
+                :current-page="1"
+                :page-sizes="[10, 20, 30, 40]"
+                :page-size="pagination1.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="pagination1.total"
+              >
+              </el-pagination>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogTableVisible = false">取 消</el-button>
+          <el-button type="primary" @click="sure"
+            >确 定</el-button
+          >
+        </div>
+      </el-dialog>
+      <addDialog :dialogTitle="'产品基本信息'" ref="addDialog"/>
+    </d2-container>
+  </div>
+</template>
+<script>
+import addDialog from "../compontents/addDialog.vue";
+import api from "@/api";
+
+import detailTable from "@/components/detailTable/index.vue";
+export default {
+  name: "productInfo",
+  components: { detailTable ,addDialog},
+  data() {
+    return {
+      info:{},
+        dialogTableVisible:false,
+        formInline:{},
+      productData:[{}],
+      activeName: "first",
+      basicInfo: [
+        {
+          name: "产品ID",
+          val: [""],
+          name1: "产品名称",
+          val1: [""],
+        },
+        {
+          name: "产品分类",
+          val: [""],
+          name1: "所属组织机构",
+          val1: [""],
+        },
+        {
+          name: "创建时间",
+          val: [""],
+          name1: "产品描述",
+          val1: [""],
+        },
+      ],
+      //分页
+      pagination: {
+        // 每页显示的条数
+        pageSize: 10,
+        // 当前页
+        curPage: 1,
+        // 总数
+        total: 20,
+      },
+      //弹框分页
+      pagination1: {
+        // 每页显示的条数
+        pageSize: 10,
+        // 当前页
+        curPage: 1,
+        // 总数
+        total: 20,
+      },
+    };
+  },
+  created(){
+    this.getBasic()
+
+  },
+  methods: {
+    edit(){
+      this.$refs.addDialog.dialogFormVisible=true
+            this.$refs.addDialog.getInfo(this.info)
+
+    },
+    getBasic(){
+            api.productDetail(this.$route.query.id).then(res=>{
+          if(res.code==200){
+            this.info=res.data
+            this.basicInfo=[
+        {
+          name: "产品ID",
+          val: [res.data.proCode],
+          name1: "产品名称",
+          val1: [res.data.proName],
+        },
+        {
+          name: "产品分类",
+          val: [res.data.proCategory],
+          name1: "所属组织机构",
+          val1: [res.data.orgName],
+        },
+        {
+          name: "创建时间",
+          val: [res.data.createTime],
+          name1: "产品描述",
+          val1: [res.data.proDescription],
+        },
+      ]
+          }
+        })
+    },
+    //取消关联
+    cancelMatch(row){
+        this.$confirm('确认进行取消关联操作吗?', '取消关联提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$message({
+            type: 'success',
+            message: '取消关联成功'
+          });
+        })
+    },
+    // 返回
+    goBack() {
+      this.$router.go(-1);
+    },
+    tabsClick() {},
+
+    //表格序号
+    indexMethod(index) {
+      return (
+        (this.pagination.curPage - 1) * this.pagination.pageSize + index + 1
+      );
+    },
+    // 每页条数改变
+    handleSizeChange(val) {
+      this.pagination.pageSize = val;
+      this.getList();
+    },
+    // 当前页改变
+    handleCurrentChange(val) {
+      this.pagination.curPage = val;
+      this.getList();
+    },
+    // 每页条数改变
+    handleSizeChange1(val) {
+      this.pagination.pageSize = val;
+      this.getList();
+    },
+    // 当前页改变
+    handleCurrentChange1(val) {
+      this.pagination.curPage = val;
+      this.getList();
+    },
+  },
+  mounted() {},
+};
+</script>
+<style lang="scss" scoped>
+.main {
+  height: 100%;
+  display: flex;
+
+  .zt_right {
+    width: 100%;
+    // margin-left: 20px;
+    // width: calc(100% - 250px);
+    .nav {
+      padding: 10px 0 10px 10px;
+
+      font-size: 14px;
+
+      background: #fff;
+    }
+    .nameTitle {
+      // width: 100%;
+      font-size: 14px;
+      background: #fff;
+      padding: 20px 0 30px 20px;
+      margin-top: 10px;
+      i {
+        font-weight: bold;
+        font-size: 16px;
+        cursor: pointer;
+      }
+      .name{
+      font-weight: bold;
+      border-bottom: 2px solid #008775;
+      color: #008775;
+
+      }
+    }
+  }
+}
+::v-deep .el-tabs {
+  background: #fff;
+  padding: 0 20px;
+}
+::v-deep .el-table--border{
+    border-color: none !important ;
+}
+
+  .infoTitle {
+    width: 100%;
+    // border-bottom: 1px solid #e6e6e6;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding-bottom: 10px;
+    h5 {
+      margin: 0;
+      padding-left:20px;
+    }
+    i{
+        color: #008775;
+        padding-right: 20px;
+        padding-top: 10px;
+        font-size: 14px;
+        cursor: pointer;
+    }
+  }
+</style>

src/views/demo/system/operationLog/index.vue

@@ -7,14 +7,14 @@
           <!-- <template slot="header">首页/数据查询</template> -->
           <div class="nav">当前所在位置:首页>操作日志</div>
           <div class="right_main">
-            <div class="right_title">
+            <!-- <div class="right_title">
               <i
                 class="fa fa-bar-chart"
                 aria-hidden="true"
                 style="padding-right: 5px"
               ></i>
               操作日志
-            </div>
+            </div> -->
             <div class="right_table">
               <el-form
                 :inline="true"
@@ -51,7 +51,6 @@
                 :data="operaLogList"
              
                 style="width: 100%"
-                :header-cell-style="{ background: '#0064b9', color: '#c9f5fa' }"
                 row-key="id"
                 border
                
@@ -65,7 +64,7 @@
                   show-overflow-tooltip
                 ></el-table-column>
                 <el-table-column
-                  prop="userId"
+                  prop="userName"
                   label="用户ID"
                   align="center"
                 >
@@ -381,11 +380,11 @@ export default {
     // width: calc(100% - 250px);
     .nav {
       padding: 10px 0 10px 10px;
-      color: #fff;
+      // color: #fff;
 
       font-size: 14px;
 
-      background: #004a93;
+      background: #fff;
     }
     // .right_main {
     //   border: 1px solid #67a7df;

src/views/demo/system/organization/index.vue

@@ -8,10 +8,10 @@
           <div class="nav">当前所在位置:首页>组织机构</div>
           <div class="ztnr">
           <div class="right_main">
-            <div class="right_title">
+            <!-- <div class="right_title">
               <i class="fa fa-bar-chart" aria-hidden="true" style="padding-right: 5px"></i>
               组织机构
-            </div>
+            </div> -->
             <div class="right_table">
               <el-form :inline="true" :model="formInline" class="demo-form-inline" id="formLabel">
                 <div class="float-left">
@@ -48,11 +48,11 @@
                   </el-form-item>
                 </div>
               </el-form>
-              <el-table :data="tableData1" ref='dataTreeList' style="width: 100%" :header-cell-style="{ background: '#0064b9', color: '#c9f5fa' }" row-key="id" border default-expand-all :tree-props="{children: 'children',hasChildren: 'hasChildren',}">
+              <el-table :data="tableData1" ref='dataTreeList' style="width: 100%" row-key="id" border default-expand-all :tree-props="{children: 'children',hasChildren: 'hasChildren',}">
                 <el-table-column prop="orgName" label="组织机构名称" width="350">
                 </el-table-column>
-                <el-table-column prop="storeTypeName" label="机构类型" align="center">
-                </el-table-column>
+                <!-- <el-table-column prop="storeTypeName" label="机构类型" align="center">
+                </el-table-column> -->
 
                 <el-table-column prop="orgState" label="机构状态" align="center">
                   <template slot-scope="scope">
@@ -64,13 +64,13 @@
                     </div>
                   </template>
                 </el-table-column>
-                </el-table-column>
+
                 <el-table-column prop="buildTime" label="创建时间" align="center">
                 </el-table-column>
-                <el-table-column label="操作" width='150'>
+                <el-table-column label="操作" width='180' align="center">
                   <template slot-scope="scope">
-                    <el-button @click="handleCheck(1, scope.$index, scope.row)" type="editbtn" class="fa fa-edit" size="mini">编辑</el-button>
-                    <el-button @click="delecheck( scope.$index, scope.row)" type="delebtn" class="fa fa-remove" size="mini">删除</el-button>
+                    <el-button @click="handleCheck(1, scope.$index, scope.row)"  class="fa fa-edit" size="mini">编辑</el-button>
+                    <el-button @click="delecheck( scope.$index, scope.row)"  class="fa fa-remove" size="mini">删除</el-button>
                     <!-- <el-button @click="delecheck( scope.$index, scope.row)" type="detailbtn" class="fa fa-info-circle" size="mini">查看</el-button> -->
                   </template>
                 </el-table-column>
@@ -95,14 +95,14 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="机构类型" prop="storeTypeName" :label-width="formLabelWidth">
+          <!-- <el-form-item label="机构类型" prop="storeTypeName" :label-width="formLabelWidth">
             <el-select v-model="addOrgForm.storeTypeCode" placeholder="请选择">
               <el-option v-for="item in orgTypes" :key="item.index" :label="item.label" :value="item.value">
                 <span style="float: left">{{ item.label }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="机构状态" prop="orgState" :label-width="formLabelWidth">
             <el-radio-group v-model="addOrgForm.orgState" size="small">
               <el-radio label="1" border>启用</el-radio>
@@ -127,14 +127,14 @@
               </el-option>
             </el-select>
           </el-form-item> -->
-          <el-form-item label="机构类型" prop="storeTypeName" :label-width="formLabelWidth">
+          <!-- <el-form-item label="机构类型" prop="storeTypeName" :label-width="formLabelWidth">
             <el-select v-model="editOrgForm.storeTypeCode" placeholder="请选择">
               <el-option v-for="item in orgTypes" :key="item.index" :label="item.label" :value="item.value">
                 <span style="float: left">{{ item.label }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="机构状态" prop="orgState" :label-width="formLabelWidth">
             <el-radio-group v-model="editOrgForm.orgState" size="small">
               <el-radio label="1" border>启用</el-radio>
@@ -401,7 +401,7 @@ export default {
     // 删除
     delecheck(index, row) {
       let id = row.id;
-      this.$confirm("确定删除该项记录?", "提示", {
+      this.$confirm("确定删除该组织机构?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -560,10 +560,15 @@ export default {
             api
               .addOrganization(data)
               .then((res) => {
-                // console.log(res, '新增机构成功')
-                this.getPageInfo();
-                // 新增成功关闭弹窗
-                this.dialogFormVisible = false;
+                if(res.code==200){
+                  // console.log(res, '新增机构成功')
+                  this.$message.success('新增机构成功');
+                  this.getPageInfo();
+                  // 新增成功关闭弹窗
+                  this.dialogFormVisible = false;
+                }else{
+                  this.$message.error(res.msg);
+                }
               })
               .catch((err) => {
                 console.log(err, "新增机构err");
@@ -596,6 +601,9 @@ export default {
                 if (res.code == 200) {
                   this.getPageInfo();
                   this.dialogFormVisible1 = false;
+                  this.$message.success("修改机构成功");
+                }else{
+                  this.$message.error(res.msg);
                 }
               })
               .catch((err) => {
@@ -671,20 +679,20 @@ export default {
     // width: calc(100% - 250px);
     .nav {
       padding: 10px 0 10px 10px;
-      color: #fff;
+      // color: #fff;
 
       font-size: 14px;
 
-      background: #004a93;
+      background: #fff;
     }
     .right_main {
-      border: 1px solid #67a7df;
-      background: #112f5d;
+      // border: 1px solid #67a7df;
+      // background: #112f5d;
 
       margin-top: 10px;
       .right_title {
         color: #fff;
-        border-bottom: 1px solid #67a7df;
+        // border-bottom: 1px solid #67a7df;
         padding: 10px;
         font-size: 14px;
       }

src/views/demo/system/roleManagement/index.vue

@@ -7,10 +7,10 @@
           <!-- <template slot="header">首页/数据查询</template> -->
           <div class="nav">当前所在位置:首页>角色管理</div>
           <div class="right_main">
-            <div class="right_title">
+            <!-- <div class="right_title">
               <i class="fa fa-bar-chart" aria-hidden="true" style="padding-right: 5px"></i>
               角色管理
-            </div>
+            </div> -->
             <div class="right_table">
               <el-form :inline="true" :model="formInline" class="demo-form-inline" id="formLabel">
                 <div class="float-left">
@@ -30,7 +30,7 @@
                   </el-form-item>
                 </div>
               </el-form>
-              <el-table :data="tableData" ref='dataTreeList' style="width: 100%" :header-cell-style="{ background: '#0064b9', color: '#c9f5fa' }" row-key="id" border>
+              <el-table :data="tableData" ref='dataTreeList' style="width: 100%" row-key="id" border>
                 <el-table-column prop="roleName" label="角色名称" align="center">
                 </el-table-column>
                 <el-table-column prop="roleState" label="角色状态" align="center">
@@ -57,11 +57,11 @@
                 </el-table-column>
                 <el-table-column fixed="right" label="操作" width="300" align="center">
                   <template slot-scope="scope">
-                    <el-button @click="handleEdit(1, scope.$index, scope.row)" type="editbtn" class="fa fa-edit" size="mini">编辑</el-button>
-                    <el-button @click="delecheck( scope.$index, scope.row)" type="delebtn" class="fa fa-remove" size="mini">删除</el-button>
-                    <el-button @click="handleCheck(scope.$index, scope.row)" type="detailbtn" class="fa fa-info-circle" size="mini">查看</el-button>
+                    <el-button @click="handleEdit(1, scope.$index, scope.row)" class="fa fa-edit" size="mini">编辑</el-button>
+                    <el-button @click="delecheck( scope.$index, scope.row)" class="fa fa-remove" size="mini">删除</el-button>
+                    <el-button @click="handleCheck(scope.$index, scope.row)" class="fa fa-info-circle" size="mini">查看</el-button>
                     <!-- <el-switch v-model="value" on-text='启用' off-text='禁用' active-value='启用' inactive-value='禁用' active-color="#13ce66" inactive-color="#ff4949"> -->
-                    </el-switch>
+                    <!-- </el-switch> -->
                   </template>
                 </el-table-column>
               </el-table>
@@ -252,7 +252,10 @@ export default {
       console.log(this.formInline, 'this.formInline')
       this.getList()
     },
-    reset () { },
+    reset () {
+      this.formInline.roleName=""
+      this.getList()
+    },
     // 重置表单
     resetForm () {
       this.addRoleForm.roleCode = '',
@@ -466,15 +469,15 @@ export default {
     // width: calc(100% - 250px);
     .nav {
       padding: 10px 0 10px 10px;
-      color: #fff;
+      // color: #fff;
 
       font-size: 14px;
 
-      background: #004a93;
+      background: #fff;
     }
     .right_main {
-      border: 1px solid #67a7df;
-      background: #112f5d;
+      // border: 1px solid #67a7df;
+      // background: #112f5d;
 
       margin-top: 10px;
       .right_title {

src/views/demo/system/userManagement/index.vue

@@ -7,15 +7,15 @@
           <!-- <template slot="header">首页/数据查询</template> -->
           <div class="nav">当前所在位置:首页>用户管理</div>
           <div class="right_main">
-            <div class="right_title">
+            <!-- <div class="right_title">
               <i class="fa fa-bar-chart" aria-hidden="true" style="padding-right: 5px"></i>
               用户管理
-            </div>
+            </div> -->
             <div class="right_table">
               <el-form :inline="true" :model="formInline" class="demo-form-inline" id="formLabel">
                 <div class="float-left">
                   <!-- <el-form-item label="直属库名称">
-                    <el-select v-model="formInline.orgId" placeholder="请选择">
+                    <el-select v-model="formInline.orgCode" placeholder="请选择">
                       <el-option v-for="item in ckLists" :key="item.id" :label="item.orgName" :value="item.id">
                       </el-option>
                     </el-select>
@@ -54,25 +54,22 @@
                   </el-form-item>
                 </div>
               </el-form>
-              <el-table :data="userList" ref="dataTreeList" style="width: 100%" :header-cell-style="{ background: '#0064b9', color: '#c9f5fa' }" row-key="id" border :tree-props="{
+              <el-table :data="userList" ref="dataTreeList" style="width: 100%" row-key="id" border :tree-props="{
                   children: 'children',
                   hasChildren: 'hasChildren',
                 }">
-                <el-table-column align="center" label="序号" type="index" width="100px" :index="indexMethod" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="userId" label="用户ID" align="center">
+                <el-table-column align="center" label="序号" type="index" width="100px" :index="indexMethod"></el-table-column>
+                <el-table-column prop="id" label="用户ID" align="center">
                 </el-table-column>
                 <el-table-column prop="userName" label="姓名" align="center">
                 </el-table-column>
 
                 <el-table-column prop="userRoleName" label="角色" align="center">
                 </el-table-column>
-                <el-table-column prop="orgName" label="所属仓库" align="center">
-                </el-table-column>
-                <el-table-column prop="manageStoreName" label="管理仓房" align="center">
+                <el-table-column prop="orgName" label="所属组织" align="center">
                 </el-table-column>
                 <el-table-column prop="userPhone" label="联系方式" align="center">
                 </el-table-column>
-                </el-table-column>
                 <el-table-column prop="userState" label="用户状态" align="center">
                   <template slot-scope="scope">
                     <div v-if="scope.row.userState=='1'">
@@ -86,13 +83,13 @@
                     </div>
                   </template>
                 </el-table-column>
-                </el-table-column>
+
                 <!-- <el-table-column prop="buildTime" label="创建时间" align="center" width="180px;">
                 </el-table-column> -->
                 <el-table-column fixed="right" label="操作" width="300" align="center">
                   <template slot-scope="scope">
-                    <el-button @click="edit(scope.row,2)" type="editbtn" class="fa fa-edit" size="mini">编辑</el-button>
-                    <el-button @click="deleted(scope.row)" type="delebtn" class="fa fa-remove" size="mini">删除</el-button>
+                    <el-button @click="edit(scope.row,2)" class="fa fa-edit" size="mini">编辑</el-button>
+                    <el-button @click="deleted(scope.row)" class="fa fa-remove" size="mini">删除</el-button>
 
                     <!-- <el-switch
                     id="switchBtn"
@@ -129,19 +126,19 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="所属仓库" :label-width="formLabelWidth" prop="orgId">
-            <el-select v-model="form.orgId" placeholder="请选择" @change="ckChange">
+          <el-form-item label="所属组织" :label-width="formLabelWidth" prop="orgCode">
+            <el-select v-model="form.orgCode" placeholder="请选择" @change="ckChange">
               <el-option v-for="item in ckLists" :key="item.id" :label="item.orgName" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="管理仓房" :label-width="formLabelWidth" prop="manageStore">
+          <!-- <el-form-item label="管理仓房" :label-width="formLabelWidth" prop="manageStore">
             <el-select v-model="form.manageStore" placeholder="请选择">
               <el-option v-for="item in cfLists" :key="item.id" :label="item.orgName" :value="item.id">
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="联系方式" :label-width="formLabelWidth" prop="userPhone">
             <el-input v-model="form.userPhone" autocomplete="off"></el-input>
           </el-form-item>
@@ -198,7 +195,7 @@ export default {
         userRole: [
           { required: true, message: "请选择用户角色", trigger: "blur" },
         ],
-        orgId: [
+        orgCode: [
           { required: true, message: "请选择所属仓库", trigger: "blur" },
         ],
         manageStore: [
@@ -221,7 +218,7 @@ export default {
         userId: "",
         userName: "",
         userRole: "",
-        orgId: "",
+        orgCode: "",
         manageStore: "",
         userPhone: "",
         userState: true,
@@ -230,7 +227,7 @@ export default {
 
       //查询条件
       formInline: {
-        orgId: "",
+        orgCode: "",
         userRole: "",
         userName: "",
       },
@@ -271,7 +268,7 @@ export default {
     getList() {
       console.log("....");
       var condition = {
-        orgId: this.formInline.orgId,
+        orgCode: this.formInline.orgCode,
         userRole: this.formInline.userRole,
         userName: this.formInline.userName,
       };
@@ -346,7 +343,7 @@ export default {
     },
     cfList() {
       var data = {
-        parentId: this.form.orgId,
+        parentId: this.form.orgCode,
       };
       api
         .ckList(data)
@@ -355,7 +352,7 @@ export default {
             this.cfLists = res.data;
             res.data.forEach((item) => {
               var obj = {};
-              if (item.storeTypeCode === this.this.form.orgId) {
+              if (item.storeTypeCode === this.this.form.orgCode) {
                 console.log(item, "item...");
                 (obj.orgName = item.orgName), (obj.id = item.id);
                 this.cfLists.push(obj);
@@ -390,7 +387,7 @@ export default {
         }
       });
       this.ckLists.forEach((item) => {
-        if (item.id === this.form.orgId) {
+        if (item.id === this.form.orgCode) {
           this.orgName = item.orgName;
         }
       });
@@ -407,7 +404,7 @@ export default {
         userName: this.form.userName,
         userPassword: this.form.userPassword,
         userRole: this.form.userRole,
-        orgId: String(this.form.orgId),
+        orgCode: String(this.form.orgCode),
         manageStore: String(this.form.manageStore),
         userPhone: this.form.userPhone,
         userState: this.form.userState === true ? "1" : "0",
@@ -437,7 +434,7 @@ export default {
         }
       });
       this.ckLists.forEach((item) => {
-        if (item.id === this.form.orgId) {
+        if (item.id === this.form.orgCode) {
           this.orgName = item.orgName;
         }
       });
@@ -456,7 +453,7 @@ export default {
         userName: this.form.userName,
         userPassword: this.form.userPassword,
         userRole: this.form.userRole,
-        orgId: String(this.form.orgId),
+        orgCode: String(this.form.orgCode),
         manageStore: String(this.form.manageStore),
         userPhone: this.form.userPhone,
         userState: this.form.userState === true ? "1" : "0",
@@ -513,7 +510,7 @@ export default {
        this.$set(this.form,"userName",null)
         this.$set(this.form,"userRole",null)
         this.$set(this.form,"userId",null)
-        this.$set(this.form,"orgId",null)
+        this.$set(this.form,"orgCode",null)
         this.$set(this.form,"manageStore",null)
         this.$set(this.form,"userPhone",null)
          this.$set(this.form,"userState",true)
@@ -526,6 +523,7 @@ export default {
     },
     //编辑用户
     edit(row, type) {
+      console.log(row,44);
       this.btnType = type;
       this.userDialog = true;
       this.title = "修改用户";
@@ -536,7 +534,7 @@ export default {
        this.$set(this.form,"userName",row.userName)
         this.$set(this.form,"userRole",row.userRole)
         this.$set(this.form,"userId",row.userId)
-        this.$set(this.form,"orgId",parseInt(row.orgId))
+        this.$set(this.form,"orgCode",parseInt(row.orgCode))
         this.$set(this.form,"manageStore",parseInt(row.manageStore))
         this.$set(this.form,"userPhone",row.userPhone)
          this.$set(this.form,"userState",row.userState==="1"?true:false)
@@ -551,7 +549,7 @@ export default {
       //   userName: row.userName,
       //   userRole: row.userRole,
       //   userId: row.userId,
-      //   orgId: parseInt(row.orgId),
+      //   orgCode: parseInt(row.orgCode),
       //   manageStore: parseInt(row.manageStore),
       //   userPhone: row.userPhone,
       //   userState: row.userState,
@@ -633,11 +631,11 @@ export default {
     // width: calc(100% - 250px);
     .nav {
       padding: 10px 0 10px 10px;
-      color: #fff;
+      // color: #fff;
 
       font-size: 14px;
 
-      background: #004a93;
+      background: #fff;
     }
     // .right_main {
     //   border: 1px solid #67a7df;

src/views/system/index/page copy 2.vue

@@ -57,7 +57,7 @@
                 <div class="aa">
                   <div
                     class="numberBac"
-                    v-for="item in endVal.toString().split('')"
+                    v-for="(item,index) in endVal.toString().split('')"
                     :key="index"
                   ></div>
                 </div>

src/views/system/login/page.vue

@@ -27,6 +27,7 @@
                 :rules="rules"
                 :model="formLogin"
                 size="default">
+                <div style="font-size:30px;text-align:center;color:#fff;margin-bottom:30px">用户登录</div>
                 <el-form-item prop="username">
                   <el-input
                     type="text"
@@ -163,7 +164,7 @@ export default {
   
    loginBtn(){
      let data={
-       userId:this.formLogin.username,
+       userName:this.formLogin.username,
        userPassword:this.formLogin.password
      }
      api.login(data)
@@ -232,7 +233,7 @@ export default {
   $backgroundColor: #F0F2F5;
   // ---
   background-color: $backgroundColor;
-  background: url('./image/bg.png') center no-repeat ;
+  background: url('./image/bg.jpg') center no-repeat ;
   background-size:100% 100%;
   height: 100%;
   position: relative;
@@ -275,14 +276,22 @@ export default {
   }
   // 登录表单
   .page-login--form {
-    width: 280px;
+    width: 25em;
+    height: 23em;
+    background-image: url("./image/dengluk.png");
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
     // 卡片
     .el-card {
       margin-bottom: 15px;
+      background: none !important;
+      border: none !important;
     }
     // 登录按钮
     .button-login {
       width: 100%;
+      background: linear-gradient(0deg, #01E9BD, #00D6B9);
+      border-radius: 6px;
     }
     // 输入框左边的图表区域缩窄
     .el-input-group__prepend {

vue.config.js

@@ -42,7 +42,7 @@ module.exports = {
     disableHostCheck: process.env.NODE_ENV === 'development', // 关闭 host check，方便使用 ngrok 之类的内网转发工具
     proxy: {
       '/api': {
-        target: 'http://101.36.160.140:21023',
+        target: 'http://101.36.160.140:31005/smart-grp-basic',
         // target: 'http://112.51.248.191:7070',
           // target: '192.168.2.6:7070',