Merge pull request '邓洁: 修改bug' (#205) from dengjie into dev

Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/205

src/components/content/airInfo/AirInfo.vue

@@ -6,15 +6,16 @@
         <div class="input-fan"><span>风速</span>{{ windSpeed }}m/s</div>
       </div>
     </div>
-    <item-info
+      <item-info
-        v-for="item in airList"
+          v-for="item in airList"
-        :key="item.equipmentId"
+          :key="item.equipmentId"
-        :wp="item"
+          :wp="item"
-        :icon="item.icon"
+          :icon="item.icon"
-        :name="item.name"
+          :name="item.name"
-        :unit="item.unit"
+          :unit="item.unit"
-        @click="handleOpenAirChart(item)"
+          @click="handleOpenAirChart(item)"
-    />
+      />
+
     <div class="digital-tunnel">
       <el-dialog :close-on-click-modal="false" v-model="isWindSpeedVisited" :title="'风速监控数据'" width="2175px" :modal="false">
         <div class="left-top-icon"></div>
@@ -87,7 +88,7 @@ watch(() => props.list, (now) => {
   })
 }, {deep: true});
 watch(() => props.airData, (now) => {
-  if(now.sensorList===null){
+  if(now.sensorList.length===0){
     airList.value=[]
   }else {
     getAirInfo(now.sensorList)

src/router/index.js

@@ -60,7 +60,7 @@ const routes = [
     }
   },
   {
-    path: '/tunnel/:siteId/:type/:userId',
+    path: '/tunnel/:siteId(\\d+)/:type/:userId(\\d+)',
     name: 'tunnel',
     component: () => import('@/views/tunnel-manage/index.vue'),
     meta: {

src/views/edit/edit.vue

@@ -93,8 +93,8 @@ const handleSave = async () => {
     tunnelName: form.value.tunnelName,
     serialNumber: form.value.serialNumber,
     remarks: form.value.remarks,
-    // constructionLength:form.value.constructionLength,
+    constructionLength:form.value.constructionLength,
-    constructionLength: 500,
+    // constructionLength: 500,
     tunnelLength: form.value.totalLength,
     isDefault: form.value.isDefault,
     modelEquipmentList: await store.getEquipmentList(),

src/views/login/index.vue

@@ -46,8 +46,8 @@ const router = useRouter();
 const authStore = useAuthStore();
 const loginForm = reactive({
   // username: "admin",
-  password: "",
+  password: "123456",
-  username: "",
+  username: "admin",
   // password: "",
   code: "",
   uuid: "",

src/views/site/index.vue

@@ -169,7 +169,11 @@ const getList = () => {
     ...pageInfo
   }).then((res) => {
     total.value = res.data.total;
-    showAddIcon.value = total.value % 6!==0;
+    if(total.value==0){
+
+    }else {
+      showAddIcon.value = total.value % 6!==0;
+    }
     showFirst.value = total.value / pageInfo.pageSize > 1;
     res.data.rows.map(item => {
       if (item.tunnelList === null || item.tunnelList.length === 0) {

src/views/tunnel/index.vue

@@ -1,14 +1,12 @@
 <template>
   <div id="main">
     <div class="box-top">
-      <manage-btn v-model="selectIndex" @select="manageSelect" :list="routeList" />
+      <manage-btn v-model="selectIndex" @select="manageSelect" :list="routeList" v-if="showMenu"/>
       <div class="tunnel-title"></div>
       <!--      <manage-length class="tunnel-length"></manage-length>-->
       <div class="top-length">
         <span>隧道总长度: {{ tunnelLength }}米</span>
         <span>当前施工长度: {{ constructionLength }}米</span>
-        <span>隧道总长度: {{ tunnelLength }}米</span>
-        <span>当前施工长度: {{ constructionLength }}米</span>
       </div>
       <div class="top-right">
         <div class="current-site">
@@ -34,7 +32,6 @@
     </div>
     <!-- <tunnel-scene id="tunnel-box" :isedit="false" /> -->
     <!-- 一进去的话应该是预览模式，所以引入这个组件1 -->
-    <!-- 一进去的话应该是预览模式，所以引入这个组件1 -->
 
     <preview-scene id="tunnel-box" :isedit="false" :tunnelId="tunnelId" :key="tunnelId"></preview-scene>
     <div class="left">
@@ -88,7 +85,6 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import { getUserInfo } from "@/api/login";
 import { initSceneData } from "@/api/tunnelScene";
 import { getSiteDetail } from "../../api/site";
-import { nextTick, reactive } from "vue";
 
 const authStore = useAuthStore();
 const router = useRouter();
@@ -96,6 +92,7 @@ const selectIndex = ref(-1);
 const showFan = ref(false);
 const drawerLeft = ref(true);
 const drawerRight = ref(true);
+const showMenu = ref(false);
 const currentSiteId = ref(0);
 const currentSite = ref("");
 const siteList = ref([])
@@ -129,12 +126,12 @@ onMounted(() => {
 });
 const getUser = () => {
   getUserInfo().then(res => {
+    showMenu.value=true
     currentUser.value = res.data.user.userName
     currentUserId.value = res.data.user.userId
   })
 }
 const getDefaultSite = (siteId) => {
-  const getDefaultSite = (siteId) => {
     // console.log('siteList.value',siteList.value)
     // getSiteDetail(siteId).then((res) => {
     //   console.log('res',res)
@@ -148,9 +145,6 @@ const getDefaultSite = (siteId) => {
         currentSiteId.value = res.data.siteOption[res.data.siteOption.length - 1].value
         currentSite.value = res.data.siteOption[res.data.siteOption.length - 1].label
         getTunnel(res.data.siteOption[res.data.siteOption.length - 1].value)
-        currentSiteId.value = res.data.siteOption[res.data.siteOption.length - 1].value
-        currentSite.value = res.data.siteOption[res.data.siteOption.length - 1].label
-        getTunnel(res.data.siteOption[res.data.siteOption.length - 1].value)
       }
     });
   };
@@ -187,19 +181,19 @@ const getDefaultSite = (siteId) => {
       }
     })
     getScreenInfo(newObj.value)
-    // nextTick(() => {
+    nextTick(() => {
-    //   showFan.value = true;
+      showFan.value = true;
-    // });
+    });
   }
   const manageSelect = (index) => {
     console.log("首页点击-", index);
     if (index == '站点管理') {
       if (currentUserId.value) {
-        router.push("/site" + '/' + currentUserId.value);
+        router.push("/site/" + currentUserId.value);
       }
     } else if (index == '隧道管理') {
       if (currentSiteId.value && currentUserId.value) {
-        router.push("/tunnel/" + currentSiteId.value + '/i' + '/' + currentUserId.value);
+        router.push("/tunnel/" + currentSiteId.value + '/i/' + currentUserId.value);
       }
     } else if (index == '用户管理') {
       if (currentSiteId.value) {
@@ -211,6 +205,10 @@ const getDefaultSite = (siteId) => {
     currentSite.value = item.label
     currentSiteId.value = item.value
     getTunnel(item.value)
+    showFan.value=false
+    nextTick(() => {
+      showFan.value = true;
+    });
   }
   const closeLeft = () => {
     drawerLeft.value = !drawerLeft.value;

src/views/user/index.vue

@@ -98,9 +98,9 @@
             <el-radio v-for="item in radioList" :label="item.value" :key="item.value">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="选择隧道" v-if="tunnelList.length!==0&&form.roleId>3">
+        <el-form-item label="选择隧道" v-if="form.roleId>3">
           <el-select
-              v-model="form.tunnelIds"
+              v-model="form.tunnelList"
               multiple
               filterable
               clearable
@@ -168,7 +168,7 @@ const form = ref({
   phoneNumber: '',
   state: '1',
   roleId: [],
-  tunnelIds: []
+  tunnelList: [1]
 });
 const formRules = ref({
   userName: [{required: true, message: '请输入用户名', trigger: 'blur'}],
@@ -197,8 +197,10 @@ const handleEditUser = (row) => {
   reset()
   getUserDetail(row.userId).then(res => {
     if (res.code === 1000) {
+      getTunnel()
       form.value = res.data.user
       form.value.roleId = res.data.roleIds[0]
+      form.value.tunnelList = res.data.user.tunnelList
     }
   })
   title.value = '修改用户'
@@ -233,7 +235,7 @@ const reset = () => {
     phoneNumber: '',
     state: '1',
     roleId: [],
-    tunnelIds: []
+    tunnelList: []
   }
 }
 const getRoleOptionInfo = () => {
@@ -272,7 +274,6 @@ const handleCurrentChange = (val) => {
   getInfo()
 }
 const handleSubmit = async (formInstance) => {
-
   if (!formInstance) return;
   formInstance.validate(async (valid) => {
     if (!valid) return;
@@ -284,7 +285,7 @@ const handleSubmit = async (formInstance) => {
       state:form.value.state,
       userName: form.value.userName,
       roleIds: [form.value.roleId],
-      tunnelList: form.value.tunnelIds
+      tunnelList: form.value.tunnelList
     }
     if (title.value === '添加用户') {
       await addUser(data).then(res => {