From c5382c2906f0289217bbfb235aaed6f996aa23fc Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 18 Aug 2020 14:40:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-oper-web/.env.development               |   4 +-
 epmet-oper-web/public/index.html              |   8 +-
 .../src/views/modules/code/CommitList.vue     | 659 ------------------
 .../ConfigEdit.vue                            |   0
 .../ConfigItem.vue                            | 190 ++++-
 .../CustomerList.vue                          |  13 +-
 .../{miniCustomize => customize}/MiniHome.vue |   0
 .../customer/{ => init}/RegisterList.vue      |   0
 .../customer/{ => manage}/customer-info.vue   |   0
 .../customer/{ => manage}/customer-manage.vue |   0
 .../miniProAgent}/BasicInfo.vue               |   0
 .../miniProAgent}/Category.vue                |   0
 .../miniProAgent}/LowVersion.vue              |   0
 .../miniProAgent/MiniProList.vue}             |   3 +-
 .../miniProAgent/version}/CommitForm.vue      |   0
 .../miniProAgent/version}/OperHistory.vue     |   0
 .../version}/SubmitFailReason.vue             |   0
 .../miniProAgent/version}/SubmitForm.vue      |   3 +-
 .../version}/SubmitFormReject.vue             |   4 +-
 .../miniProAgent/version}/SubmitItem.vue      |   0
 .../miniProAgent/version}/VersionItem.vue     |   0
 .../customizeFunction}/CustomFun.vue          |   0
 .../customizeFunction}/Edit.vue               |   0
 .../CustomizedFunction copy.vue               |   0
 .../function-add-or-update.vue                |  84 ++-
 .../defaultFunction}/function.vue             |   0
 .../homeComponent}/functionconfiguration.vue  |   0
 .../homecomponent-add-or-update.vue           |   0
 .../homeComponent}/homecomponent.vue          |   0
 29 files changed, 230 insertions(+), 738 deletions(-)
 delete mode 100644 epmet-oper-web/src/views/modules/code/CommitList.vue
 rename epmet-oper-web/src/views/modules/customer/{miniCustomize => customize}/ConfigEdit.vue (100%)
 rename epmet-oper-web/src/views/modules/customer/{miniCustomize => customize}/ConfigItem.vue (63%)
 rename epmet-oper-web/src/views/modules/customer/{miniCustomize => customize}/CustomerList.vue (91%)
 rename epmet-oper-web/src/views/modules/customer/{miniCustomize => customize}/MiniHome.vue (100%)
 rename epmet-oper-web/src/views/modules/customer/{ => init}/RegisterList.vue (100%)
 rename epmet-oper-web/src/views/modules/customer/{ => manage}/customer-info.vue (100%)
 rename epmet-oper-web/src/views/modules/customer/{ => manage}/customer-manage.vue (100%)
 rename epmet-oper-web/src/views/modules/{code => customer/miniProAgent}/BasicInfo.vue (100%)
 rename epmet-oper-web/src/views/modules/{code => customer/miniProAgent}/Category.vue (100%)
 rename epmet-oper-web/src/views/modules/{code => customer/miniProAgent}/LowVersion.vue (100%)
 rename epmet-oper-web/src/views/modules/{code/VersionManage.vue => customer/miniProAgent/MiniProList.vue} (99%)
 rename epmet-oper-web/src/views/modules/{code => customer/miniProAgent/version}/CommitForm.vue (100%)
 rename epmet-oper-web/src/views/modules/{code => customer/miniProAgent/version}/OperHistory.vue (100%)
 rename epmet-oper-web/src/views/modules/{code => customer/miniProAgent/version}/SubmitFailReason.vue (100%)
 rename epmet-oper-web/src/views/modules/{code => customer/miniProAgent/version}/SubmitForm.vue (99%)
 rename epmet-oper-web/src/views/modules/{code => customer/miniProAgent/version}/SubmitFormReject.vue (98%)
 rename epmet-oper-web/src/views/modules/{code => customer/miniProAgent/version}/SubmitItem.vue (100%)
 rename epmet-oper-web/src/views/modules/{code => customer/miniProAgent/version}/VersionItem.vue (100%)
 rename epmet-oper-web/src/views/modules/{miniPro/customFun => productConfig/customizeFunction}/CustomFun.vue (100%)
 rename epmet-oper-web/src/views/modules/{miniPro/customFun => productConfig/customizeFunction}/Edit.vue (100%)
 rename epmet-oper-web/src/views/modules/{customize => productConfig/defaultFunction}/CustomizedFunction copy.vue (100%)
 rename epmet-oper-web/src/views/modules/{customize => productConfig/defaultFunction}/function-add-or-update.vue (64%)
 rename epmet-oper-web/src/views/modules/{customize => productConfig/defaultFunction}/function.vue (100%)
 rename epmet-oper-web/src/views/modules/{customize => productConfig/homeComponent}/functionconfiguration.vue (100%)
 rename epmet-oper-web/src/views/modules/{customize => productConfig/homeComponent}/homecomponent-add-or-update.vue (100%)
 rename epmet-oper-web/src/views/modules/{customize => productConfig/homeComponent}/homecomponent.vue (100%)

diff --git a/epmet-oper-web/.env.development b/epmet-oper-web/.env.development
index 46bff07..91d7451 100644
--- a/epmet-oper-web/.env.development
+++ b/epmet-oper-web/.env.development
@@ -1,5 +1,5 @@
 NODE_ENV=development
-# VUE_APP_API_SERVER =  http://192.168.1.130:8080/api
+VUE_APP_API_SERVER =  http://192.168.1.130:8080/api
 # VUE_APP_API_SERVER =  http://10.10.10.207:8080/api
-VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
+# VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
 VUE_APP_NODE_ENV=dev
\ No newline at end of file
diff --git a/epmet-oper-web/public/index.html b/epmet-oper-web/public/index.html
index 8ddaf91..2d7cdff 100644
--- a/epmet-oper-web/public/index.html
+++ b/epmet-oper-web/public/index.html
@@ -34,13 +34,13 @@
     <!-- 开发环境 -->
     <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <!-- <script>window.SITE_CONFIG['apiURL'] = 'http://10.10.10.98:8080/api';</script> -->
-    <!-- <script>
+    <script>
       window.SITE_CONFIG['apiURL'] = 'http://192.168.1.130:8080/api'
-    </script> -->
+    </script>
     <!-- <script>window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/api';</script> -->
-    <script>
+    <!-- <script>
       window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api'
-    </script>
+    </script> -->
     <% } %>
     <!-- 集成测试环境 dev -->
     <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
diff --git a/epmet-oper-web/src/views/modules/code/CommitList.vue b/epmet-oper-web/src/views/modules/code/CommitList.vue
deleted file mode 100644
index b126581..0000000
--- a/epmet-oper-web/src/views/modules/code/CommitList.vue
+++ /dev/null
@@ -1,659 +0,0 @@
-<template>
-  <div>
-    <el-card v-show="!showSubmit"
-             shadow="never"
-             class="aui-card--fill">
-      <div class="mod-demo__demo}">
-
-        <el-form :inline="true"
-                 :model="tableParams">
-          <el-form-item>
-            <el-select v-model="tableParams.customerId"
-                       placeholder="客户"
-                       clearable>
-              <el-option v-for="item in form.data['customerId']"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-select v-model="tableParams.clientType"
-                       placeholder="类型"
-                       clearable>
-              <el-option v-for="item in form.data['clientType']"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item>
-            <el-select v-model="tableParams.state"
-                       placeholder="状态"
-                       clearable>
-              <el-option v-for="item in form.data['state']"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <!-- <el-form-item>
-            <el-date-picker v-model="tableParams.commitDate"
-                            type="daterange"
-                            range-separator="至"
-                            start-placeholder="发布开始日期"
-                            end-placeholder="发布结束日期"
-                            :default-value="new Date()"
-                            value-format="yyyy-MM-dd HH:mm:ss">
-            </el-date-picker>
-          </el-form-item> -->
-          <!-- <el-form-item>
-            <el-date-picker v-model="tableParams.submitDate"
-                            type="daterange"
-                            range-separator="至"
-                            start-placeholder="审核开始日期"
-                            end-placeholder="审核结束日期"
-                            :default-value="new Date()"
-                            value-format="yyyy-MM-dd HH:mm:ss">
-            </el-date-picker>
-          </el-form-item> -->
-          <el-form-item>
-            <el-button @click="loadTableData()">查询</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary"
-                       @click="commitCodeDiaShow('')">上传代码</el-button>
-          </el-form-item>
-        </el-form>
-
-        <c-table column-type=""
-                 ref="table"
-                 :url="tableUrl"
-                 :params="tableParams"
-                 keyword="CommitCodeList"
-                 :operations="operations"
-                 :tableHeight="tableHeight"
-                 @submitCode="submitCode"
-                 @showQRCode="showQRCode"
-                 @submitRecall="submitRecall"
-                 @issueCode="issueCode"
-                 @submitFailReason="submitFailReason"
-                 @operHistory="operHistory"
-                 @revertcoderelease="revertcoderelease"
-                 @grayrelease="grayrelease"
-                 @revertgrayrelease="revertgrayrelease">
-        </c-table>
-
-      </div>
-    </el-card>
-
-    <commit-form ref="ref_commit_form"
-                 :optionData="form.data"
-                 @refresh="refresh"></commit-form>
-
-    <submit-form v-show="showSubmit"
-                 ref="ref_submit_form"
-                 @refresh="refresh"
-                 @cancleSubmit="cancleSubmit"></submit-form>
-
-    <oper-history ref="ref_oper_history"></oper-history>
-
-    <submit-fail-reason ref="ref_submit_fail_reason"></submit-fail-reason>
-
-    <c-dialog :showFooter="false"
-              :title="'二维码'"
-              :width="40"
-              :visible="qrCodeDia.visible"
-              @cancel="qrCodeDiaCancel">
-      <div style="text-align:center">
-        <el-image style="width: 300px; height: 300px"
-                  :src="src"></el-image>
-        <div class="el-upload__tip">请用微信扫描二维码</div>
-      </div>
-    </c-dialog>
-
-    <c-dialog :title="'分阶段发布'"
-              :width="40"
-              :dialogHeight="0.5"
-              :visible="grayreleaseDia.visible"
-              @cancel="grayreleaseDiaCancel"
-              @ok="grayreleaseOk">
-      <div style="text-align:center;margin-top:40px">灰度（%）：
-        <el-input-number v-model="grayPercentage"
-                         :min="0"
-                         :max="100"
-                         label="灰度百分比"></el-input-number>
-
-        <div class="el-upload__tip"
-             style="margin-top:20px">灰度的百分比 1 ~ 100 的整数，控制发布的节奏，避免一上线就影响到所有的用户</div>
-      </div>
-    </c-dialog>
-  </div>
-</template>
-
-<script>
-import CDialog from '@c/CDialog'
-import CTable from '@c/CTable'
-import SubmitForm from './SubmitForm'
-import CommitForm from './CommitForm'
-import OperHistory from './OperHistory'
-import SubmitFailReason from './SubmitFailReason'
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-
-let loading// 加载动画
-
-export default {
-  data () {
-    return {
-      selCodeId: '',
-      // 查询相关
-      tableParams: {
-        customerId: '', // 客户
-        clientType: '', // 类型
-        state: '', // 代码状态
-        commitDate: '', // 发布日期
-        submitDate: '', // 审核日期
-        source: this.env
-      },
-      // 列表相关
-      tableUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/uploadlist',
-      // 列表操作栏的操作项数组
-      // 未审核:unaudited ————         提交审核、二维码、版本回退、操作历史
-      // 审核中:auditing ————          加急审核、审核撤回、二维码、版本回退、操作历史
-      // 审核成功:audit_success ————   发布、分阶段发布、二维码、版本回退、操作历史
-      // 审核被拒绝:audit_failed ———   审核失败原因、提交审核、二维码、版本回退、操作历史
-      // 已撤回:withdrawn ————         提交审核、二维码、版本回退、操作历史
-      // 审核延后:delay ————           审核撤回、二维码、版本回退、操作历史
-      // 发布成功:release_success ———— 二维码、版本回退、操作历史
-      // 发布失败:release_failed ————  发布、分阶段发布、二维码、版本回退、操作历史
-      // 分阶段发布:                   取消分阶段发布、二维码、版本回退、操作历史
-      operations: [
-        {
-          lable: '提交审核', // 按钮显示名称
-          size: 'mini',
-          style: 'margin: 0 6px;',
-          type: 'text',
-          slot: '',
-          plain: false,
-          methodName: 'submitCode', // 回调方法名称
-          isShow: (row) => {
-            if (row.status === 'unaudited' || row.status === 'audit_failed' || row.status === 'withdrawn') {
-              return true
-            } else {
-              return false
-            }
-          }
-        },
-        {
-          lable: '二维码', // 按钮显示名称
-          size: 'mini',
-          style: 'margin: 0 6px;',
-          type: 'text',
-          slot: '',
-          plain: false,
-          methodName: 'showQRCode', // 回调方法名称
-          isShow: (row) => {
-            return true
-          }
-        },
-        {
-          lable: '审核撤回', // 按钮显示名称
-          size: 'mini',
-          style: 'margin: 0 6px;',
-          type: 'text',
-          slot: '',
-          plain: false,
-          methodName: 'submitRecall', // 回调方法名称
-          isShow: (row) => {
-            if (row.status === 'auditing' || row.status === 'delay') {
-              return true
-            } else {
-              return false
-            }
-          }
-        },
-        {
-          lable: '发布', // 按钮显示名称
-          size: 'mini',
-          style: 'margin: 0 6px;',
-          type: 'text',
-          slot: '',
-          plain: false,
-          methodName: 'issueCode', // 回调方法名称
-          isShow: (row) => {
-            if (row.status === 'audit_success' || row.status === 'release_failed') {
-              return true
-            } else {
-              return false
-            }
-          }
-        },
-        {
-          lable: '审核失败原因', // 按钮显示名称
-          size: 'mini',
-          style: 'margin: 0 6px;',
-          type: 'text',
-          slot: '',
-          plain: false,
-          methodName: 'submitFailReason', // 回调方法名称
-          isShow: (row) => {
-            if (row.status === 'audit_failed') {
-              return true
-            } else {
-              return false
-            }
-          }
-        },
-        {
-          lable: '操作历史', // 按钮显示名称
-          size: 'mini',
-          style: 'margin: 0 6px;',
-          type: 'text',
-          slot: '',
-          plain: false,
-          methodName: 'operHistory', // 回调方法名称
-          isShow: (row) => {
-            return true
-          }
-        },
-        {
-          lable: '版本回退', // 按钮显示名称
-          size: 'mini',
-          style: 'margin: 0 6px;',
-          type: 'text',
-          slot: '',
-          plain: false,
-          methodName: 'revertcoderelease', // 回调方法名称
-          isShow: (row) => {
-            return true
-          }
-        },
-        {
-          lable: '分阶段发布', // 按钮显示名称
-          size: 'mini',
-          style: 'margin: 0 6px;',
-          type: 'text',
-          slot: '',
-          plain: false,
-          methodName: 'grayrelease', // 回调方法名称
-          isShow: (row) => {
-            return true
-            // if (row.status === 'auditSuccess' || row.status === 'releaseFailed') {
-            //   return true
-            // } else {
-            //   return false
-            // }
-          }
-        },
-        {
-          lable: '取消分阶段发布', // 按钮显示名称
-          size: 'mini',
-          style: 'margin: 0 6px;',
-          type: 'text',
-          slot: '',
-          plain: false,
-          methodName: 'revertgrayrelease', // 回调方法名称
-          isShow: (row) => {
-            return true
-          }
-        }
-      ],
-      // 提交审核相关
-      showSubmit: false,
-      // 操作历史弹出框相关
-      operDia: {
-        visible: false
-      },
-      // 二维码弹出框相关
-      qrCodeDia: {
-        visible: false
-      },
-      // 分阶段发布弹出框相关
-      grayreleaseDia: {
-        visible: false
-      },
-      grayPercentage: 50, // 灰度的百分比 1 ~ 100 的整数
-      src: '',
-      // 查询栏下拉框数据
-      form: {
-        dataUrl: [], // 下拉框/单选框/复选框等获取数据的url
-        data: { // 全部下拉框数据
-          clientType: [
-            {
-              value: 'resi',
-              label: '居民端'
-            },
-            {
-              value: 'work',
-              label: '工作端'
-            }
-          ],
-          state: [
-            {
-              value: 'unaudited',
-              label: '未审核'
-            },
-            {
-              value: 'auditing',
-              label: '审核中'
-            },
-            {
-              value: 'audit_success',
-              label: '审核成功'
-            },
-            {
-              value: 'audit_failed',
-              label: '审核被拒绝'
-            },
-            {
-              value: 'withdrawn',
-              label: '已撤回'
-            },
-            {
-              value: 'delay',
-              label: '审核延后'
-            },
-            {
-              value: 'release_success',
-              label: '发布成功'
-            },
-            {
-              value: 'release_failed',
-              label: '发布失败'
-            }
-          ]
-        }
-      }
-    }
-  },
-  components: {
-    CDialog, SubmitForm, CommitForm, OperHistory, CTable, SubmitFailReason
-  },
-  activated () {
-    let params = this.$route.params
-
-    // 由客户注册信息跳转来
-    if (params.showCommit) {
-      this.form.data.customerId = params.customerList
-      this.commitCodeDiaShow(params.customerId)
-    }
-    this.$nextTick(() => {
-      this.$refs.table.doLayout() // 解决表格错位
-    })
-  },
-  mounted () {
-    this.renderSelData()
-    this.loadTableData()
-  },
-  computed: {
-    tableHeight () {
-      return this.clientHeight - 60 - 80 - 80 - 90
-    },
-    ...mapGetters(['clientHeight', 'env'])
-  },
-  methods: {
-    // 刷新
-    refresh () {
-      this.loadTableData()
-    },
-    // 加载列表数据
-    loadTableData () {
-      this.tableParams.source = this.env
-      this.$nextTick(() => {
-        this.$refs.table.loadData() // 获取表格数据
-      })
-    },
-    // 打开上传代码窗口
-    commitCodeDiaShow (customerId) {
-      this.$nextTick(() => {
-        let dataForm = {
-          clientType: 'resi',
-          customerId: customerId
-        }
-        this.$refs['ref_commit_form'].initData(dataForm)
-      })
-    },
-
-    // 提交审核
-    submitCode (row) {
-      let feedbackShow = false
-      if (row.status === 'audit_failed') {
-        feedbackShow = true
-      }
-      this.showSubmit = true
-      this.$refs['ref_submit_form'].initData(row.id, feedbackShow)
-    },
-
-    // 提交审核取消返回
-    cancleSubmit () {
-      this.showSubmit = false
-    },
-
-    // 审核撤回
-    submitRecall (row) {
-      this.$confirm('单个帐号每天审核撤回次数最多不超过 1 次，一个月不超过 10 次，确认撤回审核?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/undo'
-        const param = {
-          codeId: row.id
-        }
-        window.app.ajax.post(url, param,
-          (data, rspMsg) => {
-            this.$message.success('审核撤回成功' + rspMsg)
-            this.refresh()
-          },
-          (rspMsg, data) => {
-            this.$message.error(rspMsg)
-          })
-        // this.$message({
-        //   type: 'success',
-        //   message: '删除成功!'
-        // })
-      }).catch(() => {
-        // this.$message({
-        //   type: 'info',
-        //   message: '已取消删除'
-        // })
-      })
-    },
-    // 体验版二维码
-    showQRCode (row) {
-      this.qrCodeDia.visible = true
-      const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/qrcode'
-      const param = {
-        codeId: row.id
-      }
-      this.startLoading()
-      window.app.ajax.post(url, param,
-        (data, rspMsg) => {
-          // // eslint-disable-next-line
-          // debugger
-          this.endLoading()
-          if (data) {
-            // console.log(data.qrcode)
-            this.src = data.qrcode
-          }
-        },
-        (rspMsg, data) => {
-          this.endLoading()
-          this.$message.error(rspMsg)
-        }, { headers: { 'Content-Type': 'image/jpeg' } })
-    },
-    // 发布
-    issueCode (row) {
-      this.$confirm('确认撤回审核?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/release'
-        const param = {
-          codeId: row.id
-        }
-        window.app.ajax.post(url, param,
-          (data, rspMsg) => {
-            this.$message.success('发布成功' + rspMsg)
-            this.refresh()
-          },
-          (rspMsg, data) => {
-            this.$message.error(rspMsg)
-          })
-      }).catch(() => { })
-    },
-    // 审核失败原因
-    submitFailReason (row) {
-      this.$refs['ref_submit_fail_reason'].initData(row.id)
-    },
-    // 操作历史
-    operHistory (row) {
-      this.$refs['ref_oper_history'].initData(row.id)
-    },
-    // 分阶段发布
-    grayrelease (row) {
-      this.selCodeId = row.id
-      this.grayreleaseDia.visible = true
-    },
-    grayreleaseOk () {
-      // eslint-disable-next-line
-      // debugger
-      // const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/grayrelease'
-      const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/grayrelease'
-      const param = {
-        codeId: this.selCodeId,
-        grayPercentage: this.grayPercentage
-      }
-      this.startLoading()
-      window.app.ajax.post(url, param,
-        (data, rspMsg) => {
-          this.grayreleaseDia.visible = false
-
-          this.endLoading()
-          this.refresh()
-          if (data) {
-            // console.log(data.qrcode)
-            this.src = data.qrcode
-          }
-        },
-        (rspMsg, data) => {
-          this.endLoading()
-          this.$message.error(rspMsg)
-        }, { headers: { 'Content-Type': 'image/jpeg' } })
-    },
-
-    operDiaCancel () {
-      this.operDia.visible = false
-    },
-    qrCodeDiaCancel () {
-      this.qrCodeDia.visible = false
-    },
-    grayreleaseDiaCancel () {
-      this.grayreleaseDia.visible = false
-    },
-    async renderSelData () { // 渲染下拉框/单选框/复选框等数据
-      const customerUrl = ' https://epmet-cloud.elinkservice.cn/api/third/pacustomer/registerbyauth'
-      const param = {
-        //  workAuth: 1,
-        // resiAuth: 1,
-        source: this.env,
-        initState: 1
-      }
-      this.startLoading()
-      await window.app.ajax.post(customerUrl, param,
-        (data, rspMsg) => {
-          this.endLoading()
-          if (data) {
-            let customerList = []
-
-            data.forEach(element => {
-              let oneObj = {
-                value: element.customerId,
-                label: element.customerName
-              }
-              customerList.push(oneObj)
-            })
-
-            this.form.data.customerId = customerList
-            this.$forceUpdate()
-          }
-        },
-        (rspMsg, data) => {
-          this.endLoading()
-          this.$message.error(rspMsg)
-        })
-    },
-    // 版本回退
-    revertcoderelease (row) {
-      this.$confirm('确认回退到上一版本?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/revertcoderelease'
-        const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/revertcoderelease'
-        const param = {
-          codeId: row.id
-        }
-        window.app.ajax.post(url, param,
-          (data, rspMsg) => {
-            this.$message.success('版本回退成功' + rspMsg)
-            this.refresh()
-          },
-          (rspMsg, data) => {
-            this.$message.error(rspMsg)
-          })
-      }).catch(() => { })
-    },
-
-    // 取消分阶段发布
-    revertgrayrelease (row) {
-      this.$confirm('确认取消分阶段发布?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/revertgrayrelease'
-        const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/revertgrayrelease'
-        const param = {
-          codeId: row.id
-        }
-        window.app.ajax.post(url, param,
-          (data, rspMsg) => {
-            this.$message.success('取消分阶段发布成功' + rspMsg)
-            this.refresh()
-          },
-          (rspMsg, data) => {
-            this.$message.error(rspMsg)
-          })
-      }).catch(() => { })
-    },
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  }
-}
-</script>
-<style>
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-}
-</style>
diff --git a/epmet-oper-web/src/views/modules/customer/miniCustomize/ConfigEdit.vue b/epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/customer/miniCustomize/ConfigEdit.vue
rename to epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue
diff --git a/epmet-oper-web/src/views/modules/customer/miniCustomize/ConfigItem.vue b/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue
similarity index 63%
rename from epmet-oper-web/src/views/modules/customer/miniCustomize/ConfigItem.vue
rename to epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue
index 9567762..20d2301 100644
--- a/epmet-oper-web/src/views/modules/customer/miniCustomize/ConfigItem.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue
@@ -5,12 +5,20 @@
       <el-button type="default"
                  @click="diaCancel">取消返回</el-button>
 
+      <span style="margin-left:20px">{{customerName}}</span>
+
     </div>
 
     <el-table :data="customizedList"
               border
+              v-loading="loading"
+              element-loading-text="正在加载中"
+              element-loading-spinner="el-icon-loading"
+              element-loading-background="rgba(255, 255， 255, 0.8)"
+              :row-style="{height:'30px'}"
+              :cell-style="{padding:'5px'}"
               style="width: 100%;"
-              :height="tableHeight"
+              :height="tableHeight1"
               ref="ref_customer_table">
       <!-- <el-table-column type="selection"
                            header-align="center"
@@ -24,7 +32,7 @@
       <el-table-column label="默认名称"
                        header-align="center"
                        align="center"
-                       width="100"
+                       width="150"
                        prop="customizedName">
 
       </el-table-column>
@@ -48,11 +56,16 @@
                        width="150"
                        prop="customizedName">
         <template slot-scope="scope">
-          <img v-if="scope.row.iconLargeImg"
+          <el-image v-if="scope.row.iconLargeImg"
+                    style="width: 50px; height: 50px;text-align: center;"
+                    :src="scope.row.iconLargeImg"
+                    :preview-src-list="[scope.row.iconLargeImg]">
+          </el-image>
+          <!-- <img v-if="scope.row.iconLargeImg"
                :src="scope.row.iconLargeImg"
                style="width: 50px; height: 50px"
                class="function-icon"
-               :fit="'fill'">
+               :fit="'fill'"> -->
 
         </template>
       </el-table-column>
@@ -63,11 +76,16 @@
                        width="110"
                        prop="customizedName">
         <template slot-scope="scope">
-          <img v-if="scope.row.iconSmallImg"
+          <el-image v-if="scope.row.iconSmallImg"
+                    style="width: 50px; height: 50px;text-align: center;"
+                    :src="scope.row.iconSmallImg"
+                    :preview-src-list="[scope.row.iconSmallImg]">
+          </el-image>
+          <!-- <img v-if="scope.row.iconSmallImg"
                :src="scope.row.iconSmallImg"
                style="width: 50px; height: 50px"
                class="function-icon"
-               :fit="'fill'">
+               :fit="'fill'"> -->
 
         </template>
       </el-table-column>
@@ -79,13 +97,27 @@
                        prop="shoppingStatusShow">
 
       </el-table-column>
+      <!--操作列-->
+      <el-table-column label="移动"
+                       header-align="center"
+                       align="center"
+                       class="operate"
+                       width="150">
+        <template slot-scope="scope">
 
+          <el-button type="text"
+                     style="width=100px;height=100px"
+                     @click.stop="moveUp( scope.$index)"
+                     icon="el-icon-top"></el-button>
+
+        </template>
+      </el-table-column>
       <!--操作列-->
       <el-table-column label="操作"
                        header-align="center"
                        align="center"
                        class="operate"
-                       width="250">
+                       width="200">
         <template slot-scope="scope">
 
           <el-button v-if="scope.row.shoppingStatus==='0'"
@@ -101,9 +133,57 @@
           <el-button size="mini"
                      type="primary"
                      @click.stop="editShow( scope.row)">修改</el-button>
+          <!-- <el-button size="mini"
+                     type="primary"
+                     @click.stop="moveUp( scope.$index)">上移</el-button> -->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-table :data="functionList"
+              border
+              v-loading="noLoading"
+              element-loading-text="正在加载中"
+              element-loading-spinner="el-icon-loading"
+              element-loading-background="rgba(255, 255， 255, 0.8)"
+              :row-style="{height:'30px'}"
+              :cell-style="{padding:'5px'}"
+              style="width: 100%;margin-top:10px"
+              :height="tableHeight2"
+              ref="ref_customer_table">
+
+      <el-table-column label="排序"
+                       type="index"
+                       align="center"
+                       width="50"></el-table-column>
+      <el-table-column label="默认名称"
+                       header-align="center"
+                       align="center"
+                       width="150"
+                       prop="customizedName">
+
+      </el-table-column>
+
+      <el-table-column label="功能说明"
+                       header-align="center"
+                       align="center"
+                       prop="customizedName">
+
+      </el-table-column>
+
+      <!--操作列-->
+      <el-table-column label="操作"
+                       header-align="center"
+                       align="center"
+                       class="operate"
+                       width="200">
+        <template slot-scope="scope">
+
           <el-button size="mini"
+                     class="btn_putaway"
                      type="primary"
-                     @click.stop="moveUp">上移</el-button>
+                     @click.stop="addFunction(scope.row.functionId)">采集</el-button>
+
         </template>
       </el-table-column>
     </el-table>
@@ -149,12 +229,17 @@ export default {
   data () {
     return {
       loading: false,
-      customerId: '', // 上传代码定制id，父组件传
+      noLoading: false,
+      customerId: '', // 客户id，父组件传
+      customerName: '', // 客户名称，父组件传
 
       // 定制功能
       customizedList: [],
       customizeForm: [],
 
+      // 未添加的功能
+      functionList: [],
+
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/function/upload',
 
       // 新增定制功能相关
@@ -173,14 +258,17 @@ export default {
     }
   },
   components: {
-    CDialog
+    CDialog, ConfigEdit
   },
   mounted () {
 
   },
   computed: {
-    tableHeight () {
-      return this.clientHeight - 220
+    tableHeight1 () {
+      return (this.clientHeight - 220) / 2
+    },
+    tableHeight2 () {
+      return (this.clientHeight - 220) / 2
     },
     ...mapGetters(['clientHeight']),
     dataRule () {
@@ -204,13 +292,15 @@ export default {
     }
   },
   methods: {
-    initData (customerId) {
+    initData (customerId, customerName) {
       this.customerId = customerId
+      this.customerName = customerName
       this.loadTableData()
     },
 
     // 获取列表数据
     loadTableData () {
+      this.loading = true
       let params = {
         customerId: this.customerId
       }
@@ -219,7 +309,8 @@ export default {
       window.app.ajax.post(url, params,
         (data, rspMsg) => {
           this.$nextTick(() => {
-            this.customizedList = data
+            this.customizedList = data.customerList
+            this.functionList = data.functionList
 
             this.customizedList.forEach(element => {
               element.shoppingStatusShow = element.shoppingStatus === '0' ? element.shoppingStatusShow = '下架' : '上架'
@@ -230,6 +321,7 @@ export default {
           this.endLoading()
           this.$message.error(rspMsg)
         })
+      this.loading = false
     },
 
     // 上架
@@ -273,6 +365,11 @@ export default {
 
     },
 
+    // 采集
+    addFunction (functionId) {
+
+    },
+
     // 上传大图标成功
     handleLargeSuccess (res, file, index) {
       if (res.code === 0 && res.msg === 'success') {
@@ -303,26 +400,55 @@ export default {
     },
 
     // 上移
-    moveUp () {
-      console.log(this.customizedList)
-      this.customizedList.forEach((element, index) => {
-        element.displayOrder = index
-      })
-      const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfunctiondetail/updatedisplayorder'
-      //  const url = '/oper/customize/customerfunctiondetail/updatedisplayorder'
-      window.app.ajax.post(url, this.customizedList,
-        (data, rspMsg) => {
-          // this.$message.success('操作成功')
+    moveUp (index) {
+      console.log(index)
+      if (index > 0) {
+        this.startLoading()
+        let resultList = []
+        let one = {}
+        for (let i = 0; i < this.customizedList.length; i++) {
+          let obj = {}
+          // eslint-disable-next-line
+          // debugger
+          if (i === index - 1) {
+            one.customerId = this.customizedList[i].customerId
+            one.functionId = this.customizedList[i].functionId
+            one.displayOrder = i
+          } else if (i === index) {
+            obj.customerId = this.customizedList[i].customerId
+            obj.functionId = this.customizedList[i].functionId
+            obj.displayOrder = i
+            resultList.push(obj)
+            resultList.push(one)
+          } else {
+            obj.customerId = this.customizedList[i].customerId
+            obj.functionId = this.customizedList[i].functionId
+            obj.displayOrder = i
+            resultList.push(obj)
+          }
+
+          const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfunctiondetail/updatedisplayorder'
+          //  const url = '/oper/customize/customerfunctiondetail/updatedisplayorder'
+          window.app.ajax.post(url, resultList,
+            (data, rspMsg) => {
+              // this.$message.success('操作成功')
+
+            },
+            (rspMsg, data) => {
+              this.$message.error(rspMsg)
+            })
+          this.endLoading()
+        }
+      } else {
+        this.$message.warning('无法上移')
 
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg)
-        })
+        return false
+      }
     },
 
     // 取消
     diaCancel () {
-      this.$emit('cancleSubmit')
+      this.$emit('cancleBack')
     },
 
     // 开启加载动画
@@ -342,7 +468,7 @@ export default {
     }
   },
   props: {
-    ConfigEdit
+
   }
 }
 </script>
@@ -367,4 +493,8 @@ export default {
   background-color: rgb(89, 161, 255);
   border-color: rgb(89, 161, 255);
 }
+.el-icon-top {
+  font-weight: 600 !important;
+  font-size: 100px !important;
+}
 </style>
diff --git a/epmet-oper-web/src/views/modules/customer/miniCustomize/CustomerList.vue b/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue
similarity index 91%
rename from epmet-oper-web/src/views/modules/customer/miniCustomize/CustomerList.vue
rename to epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue
index 52913d1..1e66f46 100644
--- a/epmet-oper-web/src/views/modules/customer/miniCustomize/CustomerList.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue
@@ -47,10 +47,10 @@
                        @click="showMiniHome(scope.row.customerId,scope.row.customerName,1)">工作端首页</el-button>
             <el-button type="text"
                        size="small"
-                       @click="showConfigItem(scope.row.customerId)">功能配置</el-button>
+                       @click="showConfigItem(scope.row.customerId,scope.row.customerName)">功能配置</el-button>
             <el-button type="text"
                        size="small"
-                       @click="showConfigItem(scope.row.customerId)">角色权限</el-button>
+                       @click="showLimitConfig(scope.row.customerId,scope.row.customerName)">角色权限</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -136,9 +136,14 @@ export default {
     },
 
     // 功能配置
-    showConfigItem (customerId) {
+    showConfigItem (customerId, customerName) {
       this.showType = 'config'
-      this.$refs['ref_config_item'].initData(customerId)
+      this.$refs['ref_config_item'].initData(customerId, customerName)
+    },
+
+    // 显示权限配置
+    showLimitConfig (customerId, customerName) {
+      this.$message.warning('当前功能还未开发')
     },
 
     pageCurrentChangeHandle (val) {
diff --git a/epmet-oper-web/src/views/modules/customer/miniCustomize/MiniHome.vue b/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/customer/miniCustomize/MiniHome.vue
rename to epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue
diff --git a/epmet-oper-web/src/views/modules/customer/RegisterList.vue b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/customer/RegisterList.vue
rename to epmet-oper-web/src/views/modules/customer/init/RegisterList.vue
diff --git a/epmet-oper-web/src/views/modules/customer/customer-info.vue b/epmet-oper-web/src/views/modules/customer/manage/customer-info.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/customer/customer-info.vue
rename to epmet-oper-web/src/views/modules/customer/manage/customer-info.vue
diff --git a/epmet-oper-web/src/views/modules/customer/customer-manage.vue b/epmet-oper-web/src/views/modules/customer/manage/customer-manage.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/customer/customer-manage.vue
rename to epmet-oper-web/src/views/modules/customer/manage/customer-manage.vue
diff --git a/epmet-oper-web/src/views/modules/code/BasicInfo.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/BasicInfo.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/code/BasicInfo.vue
rename to epmet-oper-web/src/views/modules/customer/miniProAgent/BasicInfo.vue
diff --git a/epmet-oper-web/src/views/modules/code/Category.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/Category.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/code/Category.vue
rename to epmet-oper-web/src/views/modules/customer/miniProAgent/Category.vue
diff --git a/epmet-oper-web/src/views/modules/code/LowVersion.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/LowVersion.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/code/LowVersion.vue
rename to epmet-oper-web/src/views/modules/customer/miniProAgent/LowVersion.vue
diff --git a/epmet-oper-web/src/views/modules/code/VersionManage.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue
similarity index 99%
rename from epmet-oper-web/src/views/modules/code/VersionManage.vue
rename to epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue
index 72905cf..3489154 100644
--- a/epmet-oper-web/src/views/modules/code/VersionManage.vue
+++ b/epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue
@@ -71,10 +71,9 @@
 <script>
 import CDialog from '@c/CDialog'
 import CTable from '@c/CTable'
-import VersionItem from './VersionItem'
+import VersionItem from './version/VersionItem'
 import LowVersion from './LowVersion'
 import BasicInfo from './BasicInfo'
-
 import Category from './Category'
 
 import { mapGetters } from 'vuex'
diff --git a/epmet-oper-web/src/views/modules/code/CommitForm.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/CommitForm.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/code/CommitForm.vue
rename to epmet-oper-web/src/views/modules/customer/miniProAgent/version/CommitForm.vue
diff --git a/epmet-oper-web/src/views/modules/code/OperHistory.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/OperHistory.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/code/OperHistory.vue
rename to epmet-oper-web/src/views/modules/customer/miniProAgent/version/OperHistory.vue
diff --git a/epmet-oper-web/src/views/modules/code/SubmitFailReason.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitFailReason.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/code/SubmitFailReason.vue
rename to epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitFailReason.vue
diff --git a/epmet-oper-web/src/views/modules/code/SubmitForm.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitForm.vue
similarity index 99%
rename from epmet-oper-web/src/views/modules/code/SubmitForm.vue
rename to epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitForm.vue
index e2932fd..a3d619b 100644
--- a/epmet-oper-web/src/views/modules/code/SubmitForm.vue
+++ b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitForm.vue
@@ -171,7 +171,6 @@
 
 <script>
 import CDialog from '@c/CDialog'
-import CommitForm from './CommitForm'
 import SubmitItem from './SubmitItem'
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
@@ -215,7 +214,7 @@ export default {
     }
   },
   components: {
-    CDialog, CommitForm, SubmitItem
+    CDialog, SubmitItem
   },
   mounted () {
   },
diff --git a/epmet-oper-web/src/views/modules/code/SubmitFormReject.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitFormReject.vue
similarity index 98%
rename from epmet-oper-web/src/views/modules/code/SubmitFormReject.vue
rename to epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitFormReject.vue
index a585ef7..2adc916 100644
--- a/epmet-oper-web/src/views/modules/code/SubmitFormReject.vue
+++ b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitFormReject.vue
@@ -51,8 +51,6 @@
 
 <script>
 import CDialog from '@c/CDialog'
-import CommitForm from './CommitForm'
-import SubmitItem from './SubmitItem'
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 
@@ -82,7 +80,7 @@ export default {
     }
   },
   components: {
-    CDialog, CommitForm, SubmitItem
+    CDialog
   },
   mounted () {
   },
diff --git a/epmet-oper-web/src/views/modules/code/SubmitItem.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitItem.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/code/SubmitItem.vue
rename to epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitItem.vue
diff --git a/epmet-oper-web/src/views/modules/code/VersionItem.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/code/VersionItem.vue
rename to epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue
diff --git a/epmet-oper-web/src/views/modules/miniPro/customFun/CustomFun.vue b/epmet-oper-web/src/views/modules/productConfig/customizeFunction/CustomFun.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/miniPro/customFun/CustomFun.vue
rename to epmet-oper-web/src/views/modules/productConfig/customizeFunction/CustomFun.vue
diff --git a/epmet-oper-web/src/views/modules/miniPro/customFun/Edit.vue b/epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/miniPro/customFun/Edit.vue
rename to epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue
diff --git a/epmet-oper-web/src/views/modules/customize/CustomizedFunction copy.vue b/epmet-oper-web/src/views/modules/productConfig/defaultFunction/CustomizedFunction copy.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/customize/CustomizedFunction copy.vue
rename to epmet-oper-web/src/views/modules/productConfig/defaultFunction/CustomizedFunction copy.vue
diff --git a/epmet-oper-web/src/views/modules/customize/function-add-or-update.vue b/epmet-oper-web/src/views/modules/productConfig/defaultFunction/function-add-or-update.vue
similarity index 64%
rename from epmet-oper-web/src/views/modules/customize/function-add-or-update.vue
rename to epmet-oper-web/src/views/modules/productConfig/defaultFunction/function-add-or-update.vue
index cfb11e5..e93ec9e 100644
--- a/epmet-oper-web/src/views/modules/customize/function-add-or-update.vue
+++ b/epmet-oper-web/src/views/modules/productConfig/defaultFunction/function-add-or-update.vue
@@ -1,49 +1,69 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
-      <el-form-item label="功能名称" prop="functionName">
-        <el-input v-model="dataForm.functionName" placeholder="功能名称"></el-input>
+  <el-dialog :visible.sync="visible"
+             :title="!dataForm.id ? $t('add') : $t('update')"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+      <el-form-item label="功能名称"
+                    prop="functionName">
+        <el-input v-model="dataForm.functionName"
+                  placeholder="功能名称"></el-input>
       </el-form-item>
-      <el-form-item label="功能类型" prop="functionGroup">
+      <el-form-item label="功能类型"
+                    prop="functionGroup">
         <el-select v-model="dataForm.functionGroup"
-               placeholder="请选择" clearable>
+                   placeholder="请选择"
+                   clearable>
           <el-option v-for="item in functionGroupList"
-                 :key="item.dictValue"
-                 :label="item.dictName"
-                 :value="item.dictValue">
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="functionIcon" label="功能图标">
-        <el-upload
-          class="avatar-uploader"
-          :action="uploadUlr"
-          :show-file-list="false"
-          :on-success="handleAvatarSuccess"
-          :before-upload="beforeAvatarUpload">
-          <img v-if="dataForm.functionIcon" :src="dataForm.functionIcon" class="function-icon">
-          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+      <el-form-item prop="functionIcon"
+                    label="功能图标">
+        <el-upload class="avatar-uploader"
+                   :action="uploadUlr"
+                   :show-file-list="false"
+                   :on-success="handleAvatarSuccess"
+                   :before-upload="beforeAvatarUpload">
+          <img v-if="dataForm.functionIcon"
+               :src="dataForm.functionIcon"
+               class="function-icon">
+          <i v-else
+             class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
-      <el-form-item label="上架状态" prop="shoppingStatus">
+      <el-form-item label="上架状态"
+                    prop="shoppingStatus">
         <el-select v-model="dataForm.shoppingStatus"
-               placeholder="请选择" clearable>
+                   placeholder="请选择"
+                   clearable>
           <el-option v-for="item in shoppingStatusList"
-                 :key="item.dictValue"
-                 :label="item.dictName"
-                 :value="item.dictValue">
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
           </el-option>
         </el-select>
       </el-form-item>
 
-      <el-form-item label="功能说明" prop="functionExplain">
-        <el-input v-model="dataForm.functionExplain" placeholder="功能说明" type="textarea"></el-input>
+      <el-form-item label="功能说明"
+                    prop="functionExplain">
+        <el-input v-model="dataForm.functionExplain"
+                  placeholder="功能说明"
+                  type="textarea"></el-input>
       </el-form-item>
 
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
 </template>
@@ -130,7 +150,7 @@ export default {
           ...this.dataForm,
           ...res.data
         }
-      }).catch(() => {})
+      }).catch(() => { })
     },
     handleAvatarSuccess (res, file) {
       if (res.code === 0 && res.msg === 'success') {
@@ -152,7 +172,7 @@ export default {
       return isPNG && isLt1M
     },
     // 表单提交
-    dataFormSubmitHandle: debounce(function () {
+    dataFormSubmitHandle: debounce(() => {
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
           return false
@@ -170,7 +190,7 @@ export default {
               this.$emit('refreshDataList')
             }
           })
-        }).catch(() => {})
+        }).catch(() => { })
       })
     }, 1000, { 'leading': true, 'trailing': false })
   }
@@ -178,7 +198,7 @@ export default {
 </script>
 
 <style scoped>
-  .function-icon {
-    width: 28px;
-  }
+.function-icon {
+  width: 28px;
+}
 </style>
diff --git a/epmet-oper-web/src/views/modules/customize/function.vue b/epmet-oper-web/src/views/modules/productConfig/defaultFunction/function.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/customize/function.vue
rename to epmet-oper-web/src/views/modules/productConfig/defaultFunction/function.vue
diff --git a/epmet-oper-web/src/views/modules/customize/functionconfiguration.vue b/epmet-oper-web/src/views/modules/productConfig/homeComponent/functionconfiguration.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/customize/functionconfiguration.vue
rename to epmet-oper-web/src/views/modules/productConfig/homeComponent/functionconfiguration.vue
diff --git a/epmet-oper-web/src/views/modules/customize/homecomponent-add-or-update.vue b/epmet-oper-web/src/views/modules/productConfig/homeComponent/homecomponent-add-or-update.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/customize/homecomponent-add-or-update.vue
rename to epmet-oper-web/src/views/modules/productConfig/homeComponent/homecomponent-add-or-update.vue
diff --git a/epmet-oper-web/src/views/modules/customize/homecomponent.vue b/epmet-oper-web/src/views/modules/productConfig/homeComponent/homecomponent.vue
similarity index 100%
rename from epmet-oper-web/src/views/modules/customize/homecomponent.vue
rename to epmet-oper-web/src/views/modules/productConfig/homeComponent/homecomponent.vue