公示墙展示地址调整

.env.development

@@ -1,8 +1,10 @@
 VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
 #VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
-#手机版
-VUE_APP_COMPANY_HEALTH_WECHAT_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
-#企业版
+#手机企业版
+VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
+#手机校园版
+VUE_APP_COMPANY_HEALTH_WECHAT_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd.html
+#大屏企业版
 VUE_APP_COMPANY_HEALTH_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
-#校园版
-VUE_APP_COMPANY_HEALTH_XXD_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html
+#大屏校园版
+VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html

.env.production

@@ -1,9 +1,11 @@
 VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
 VUE_APP_IMAGE_URL=http://wisdomhouseadmin.sudaonline.net
 #VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
-#手机版
-VUE_APP_COMPANY_HEALTH_WECHAT_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
-#企业版
+#手机企业版
+VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
+#手机校园版
+VUE_APP_COMPANY_HEALTH_WECHAT_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd.html
+#大屏企业版
 VUE_APP_COMPANY_HEALTH_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
-#校园版
-VUE_APP_COMPANY_HEALTH_XXD_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html
+#大屏校园版
+VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html

src/views/Home.vue

@@ -78,6 +78,7 @@
 <script>
 import Constant from "@/constant";
 import workAttendanceApi from "@/api/business/workAttendance";
+import companyInfoApi from "@/api/base/companyInfo";
 import userApi from "@/api/sys/user";
 
 import "nprogress/nprogress.css"; // progress bar style
@@ -181,11 +182,33 @@ export default {
     },
     openView() {
       var companyId = this.user.companyId;
+      //默认企业版
       var qrtext =
-        process.env.VUE_APP_COMPANY_HEALTH_QY_URL +
-        "?companyId=" +
-        companyId;
-      window.open(qrtext);
+        process.env.VUE_APP_COMPANY_HEALTH_QY_URL + "?companyId=" + companyId;
+
+      companyInfoApi.edit(companyId).then(function(response) {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          var dpUrl = jsonData.data.wallUrl;
+          if (dpUrl == "" || dpUrl == null) {
+            if ("2" == jsonData.data.type) {
+              qrtext =
+                process.env.VUE_APP_COMPANY_HEALTH_XY_URL +
+                "?companyId=" +
+                companyId;
+            }
+          } else {
+            //填写了固定地址wallUrl
+            qrtext = dpUrl + "?companyId=" + companyId;
+          }
+
+          window.open(qrtext);
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      });
     }
   },
   async mounted() {
@@ -223,7 +246,7 @@ export default {
       //day
     });
 
-    userApi.userInfo().then(resp => {
+    await userApi.userInfo().then(resp => {
       if (resp.data.result) {
         this.user = resp.data.data;
       }

src/views/base/companyInfo-list.vue

@@ -106,8 +106,7 @@
               >
                 <div :ref="'qrcode_' + row.id" style="width:300px;height:300px;"></div>
                 <el-link type="primary" :underline="false" slot="reference">健康公示二维码</el-link>
-              </el-popover>
-              -
+              </el-popover>-
               <span v-if="row.type != null && row.type != ''">
                 <el-link type="primary" :underline="false" @click="openDP(row)">大屏网址</el-link>
               </span>
@@ -421,13 +420,28 @@ export default {
       this.showDeviceModal = true;
     },
     openQRCode(record) {
-
       //el.innerHTML = "";
       var self = this;
+      self.$refs["qrcode_" + record.id].innerHTML = "";
+      //默认企业版
       var qrtext =
-        process.env.VUE_APP_COMPANY_HEALTH_WECHAT_URL +
+        process.env.VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL +
         "?companyId=" +
         record.id;
+      var type = record.type;
+      if ("1" == type) {
+        //企业版
+        qrtext =
+          process.env.VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL +
+          "?companyId=" +
+          record.id;
+      } else if ("2" == type) {
+        //校园版
+        qrtext =
+          process.env.VUE_APP_COMPANY_HEALTH_WECHAT_XY_URL +
+          "?companyId=" +
+          record.id;
+      }
 
       var el = self.$refs["qrcode_" + record.id];
 
@@ -457,7 +471,7 @@ export default {
         } else if ("2" == type) {
           //校园版
           dpUrl =
-            process.env.VUE_APP_COMPANY_HEALTH_XXD_URL +
+            process.env.VUE_APP_COMPANY_HEALTH_XY_URL +
             "?companyId=" +
             companyId;
         } else {

src/views/base/personInfo-detail.vue

@@ -270,13 +270,6 @@ export default {
     };
   },
   created() {
-    var formData = new FormData();
-    formData.append("catalogName", "用户身份");
-    dataDictionaryApi.findByCatalogName(formData).then(response => {
-      var jsonData = response.data;
-      this.popedomList = jsonData.data;
-    });
-
     this.loadTree();
   },
   methods: {
@@ -431,6 +424,17 @@ export default {
               self.formModel.wechatNoticeEnabled = true;
             }
           }
+
+          var formData = new FormData();
+          if (self.formModel.companyType == "2") {
+            formData.append("catalogName", "学校身份");
+          } else {
+            formData.append("catalogName", "用户身份");
+          }
+          dataDictionaryApi.findByCatalogName(formData).then(response => {
+            var jsonData = response.data;
+            this.popedomList = jsonData.data;
+          });
         } else {
           self.$message.error(jsonData.message + "");
         }

src/views/base/personInfo-list.vue

@@ -216,10 +216,11 @@
         <template slot-scope="{row}">
           <el-row>
             <el-col :span="10" v-if="row.popedom.indexOf('1')!= -1">个人用户</el-col>
-            <el-col :span="10" v-if="row.popedom.indexOf('2')!= -1">单位管理员</el-col>
+            <el-col :span="10" v-if="row.popedom.indexOf('2')!= -1 && row.companyType == 1">单位管理员</el-col>
+            <el-col :span="10" v-if="row.popedom.indexOf('2')!= -1 && row.companyType == 2">班主任</el-col>
             <el-col :span="10" v-if="row.popedom.indexOf('3')!= -1">监管专员</el-col>
           </el-row>
-        </template>
+        </template> 
       </el-table-column>
       <el-table-column label="人脸授权">
         <template slot-scope="{row}">