Merge branch 'master' into 跨公司客户接替

.env.prod-cqtyt

@@ -0,0 +1,22 @@
+# 页面标题
+VUE_APP_TITLE =重庆泰医堂
+# 公司名称
+VUE_APP_COMPANY_NAME =泰安高新区泰医堂中医医院有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD =鲁ICP备2025154120号-1
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/cqtyt.jpg
+
+# 生产环境配置
+ENV = 'production'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 1
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -30,6 +30,7 @@
     "build:prod-drk": "vue-cli-service build --mode prod-drk",
     "build:prod-zkzh": "vue-cli-service build --mode prod-zkzh",
     "build:prod-nmgyt": "vue-cli-service build --mode prod-nmgyt",
+    "build:prod-cqtyt": "vue-cli-service build --mode prod-cqtyt",
     "build:prod-bly": "vue-cli-service build --mode prod-bly",
     "build:prod-qdtst": "vue-cli-service build --mode prod-qdtst",
     "build:prod-bjczwh": "vue-cli-service build --mode prod-bjczwh",

src/views/company/companyUser/index.vue

@@ -180,11 +180,6 @@
                 :type="scope.row.isNeedRegisterMember === 1 ? 'success' : 'info'">{{scope.row.isNeedRegisterMember === 1 ? '是' : '否' }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间"  sortable align="center" prop="createTime" width="160">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
           <el-table-column label="允许注册会员" align="center" prop="isNeedRegisterMember" width="80px">
             <template slot-scope="scope">
               <el-tag

src/views/course/courseWatchLog/index.vue

@@ -11,6 +11,16 @@
           />
         </el-select>
       </el-form-item>
+        <el-form-item label="项目" prop="project">
+          <el-select  v-model="queryParams.project" placeholder="请选择项目" clearable size="small" >
+            <el-option
+              v-for="item in projectOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            />
+          </el-select>
+        </el-form-item>
       <el-form-item label="会员昵称" prop="nickName" v-if="queryParams.sendType == 1">
         <el-input
           v-model="queryParams.nickName"
@@ -543,6 +553,7 @@ export default {
       courseLists:[],
       videoList:[],
       logTypeOptions:[],
+      projectOptions:[],
       sendTypeOptions:[{
         dictLabel:"会员",dictValue:'1'
       },
@@ -627,6 +638,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        project: null,
         userId: null,
         nickName: null,
         videoId: null,
@@ -674,6 +686,9 @@ export default {
     this.getDicts("sys_course_watch_log_type").then(response => {
       this.logTypeOptions = response.data;
     });
+    this.getDicts("sys_course_project").then(response => {
+      this.projectOptions = response.data;
+    });
   },
   methods: {
     /**
@@ -890,6 +905,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.sTime = null;
+      this.queryParams.project = null;
       this.queryParams.eTime = null;
       this.queryParams.upSTime = null;
       this.queryParams.upETime = null;

src/views/course/courseWatchLog/watchLog.vue

@@ -11,6 +11,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="项目" prop="project">
+        <el-select  v-model="queryParams.project" placeholder="请选择项目" clearable size="small" >
+          <el-option
+            v-for="item in projectOptions"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="企微账号" prop="qwUserId" v-if="queryParams.sendType == 2">
         <el-select v-model="queryParams.qwUserId" placeholder="企微账号" clearable size="small"
                    @change="updateQwuser()">
@@ -578,6 +588,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      projectOptions:[],
       sendTypeOptions:[{
         dictLabel:"会员",dictValue:'1'
       },
@@ -635,6 +646,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
+        project: null,
         pageSize: 10,
         userId: null,
         videoId: null,
@@ -680,6 +692,9 @@ export default {
     getMyQwUserList().then(response => {
       this.myQwUserList = response.data;
     });
+    this.getDicts("sys_course_project").then(response => {
+      this.projectOptions = response.data;
+    });
   },
   methods: {
 
@@ -871,6 +886,7 @@ export default {
       this.resetForm("queryForm");
       this.queryParams.sTime = null;
       this.queryParams.eTime = null;
+      this.queryParams.project = null;
       this.queryParams.upSTime = null;
       this.queryParams.upETime = null;
       this.queryParams.qecSTime = null;