Merge pull request 'dengjie' (#199) from dengjie into dev

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

src/components/content/fanInfo/FanInfo.vue

@@ -64,13 +64,13 @@
             </div>
           </div>
         </div>
-        <div class="current" @click="handleOpenChart(item)">
+        <div class="current"  @click="handleOpenChart(item,index)">
           <fan-info-item :wp="transducerData[index]" />
         </div>
       </div>
     </div>
     <div class="digital-tunnel">
-      <el-dialog :close-on-click-modal="false" v-model="isVisited" :title="'电流监控数据'" width="2175px"
+      <el-dialog :close-on-click-modal="false" v-model="isVisited" :title="changeNum(fanIndex)+'号风机电流监控数据'" width="2175px"
                  :modal="false">
         <div class="left-top-icon"></div>
         <div class="right-top-icon"></div>
@@ -111,7 +111,9 @@ const stateA = ref(false)
 const stateB = ref(false)
 const stateC = ref(false)
 const isVisited = ref(false)
+const fanIndex = ref(0)
 let myEcharts = reactive({});
+
 watch(() => props.transducerData, (now) => {
   getTransData(now.frequencyChangerList)
 }, {deep: true});
@@ -155,8 +157,9 @@ const getFanInfo = (equipmentId) => {
     }
   })
 }
-const handleOpenChart = (item) => {
+const handleOpenChart = (item,index) => {
   getFanInfo(item.equipmentId)
+  fanIndex.value=index+1
 }
 const getTransData = (data) => {
   let tranObj = {}
@@ -505,7 +508,6 @@ input[type="number"] {
 
 :deep( .el-radio__label) {
   font-size: 28px;
-  font-family: MicrosoftYaHei;
   color: #38cafb;
   line-height: 37px;
 }
@@ -520,17 +522,14 @@ input[type="number"] {
   left: 68px;
   padding: 10px;
   background-image: url(../../../assets/images/fanInfo/bg.png);
-  //clip-path: polygon(0% 0%, 40% 0%, 48% 15%, 100% 15%, 100% 100%, 0% 100%);
   color: #2fb0df;
   box-sizing: border-box;
 
   .title {
     width: 40%;
     text-align: left;
-    font-size: 20px;
-    padding: 0px 0px 0px 62px;
+    padding: 0 0 0 62px;
     font-size: 32px;
-    font-family: MicrosoftYaHei, MicrosoftYaHei;
     font-weight: bold;
     color: #38cafb;
     line-height: 42px;
@@ -560,7 +559,6 @@ input[type="number"] {
         .echart::after {
           content: "Hz";
           font-size: 24px;
-          font-family: MicrosoftYaHei, MicrosoftYaHei;
           font-weight: bold;
           color: #ffffff;
           line-height: 31px;
@@ -574,7 +572,6 @@ input[type="number"] {
           width: 39px;
           height: 140px;
           font-size: 26px;
-          font-family: MicrosoftYaHei;
           color: #38cafb;
           line-height: 35px;
           text-align: center;
@@ -598,7 +595,6 @@ input[type="number"] {
               flex-direction: column;
               justify-content: center;
               font-size: 26px;
-              font-family: MicrosoftYaHei;
               color: #38cafb;
               line-height: 35px;
               gap: 40px;
@@ -644,7 +640,6 @@ input[type="number"] {
                 border-radius: 22px;
                 border: 2px solid #0f82af;
                 overflow: hidden;
-                font-family: MicrosoftYaHei, MicrosoftYaHei;
                 font-weight: bold;
                 color: #127399;
                 line-height: 35px;
@@ -662,9 +657,8 @@ input[type="number"] {
               display: flex;
               flex-direction: column;
               justify-content: center;
-              padding: 0px 20px;
+              padding: 0 20px;
               font-size: 28px;
-              font-family: MicrosoftYaHei;
               color: #38cafb;
               line-height: 37px;
               gap: 33px;
@@ -683,7 +677,6 @@ input[type="number"] {
                   top: 50%;
                   transform: translateY(-50%);
                   font-size: 28px;
-                  font-family: MicrosoftYaHei;
                   color: #38cafb;
                   line-height: 37px;
                 }
@@ -696,7 +689,6 @@ input[type="number"] {
                   margin-left: 14px;
                   outline: none;
                   font-size: 28px;
-                  font-family: MicrosoftYaHei, MicrosoftYaHei;
                   font-weight: bold;
                   color: #38cafb;
                   line-height: 37px;
@@ -714,7 +706,6 @@ input[type="number"] {
             padding-top: 30px;
             padding-right: 25px;
             font-size: 28px;
-            font-family: MicrosoftYaHei;
             color: #FFFFFF;
 
             .fenliu-icon {
@@ -737,7 +728,6 @@ input[type="number"] {
               margin-left: 14px;
               outline: none;
               font-size: 28px;
-              font-family: MicrosoftYaHei, MicrosoftYaHei;
               font-weight: bold;
               color: #38cafb;
               line-height: 37px;
@@ -751,7 +741,6 @@ input[type="number"] {
               bottom: 0;
               transform: translateY(-50%);
               font-size: 28px;
-              font-family: MicrosoftYaHei;
               color: #38cafb;
               line-height: 37px;
             }
@@ -761,13 +750,17 @@ input[type="number"] {
 
       .current {
         margin-top: 30px;
+        margin-right: 20px;
         margin-left: 26px;
-        height: 37px;
+        //height: 37px;
         font-size: 28px;
         color: #FFFFFF;
         cursor: pointer;
+        &:hover{
+          background-color:  #2E5589;
+          border-radius: 6px;
+        }
       }
-
     }
   }
 }

src/components/content/fanInfo/FanInfoItem.vue

@@ -110,15 +110,16 @@ let isWaringC = computed(() => {
   display: flex;
   align-items: center;
   width: 100%;
-  padding: 6px 38px 7px 10px;
+  padding: 6px 0 7px 10px;
   margin-bottom: 17px;
 
   &:hover {
-    background: #2E5589;
-    border-radius: 6px;
+    //background: #2E5589;
+    //border-radius: 6px;
   }
 
   &:last-child {
+    margin-bottom: 0;
     .label {
       span {
         margin: 0 5px 0 14px;

src/views/user/index.vue

@@ -47,6 +47,11 @@
             <el-table-column prop="nickName" label="昵称" align="center"/>
             <el-table-column prop="roleName" label="身份" align="center"/>
             <el-table-column prop="phoneNumber" label="电话号码" align="center"/>
+            <el-table-column prop="state" label="状态" align="center">
+              <template #default="scope">
+                {{scope.row.state=="1"?'启用':'停用'}}
+              </template>
+            </el-table-column>
             <el-table-column label="操作" align="center">
               <template #default="scope">
                 <el-button link type="primary" size="large" style="font-size: 40px;color: #17E1E2;"
@@ -79,10 +84,14 @@
         <el-form-item label="输入电话号码">
           <el-input v-model="form.phoneNumber" placeholder="输入电话号码"/>
         </el-form-item>
-
+        <el-form-item label="是否启用">
+          <el-radio-group v-model="form.state">
+            <el-radio label="1">启用</el-radio>
+            <el-radio label="0">停用</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="选择身份">
           <el-radio-group v-model="form.roleId" @change="(val) => {
-             console.log('vaaa',val)
             if (val >3){
                  getTunnel()
             }}">
@@ -91,7 +100,7 @@
         </el-form-item>
         <el-form-item label="选择隧道" v-if="checkList.length!==0&&form.roleId>3">
           <el-select
-              v-model="tunnelIndex"
+              v-model="form.tunnelIds"
               multiple
               filterable
               clearable
@@ -157,6 +166,7 @@ const form = ref({
   userName: '',
   nickName: '',
   phoneNumber: '',
+  state: '1',
   roleId: [],
   tunnelIds: []
 });
@@ -189,6 +199,7 @@ const handleEditUser = (row) => {
     if (res.code === 1000) {
       form.value = res.data.user
       form.value.roleId = res.data.roleIds[0]
+      console.log('form.value',form.value)
     }
   })
   title.value = '修改用户'
@@ -198,7 +209,6 @@ const handleAll = () => {
   multipleTable.value.toggleAllSelection()
 }
 const handleDelete = () => {
-  console.log('userIds.value',userIds.value)
   if (userIds.value ===undefined) {
     ElMessage.warning('请先选择用户进行删除')
   } else {
@@ -222,6 +232,7 @@ const reset = () => {
     userName: '',
     nickName: '',
     phoneNumber: '',
+    state: '1',
     roleId: [],
     tunnelIds: []
   }
@@ -262,14 +273,21 @@ const handleCurrentChange = (val) => {
   getInfo()
 }
 const handleSubmit = async (formInstance) => {
+
   if (!formInstance) return;
   formInstance.validate(async (valid) => {
     if (!valid) return;
     const data = {
       siteId: siteId,
+      nickName: form.value.nickName,
+      password: form.value.password,
+      phoneNumber: form.value.phoneNumber,
+      state:form.value.state,
+      userName: form.value.userName,
       roleIds: [form.value.roleId],
-      ...form.value
+      tunnelIds: form.value.tunnelIds
     }
+    console.log('data',data)
     if (title.value === '添加用户') {
       await addUser(data).then(res => {
         if (res.code === 1000) {