no message

public/index.html

@@ -20,7 +20,7 @@
   <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
   <script src="https://cdn.staticfile.org/ali-oss/6.10.0/aliyun-oss-sdk.min.js"></script>
   <link rel="icon" href="<%= BASE_URL %>favicon.png">
-  <title>分布式可信公共服务平台</title>
+  <title>青鸟物联网平台</title>
   <style>
     html,
     body,

src/api/communication/basiccard.js

@@ -62,6 +62,14 @@ export const tenant = () => {
     method: 'get',
   })
 }
+//流量池名称
+export const flowPoolName = () => {
+  return request({
+    url: "/api/iot-sim/flowpool/fillData?isSource=" + 2,
+    method: 'get',
+  })
+}
+
 //分拨操作
 export const simdeliver = (params) => {
   return request({

src/api/informationmanage/carduse.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 //列表
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/iot-sim/flowhis/page',
+    url: '/api/iot-sim/simcarddeliver/getFlowHis',
     method: 'get',
     params: {
       ...params,

src/api/informationmanage/cardusemonth.js

@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+//列表
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/iot-sim/simcarddeliver/getFlowHisMonth',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

src/config/website.js

@@ -5,7 +5,7 @@ export default {
   title: "saber",
   logo: "S",
   key: 'saber', //配置主键,目前用于存储
-  indexTitle: '分布式可信公共服务平台',
+  indexTitle: '物联网平台',
   clientId: 'falcon', // 客户端id
   clientSecret: 'falcon_secret', // 客户端密钥
   tenantMode: true, // 是否开启租户模式

src/lang/zh.js

@@ -1,6 +1,6 @@
 export default {
   tip: '提示',
-  title: '分布式可信公共服务平台',
+  title: '青鸟物联网平台',
   logoutTip: '退出系统, 是否继续?',
   submitText: '确定',
   cancelText: '取消',
@@ -67,7 +67,7 @@ export default {
   },
   login: {
     title: '登录 ',
-    info: '分布式可信公共服务平台',
+    info: '物联网平台',
     tenantId: '请输入租户ID',
     username: '请输入账号',
     password: '请输入密码',

src/views/communicationmanage/basiccard/basiccard.vue

@@ -170,7 +170,25 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
+        <el-form-item
+          label="目标流量池"
+          prop="flowPoolId"
+          v-if="distitle == '分拨' || distitle == '出库'"
+        >
+          <el-select
+            v-model="distribution.flowPoolId"
+            placeholder="请选择目标流量池"
+            size="mini"
+            style="width: 90%"
+          >
+            <el-option
+              v-for="(item, index) in flowPoolNameArr"
+              :label="item.name"
+              :value="item.id"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item
           label="开始/结束号码"
           prop="numbers"
@@ -225,6 +243,7 @@ import {
   simCallback,
   deliver,
   dataplangroup,
+  flowPoolName,
 } from "@/api/communication/basiccard";
 import { mapGetters } from "vuex";
 import { getToken } from "@/util/auth";
@@ -381,6 +400,7 @@ export default {
         numEnd: "", //结束号码
         dataPlanId: "",
         dataPlanGroupId: "", //
+        flowPoolId: "", //流量池名称
       }, //分拨
       redistribution: {
         numStart: null, //开始号码
@@ -406,6 +426,7 @@ export default {
         ],
       },
       channellist: [], //通道下拉
+      flowPoolNameArr: [], //流量池名称
       ruleForm: {}, //导入
       dialogVisible: false, //分拨弹窗布尔
       dialogVisibles: false, //分拨弹窗布尔
@@ -683,7 +704,7 @@ export default {
   created() {
     this.allocatelist(); //分拨列表
     this.tenantlists(); //租户下拉
-
+    this.flowPoolIds(); //流量池名称
     this.basicpackgesgroup(); //基础套餐组下拉
   },
   watch: {
@@ -920,7 +941,14 @@ export default {
         }
       });
     },
-
+    //流量池名称
+    flowPoolIds() {
+      flowPoolName().then((res) => {
+        if (res.data.code == 200) {
+          this.flowPoolNameArr = res.data.data;
+        }
+      });
+    },
     //租户下拉框
     tenantlists() {
       tenant().then((res) => {

src/views/communicationmanage/targetflowpool/targetflowpool.vue

@@ -84,6 +84,22 @@ export default {
               },
             ],
           },
+          {
+            label: "客户名称",
+            prop: "tenantId",
+            type: "select",
+            dicUrl: "/api/iot-system/tenant/fillData",
+            props: {
+              label: "tenantName",
+              value: "tenantId",
+            },
+            dataType: "String",
+            span: 12,
+            search: true,
+            rules: [
+              { required: true, message: "请选择客户名称", trigger: "change" },
+            ],
+          },
           {
             label: "目标流量池编号",
             prop: "code",
@@ -119,6 +135,7 @@ export default {
             prop: "total",
             span: 12,
             searchLabelWidth: 90,
+            width: 115,
             search: false,
             addDisplay: false,
             editDisplay: false,
@@ -163,10 +180,11 @@ export default {
             ],
           },
           {
-            label: "提醒阈值",
+            label: "提醒阈值(%)",
             prop: "remindRatio",
             span: 12,
             searchLabelWidth: 90,
+            width: "90",
             search: false,
             hide: false,
             type: "number",

src/views/financial/telecomCheckBill.vue

@@ -0,0 +1,95 @@
+<template>
+  <basic-container>
+    <div style="width: 50%; margin: 0 auto">
+      <div class="downloads">
+        <div>
+          请
+          <el-link type="primary" @click="handleTemplate">下载模板</el-link>
+          并按照模板提示输入数据后上传
+        </div>
+      </div>
+      <div class="tip">
+        温馨提示：
+        <div>1、请选择模板下载；</div>
+        <div>2、导入必须是xls、xlsx文件；</div>
+        <div>3、文件大小最大为10MB；</div>
+        <div>4、号码最多10000个。</div>
+      </div>
+      <avue-form :option="auditoptions" :upload-after="uploadAfter"></avue-form>
+    </div>
+  </basic-container>
+</template>
+
+<script>
+import { getToken } from "@/util/auth";
+export default {
+  data() {
+    return {
+      auditoptions: {
+        menuBtn: false,
+        labelWidth: 95,
+        size: "medium",
+        column: [
+          {
+            label: "电信对账单",
+            prop: "excelFile",
+            type: "upload",
+            drag: true,
+            loadText: "上传中，请稍等",
+            showFileList: false,
+            propsHttp: {
+              res: "data",
+            },
+            tip: "请上传模板格式文件",
+            action: "/api/iot-sim/telecomCheckBill/import-checkBill",
+            rules: [
+              {
+                required: true,
+                message: "请选择文件",
+                trigger: "change",
+              },
+            ],
+          },
+        ],
+      },
+    };
+  },
+
+  methods: {
+    //下载模板
+    handleTemplate() {
+      window.open(
+        `${this.baseUrl}/${
+          this.apis
+        }iot-sim/telecomCheckBill/export-checkBill?${
+          this.website.tokenHeader
+        }=${getToken()}`
+      );
+    },
+    uploadAfter(res, done, loading, column) {
+      done();
+      window.open(
+        `${this.baseUrl}/${
+          this.apis
+        }iot-sim/telecomCheckBill/export-checkBillInfo?${
+          this.website.tokenHeader
+        }=${getToken()}`
+      );
+    },
+  },
+};
+</script>
+
+<style>
+.downloads {
+  display: flex;
+  align-items: center;
+  padding-bottom: 30px;
+  font-size: 16px;
+}
+.tip {
+  padding-bottom: 50px;
+  color: #a8a8a8;
+  font-size: 15px;
+}
+</style>

src/views/informationmanage/carduse/index.vue

@@ -55,7 +55,7 @@ export default {
         column: [
           {
             label: "用量(M)",
-            prop: "usageM",
+            prop: "usage",
             width: 200,
           },
 
@@ -69,36 +69,14 @@ export default {
             prop: "msisdn",
             search: true,
           },
+
           {
             label: "时间",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyyMMdd",
             prop: "time",
-          },
-          {
-            label: "时间",
-            prop: "type",
-            type: "select",
             search: true,
-            hide: true,
-            // searchClearable: false,
-            searchValue: 2,
-            dicData: [
-              {
-                label: "昨日",
-                value: 1,
-              },
-              {
-                label: "本周",
-                value: 2,
-              },
-              {
-                label: "上周",
-                value: 3,
-              },
-              {
-                label: "本月",
-                value: 4,
-              },
-            ],
           },
         ],
       },

src/views/informationmanage/cardusemonth/index.vue

@@ -0,0 +1,189 @@
+<template>
+  <basic-container>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      :page.sync="page"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      v-model="form"
+      ref="crud"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import { getList } from "@/api/informationmanage/cardusemonth";
+import { mapGetters } from "vuex";
+
+export default {
+  data() {
+    return {
+      form: {},
+      query: {
+        type: 2,
+      },
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      option: {
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        viewBtn: false,
+        addBtn: false,
+        menu: false,
+        selection: false,
+        dialogClickModal: false,
+        dialogWidth: "45%",
+        column: [
+          {
+            label: "用量(M)",
+            prop: "usage",
+            width: 200,
+          },
+          {
+            label: "ICCID",
+            prop: "iccid",
+            search: true,
+          },
+          {
+            label: "MSISDN",
+            prop: "msisdn",
+            search: true,
+          },
+          {
+            label: "时间",
+            type: "month",
+            format: "yyyy-MM",
+            valueFormat: "yyyyMM",
+            prop: "time",
+            search: true,
+          },
+        ],
+      },
+      data: [],
+    };
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        // addBtn: this.vaildData(this.permission.product_topic_add, false),
+        // viewBtn: this.vaildData(this.permission.product_topic_view, false),
+        // delBtn: this.vaildData(this.permission.product_topic_delete, false),
+        // editBtn: this.vaildData(this.permission.product_topic_edit, false),
+      };
+    },
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      add(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          loading();
+          window.console.log(error);
+        }
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          loading();
+          console.log(error);
+        }
+      );
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+        });
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getDetail(this.form.id).then((res) => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query)
+      ).then((res) => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+      });
+    },
+  },
+};
+</script>
+
+<style></style>