Merge branch 'master' of http://223.75.76.159:9090/xiao547607/smart-community-server-portal

src/api/sys/user.js

@@ -51,10 +51,14 @@ function batchRemove(idList) {
   });
 }
 
+function changeUserPassword(formData) {
+  return request.post(constant.serverUrl + "/sys/user/changeUserPassword", formData);
+}
+
 function userInfo() {
   return request.get(constant.serverUrl + "/userInfo");
 }
 
 export default {
-  login, pageList, create, edit, add, update, remove, batchRemove, userInfo
+  login, pageList, create, edit, add, update, remove, batchRemove, userInfo,changeUserPassword
 }

src/views/base/companyInfo-detail.vue

@@ -71,6 +71,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="大屏网址" prop="wallUrl">
+              <el-input v-model="formModel.wallUrl" placeholder="请输入" style="width:100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="一级位置" prop="position1Name">

src/views/base/companyInfo-list.vue

@@ -368,21 +368,26 @@ export default {
     openDP(record) {
       var companyId = record.id;
       var type = record.type;
-      var dpUrl = "";
-      if ("1" == type) {
-        //企业版
-        dpUrl =
-          process.env.VUE_APP_COMPANY_HEALTH_QY_URL + "?companyId=" + companyId;
-      } else if ("2" == type) {
-        //校园版
-        dpUrl =
-          process.env.VUE_APP_COMPANY_HEALTH_XXD_URL +
-          "?companyId=" +
-          companyId;
-      } else {
-        //企业版
-        dpUrl =
-          process.env.VUE_APP_COMPANY_HEALTH_QY_URL + "?companyId=" + companyId;
+      var dpUrl = record.wallUrl;
+      if(dpUrl == "" || dpUrl == null){
+        if ("1" == type) {
+          //企业版
+          dpUrl =
+            process.env.VUE_APP_COMPANY_HEALTH_QY_URL + "?companyId=" + companyId;
+        } else if ("2" == type) {
+          //校园版
+          dpUrl =
+            process.env.VUE_APP_COMPANY_HEALTH_XXD_URL +
+            "?companyId=" +
+            companyId;
+        } else {
+          //企业版
+          dpUrl =
+            process.env.VUE_APP_COMPANY_HEALTH_QY_URL + "?companyId=" + companyId;
+        }
+      }else{
+        //填写了固定地址wallUrl
+         dpUrl = dpUrl + "?companyId=" + companyId;
       }
       window.open(dpUrl);
     }

src/views/base/personInfo-list.vue

@@ -84,6 +84,9 @@
             <el-option value="0" label="未同步"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="绑定设备名称" prop="derviceName">
+          <el-input type="text" size="mini" v-model="queryModel.derviceName"></el-input>
+        </el-form-item>
       </div>
       <div>
         <el-form-item v-if="position1Show" :label="position1" prop="position1">
@@ -472,7 +475,8 @@ export default {
         position2: "",
         position3: "",
         position4: "",
-        position5: ""
+        position5: "",
+        derviceName:""
       },
       loading: false,
       tableData: [],
@@ -595,6 +599,10 @@ export default {
       formData.append("position4", self.queryModel.position4);
       formData.append("position5", self.queryModel.position5);
 
+      formData.append("derviceName", self.queryModel.derviceName);
+
+      
+
       if (this.field != null) {
         formData.append("field", this.field);
       }

src/views/sys/user-list.vue

@@ -113,6 +113,7 @@
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
           <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+          <el-button size="mini" type="primary" @click="openChangePw(row)">修改密码</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -132,6 +133,23 @@
       :title="modalTitle"
       @close="onDetailModalClose"
     ></user-detail>
+    <el-dialog
+      title="修改密码"
+      :visible.sync="dialogFormVisible"
+      :modal-append-to-body="false"
+      :close-on-click-modal="false"
+      style="width:100%"
+    >
+      <el-form>
+        <el-form-item label="新密码" prop="password">
+          <el-input v-model="newPassword" placeholder="请输入新密码" style="width:50%" show-password></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="changePw">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -165,7 +183,9 @@ export default {
       modalTitle: "",      
       businessKey: "",
       showModal: false,
-      companyResult:""
+      companyResult:"",
+      dialogFormVisible:false,
+      newPassword:""
     };
   },
   methods: {
@@ -301,6 +321,35 @@ export default {
       if(refreshed) {
         this.changePage(this.pageIndex);
       }
+    },
+    openChangePw(record) {
+      var self = this;
+      self.changeId = record.id;
+      self.dialogFormVisible = true;
+    },
+    changePw() {
+      var self = this;
+      var formData = new FormData();
+
+      formData.append("userId",  self.changeId);
+      formData.append("newPwd", self.newPassword);
+
+      userApi.changeUserPassword(formData).then(function(response) {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          self.changePage(self.pageIndex);
+
+          self.dialogFormVisible = false;
+          self.changeId = "";
+          self.newPassword = "";
+
+          self.$message({
+            type: "success",
+            message: "修改成功!"
+          });
+        }
+      });
     }
   },
   mounted: function() {