Merge branch 'http_mock' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_mock

src/utils/crypto-js.js

@@ -5,8 +5,8 @@ const key = CryptoJS.enc.Utf8.parse('zh#2020#key#331#') // 十六位十六进制
 // 加密方法
 export function Encrypt() {
   const token = 'zh#2020#token#331#' + Date.parse(new Date()) / 1000
-  var srcs = CryptoJS.enc.Utf8.parse(token)
-  var encrypted = CryptoJS.AES.encrypt(srcs, key, {
+  const srcs = CryptoJS.enc.Utf8.parse(token)
+  const encrypted = CryptoJS.AES.encrypt(srcs, key, {
     // iv: iv,
     mode: CryptoJS.mode.ECB,
     padding: CryptoJS.pad.Pkcs7

src/views/projectManage/taskList/versionsCalendar.vue

@@ -2,12 +2,30 @@
   <div style="background-color:#F2F3F6;display:flex;align-items: center;justify-content: center;">
     <el-container>
       <el-header class="bgborder" style=" margin: 1%;display:flex;align-items: center;justify-content: flex-start;">
-        <el-dropdown @command="handleCommand">
+        <!-- <el-dropdown @command="handleCommand">
           <span v-if="typeOpt !== []" class="el-dropdown-link drop_down" style="cursor: pointer;">{{ isCommand === '' ? defaultTypeOpt : clientType }}<i class="el-icon-arrow-down el-icon--right" /></span>
           <el-dropdown-menu v-if="typeOpt !== []" slot="dropdown" align="center">
             <el-dropdown-item v-for="item in typeOpt" :key="item.code" :command="{value:item.code,flag:item,flag2:1}">{{ item.msg }}</el-dropdown-item>
           </el-dropdown-menu>
-        </el-dropdown>
+        </el-dropdown> -->
+        <el-row>
+          <el-col :span="20">
+            <el-select
+              v-model="clientType"
+              size="small"
+              style="padding-left: 2px;"
+              placeholder="请选择"
+              @change="celectClientType"
+            >
+              <el-option
+                v-for="item in typeOpt"
+                :key="item.code"
+                :label="item.msg"
+                :value="item"
+              />
+            </el-select>
+          </el-col>
+        </el-row>
         <!-- <el-dropdown style="margin-left:2%;" @command="handleCommand">
           <span v-if="versionOpt !== []" class="el-dropdown-link drop_down" style="cursor: pointer;">{{ isCommand2 === '' ? defaultVerOpt : versionType }}<i class="el-icon-arrow-down el-icon--right" /></span>
           <el-dropdown-menu v-if="versionOpt !== []" slot="dropdown" align="center">
@@ -278,6 +296,14 @@ export default {
     this.getVersionBytpye(this.isCommand === '' ? 1 : this.isCommand)
   },
   methods: {
+    celectClientType(e) {
+      this.isCommand = e.code
+      this.clientType = e.msg
+      this.getVersionList()
+      this.getVersionBytpye(this.isCommand === '' ? this.typeOpt[0].code : this.isCommand)
+      this.versionOpt = this.versionOpt[0].version
+      this.isCommand2 = ''
+    },
     handleCommand(command) {
       switch (command.flag2) {
         case 1:
@@ -357,6 +383,7 @@ export default {
       showAppClientEnum().then(res => {
         this.typeOpt = res.data.appClient
         this.defaultTypeOpt = this.typeOpt[0].msg
+        this.clientType = this.typeOpt[0].msg
       })
     },
     handelDeleteBiz(ele) {
@@ -589,16 +616,12 @@ export default {
     border-color: #3f9eff !important;
   }
 
-  .bgborder .el-input__inner { border: none; padding: 0px 50px 0px 0px;}
-
   .bgborder .event-item { height:25px !important;line-height: 25px !important; }
 
   .bgborder .el-select .el-input .el-select__caret { color: #333333 !important; }
 
   .bgborder .el-table .el-table__body tr:hover td { color: #409EFF; background: #EEF0F5; font-size: 13px !important;} /*hover时字体, 背景颜色*/
 
-  .bgborder .el-input__icon { width: 77px !important; }
-
   .bgborder .el-link { font-size: 13px !important; }
 
   .el-table .warning-row { background: oldlace; }