Browse Source

bug修复

hurixing 2 years ago
parent
commit
531b2975ad

+ 1 - 1
src/layout/components/Navbar.vue

@@ -78,7 +78,7 @@ export default {
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
           if (process.env.NODE_ENV == 'production') {
-            location.href = '/index';
+            location.href = '/hcp';
           } else {
             location.href = '/hcp-dev';
           }

+ 2 - 2
src/utils/request.js

@@ -94,7 +94,7 @@ service.interceptors.response.use(res => {
       MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
         isRelogin.show = false;
         store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          location.href = '/hcp';
         })
       }).catch(() => {
         isRelogin.show = false;
@@ -111,7 +111,7 @@ service.interceptors.response.use(res => {
     MessageBox.confirm('信息已经更改请重新登录', '系统提示', { confirmButtonText: '重新登录', type: 'warning', showCancelButton: false, }).then(() => {
       store.dispatch('LogOut').then(() => {
         if (process.env.NODE_ENV == 'production') {
-          location.href = '/index';
+          location.href = '/hcp';
         } else {
           location.href = '/hcp-dev';
         }

+ 1 - 0
src/views/game/list/index.vue

@@ -88,6 +88,7 @@
       @pagination="getList" />
     <!-- 视频弹框 -->
     <el-dialog title="视频" :visible.sync="videoOpen" width="700px" append-to-body destroy-on-close>
+      {{VideoUrl}}
       <video width="500" v-if="videoOpen" height="270" controls :src="VideoUrl"></video>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="videoOpen = false">关 闭</el-button>

+ 1 - 1
src/views/live/push/index.vue

@@ -9,7 +9,7 @@
           <div class="left_item" v-for="(item, index) in users" :key="index">
             <div class="left_item_left">
               <el-image style="width: 50px; height: 50px; border-radius: 50%; vertical-align: middle;"
-                src="http://oss.dustlee.com/test/2fd25e5ea02c4a00b991c987f109aa3c.png"
+                src="https://yaorongoss.yaorongmedical.com/test/2fd25e5ea02c4a00b991c987f109aa3c.png"
                 fit="fill"></el-image>
             </div>
             <div class="left_item_center">

+ 5 - 4
src/views/patient/list/lookDetail.vue

@@ -327,22 +327,22 @@
         <!-- <el-form-item prop="gameCoverImage" label="游戏封面">
           <el-image style="width: 100px; height: 100px" :src="form.gameCoverImage" fit="fill"></el-image>
         </el-form-item> -->
-        <el-form-item prop="gameLevel" label="当前关卡">
+        <el-form-item prop="gameLevel" label="当前关卡" v-if="form.totalNum != null">
           <el-input-number :min="1" :max="10" v-model.trim="form.gameLevel" placeholder="请输入关卡" maxlength="20" />
         </el-form-item>
-        <el-form-item prop="totalNum" label="关卡总数">
+        <el-form-item prop="totalNum" label="关卡总数" v-if="form.totalNum != null">
           <el-input-number :min="1" :max="10" v-model.trim="form.totalNum" placeholder="请输入关卡总数" maxlength="20" />
         </el-form-item>
         <el-form-item prop="gameDuration" label="关卡时长(分)">
           <el-input-number :min="1" :max="10" v-model.trim="form.gameDuration" placeholder="请输入关卡时长" maxlength="20" />
         </el-form-item>
-        <el-form-item prop="gameType" label="游戏类型">
+        <el-form-item prop="gameType" label="游戏类型" v-if="form.totalNum != null">
           <el-select v-model="form.gameType" placeholder="请选择">
             <el-option v-for="item in dict.type.game_type" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="gameDifficulty" label="游戏难易程度">
+        <el-form-item prop="gameDifficulty" label="游戏难易程度" v-if="form.totalNum != null">
           <el-select v-model="form.gameDifficulty" placeholder="请选择">
             <el-option v-for="item in dict.type.game_difficulty" :key="item.value" :label="item.label"
               :value="item.value">
@@ -648,6 +648,7 @@ export default {
     },
     submit() {
       const data = {
+        gameId: this.form.gameId,
         patientId: this.defaultVal.id,
         gameCode: this.form.gameCode,
         gameDifficultyRate: this.form.gameDifficultyRate,

+ 3 - 2
src/views/system/dept/index.vue

@@ -155,7 +155,8 @@
             </el-row>
             <el-row>
               <el-col>
-                <el-form-item label="企业微信二维码" prop="wxUrl">
+                <el-form-item label="*企业微信二维码" prop="wxUrl">
+                  <label slot="label"><span style="color:red">*</span>企业微信二维码</label>
                   <ImageUpload ref="imgupload" v-if="open" :imgList="form.wxUrl" :paramsData="{ dirName: 'hcp' }"
                     :limit="1" />
                 </el-form-item>
@@ -623,4 +624,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 1 - 1
src/views/system/user/profile/resetPwd.vue

@@ -63,7 +63,7 @@ export default {
             this.$modal.msgSuccess("修改成功");
             this.$store.dispatch('LogOut').then(() => {
               if (process.env.NODE_ENV == 'production') {
-                location.href = '/index';
+                location.href = '/hcp';
               } else {
                 location.href = '/hcp-dev';
               }

+ 21 - 3
src/views/system/version/index.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="app-container">
-    <!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="版本号" prop="versionCode">
+        <el-input v-model="queryParams.versionCode" type="number" placeholder="请输入版本号" clearable size="small"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="版本名称" prop="versionName">
         <el-input v-model="queryParams.versionName" placeholder="请输入版本名称" clearable size="small"
           @keyup.enter.native="handleQuery" />
@@ -9,7 +13,7 @@
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
-    </el-form> -->
+    </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -31,6 +35,11 @@
       </el-table-column>
 
     </el-table>
+
+    <!-- 分页 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.limit"
+      @pagination="getList" />
+
    <!-- 添加或修改机构对话框 -->
     <el-dialog :beforeClose="cancel" :title="title" :visible.sync="open" width="700px" append-to-body destroy-on-close>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
@@ -73,8 +82,12 @@ export default {
       listData: [],
       // 弹出层标题
       title: "",
+      // 总条数
+      total: 0,
       // 查询参数
       queryParams: {
+        page: 1,
+        limit: 10,
       },
       form:{},
       rules:{},
@@ -95,7 +108,7 @@ export default {
     getList() {
       this.loading = true;
       listData(this.queryParams).then(response => {
-        this.listData = response.data
+        this.listData = response.data.records
         this.total = response.data.total;
         this.loading = false;
       });
@@ -116,6 +129,11 @@ export default {
     handleQuery() {
       this.getList();
     },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
     handelAdd(){
       this.form={}
       this.title='添加',