上传代码调整

5 years ago · c6aa7ac886
8 changed files with 86 additions and 76 deletions
--- 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://10.10.10.98:8080/api
+VUE_APP_API_SERVER =  http://192.168.1.130:8080/api
+# VUE_APP_API_SERVER =  http://10.10.10.98:8080/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
 VUE_APP_NODE_ENV=dev
--- a/epmet-oper-web/public/index.html
+++ b/epmet-oper-web/public/index.html
@ -38,7 +38,7 @@
  <!-- <script>window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/api';</script> -->
  <!-- <script>window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api';</script> -->
  <% } %>
-  <!-- 集成测试环境 dev -->https://epmet-dev.elinkservice.cn/
+  <!-- 集成测试环境 dev -->
  <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
  <script>window.SITE_CONFIG['apiURL'] = 'http://epmet-dev.elinkservice.cn:48080/api';</script>
  <% } %>
--- a/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss
+++ b/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss
@ -983,7 +983,7 @@
                font-family: PingFang SC;
                padding:3px 10px;
                font-weight: 500;
-                background-color: rgb(255, 21, 21);
+                background-color: rgba(239, 60, 61, 1);
                color: rgb(255, 255, 255);
                border-radius: 90px;
              }
@ -1019,7 +1019,6 @@
            }

 						.list {
-              width: 100%;
              margin:10px 15px;
 							.item {
                margin:8px 0;
@ -1027,6 +1026,8 @@
 								background-color: #ffffff;
                width: 100%;
                display:flex;
+                height: 40px ; 
+                align-items:center;
 								.logo {
                  width:10%;
 									height: 21px;
--- a/epmet-oper-web/src/views/components/CTable.vue
+++ b/epmet-oper-web/src/views/components/CTable.vue
@ -340,7 +340,7 @@ export default {
 }

 .page {
-  padding: 20px 6px 0;
+  padding: 0 6px;
  text-align: right;
 }

--- a/epmet-oper-web/src/views/components/CTableNoPage.vue
+++ b/epmet-oper-web/src/views/components/CTableNoPage.vue
@ -95,10 +95,7 @@ export default {
      loading: false,
      table: {
        height: this.tableHeight,
-        params: {
-          size: this.size, // 当前页数显示记录数
-          page: this.page // 当前页数
-        }
+        params: {}
      },

      selected: false,
@ -143,14 +140,6 @@ export default {
        return [{}]
      }
    },
-    page: {
-      type: Number,
-      default: 0
-    },
-    size: {
-      type: Number,
-      default: 10
-    },
    tableHeight: {
      type: Number
    },
@ -242,13 +231,6 @@ export default {
      //  关闭popover弹出层
      scope._self.$refs[`popover-${scope.$index}`].doClose()
    },
-    handleSizeChange (size) {
-      this.table.params.size = size
-      this.table.params.page = 0
-      this.$nextTick(() => {
-        this.loadData()
-      })
-    },

    // 单选选中
    getRadioRow (index, row) { // 获取选中数据
--- a/epmet-oper-web/src/views/modules/code/CommitForm.vue
+++ b/epmet-oper-web/src/views/modules/code/CommitForm.vue
@ -8,12 +8,11 @@
               class="aui-card--fill">
        <c-form ref="ref_form_temp"
                keyword="CommitCodeForm"
-                :formWidth="'100%'"
                :itemWidth="'300px'"
                :method="tempForm.method"
                :option-data="optionData"></c-form>

-        <el-form :inline="true"
+        <!-- <el-form :inline="true"
                 :model="extJson"
                 :style="{margin:'0 auto',width:'100%',textAlign:'left'}">
          <el-form-item label="小程序配置"
@ -35,7 +34,7 @@

          </el-form-item>

-        </el-form>
+        </el-form> -->
        <div class="mod-demo__demo}">

          <c-table column-type="radio"
@ -183,10 +182,10 @@ export default {
    commitCode () {
      this.$refs['ref_form_temp'].validate((valid) => {
        if (valid) {
-          if (this.extJson.json === '') {
-            this.$message.warning('请获取配置')
-            return
-          }
+          // if (this.extJson.json === '') {
+          //   this.$message.warning('请获取配置')
+          //   return
+          // }
          if (this.selTempId === '') {
            this.$message.warning('请选择模板')
            return
@ -194,11 +193,11 @@ export default {
          this.startLoading()
          // 表单对象
          let _data = this.$refs['ref_form_temp'].model
-          _data.extJson = this.extJson.json
+          // _data.extJson = this.extJson.json
          _data.templateId = this.selTempId
          console.log(_data)

-          window.app.ajax.post2(this.tempForm.commitUrl, _data,
+          window.app.ajax.post(this.tempForm.commitUrl, _data,
            (data, rspMsg) => {
              this.endLoading()
              this.$message.success('上传成功')
--- a/epmet-oper-web/src/views/modules/code/CommitList.vue
+++ b/epmet-oper-web/src/views/modules/code/CommitList.vue
@ -9,7 +9,8 @@
                 @keyup.enter.native="loadTableData()">
          <el-form-item>
            <el-select v-model="tableParams.customerId"
-                       placeholder="客户">
+                       placeholder="客户"
+                       clearable>
              <el-option v-for="item in form.data['customerId']"
                         :key="item.value"
                         :label="item.label"
@ -19,7 +20,8 @@
          </el-form-item>
          <el-form-item>
            <el-select v-model="tableParams.clientType"
-                       placeholder="类型">
+                       placeholder="类型"
+                       clearable>
              <el-option v-for="item in form.data['clientType']"
                         :key="item.value"
                         :label="item.label"
@ -30,7 +32,8 @@

          <el-form-item>
            <el-select v-model="tableParams.state"
-                       placeholder="状态">
+                       placeholder="状态"
+                       clearable>
              <el-option v-for="item in form.data['state']"
                         :key="item.value"
                         :label="item.label"
@ -145,12 +148,11 @@ export default {
          plain: false,
          methodName: 'submitCodeDiaShow', // 回调方法名称
          isShow: function (row) {
-            return true
-            // if (row.status === 'unaudited' || row.status === 'audit_failed' || row.status === 'withdrawn') {
-            //   return true
-            // } else {
-            //   return false
-            // }
+            if (row.status === 'unaudited' || row.status === 'audit_failed' || row.status === 'withdrawn') {
+              return true
+            } else {
+              return false
+            }
          }
        },
        {
@ -162,12 +164,11 @@ export default {
          plain: false,
          methodName: 'showQRCode', // 回调方法名称
          isShow: function (row) {
-            return true
-            // if (row.status === 'unaudited') {
-            //   return true
-            // } else {
-            //   return false
-            // }
+            if (row.status === 'unaudited') {
+              return true
+            } else {
+              return false
+            }
          }
        },
        {
@ -179,12 +180,11 @@ export default {
          plain: false,
          methodName: 'submitRecall', // 回调方法名称
          isShow: function (row) {
-            return true
-            // if (row.status === 'auditing') {
-            //   return true
-            // } else {
-            //   return false
-            // }
+            if (row.status === 'auditing') {
+              return true
+            } else {
+              return false
+            }
          }
        },
        {
@ -196,12 +196,11 @@ export default {
          plain: false,
          methodName: 'issueCode', // 回调方法名称
          isShow: function (row) {
-            return true
-            // if (row.status === 'audit_success' || row.status === 'release_failed') {
-            //   return true
-            // } else {
-            //   return false
-            // }
+            if (row.status === 'audit_success' || row.status === 'release_failed') {
+              return true
+            } else {
+              return false
+            }
          }
        },
        {
@ -213,12 +212,11 @@ export default {
          plain: false,
          methodName: 'submitFailReason', // 回调方法名称
          isShow: function (row) {
-            return true
-            // if (row.status === 'audit_failed') {
-            //   return true
-            // } else {
-            //   return false
-            // }
+            if (row.status === 'audit_failed') {
+              return true
+            } else {
+              return false
+            }
          }
        },
        {
@ -301,6 +299,7 @@ export default {

    // 由客户注册信息跳转来
    if (params.showCommit) {
+      this.form.data.customerId = params.customerList
      this.commitCodeDiaShow(params.customerId)
    }
    this.$nextTick(() => {
@ -313,7 +312,7 @@ export default {
  },
  computed: {
    tableHeight () {
-      return this.clientHeight - 60 - 80 - 80 - 85
+      return this.clientHeight - 60 - 80 - 80 - 90
    },
    ...mapGetters(['clientHeight'])
  },
--- a/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue
+++ b/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue
@ -188,14 +188,43 @@ export default {
    },
    // 上传代码
    commitCode (row) {
-      this.$router.push({
-        'name': 'code-CommitList',
-        'params': {
-          showCommit: true,
-          customerId: row.customerId,
-          name: row.agencyName
-        }
-      })
+      const customerUrl = '/third/pacustomer/registerbyauth'
+      // const customerUrl = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/pacustomer/registerbyauth'
+      const param = {
+        // initState: 1,
+        // resiAuth: 1,
+        workAuth: 1
+      }
+      this.startLoading()
+      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.$router.push({
+              'name': 'code-CommitList',
+              'params': {
+                showCommit: true,
+                customerId: row.customerId,
+                name: row.agencyName,
+                customerList: customerList
+              }
+            })
+          }
+        },
+        (rspMsg, data) => {
+          this.endLoading()
+          this.$message.error(rspMsg)
+        })
    },
    // 开启加载动画
    startLoading () {