邓洁: 接口及细节优化

src/views/edit/edit.vue

@@ -16,6 +16,9 @@
         <el-form-item label="隧道名称">
           <el-input v-model="form.tunnelName" placeholder="请输入隧道名称"/>
         </el-form-item>
+        <el-form-item label="隧道简称">
+          <el-input v-model="form.tunnelAlias" placeholder="请输入隧道简称"/>
+        </el-form-item>
         <el-form-item label="序列号">
           <el-input v-model="form.serialNumber" placeholder="请输入序列号"/>
         </el-form-item>
@@ -52,7 +55,7 @@ const tunnelId = reactive(router.currentRoute.value.params.tunnelId);
 const userId = reactive(router.currentRoute.value.params.userId);
 const type = reactive(router.currentRoute.value.params.type);
 const modelStore = useModelSceneStore();
-const constructionLength = ref(null)
+const constructionLength = ref(0)
 const modelEquipmentList = ref(null)
 const form = ref({
   tunnelName: "",
@@ -87,9 +90,16 @@ const getTunnelInfo = () => {
   initSceneData(tunnelId).then((res) => {
     constructionLength.value = res.data.constructionLength
     modelEquipmentList.value = JSON.parse(res.data.tunnelThreeConfig)
+    if(constructionLength.value===null){
+      constructionLength.value=0
+    }
+    if(modelEquipmentList.value===null){
+      modelEquipmentList.value=[]
+    }
     const data = {
       tunnelId: tunnelId,
       tunnelName: form.value.tunnelName,
+      tunnelAlias: form.value.tunnelAlias,
       serialNumber: form.value.serialNumber,
       remarks: form.value.remarks,
       constructionLength: constructionLength.value,

src/views/tunnel-manage/index.vue

@@ -45,8 +45,8 @@
           </div>
           <div class="tunnel-right">
             <div>
-              <div class="fan-icon"></div>
-              <span>风机异常</span>
+<!--              <div class="fan-icon"></div>-->
+<!--              <span>风机异常</span>-->
             </div>
             <div class="icons-block">
               <div v-for="equItem in iconsList" :key="item.icon" class="icon-text">
@@ -70,6 +70,9 @@
         <el-form-item label="隧道名称" prop="tunnelName">
           <el-input v-model="form.tunnelName" placeholder="请输入隧道名称"/>
         </el-form-item>
+        <el-form-item label="隧道简称" prop="tunnelAlias">
+          <el-input v-model="form.tunnelAlias" placeholder="请输入隧道简称"/>
+        </el-form-item>
         <el-form-item label="序列号" prop="serialNumber">
           <el-input v-model="form.serialNumber" placeholder="请输入序列号"/>
         </el-form-item>
@@ -123,6 +126,7 @@ const validateNumber = (rule, value) => {
 }
 const formRules = ref({
   tunnelName: [{required: true, message: '请输入隧道名称', trigger: ['blur', 'change']}],
+  tunnelAlias: [{required: true, message: '请输入隧道简称', trigger: ['blur', 'change']}],
   serialNumber: [
     {required: true, message: '请输入序列号', trigger: ['blur', 'change']},
     {validator: validateNumber, message: '请输入英文、数字、英文数字组合的用户名', trigger: ['blur', 'change']}
@@ -190,6 +194,7 @@ const tunnelNameList = ref([])
 const siteName = ref(localStorage.getItem('site'))
 const form = ref({
   tunnelName: '',
+  tunnelAlias: '',
   serialNumber: '',
   totalLength: '',
   remarks: '',
@@ -297,6 +302,7 @@ const handleEditDevice = (tunnelId) => {
 const restFrom = () => {
   form.value = {
     tunnelName: '',
+    tunnelAlias: '',
     serialNumber: '',
     totalLength: '',
     remarks: '',
@@ -650,7 +656,7 @@ const handleMoreDelete = () => {
           }
 
           .icons-block {
-            margin-top: 30px;
+            margin-top: 50px;
             display: flex;
             flex-wrap: wrap;
 

src/views/tunnel/index.vue

@@ -5,7 +5,7 @@
       <div class="tunnel-title"></div>
       <!--      <manage-length class="tunnel-length"></manage-length>-->
       <div class="top-length">
-        <span>隧道总长度: {{ tunnelLength }}米</span>
+<!--        <span>隧道总长度: {{ tunnelLength }}米</span>-->
         <span>当前施工长度: {{ constructionLength }}米</span>
       </div>
       <div class="top-right">
@@ -39,7 +39,7 @@
       <el-drawer v-model="drawerLeft" direction="ltr" modal-class="modal-box" :modal="false" :show-close="false"
         :close-on-click-modal="false" :close-on-press-escape="false">
         <fan-info v-if="showFan" :list="socketData.leftData" :fan-data="largeScreenData"
-          :transducer-data="largeScreenData" :loading="showFanLoading" />
+          :transducer-data="largeScreenData" :loading="showFanLoading" :tunnel-id="tunnelId"/>
         <used-ele v-if="showFan" :list="socketData.leftData" :ele-data="largeScreenData" />
       </el-drawer>
       <div v-if="drawerLeft" class="left-arrow" @click="closeLeft"></div>
@@ -115,8 +115,6 @@ const routeList = ref([]);
 let socket = reactive("");
 let tunnelName = reactive("")
 
-
-
 const btnList = ref([
   {
     route: '/site',
@@ -143,7 +141,7 @@ const btnList = ref([
   //   name: '模拟仿真'
   // },
 ])
-const serialNumber = ref("SC00DY00GH00ELBT");
+const serialNumber = ref("");
 let token = getToken();
 let send = {
   type: "ping",
@@ -154,10 +152,11 @@ const socketData = reactive({
   windPressure: [],
   sensor: [],
 });
+let tunnelLen = computed(() => tunnelLength);
+
 onMounted(() => {
   if (previewId) {
     getScreenInfo(previewId)
-
   }
   getUser()
   getOtherInfo()
@@ -165,6 +164,7 @@ onMounted(() => {
     showFan.value = true;
   });
 });
+
 const getUser = () => {
   getUserInfo().then(res => {
     currentUser.value = res.data.user.userName
@@ -245,6 +245,8 @@ const getScreenInfo = (id) => {
     initSceneData(id).then((res) => {
       tunnelLength.value = res.data.tunnelLength
       constructionLength.value = res.data.constructionLength
+      serialNumber.value=res.data.serialNumber
+      initWebSocket();
     })
   }
 };
@@ -359,10 +361,6 @@ const initWebSocket = () => {
     socket.send(JSON.stringify(send));
   }, 30000);
 };
-initWebSocket();
-
-let tunnelLen = computed(() => tunnelLength);
-
 </script>
 <style lang="scss">
 .el-drawer__header {