授权正式版

heyujie

2022-01-28 ea05b9be825899d4c86d131fb9a38ad58f078fa5

授权正式版

 src/api/system.ts

@@ -471,6 +471,13 @@
    data: qs.stringify(data)
  })
}
export const activeByOrder = (data: any) => {
  return request({
    url: "/version/auth/shop/activeByOrder",
    method: "post",
    data: qs.stringify(data)
  })
}
export const getShopOrderList = (data: any) => {
  return request({
    url: "/version/auth/shop/getOrderList",

 src/pages/desktop/index/components/Desktop.vue

@@ -82,30 +82,33 @@
          <el-button type="primary" @click="loginShop">确定</el-button>
        </span>
      </el-dialog>
      <div class="ver"><span class="ver-text">版本：</span>{{ version }}</div>
      <div class="ver">
        <span class="ver-text">版本：</span>{{ versionName }}
      </div>
      <div class="ver">
        <span class="ver-text">状态：</span>{{ versionState }}
      </div>
      <el-divider></el-divider>
      <div class="info">
      <div class="info" v-if="versionName=='SmartAI正式版'">
        如果您已连接到Internet并且已购买产品密钥，可以尝试验证SmartAI商城账户激活系统。
        <div>
        <div class="margin-top:10px;">
          <el-button type="primary" @click="innerVisible = true">
            账户激活
          </el-button>
        </div>
      </div>
      <div class="info">
      <div class="info" v-if="versionName=='SmartAI正式版'">
        如果您未连接Internet或激活失败，可尝试离线激活，使用手机扫码购买产品或验证SmartAI商城账户激活系统。
        <!-- <a href="http://apps.smartai.com" target="_blank"
      </div>
      <div class="info" v-if="versionName!=='SmartAI正式版'">
        如果还没有产品密钥，你可以使用手机扫码或前往此链接
        <a href="http://apps.smartai.com" target="_blank"
          >http://apps.smartai.com</a
        >
        如果还没有产品密钥，你可以使用手机扫码或前往此链接
        购买。 -->
        购买。
      </div>
      <img class="qr-code-img" src="/version/offline/qrcode" />
      <el-divider></el-divider>

      <div class="ask">
        如果你具有SmartAI提供的产品密钥，请在此处输入激活SmartAI。
      </div>
@@ -133,10 +136,10 @@
      </div>

      <span slot="footer" class="dialog-footer">
        <el-button v-if="!snExpire" @click="activeDialog = false"
        <el-button v-if="!snExpire && versionName!='SmartAI正式版'" @click="activeDialog = false"
          >继续试用</el-button
        >
        <el-button v-else @click="quit">退出登录</el-button>
        <el-button v-if="snExpire && versionName!='SmartAI正式版'"  @click="$emit('quit')">退出登录</el-button>
        <el-button type="primary" @click="activateVersion">激活</el-button>
      </span>
    </el-dialog>
@@ -156,45 +159,48 @@
      </div>

      <div class="order-list">
        <div class="order-card">
        <div class="wrap" style="    margin: 0 5px;" v-for="(item, index) in orderList" :key="index">
          <div class="order-card" v-for="(prod, i) in item.products" :key="i">
          <div class="head">
            <el-checkbox v-model="checked">
              <span>订单ID：{{ 22322323423 }}</span>
            <el-checkbox v-model="checked" @change="choseProd(item,prod)">
              <span>订单ID：{{ item.id }}</span>
            </el-checkbox>

            <span>￥{{ 111 }} 元</span>
            <span>{{ item.orderMoney }} 元</span>
          </div>
          <div class="desc">
            <div>系统版本：{{ 22322323423 }}</div>
            <div>通道数量：{{ 22322323423 }}</div>
            <div>摄像机数量：{{ 22322323423 }}</div>
            <div>服务时长：{{ 22322323423 }}</div>
            <div>系统版本：{{ prod.edition }}</div>
            <div>通道数量：{{ prod.ChCount }}</div>
            <div>摄像机数量：{{ prod.cameraCount }}</div>
            <div>服务时长：{{ prod.serveYear }} 年</div>

          </div>
        </div>

        <div class="order-card">
        </div>
        <!-- <div class="order-card" v-for="(item, index) in orderList" :key="index">
          <div class="head">
            <el-checkbox v-model="checked">
              <span>订单ID：{{ 31423233423 }}</span>
              <span>订单ID：{{ item.id }}</span>
            </el-checkbox>

            <span>￥{{ 111 }} 元</span>
            <span>￥{{ item.orderMoney }} 元</span>
          </div>
          <div class="desc">
            <div>系统版本：{{ 22322323423 }}</div>
            <div>通道数量：{{ 22322323423 }}</div>
            <div>摄像机数量：{{ 22322323423 }}</div>
            <div>服务时长：{{ 22322323423 }}</div>
            <div>系统版本：{{ item.products[0]&&item.products[0].productVersion }}</div>
            <div>通道数量：{{ item.products[0]&&item.products[0].ChCount }}</div>
            <div>摄像机数量：{{ item.products[0]&&item.products[0].cameraCount }}</div>
            <div>服务时长：{{ item.products[0]&&item.products[0].serveYear }} 年</div>

          </div>
        </div>
        </div> -->
      </div>

      <span slot="footer" class="dialog-footer">
        <el-button v-if="!snExpire" @click="activeDialog = false"
        <!-- <el-button v-if="!snExpire" @click="activeDialog = false"
          >取消激活</el-button
        >
        <el-button v-else @click="quit">退出登录</el-button>
        <el-button type="primary" @click="activateVersion">激活</el-button>
        > -->
        <el-button  @click="$emit('quit')">退出登录</el-button>
        <el-button type="primary" @click="activeVerByOrd">激活</el-button>
      </span>
    </el-dialog>
  </div>
@@ -210,7 +216,8 @@
  activateVersion,
  uploadKey,
  getSmsCode,
  loginShopInSmart,getShopOrderList,
  loginShopInSmart,
  getShopOrderList,activeByOrder,
} from "@/api/system";
export default {
  name: "Desktop",
@@ -221,25 +228,28 @@
  data() {
    return {
      showFreeVersion: false,
      activeDialog: false, 
      activeDialog: false,
      countdown: 60,
      innerDialog: false,
      version: "SmartAI试用版",
      versionName: "",
      codeMsg: "获取验证码",
      versionState: "尚未激活",
      secrectKey: "",
      curOrder:{},
      curProd:{},
      codeDisabled: false,
      innerVisible: false,
      snExpire: false,
      timer: null,token: "",
      timer: null,
      token: "",orderList:[],
      phone: {
        phoneNum: "",
        verifyCode: "",
      },
      phoneCodeRule: {
        phoneNum: [{ validator: isPhone, trigger: "change" }],
        phoneNum: [{ validator: isPhone, trigger: "blur" }],
        verifyCode: [
          { required: true, message: "请输入验证码", trigger: "change" },
          { required: true, message: "请输入验证码", trigger: "blur" },
        ],
      },
    };
@@ -248,13 +258,22 @@
    this.validateSn();
  },
  methods: {
    quit() {
      this.$emit("quit");
    activeVerByOrd(){
      activeByOrder({
        token:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NDMzODUzNjgsInVzZXIiOiJ7XCJpZFwiOlwiZTZjY2QzNmQtNGYxNi00NmZjLTg4ZDUtMDczNjU4NjZkMjA1XCIsXCJwZXJtaXNzaW9uc1wiOltcInByb2R1Y3RDZW50ZXI6dmlld1wiLFwib3JkZXJNYW5nZTpjYW5jZWxcIixcImRldmljZU1hbmFnZTp2aWV3XCIsXCJwcm9kdWN0TWFuZ2U6ZWRpdFwiLFwiY29kZU1hbmdlOmFkZFwiLFwibG9nTWFuYWdlXCIsXCJkaWNNYW5hZ2VcIixcIm9yZGVyTWFuZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpwYXlcIixcIm9yZGVyTWFuZ2U6ZG93bmxvYWRcIixcInByb2R1Y3RDZW50ZXJcIixcImFwcE1hbmFnZVwiLFwicHJvZHVjdE1hbmdlOmFkZFwiLFwicHJvZHVjdE1hbmdlOnZpZXdcIixcInZpcE1hbmFnZVwiLFwiYXBpXCIsXCJ2aXBNYW5hZ2U6YWRkXCIsXCJhZG1pbk1hbmFnZVwiLFwicHJvZHVjdE1hbmdlXCIsXCJwcm9kdWN0Q2VudGVyOmRvd25sb2FkXCIsXCJhZG1pbk1hbmFnZTphZGRcIixcInByb2R1Y3RDZW50ZXI6YnV5XCIsXCJzZGtNYW5hZ2VcIixcImRldmljZU1hbmFnZTphZGRcIixcImNvZGVNYW5nZVwiLFwiYWRtaW5NYW5hZ2U6dmlld1wiLFwidmlwTWFuYWdlOmVkaXRcIixcImNvZGVNYW5nZTp2aWV3XCIsXCJkZXZpY2VNYW5hZ2VcIixcImhvbWVcIixcInByb2R1Y3RNYW5nZTpwdWJsaXNoXCIsXCJkZXZpY2VNYW5hZ2U6dW5iaW5kXCIsXCJ2aXBNYW5hZ2U6dmlld1wiLFwib3JkZXJNYW5nZVwiLFwicHJvZHVjdE1hbmdlOm9mZlNhbGVcIixcImFkbWluTWFuYWdlOmVkaXRcIl0sXCJ1c2VybmFtZVwiOlwiYmFzaWNcIn0ifQ.WVdowrEmEmIrZUhELckbNGBzwwaHOD9UgvB0Ki1Jbe0",
        activateCode:this.curProd.activateCode,
        productId:this.curProd.productId,
        orderId:this.curOrder.id
      }).then((res) => {
        debugger
      })
    },
    validateSn() {
      getSN().then((res) => {
        this.snExpire = res.data.expire;
        this.showFreeVersion = res.data.sn == "" || res.data.expire;
        this.versionName = this.getVersionName('official');
        // this.versionName = this.getVersionName(res.data.edition);
      });
    },
    getValidStr() {
@@ -271,13 +290,37 @@
        }
      }
    },
    choseProd(order,prod){
      debugger
      this.curOrder= order
      this.curProd=prod
    },
    getVersionName(s) {
      switch (s) {
        case "alpha":
          return "SmartAI内测版";
        case "beta":
          return "SmartAI公测版";
        case "trial":
          return "SmartAI试用版";
        case "test":
          return "SmartAI测试版";
        case "official":
          return "SmartAI正式版";
        default:
          return "SmartAI定制版";
          break;
      }
    },
    loginShop() {
      // this.innerDialog = true
      //   this.activeDialog=false
      getShopOrderList({token:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NDMyMTYyODMsInVzZXIiOiJ7XCJpZFwiOlwiZTZjY2QzNmQtNGYxNi00NmZjLTg4ZDUtMDczNjU4NjZkMjA1XCIsXCJwZXJtaXNzaW9uc1wiOltcIm9yZGVyTWFuZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpjYW5jZWxcIixcImRldmljZU1hbmFnZTp2aWV3XCIsXCJhZG1pbk1hbmFnZTphZGRcIixcImRldmljZU1hbmFnZTphZGRcIixcImFkbWluTWFuYWdlOmVkaXRcIixcImNvZGVNYW5nZTp2aWV3XCIsXCJjb2RlTWFuZ2U6YWRkXCIsXCJkZXZpY2VNYW5hZ2U6dW5iaW5kXCIsXCJvcmRlck1hbmdlXCIsXCJwcm9kdWN0Q2VudGVyXCIsXCJ2aXBNYW5hZ2VcIixcImRpY01hbmFnZVwiLFwicHJvZHVjdENlbnRlcjp2aWV3XCIsXCJvcmRlck1hbmdlOnBheVwiLFwibG9nTWFuYWdlXCIsXCJkZXZpY2VNYW5hZ2VcIixcImFkbWluTWFuYWdlXCIsXCJwcm9kdWN0TWFuZ2VcIixcInZpcE1hbmFnZTplZGl0XCIsXCJjb2RlTWFuZ2VcIixcInByb2R1Y3RDZW50ZXI6YnV5XCIsXCJwcm9kdWN0TWFuZ2U6dmlld1wiLFwic2RrTWFuYWdlXCIsXCJob21lXCIsXCJwcm9kdWN0Q2VudGVyOmRvd25sb2FkXCIsXCJwcm9kdWN0TWFuZ2U6b2ZmU2FsZVwiLFwiYWRtaW5NYW5hZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpkb3dubG9hZFwiLFwicHJvZHVjdE1hbmdlOmFkZFwiLFwidmlwTWFuYWdlOmFkZFwiLFwiYXBwTWFuYWdlXCIsXCJ2aXBNYW5hZ2U6dmlld1wiLFwicHJvZHVjdE1hbmdlOmVkaXRcIixcImFwaVwiLFwicHJvZHVjdE1hbmdlOnB1Ymxpc2hcIl0sXCJ1c2VybmFtZVwiOlwiYmFzaWNcIn0ifQ.DaTOv8pnh8kG1TPtuNVSo2qPc2z9wGxl2cMZtJ8iwo0"}).then((res) => {
              debugger
              res.data
            })
      this.innerDialog = true
        this.activeDialog=false
      getShopOrderList({
        token:
          "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NDMzODUzNjgsInVzZXIiOiJ7XCJpZFwiOlwiZTZjY2QzNmQtNGYxNi00NmZjLTg4ZDUtMDczNjU4NjZkMjA1XCIsXCJwZXJtaXNzaW9uc1wiOltcInByb2R1Y3RDZW50ZXI6dmlld1wiLFwib3JkZXJNYW5nZTpjYW5jZWxcIixcImRldmljZU1hbmFnZTp2aWV3XCIsXCJwcm9kdWN0TWFuZ2U6ZWRpdFwiLFwiY29kZU1hbmdlOmFkZFwiLFwibG9nTWFuYWdlXCIsXCJkaWNNYW5hZ2VcIixcIm9yZGVyTWFuZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpwYXlcIixcIm9yZGVyTWFuZ2U6ZG93bmxvYWRcIixcInByb2R1Y3RDZW50ZXJcIixcImFwcE1hbmFnZVwiLFwicHJvZHVjdE1hbmdlOmFkZFwiLFwicHJvZHVjdE1hbmdlOnZpZXdcIixcInZpcE1hbmFnZVwiLFwiYXBpXCIsXCJ2aXBNYW5hZ2U6YWRkXCIsXCJhZG1pbk1hbmFnZVwiLFwicHJvZHVjdE1hbmdlXCIsXCJwcm9kdWN0Q2VudGVyOmRvd25sb2FkXCIsXCJhZG1pbk1hbmFnZTphZGRcIixcInByb2R1Y3RDZW50ZXI6YnV5XCIsXCJzZGtNYW5hZ2VcIixcImRldmljZU1hbmFnZTphZGRcIixcImNvZGVNYW5nZVwiLFwiYWRtaW5NYW5hZ2U6dmlld1wiLFwidmlwTWFuYWdlOmVkaXRcIixcImNvZGVNYW5nZTp2aWV3XCIsXCJkZXZpY2VNYW5hZ2VcIixcImhvbWVcIixcInByb2R1Y3RNYW5nZTpwdWJsaXNoXCIsXCJkZXZpY2VNYW5hZ2U6dW5iaW5kXCIsXCJ2aXBNYW5hZ2U6dmlld1wiLFwib3JkZXJNYW5nZVwiLFwicHJvZHVjdE1hbmdlOm9mZlNhbGVcIixcImFkbWluTWFuYWdlOmVkaXRcIl0sXCJ1c2VybmFtZVwiOlwiYmFzaWNcIn0ifQ.WVdowrEmEmIrZUhELckbNGBzwwaHOD9UgvB0Ki1Jbe0",
      }).then((res) => {
        this.orderList=res.data.list
      });
      // this.$refs["phoneLogin"].validate((valid) => {
      //   if (valid) {

@@ -299,12 +342,10 @@
      //   }
      // });
    },
    cancelLogin(){
      this.innerVisible= false
    cancelLogin() {
      this.innerVisible = false;
    },
    // 获取验证码
    getCode() {
      // 验证码60秒倒计时
      var pattern = /^1[345789]\d{9}$/;
      if (this.phone.phoneNum == "") {
        this.$refs["phoneLogin"].fields[0].validateMessage = "请输入手机号";
@@ -490,7 +531,8 @@
  }
  .order-list {
    margin: 20px 0;

    height: 550px;
    overflow-y: auto;
    .order-card {
      height: 150px;
      background: #fff;
@@ -522,7 +564,7 @@
  }
}
.warn-tag {
  width: 640px;
  width: 650px;
  text-align: left;
  box-sizing: border-box;
  padding: 0 25px;
@@ -533,7 +575,7 @@
  display: flex;
  justify-content: space-between;
  top: 55px;
  left: calc(50% - 320px);
  left: calc(50% - 325px);
  line-height: 45px;
  border-radius: 5px;
  .go-to {
@@ -541,10 +583,10 @@
    cursor: pointer;
    text-decoration: underline;
    font-weight: 600;
    font-size: 13px;
    font-size: 14px;
  }
  .text {
    font-size: 13px;
    font-size: 14px;
  }
  .icon {
    font-size: 14px;

 src/pages/library/components/addBase.vue

@@ -344,7 +344,6 @@
              enabled: this.form.enabled,
              tableDesc: this.form.tableDesc,
              analyServerId: this.type,
              // isSync: this.form.isSync,
            })
              .then((res) => {
                this.$notify({
@@ -353,6 +352,7 @@
                  type: "success",
                });
                this.$emit("refresh");
                this.$emit("closeAdd");
              })
              .catch((err) => {
                this.$notify({

 src/pages/library/components/baseList.vue

@@ -9,7 +9,12 @@
          <img v-if="title === '同步库'" src="/images/library/同步库2.png" alt="" srcset="">
          <img v-else src="/images/library/本地库2.png" alt="" srcset="">
          <span class="m5">{{ title }}</span>
          <span
          <el-tooltip
            content="添加同步库"
            placement="top"
          >
            <!-- popper-class="atooltip" -->
              <span
            class="iconfont icontianjiaku-09"
            style="
              font-size: 22px;
@@ -20,6 +25,8 @@
            @click.stop="add('sync')"
            v-if="isShow('library:set')"
          ></span>
          </el-tooltip>
       
        
        </template>
        <div class="max-height">
@@ -82,7 +89,12 @@
        <template slot="title">
          <img src="/images/library/本地库2.png" alt="" srcset="">
          <span class="m5">{{ titleB }}</span>
          <span
          <el-tooltip
            content="添加同步库"
            placement="top"
           
          >
              <span
            class="iconfont icontianjiaku-09"
            style="
              font-size: 22px;
@@ -93,6 +105,8 @@
            @click.stop="add('local')"
            v-if="isShow('library:set')"
          ></span>
          </el-tooltip>
        
        </template>
        <div class="max-height">
          <el-row
@@ -320,6 +334,9 @@
}
.out-div {
  max-height: 100%;    height: 100%;
  .el-collapse-item__header{
    position:relative;
  }
  .el-collapse-item__wrap {
    will-change: height;
    background-color: #fff;

 src/pages/library/components/personList.vue

@@ -623,14 +623,14 @@
          class="cancel-btn"
          @click="handleClose"
          type="info"
          >取 消</el-button
          >取消</el-button
        >
        <el-button
          size="small"
          class="sure-btn"
          type="primary"
          @click="submit()"
          >确 定</el-button
          @click="submit"
          >确定</el-button
        >
      </div>
    </el-drawer>
@@ -870,13 +870,23 @@
} from "@/api/baseLibrary";
import { getCameraFaceData } from "@/api/es";
// import { checkIDCard } from "@/api/utils";
import { isIDCard, isPhone } from "../../../scripts/validate";
import { isIDCard } from "../../../scripts/validate";

import axios from "axios";
import UploadBtn from "./upload";
import fTemplate from "@/components/fTemplate";
import UploadIcon from "@/components/searching/UploadIcon.vue";

function isPhone(rule, value, callback) {
      if (!value) {
        return callback();
      } else if (value.trim()) {
        var pattern = /^1[345789]\d{9}$/;
        if (pattern.test(value)) {
          return callback();
        }
        return callback(new Error("输入的手机号错误"));
      }
    }
Date.prototype.Format = function (fmt) {
  var o = {
    "M+": this.getMonth() + 1, //月份
@@ -1173,7 +1183,6 @@
      this.getPersonList();
    },
    editRow(row) {
      debugger;
      this.inputPersonForm = { ...row };
      this.showInfoDrawer = true;
    },
@@ -1184,6 +1193,7 @@
          delete json["compareScore"];
          let res = await updateBasePerson(json);
          if (res.success) {
            this.getPersonList()
            this.$notify.success("人员修改成功！");
            this.showInfoDrawer = false;
          } else {
@@ -1194,14 +1204,6 @@
        }
      });
    },
    // confirm() {
    //   this.$confirm({
    //     title: "Confirm",
    //     content: "Bla bla ...",
    //     okText: "确认",
    //     cancelText: "取消",
    //   });
    // },
    async enable(item) {
      let res = await updateBasePerson({
        id: item.id,

 src/scripts/validate.ts

@@ -58,6 +58,9 @@
}

export function isIDCard(rule, idcode, callback) {
  if (idcode==""||idcode===undefined) {
    return callback()
  }
  var weight_factor = [7,9,10,5,8,4,2,1,6,3,7,9,10,5,8,4,2];
  var check_code = ['1', '0', 'X' , '9', '8', '7', '6', '5', '4', '3', '2'];