Merge branch 'dev'

epmet-oper-web/src/mixins/view-module.js

@@ -1,5 +1,7 @@
 import Cookies from 'js-cookie'
 import qs from 'qs'
+import { requestPost } from '@/js/dai/request'
+
 export default {
   data () {
     /* eslint-disable */
@@ -139,6 +141,33 @@ export default {
         }).catch(() => {})
       }).catch(() => {})
     },
+    // 删除
+   async deleteHandlePost (id) {
+
+      
+     
+      this.$confirm(this.$t('prompt.info', { 'handle': this.$t('delete') }), this.$t('prompt.title'), {
+        confirmButtonText: this.$t('confirm'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.$http.post(this.mixinViewModuleOptions.deleteURL,
+           [id]
+        ).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.query()
+            }
+          })
+        }).catch(() => {})
+      }).catch(() => {})
+    },
     // 导出
     exportHandle () {
       var params = qs.stringify({

epmet-oper-web/src/views/modules/sys/dingding/Edit.vue

@@ -0,0 +1,206 @@
+<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="120px">
+
+      <el-form-item prop="appId"
+                    label="AppId">
+        <el-input v-model="dataForm.appId"
+                  placeholder="AppId"></el-input>
+      </el-form-item>
+      <el-form-item prop="miniAppId"
+                    label="MiniAppId">
+        <el-input v-model="dataForm.miniAppId"
+                  placeholder="MiniAppId"></el-input>
+      </el-form-item>
+      <el-form-item prop="suiteId"
+                    label="SuiteId">
+        <el-input v-model="dataForm.suiteId"
+                  placeholder="SuiteId"></el-input>
+      </el-form-item>
+      <el-form-item prop="suiteName"
+                    label="应用名称">
+        <el-input v-model="dataForm.suiteName"
+                  placeholder="应用名称"></el-input>
+      </el-form-item>
+      <el-form-item prop="suiteKey"
+                    label="SuiteKey">
+        <el-input v-model="dataForm.suiteKey"
+                  placeholder="SuiteKey"></el-input>
+      </el-form-item>
+      <el-form-item prop="suiteSecret"
+                    label="SuiteSecret">
+        <el-input v-model="dataForm.suiteSecret"
+                  placeholder="SuiteSecret"></el-input>
+      </el-form-item>
+      <el-form-item prop="token"
+                    label="Token">
+        <el-input v-model="dataForm.token"
+                  placeholder="Token"></el-input>
+      </el-form-item>
+      <el-form-item prop="aesKey"
+                    label="AesKey">
+        <el-input v-model="dataForm.aesKey"
+                  placeholder="AesKey"></el-input>
+      </el-form-item>
+
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 v-if="canSave"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button type="primary"
+                 v-else
+                 disabled>{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+import { isEmail, isMobile } from '@/utils/validate'
+export default {
+  data () {
+    return {
+      visible: false,
+      canSave: true,
+
+
+      dataForm: {
+        id: '',
+        appId: '',
+        miniAppId: '',
+        suiteId: '',
+        suiteName: '',
+        suiteKey: '',
+        suiteSecret: '',
+        token: '',
+        aesKey: '',
+
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        appId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        miniAppId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        suiteId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+
+        suiteName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+        ],
+        suiteKey: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+        ],
+        suiteSecret: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+        ],
+        token: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+        ],
+        aesKey: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+
+      })
+    },
+
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/third/dingMiniInfo/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data,
+          roleIdList: []
+        }
+
+      }).catch(() => { })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        if (!this.canSave) {
+          return;
+        }
+        this.canSave = false;
+        setTimeout(() => {
+          this.canSave = true   //点击一次时隔两秒后才能再次点击
+        }, 2000)
+        let url = '/third/dingMiniInfo/save'
+        if (!this.dataForm.id) {
+          url = '/third/dingMiniInfo/save'
+        } else {
+          url = '/third/dingMiniInfo/update'
+        }
+
+        this.$http['post'](url, {
+          ...this.dataForm,
+
+        }).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
+
+<style lang="scss">
+.mod-sys__user {
+  .dept-list {
+    .el-input__inner,
+    .el-input__suffix {
+      cursor: pointer;
+    }
+  }
+  .role-list {
+    .el-select {
+      width: 100%;
+    }
+  }
+}
+</style>

epmet-oper-web/src/views/modules/sys/dingding/EditDomainNameList.vue

@@ -0,0 +1,412 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             :title="diaTitle"
+             :close-on-click-modal="false"
+             :before-close="handleClose"
+             :close-on-press-escape="false"
+             :width="60+'%'"
+             :top="'20px'">
+    <el-form :inline="true"
+             :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             :label-width="'140px'">
+      <el-form-item label="功能名称"
+                    prop="functionName">
+        <el-tooltip class="item"
+                    effect="dark"
+                    content="请输入2-5个字"
+                    placement="bottom-start">
+          <el-input class="item_width_1"
+                    :maxlength="5"
+                    :minlength="2"
+                    v-model="dataForm.functionName"
+                    placeholder="功能名称"></el-input>
+        </el-tooltip>
+
+        <div slot="tip"
+             class="el-upload__tip">2-5个字</div>
+      </el-form-item>
+      <el-form-item label="来源"
+                    prop="fromApp">
+        <el-select :disabled="isApply===1"
+                   class="item_width_1"
+                   v-model="dataForm.fromApp"
+                   placeholder="请选择"
+                   clearable>
+          <el-option v-for="item in fromAppList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上架状态"
+                    prop="shoppingStatus">
+        <el-select class="item_width_1"
+                   :disabled="isApply===1"
+                   v-model="dataForm.shoppingStatus"
+                   placeholder="请选择"
+                   clearable>
+          <el-option v-for="item in shoppingStatusList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="外链地址"
+                    prop="targetLink">
+        <el-input v-if="isApply===0"
+                  class="item_width_1"
+                  v-model="dataForm.targetLink"
+                  placeholder="外链地址"></el-input>
+        <span v-else
+              style="width:300px;display:block;margin-bottom:10px; float:left">{{dataForm.targetLink}} </span>
+      </el-form-item>
+
+      <el-form-item prop="iconLargeImg"
+                    label="大图标">
+        <el-upload class="item_width_1 avatar-uploader"
+                   :action="uploadUlr"
+                   :show-file-list="false"
+                   :on-success="function (res, file) { return handleImgSuccess(res, file, 'large')}"
+                   :before-upload="beforeImgUpload">
+          <img v-if="dataForm.iconLargeImg"
+               :src="dataForm.iconLargeImg"
+               style="width:70px;height:70px"
+               class="function-icon">
+          <i v-else
+             class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+
+      <el-form-item prop="iconSmallImg"
+                    label="小图标">
+        <el-upload class="item_width_1 avatar-uploader"
+                   :action="uploadUlr"
+                   :show-file-list="false"
+                   :on-success="function (res, file) { return handleImgSuccess(res, file, 'small')}"
+                   :before-upload="beforeImgUpload">
+          <img v-if="dataForm.iconSmallImg"
+               :src="dataForm.iconSmallImg"
+               style="width:50px;height:50px"
+               class="function-icon">
+          <i v-else
+             class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+
+      <el-form-item prop="domainNameList"
+                    class="block"
+                    label="是否需要业务域名">
+
+        <el-checkbox v-model="isDomainNameCheck"></el-checkbox>
+      </el-form-item>
+
+      <el-form-item v-if="isDomainNameCheck"
+                    prop="domainNameList"
+                    class="block"
+                    label="业务域名">
+        <div v-if="type==='A'||isApply===0">
+          <div v-for="(item, index)  in domainNameList"
+               :key="index">
+            <el-input :disabled="isApply===1"
+                      style="width:300px;display:block;margin-bottom:10px; float:left"
+                      placeholder='请输入业务域名'
+                      v-model="domainNameList[index]"> </el-input>
+
+            <el-button v-if="index===0"
+                       size="mini"
+                       class="btn_serve"
+                       type="primary"
+                       icon="el-icon-plus"
+                       @click="addRequest()"
+                       circle></el-button>
+            <el-button v-if="index!==0"
+                       size="mini"
+                       type="danger"
+                       class="btn_serve"
+                       icon="el-icon-minus"
+                       @click="delRequest(index)"
+                       circle></el-button>
+
+          </div>
+        </div>
+        <div v-else>
+          <div v-for="(item, index)  in domainNameList"
+               :key="index">
+            <span style="width:300px;display:block;margin-bottom:10px; float:left">{{domainNameList[index]}} </span>
+
+          </div>
+        </div>
+
+      </el-form-item>
+
+      <el-form-item class="block"
+                    label="功能说明"
+                    prop="functionExplain">
+        <el-input class="item_width_2"
+                  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="saveForm()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading// 加载动画
+export default {
+  data () {
+    return {
+      visible: false,
+      diaTitle: '修改定制功能',
+      type: '', // 操作类型A/U
+      functionId: '', // 父组件传来功能id
+      dataForm: {
+        functionId: '',
+        functionName: '',
+        customizedName: '',
+        iconLargeImg: '',
+        iconSmallImg: '',
+        shoppingStatus: 1,
+        functionExplain: '',
+        targetLink: '',
+        domainName: '',
+        fromApp: 'resi',
+        isDomainName: ''
+      },
+      isDomainNameCheck: true,
+      domainNameList: [],
+      isApply: 0,//客户是否在用
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/function/upload',
+      fromAppList: [
+        {
+          'dictName': '工作端',
+          'dictValue': 'gov'
+        }, {
+          'dictName': '居民端',
+          'dictValue': 'resi'
+        }
+      ],
+      shoppingStatusList: [
+        {
+          'dictName': '下架',
+          'dictValue': '0'
+        }, {
+          'dictName': '上架',
+          'dictValue': '1'
+        }
+      ]
+    }
+  },
+  created () {
+    // this.queryFunctionList()
+  },
+  computed: {
+    dataRule () {
+      return {
+        functionName: [
+          { required: true, message: '功能名称不能为空', trigger: 'blur' },
+          { min: 2, max: 5, message: '功能名称长度在 2 到 5 个字符', trigger: 'blur' }
+        ],
+        // domainNameList: [
+        //   { required: true, message: '业务域名不能为空', trigger: 'blur' }
+        // ],
+        iconLargeImg: [
+          { required: true, message: '大图标不能为空', trigger: 'blur' }
+        ],
+        iconSmallImg: [
+          { required: true, message: '小图标不能为空', trigger: 'blur' }
+        ],
+        fromApp: [
+          { required: true, message: '来源不能为空', trigger: 'blur' }
+        ],
+        shoppingStatus: [
+          { required: true, message: '上架状态不能为空', trigger: 'blur' }
+        ],
+        functionExplain: [
+          { required: true, message: '功能描述不能为空', trigger: 'blur' }
+        ],
+        targetLink: [
+          { required: true, message: '外链地址不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init (functionId, type) {
+      this.type = type
+      this.visible = true
+      this.functionId = functionId
+      if (type === 'A') {
+        this.diaTitle = '新增定制功能'
+        this.dataForm = {
+          functionId: '',
+          functionName: '',
+          customizedName: '',
+          iconLargeImg: '',
+          iconSmallImg: '',
+          shoppingStatus: '1',
+          functionExplain: '',
+          targetLink: '',
+          domainName: '',
+          fromApp: 'resi'
+        }
+        this.domainNameList = ['']
+        this.isApply = 0
+      } else {
+        this.diaTitle = '修改定制功能'
+        this.loadFormData()
+      }
+    },
+    addRequest () {
+      // eslint-disable-next-line
+      // debugger
+      this.domainNameList.push('')
+    },
+    delRequest (index) {
+      this.domainNameList.splice(index, 1)
+    },
+
+    loadFormData () {
+      // const url='https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/functioncustomized/getfunctioncustomized'
+      const url = '/oper/customize/functioncustomized/getfunctioncustomized'
+      let _data = {
+        functionId: this.functionId
+      }
+      window.app.ajax.post(url, _data,
+        (data, rspMsg) => {
+          this.dataForm = data
+          this.isDomainNameCheck = data.isDomainName === '1'
+
+          this.domainNameList = this.dataForm.domainName.split(';')
+          this.isApply = data.isApply
+        },
+        (rspMsg, data) => {
+          this.endLoading()
+          this.$message.error(rspMsg)
+        })
+    },
+
+    // 上传大图标成功
+    handleImgSuccess (res, file, type) {
+      if (res.code === 0 && res.msg === 'success') {
+        if (type === 'large') {
+          this.dataForm.iconLargeImg = res.data.url
+        } else if (type === 'small') {
+          this.dataForm.iconSmallImg = res.data.url
+        }
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+
+    beforeImgUpload (file) {
+      // const isPNG = file.type === 'image/png'
+      const isLt1M = file.size / 1024 / 1024 < 1
+
+      // if (!isPNG) {
+      //   this.$message.error('上传图片只能是 PNG 格式!')
+      // }
+      if (!isLt1M) {
+        this.$message.error('上传图片大小不能超过 1MB!')
+      }
+      // return isPNG && isLt1M
+      return isLt1M
+    },
+
+    saveForm () {
+      this.$refs['dataForm'].validate((valid, messageObj) => {
+
+        if (!valid) {
+          app.util.validateRule(messageObj)
+        } else {
+
+          let domainName = ''
+          for (let i = 0; i < this.domainNameList.length; i++) {
+            if (this.domainNameList[i] !== '') {
+              domainName = domainName + this.domainNameList[i] + ';'
+            }
+          }
+          domainName = domainName.substring(0, domainName.length - 1)
+          this.dataForm.domainName = domainName
+          this.dataForm.isDomainName = this.isDomainNameCheck ? '1' : '0'
+
+          let url = ''
+          if (this.type === 'U') {
+            url = '/oper/customize/functioncustomized/updatecustomized'
+          } else {
+            url = '/oper/customize/functioncustomized/savefunctioncustomized'
+            this.dataForm.functionId = ''
+          }
+          this.dataForm.functionGroup = '1'
+          window.app.ajax.post(url, this.dataForm,
+            (data, rspMsg) => {
+              this.$message({
+                type: 'success',
+                message: '保存成功'
+              })
+              this.$emit('editDiaOK')
+              this.visible = false
+            },
+            (rspMsg, data) => {
+              this.endLoading()
+              this.$message.error(rspMsg)
+            })
+        }
+      })
+    },
+    handleClose () {
+      this.visible = false
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+.function-icon {
+  width: 28px;
+}
+.item_width_1 {
+  width: 300px;
+}
+.item_width_2 {
+  width: 500px;
+}
+.block {
+  display: block;
+}
+.btn_serve {
+  float: left;
+  margin-top: 4px;
+  margin-left: 10px;
+  vertical-align: bottom;
+}
+</style>

epmet-oper-web/src/views/modules/sys/dingding/digndingList.vue

@@ -0,0 +1,142 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.appId"
+                    placeholder="应用名称"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+
+      </el-form>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                @sort-change="dataListSortChangeHandle"
+                style="width: 100%;">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="appId"
+                         label="AppId"
+                         sortable="custom"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="miniAppId"
+                         label="MiniAppId"
+                         sortable="custom"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="suiteId"
+                         label="SuiteId"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="suiteName"
+                         label="应用名称"
+                         header-align="center"
+                         align="center"></el-table-column>
+
+        <el-table-column prop="suiteKey"
+                         label="SuiteKey"
+                         sortable="custom"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="suiteSecret"
+                         label="SuiteSecret"
+                         sortable="custom"
+                         header-align="center"
+                         align="center">
+        </el-table-column>
+        <el-table-column prop="token"
+                         label="token"
+                         sortable="custom"
+                         header-align="center"
+                         align="center">
+        </el-table-column>
+        <el-table-column prop="aesKey"
+                         label="AesKey"
+                         sortable="custom"
+                         header-align="center"
+                         align="center">
+
+        </el-table-column>
+
+        <el-table-column prop="createdBy"
+                         label="创建人"
+                         sortable="custom"
+                         header-align="center"
+                         align="center"
+                         width="180"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="创建时间"
+                         sortable="custom"
+                         header-align="center"
+                         align="center"
+                         width="180"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
+          <template slot-scope="scope">
+            <el-button type="text"
+                       size="small"
+                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text"
+                       size="small"
+                       @click="deleteHandlePost(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './Edit'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/third/dingMiniInfo/page',
+        getDataListIsPage: true,
+        deleteURL: '/third/dingMiniInfo/delete',
+        deleteIsBatch: true,
+
+      },
+      dataForm: {
+
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>