Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/App.vue

@@ -10,7 +10,7 @@
   import { getPathAddress } from '@/api/system/file/index';
   export default {
     name: 'App',
-    created () {
+    created() {
       console.log('我是子应用------------------------------------');
       // 恢复主题
       this.$store.dispatch('theme/recoverTheme');
@@ -23,7 +23,7 @@
     },
     methods: {
       /* 路由切换更新浏览器标题 */
-      setDocumentTitle () {
+      setDocumentTitle() {
         updateDocumentTitle(
           this.$route,
           (key) => this.$t(key),
@@ -32,10 +32,10 @@
       }
     },
     watch: {
-      '$i18n.locale' () {
+      '$i18n.locale'() {
         this.setDocumentTitle();
       },
-      $route () {
+      $route() {
         this.setDocumentTitle();
       }
     }

src/views/rulesManagement/meteringManagement/dialog.vue

@@ -0,0 +1,202 @@
+<template>
+  <el-dialog
+    :title="`${type}统一门户`"
+    :visible.sync="dialogVisible"
+    width="20%"
+  >
+    <el-form label-width="100px" class="zw-criterion">
+      <el-form-item label="编码" required>
+        <el-input
+          v-model="form.code"
+          placeholder="请输入内容"
+          disabled
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="名称" required>
+        <el-input v-model="form.name" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item label="所属组别" required>
+        <template>
+          <el-select v-model="form.type" placeholder="请选择" disabled>
+            <el-option
+              v-for="item in typeOptions"
+              :label="item.label"
+              :value="item.value"
+              :key="item.value"
+            >
+            </el-option>
+          </el-select>
+        </template>
+      </el-form-item>
+      <el-form-item label="换算类型" required>
+        <el-input v-model="form.name" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item label="精度" required>
+        <el-input
+          v-model="form.sort"
+          type="number"
+          placeholder="请输入内容"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="舍入类型" required>
+        <template>
+          <el-select v-model="form.type" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :label="item.label"
+              :value="item.value"
+              :key="item.value"
+            >
+            </el-option>
+          </el-select>
+        </template>
+      </el-form-item>
+      <el-form-item label="数据状态" required>
+        <template>
+          <el-select v-model="form.dataType" placeholder="请选择" disabled>
+            <el-option
+              v-for="item in dataTypeOptions"
+              :label="item.label"
+              :value="item.value"
+              :key="item.value"
+            >
+            </el-option>
+          </el-select>
+        </template>
+      </el-form-item>
+      <el-form-item label="备注描述">
+        <el-input v-model="form.remark" placeholder="请输入内容"></el-input>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button size="small" @click="dialogVisible = false">关 闭</el-button>
+      <el-button size="small" @click="config" type="primary">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { uploadFile } from '@/api/system/file/index.js';
+  import { getImageUrl } from '@/utils/file';
+  import {
+    saveInfo,
+    updateInfo,
+    getDetails
+  } from '@/api/system/unifiedPortal/index.js';
+  export default {
+    data() {
+      return {
+        options: [
+          {
+            label: '四舍五入',
+            value: 1
+          },
+          {
+            label: '舍位',
+            value: 2
+          },
+          {
+            label: '进位',
+            value: 3
+          }
+        ],
+        typeOptions: [
+          {
+            label: '固定',
+            value: 1
+          }
+        ],
+        dataTypeOptions: [
+          {
+            label: '暂存',
+            value: 1
+          }
+        ],
+        dialogVisible: false,
+        file: null,
+        type: '新增',
+        form: {}
+      };
+    },
+    methods: {
+      handleClose() {
+        this.dialogVisible = false;
+      },
+      async open(type, id) {
+        this.type = type;
+        if (type == '新增') {
+          this.form = {};
+          this.imageUrl = '';
+          this.file = null;
+        } else {
+          this.file = null;
+          this.form = await getDetails(id);
+          this.imageUrl = getImageUrl(this.form.iconPath);
+        }
+        this.dialogVisible = true;
+      },
+      async config() {
+        if (!this.form.name) {
+          return this.$message.error('请输入名称');
+        }
+        if (this.form.sort < 0) {
+          return this.$message.error('请输入排序');
+        }
+        if (!this.form.linkUrl) {
+          return this.$message.error('请输入链接');
+        }
+        if (this.form.linkType < 0) {
+          return this.$message.error('请选择链接类型');
+        }
+        if (this.form.architType < 0) {
+          return this.$message.error('请选择架构类型');
+        }
+        if (this.type == '新增') {
+          // 保存数据
+          try {
+            await saveInfo(this.form);
+            this.$message.success('新增成功');
+            this.dialogVisible = false;
+            this.$emit('reload');
+          } catch (error) {
+            console.log(error);
+            this.$message.error('新增失败');
+          }
+        } else {
+          // 修改
+          try {
+            await updateInfo(this.form);
+            this.$message.success('修改成功');
+            this.dialogVisible = false;
+            this.$emit('reload');
+          } catch (error) {
+            this.$message.error('修改失败');
+          }
+        }
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .typeSelect {
+    width: 100%;
+  }
+  .avatar-uploader {
+    height: 120px;
+    width: 100%;
+  }
+  .avatar {
+    width: 120px;
+    height: 120px;
+    object-fit: cover;
+  }
+  .avatar-uploader-icon {
+    width: 120px;
+    height: 120px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 1px dashed #d9d9d9;
+  }
+</style>

src/views/rulesManagement/meteringManagement/index.vue

@@ -0,0 +1,192 @@
+<template>
+  <div id="meteringManagement">
+    <div class="mian">
+      <div class="tree_box">
+        <div class="control">
+          <el-button icon="el-icon-plus" type="primary">新增</el-button>
+        </div>
+        <el-tree
+          class="tree"
+          ref="tree"
+          highlight-current
+          node-key="id"
+          :expand-on-click-node="false"
+          :default-expand-all="true"
+          :data="data"
+          :props="defaultProps"
+          @node-click="handleNodeClick"
+        ></el-tree>
+      </div>
+      <div class="list">
+        <div class="search_bar">
+          <el-input
+            placeholder="请输入关键词"
+            v-model="keyWord"
+            class="input-with-select"
+          >
+            <el-button slot="append" icon="el-icon-search">搜索</el-button>
+          </el-input>
+        </div>
+        <div class="table_box">
+          <ele-pro-table
+            ref="table"
+            :columns="columns"
+            :datasource="datasource"
+          >
+            <!-- 表头工具栏 -->
+            <template v-slot:toolbar>
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-plus"
+                class="ele-btn-icon"
+                @click="openEdit('add')"
+              >
+                新增
+              </el-button>
+            </template>
+          </ele-pro-table>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Dialog from './dialog.vue';
+  export default {
+    components: { Dialog },
+    data() {
+      return {
+        // 表格列配置
+        columns: [
+          {
+            columnKey: 'index',
+            type: 'index',
+            label: '序号',
+            width: 50,
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'code',
+            label: '编码',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'name',
+            label: '名称',
+            showOverflowTooltip: true
+          }
+        ],
+        keyWord: '',
+        tableData: [
+          {
+            name: '包',
+            code: 'bao'
+          },
+          {
+            name: '包',
+            code: 'bao'
+          }
+        ],
+        data: [
+          {
+            label: '包(bao)',
+            children: []
+          },
+          {
+            label: '件(jian)',
+            children: []
+          },
+          {
+            label: '盒(he)',
+            children: []
+          }
+        ],
+        defaultProps: {
+          children: 'children',
+          label: 'label'
+        }
+      };
+    },
+    methods: {
+      datasource({ page, limit, where, order }) {
+        return this.tableData;
+      },
+      handleNodeClick(data) {
+        console.log(data);
+      },
+      openEdit() {
+        console.log('新增');
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  #meteringManagement {
+    height: calc(100vh - 96px);
+    width: 100%;
+    padding: 10px;
+    box-sizing: border-box;
+    .mian {
+      height: 100%;
+      width: 100%;
+      border-radius: 4px;
+      display: flex;
+      .tree_box {
+        flex: 0 0 200px;
+        background-color: #fff;
+        margin-right: 10px;
+        display: flex;
+        flex-direction: column;
+        border: 1px solid #ddd;
+        .control {
+          flex: 0 0 50px;
+          padding: 10px;
+          box-sizing: border-box;
+          display: flex;
+          align-items: center;
+          background-color: #fafafa;
+          border-bottom: 1px solid #ddd;
+        }
+        .tree {
+          flex: 1 0 auto;
+          height: 0;
+          padding: 10px;
+          box-sizing: border-box;
+          overflow: auto;
+        }
+      }
+      .list {
+        flex: 1;
+        padding: 10px;
+        box-sizing: border-box;
+        border: 1px solid #ddd;
+        background-color: #fff;
+        display: flex;
+        flex-direction: column;
+        .search_bar {
+          height: 50px;
+          box-sizing: border-box;
+          display: flex;
+          align-items: center;
+          > div {
+            width: 300px;
+          }
+        }
+        .table_box {
+          flex: 1 0 auto;
+          height: 0;
+          overflow: hidden;
+          > div {
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+          }
+        }
+      }
+    }
+  }
+</style>

src/views/system/unifiedPortal/dialog.vue

@@ -2,19 +2,36 @@
   <el-dialog
     :title="`${type}统一门户`"
     :visible.sync="dialogVisible"
-    width="20%"
+    width="25%"
   >
-    <el-form label-width="80px" class="zw-criterion">
-      <el-form-item label="图片">
-        <el-upload
+    <el-form label-width="120px" class="zw-criterion">
+      <el-form-item label="图标(比例1:1)" required>
+        <!-- <el-upload
           class="avatar-uploader"
           :action="''"
           :auto-upload="false"
           :show-file-list="false"
           :on-change="handleAvatarChangeIcon"
         >
-          <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+          <div class="avatar" v-if="imageUrl">
+            <img :src="imageUrl" />
+            <i @click="delImg" class="el-icon-close"></i>
+          </div>
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload> -->
+        <div class="avatar" v-if="imageUrl">
+          <img :src="imageUrl" />
+          <i @click="delImg" class="el-icon-close"></i>
+        </div>
+        <el-upload
+          v-else
+          class="avatar-uploader"
+          :action="''"
+          :auto-upload="false"
+          :show-file-list="false"
+          :on-change="handleAvatarChangeIcon"
+        >
+          <i class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
       <el-form-item label="名称" required>
@@ -28,7 +45,9 @@
         ></el-input>
       </el-form-item>
       <el-form-item label="链接" required>
-        <el-input v-model="form.linkUrl" placeholder="请输入内容"></el-input>
+        <el-input placeholder="请输入内容" v-model="form.linkUrl">
+          <template slot="prepend">https://</template>
+        </el-input>
       </el-form-item>
       <el-form-item label="链接类型" required>
         <DictSelection
@@ -84,6 +103,10 @@
       };
     },
     methods: {
+      delImg() {
+        this.imageUrl = '';
+        this.file = null;
+      },
       handleClose() {
         this.dialogVisible = false;
       },
@@ -190,7 +213,20 @@
   .avatar {
     width: 120px;
     height: 120px;
-    object-fit: cover;
+    position: relative;
+    border: 1px solid #d9d9d9;
+    > img {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+    .el-icon-close {
+      cursor: pointer;
+      position: absolute;
+      top: 0;
+      right: 0;
+      color: #000;
+    }
   }
   .avatar-uploader-icon {
     width: 120px;

src/views/system/unifiedPortal/index.vue

@@ -125,7 +125,7 @@
 
 <style lang="scss" scoped>
   #unifiedPortalIndex {
-    height: 100%;
+    height: calc(100vh - 97px);
     width: 100%;
     .content_box {
       width: 100%;