Browse Source

tree 生产树

tangning 3 years ago
parent
commit
2120d63288

BIN
src/assets/image/pasword.png


+ 2 - 1
src/view/dispatch/index.vue

@@ -649,7 +649,7 @@ export default {
       window.open(process.env.VUE_APP_DOMAIN + '/fire-rtc-live.html?m=' + item.sceneNum+'&p_id=' + item.id)
     },
     queryScene(item) {
-      if (!item.vrLink) {
+      if (!item.sceneNum) {
         return this.$message.error('当前火调项目暂未录入场景链接', '提示')
       } else {
       window.open(process.env.VUE_APP_DOMAIN + '/spc.html?m=' + item.sceneNum)
@@ -769,6 +769,7 @@ export default {
   text-overflow:ellipsis; //溢出用省略号显示
   white-space:nowrap; //溢出不换行
   cursor: pointer;
+  line-height: 25px;
 }
 </style>
 

+ 5 - 2
src/view/organization/list.vue

@@ -70,7 +70,7 @@
             v-if="detailType == '新增'"
             style="width: 100%"
             v-model="superiorValue"
-            :options="treedata"
+            :options="treedatas"
             :props="{ checkStrictly: true, label: 'name', value: 'id' }"
             @change="handleChange"
           ></el-cascader>
@@ -176,6 +176,7 @@ export default {
       treeProps: { children: "children", label: "name" },
       superiorValue: [],
       treedata: [],
+      treedatas:[]
     });
     const seeDetail = (val) => {
       // console.log('seeDetail',getApp().$refs)
@@ -282,8 +283,10 @@ export default {
       }
     };
     const getTreedata = async () => {
-      let res = await axios.get(getTreeselect, {});
+      let ress = await axios.get(getTreeselect, {});
+      let res = await axios.get(getTreeselect, {type:'1'});
       data.treedata = res.data;
+      data.treedatas = ress.data;
       // getApp().$ref.treeBox.setCurrentKey(user.info.id)
     };
     onMounted(async () => {

+ 2 - 1
src/view/system/login.vue

@@ -18,7 +18,8 @@
         <p class="err-info">{{verification.psw}}</p>
         <el-input v-model="form.psw" placeholder="密码" :type="flag?'password':'text'" @keydown.enter="submitClick">
           <template v-slot:suffix>
-              <i class="icon-style" size="20" :class="flag?'el-icon-minus':'el-icon-view'" @click="flag = !flag"></i>
+              <img v-if="flag" @click="flag = !flag" style="width:20px; margin: 15px;" src="@/assets/image/pasword.png" alt="">
+              <i  v-else class="icon-style el-icon-view" size="20"  @click="flag = !flag"></i>
           </template>
         </el-input>
       </el-form-item>

+ 2 - 2
src/view/user/index.vue

@@ -148,8 +148,8 @@
             :type="flag?'password':'text'"
           >
             <template v-slot:suffix>
-                <i class="icon-style" style="marginRight:15px;
-                fontSize:20px;lineHeight:45px" size="20" :class="flag?'el-icon-minus':'el-icon-view'" @click="flag = !flag"></i>
+              <img v-if="flag" @click="flag = !flag" style="width:20px; margin: 10px;" src="@/assets/image/pasword.png" alt="">
+              <i  v-else class="icon-style el-icon-view" style="font-size:20px;margin: 10px;" size="20"  @click="flag = !flag"></i>
             </template>
           </el-input>
         </el-form-item>