修改用户信息

src/request/config.js

@@ -1,5 +1,5 @@
 /**  ----------------角色接口----------------   */
-export const getRoleList = '/web/user/getAllRoleList'
+export const getRoleList = '/web/role/getAllRoleList'
 
 /** ------------------------------------------ */
 

src/view/dispatch/index.vue

@@ -107,6 +107,7 @@
         <span class="oper-span" @click="queryDetail(row)">详情</span>
         <span class="oper-span" @click="archivesHandle(row)">档案</span>
         <span class="oper-span" @click="queryScene(row)">场景</span>
+        <span class="oper-span" v-if="row.vrLink" @click="takeLook(row)">带看</span>
         <template v-if="isTeaching">
           <span class="oper-span" @click="leaveMsgHandle(row)">留言</span>
           <span class="oper-span" 
@@ -127,6 +128,7 @@
           删除
           </span>
         </template>
+
       </el-table-column>
     </el-table>
 
@@ -638,6 +640,9 @@ export default {
         message: items.map(({projectSn}) => projectSn).join(',')+ '已成功从教学项目撤销',
       })
     },
+    takeLook(item){
+      window.open(process.env.VUE_APP_DOMAIN + '/fire-rtc-live.html?m=' + item.sceneNum+'&p_id=' + item.id)
+    },
     queryScene(item) {
       if (!item.vrLink) {
         return this.$message.error('当前火调项目暂未录入场景链接', '提示')

src/view/organization/list.vue

@@ -63,13 +63,18 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="上级组织">
-          <el-cascader
+          <el-cascader  v-if="detailType == '新增'"
             style="width: 100%"
             v-model="superiorValue"
-            :options="superiorOptions"
-            :props="{ expandTrigger: 'hover' }"
+            :options="treedata"
+            :props="{ checkStrictly: true,label:'name',value:'id' }"
             @change="handleChange"
           ></el-cascader>
+           <el-input v-else
+            v-model="detail.parentName"
+            :disabled="true"
+            placeholder="请输入组织名称"
+          ></el-input>
         </el-form-item>
         <el-form-item label="负责人">
           <el-input
@@ -231,7 +236,7 @@ export default {
       console.log(data);
     };
     const submit = async () => {
-      const { name, deptType,leader,phone,remark } = data.detail;
+      const { name, deptType,} = data.detail;
       if (!name) {
         return getApp().$message.error("组织名称不能为空！", "提示");
       } else if (!deptType) {
@@ -239,12 +244,8 @@ export default {
       }
       //校验成功后温馨提示
       let apidata = {
-        name,
-        deptType,
         superior:'sheq',
-        leader,
-        phone,
-        remark,
+        ...data.detail
       }
       let requestApi = addTreeitem
       if(data.detailType == '编辑'){
@@ -257,7 +258,8 @@ export default {
       // data.tipsShow = true;
     };
     const insertProject = (val) => {
-     if(val){
+     console.log('insertProject',val.id);
+     if(val.id){
       data.detailType = '编辑'
       data.detail = {
           ...val
@@ -268,7 +270,8 @@ export default {
       data.show = true;
     };
     const handleChange = (val) => {
-      console.log("点击handleChange", val);
+      console.log("点击handleChange", val,data.superiorValue);
+
     };
     const loadNode = (node, resolve) => {
       if (node.level === 0) {

src/view/user/index.vue

@@ -117,14 +117,15 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="用户角色" class="roleName">
-          <com-role
-            v-model="newData.roleId"
-            style="width: 100%"
-            allText="请选择"
-            hideAll
-            :notDefault="true"
-            :disabled="true"
-          />
+          <el-select v-model="newData.roleId" placeholder="Select">
+            <el-option
+              v-for="item in roleIdOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="用户账号" class="mandatory">
           <el-input