Merge branch 'dev-learning-report-0627' into 'release'

Dev learning report 0627



See merge request !64

src/style/common.scss

@@ -231,3 +231,8 @@ html,body{
 .el-breadcrumb__inner.is-link:hover {
     color: #449284 !important;
 }
+
+.el-radio-button__orig-radio:checked+.el-radio-button__inner {
+    background-color: #449284 !important;
+    border-color: #449284 !important;
+}
\ No newline at end of file

src/utils/env-config.js

@@ -11,7 +11,8 @@ export const envConfig = {
     // baseUrl: 'http://10.177.15.150:10401/',
     // baseUrl: 'http://10.177.15.150:11905/',
     // baseUrl: 'https://dev-sc.yunqueyi.com/',
-    baseUrl: 'https://test1-sc.yunqueyi.com/',
+    // baseUrl: 'https://test1-sc.yunqueyi.com/',
+    baseUrl: 'https://uat-sc.yunqueyi.com/',
     apiUrl: 'https://dev-api.yunqueyi.com/',
     qiniuFileUrl: "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
@@ -27,7 +28,8 @@ export const envConfig = {
     // reportUrl: 'http://10.177.15.150:10401/',
     // reportUrl: 'http://192.168.140.13:10401/',
     // reportUrl: 'https://dev-sc-report.yunqueyi.com/',
-    reportUrl: 'https://test1-sc-report.yunqueyi.com/',
+    // reportUrl: 'https://test1-sc-report.yunqueyi.com/',
+    reportUrl: 'https://uat-sc-report.yunqueyi.com/',
   },
   dev: {
     baseUrl: 'https://dev-sc.yunqueyi.com/',

src/utils/fetch.js

@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = 'E5F82EDD958941C29BCDDDED410ACDB3';
+      config.headers['token'] = '6F0F3B3F0EB24A14AA025FA47CD43770';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/utils/operation.js

@@ -336,7 +336,8 @@ export function getPicOption(title, legendData, colorData, seriesData) {
   let option = {
     title: {
       text: title,
-      x: "center"
+      x: "center",
+      top: "3%",
     },
     tooltip: {
       trigger: 'item',
@@ -344,17 +345,24 @@ export function getPicOption(title, legendData, colorData, seriesData) {
     },
     legend: {
       orient: "vertical",
+      top: "3%",
       left: "left",
       data: legendData
     },
+    grid: {
+      left: "30%",
+      right: "0%",
+      bottom: "10%",
+      containLabel: true
+    },
     color: colorData,
     backgroundColor: '#F3F3F3',
     series: [
       {
         name: "",
         type: "pie",
-        // radius: "55%",
-        center: ["50%", "60%"],
+        radius: "55%",
+        center: ["50%", "65%"],
         data: seriesData,
       }
     ]
@@ -365,7 +373,8 @@ export function getBarOption(xAxisData, seriesData) {
   let option = {
     title: {
       text: "用户年龄发布",
-      x: "center"
+      x: "center",
+      top: "3%",
     },
     color: ['#3398DB'],
     backgroundColor: '#F3F3F3',

src/views/learning/export-download.vue

@@ -91,9 +91,12 @@ export default {
         if (vm.tableData[i].status == 1) {
           vm.tableData[i].buttonText = "下载";
           vm.tableData[i].buttonStatus = false;
-        } else {
+        } else if(vm.tableData[i].status == 0) {
           vm.tableData[i].buttonText = "刷新";
           vm.tableData[i].buttonStatus = false;
+        } else if(vm.tableData[i].status == 2) {
+          vm.tableData[i].buttonText = "刷新";
+          vm.tableData[i].buttonStatus = true;
         }
       }
     },

src/views/learning/item-crowd-analysis.vue

@@ -261,6 +261,7 @@ export default {
   .crowd-radio {
     position: relative;
     left: 50%;
+    margin-top: 25px;
     margin-left: -119px;
     .is-active {
       .el-radio-button__inner {
@@ -291,7 +292,8 @@ export default {
       border: 1px solid #dedede;
       .title {
         position: relative;
-        margin: 10px auto;
+        margin: 15px auto 10px auto;
+        font-size: 18px;
         text-align: center;
         font-weight: bold;
       }

src/views/learning/item-list.vue

@@ -206,6 +206,7 @@ export default {
       dialogVisible: false,
       dialogUpdate: false,
       displayExam: 2,
+      flag: 1,
     };
   },
   computed: {
@@ -219,17 +220,19 @@ export default {
   created() {
     vm = this;
     this.projectId = vm.getUrlSearch(window.location.href, "id");
+    this.projectName = vm.getUrlSearch(window.location.href, "projectName");
     this.curmbThird = vm.getUrlSearch(window.location.href, "projectName");
     this.getDisplay();
-    this.getRegionOption();
+    // this.getRegionOption();
   },
   mounted: function() {
     commonUtil.resizeHeight();
   },
   methods: {
-    getDisplay() {
+    getDisplay(type) {
       let req = {
         projectId: vm.projectId,
+        projectName: vm.projectName,
       };
       openLoading(vm);
       vm.reportGET("report/portal/display", req).then(res => {
@@ -239,6 +242,10 @@ export default {
           vm.showOriginal = res.data.status;
           vm.roleType = res.data.roleType;
           vm.displayExam = res.data.existExam;
+          vm.flag = res.data.flag;
+        }
+        if(type !=2) {
+          vm.getRegionOption();
         }
       });
     },
@@ -354,19 +361,21 @@ export default {
     },
     //获取地区
     getRegionOption() {
-      // this.optionsRegion = operationData.getRegionOption();
-
-      let req = {};
-      openLoading(vm);
-      vm.GET("basic-data/position/provinces", req).then(res => {
-        closeLoading(vm);
-        if (res.code == "000000") {
-          this.optionsRegion = operationData.setRegionOption(
-            res.data.provinceList
-          );
-          // console.log("this.optionsRegion", this.optionsRegion);
-        }
-      });
+      if(vm.flag == 2 && vm.roleType == "L1") {
+         this.optionsRegion = [{id: 11, provinceId: 330, provinceName: "浙江省",value: 330, label: "浙江省"}]
+      } else {
+        let req = {};
+        openLoading(vm);
+        vm.GET("basic-data/position/provinces", req).then(res => {
+          closeLoading(vm);
+          if (res.code == "000000") {
+            this.optionsRegion = operationData.setRegionOption(
+              res.data.provinceList
+            );
+            // console.log("this.optionsRegion", this.optionsRegion);
+          }
+        });
+      }
     },
     getOrganizationList() {
       this.organizationList = [
@@ -418,6 +427,7 @@ export default {
     },
     closeSearch() {
       vm.dialogUpdate = false;
+      vm.getDisplay(2);
       vm.search();
     },
     search() {