bug

src/layout/header-aside/layout.vue

@@ -415,7 +415,7 @@ export default {
 .semi-circle {
 	position: absolute;
 	top: 40%;
-	z-index: 9999;
+	z-index: 999;
 	width: 10px;
 	height: 20px;
     line-height: 20px;

src/pages/eq/hall/components/hallModal.vue

@@ -38,7 +38,7 @@ export default {
   methods: {
     init(data) {
       console.log('data', data)
-      this.dataForm = data
+      this.dataForm = JSON.parse(JSON.stringify(data))
       this.hallModalVisible = true
     },
     submitHandle() {

src/pages/eq/hall/page.vue

@@ -151,6 +151,7 @@
           :opNum="3"
           :showStateColor="true"
           :currentMode="currentModel"
+          maxHeight='400px'
         >
         <!-- (1运行，2停止，3离线，4故障) -->
           <template v-slot:operation="scope">

src/pages/eq/office/page.vue

@@ -18,6 +18,7 @@
           :opNum="3"
           :showStateColor="true"
           :currentMode="currentModel"
+          maxHeight='520px'
         >
           <template
             v-slot:operation="scope"

src/pages/eq/view/query-detail.vue

@@ -489,14 +489,14 @@ watch: {
         state = this.temperature
         if (this.temperature) {
           if (!/(^[1-9]\d*$)/.test(this.temperature)) {
-            this.$message.warning('温度需要是17-30之间的整数1')
+            this.$message.warning('温度需要是17-30之间的整数')
             return
           } else if (this.temperature * 1 < 17 || this.temperature * 1 > 30) {
-            this.$message.warning('温度需要是17-30之间的整数2')
+            this.$message.warning('温度需要是17-30之间的整数')
             return
           }
         } else {
-          this.$message.warning('温度需要是17-30之间的整数3')
+          this.$message.warning('温度需要是17-30之间的整数')
           return
         }
       } else if (val == 2) {

src/pages/kb/power/components/historyDataModal.vue

@@ -156,6 +156,8 @@ export default {
     },
     cancelhandle() {
       this.visible = false
+      this.startTime=''
+      this.endTime=''
     },
     // 开始时间change事件
     startChangeHandle(val) {

src/pages/kb/power/page.vue

@@ -69,6 +69,7 @@
           :tableData="tableData"
           :showOpr="true"
           :opNum="2"
+          maxHeight='500px'
         >
           <template #operation="data">
             <el-button type="text" @click="openHistoryHandle(data.scope)"

src/pages/sys/commandlog/query-detail.vue

@@ -25,33 +25,55 @@
         </div>
         <div class="m_i_dialog_right">
           <div class="header_title">运行信息</div>
-          <el-form :model='dataForm' ref='dataForm' :inline='true'  label-width="100px" style='padding-left: 20px;'>
+          <el-form :model='dataForm' ref='dataForm' :inline='true'  label-width="auto" style='padding-left: 20px;'>
+            <el-row>
+              <el-col :span="12">
                 <el-form-item label='操作员:' prop='createUserName'>
                   <el-input  size="medium" v-model='dataForm.createUserName' readonly></el-input>
                 </el-form-item>
+              </el-col>
+              <el-col :span="12">
                 <el-form-item label='执行完成时间:' prop='createTime'>
                   <el-input  size="medium" v-model='dataForm.createTime' readonly></el-input>
                 </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
                 <el-form-item label='执行结果:' prop='result'>
                   <el-input  size="medium" v-model='dataForm.result' readonly></el-input>
                 </el-form-item>
+              </el-col>
+              <el-col :span="12">
                 <el-form-item label='指令类型:' prop='comType'>
-              <el-input v-if="dataForm.comType==1" value="自动" size="medium" readonly></el-input>
-              <el-input v-if="dataForm.comType==2" value="人工" size="medium" readonly></el-input>
+                  <el-input :value="dataForm.comType==1 ? '自动': '人工'" size="medium" readonly></el-input>
                 </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
                 <el-form-item label='指令来源:' prop='comSource'>
-              <el-input v-if="dataForm.comSource==1" value="算法" size="medium" readonly></el-input>
-              <el-input v-if="dataForm.comSource==2" value="人工" size="medium" readonly></el-input>
+                  <el-input :value="dataForm.comSource==1 ? '算法': '人工'" size="medium" readonly></el-input>
                 </el-form-item>
+              </el-col>
+              <el-col :span="12">
                 <el-form-item label='部署位置:' prop='deployLocation'>
                   <el-input  size="medium" :title='dataForm.deployLocation' v-model='dataForm.deployLocation' readonly></el-input>
                 </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
                 <el-form-item label='附属信息:' prop='attachedInfo'>
                   <el-input size="medium" :title='dataForm.attachedInfo' v-model='dataForm.attachedInfo' readonly></el-input>
                 </el-form-item>
+              </el-col>
+              <el-col :span="12">
                 <el-form-item label='指令内容:' prop='comMark'>
                   <el-input type="textarea" resize="none" readonly v-model="dataForm.comMark" autosize></el-input>
                 </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
         </div>
       </div>
@@ -90,6 +112,7 @@ export default {
           this.dataForm.result == 1
             ? (this.dataForm.result = '成功')
             : (this.dataForm.result = '失败')
+          if(!this.dataForm.createUserName){this.dataForm.createUserName='系统'}
         }
       })
     }
@@ -101,7 +124,7 @@ export default {
   min-width: 1100px;
 }
 .m_i_dialog_lift {
-  width: 364px;
+  width: 30%;
   height: 300px;
   background: rgba(255, 255, 255, 1);
   border: 1px solid rgba(23, 41, 71, 0.08);
@@ -110,7 +133,6 @@ export default {
   box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.2);
   .header_title {
     height: 40px;
-    width: 344px;
     background: #eef8ff;
     line-height: 40px;
     padding-left: 20px;
@@ -123,7 +145,7 @@ export default {
   }
 }
 .m_i_dialog_right {
-  width: 670px;
+  width: 67%;
   height: 300px;
   float: left;
   background: rgba(255, 255, 255, 1);
@@ -132,7 +154,6 @@ export default {
   box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.2);
   .header_title {
     height: 40px;
-    width: 650px;
     background: #eef8ff;
     line-height: 40px;
     padding-left: 20px;

src/pages/sys/logs/index.vue

@@ -56,7 +56,7 @@ export default {
         startTime: '',
         endTime: ''
       },
-      operationList: ['登录', '注销', '新增', '修改', '删除', '查看', '上传'],
+      operationList: ['注销', '新增', '修改', '删除'],
       dataList: [],
       pageIndex: 1,
       pageSize: 10,