Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

田浩浩
Showing 4 changed files with 49 additions and 51 deletions
src/styles/element-ui.scss
src/views/jktj/bsxljk/index.vue
src/views/jktj/ywltj/index.vue
src/views/jsbwcx/index.vue
--- a/src/styles/element-ui.scss
View file @c93d1d0
+++ b/src/styles/element-ui.scss
View file @c93d1d0
@@ -12,7 +12,7 @@
 //input
 .el-input__inner {
-  color: #FFFFFF!important;
+  color: #FFFFFF !important;
  padding: 0 7px !important;
 }
@@ -257,38 +257,51 @@ table td {
 }
 .el-popper[x-placement^="bottom"] .popper__arrow::after {
-display: none;
+  display: none;
 }
 .el-popper[x-placement^="bottom"] .popper__arrow {
  display: none;
 }
-.el-date-picker{
+// 时间选择框样式
+.el-date-picker {
  background-color: #031a46;
  .el-date-picker__header-label{
-    color: #A6CFD6;
+  color:#A6CFD6;
  }
-  .el-picker-panel__icon-btn{
+  .el-picker-panel__content{
+    background-color:#074487;
+    .disabled{
+      background-color:#074487;
+      .el-date-table td.disabled div{
+        background-color:#074487;
+      }
+    }
+  }
+  .el-picker-panel__icon-btn {
    color: #A6CFD6;
  }
-  .el-date-table th{
+  .el-date-table th {
    color: #02D9FD;
  }
-  .el-date-table td span{
+  .el-date-table td span {
    color: #A6CFD6;
  }
-  .el-date-table td.current:not(.disabled) span{
-   background-color: #074487;
+  .el-date-table td.current:not(.disabled) span {
-  //  border:1px solid saddlebrown;
+    background-color: #074487;
-   box-shadow: inset 0 0 7px #02D9FD;
+    //  border:1px solid saddlebrown;
-   border: 1px solid #02D9FD;
+    box-shadow: inset 0 0 7px #02D9FD;
+    border: 1px solid #02D9FD;
  }
 }
-.el-picker-panel__content{
-  background-color:#074487;
-}
 .el-menu--horizontal .el-menu .el-menu-item,
@@ -302,6 +315,7 @@ display: none;
 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):hover,
 .el-select-dropdown__item:hover,
+.el-select-dropdown__item.selected,
 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):focus {
  background: #074487;
  border: 1px solid #02D9FD;
--- a/src/views/jktj/bsxljk/index.vue
View file @c93d1d0
+++ b/src/views/jktj/bsxljk/index.vue
View file @c93d1d0
@@ -145,7 +145,6 @@ export default {
 @import "~@/styles/public.scss";
 .jktjDetail {
-    background-color: #fff;
    height: 100%;
    display: flex;
    flex-direction: column;
--- a/src/views/jktj/ywltj/index.vue
View file @c93d1d0
+++ b/src/views/jktj/ywltj/index.vue
View file @c93d1d0
 <template>
    <!-- 监控日志 -->
-    <div class="jktjDetail from-clues">
+    <div class="jktjDetail form-clues">
        <!-- 头部搜索 -->
-        <div class="from-clues-header">
+        <el-form ref="form" :model="form" :inline="true" class="from-clues-header" label-width="100px">
-         <el-form ref="form" :model="form" label-width="80px">
            <el-row>
                <el-col :span="8">
                    <el-date-picker v-model="valueTime" type="datetimerange" range-separator="至"
                        start-placeholder="开始日期" end-placeholder="结束日期">
                    </el-date-picker>
                </el-col>
-                <!-- <el-col :span="6">
-                    <el-form-item label="开始时间">
-                        <el-date-picker type="date" :picker-options="pickerOptionsStart" clearable
-                            v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="结束时间">
-                        <el-date-picker clearable :picker-options="pickerOptionsEnd" v-model="form.endTime"
-                            value-format="yyyy-MM-dd">
-                        </el-date-picker>
-                    </el-form-item>
-                </el-col> -->
                <!-- 按钮操作 -->
                <el-col :span="12" class="btnColRight">
                    <el-button type="default" @click="resetForm"> 重置 </el-button>
@@ -30,12 +16,10 @@
                </el-col>
            </el-row>
        </el-form>
        <!-- 表格 -->
        <div class="form-clues-content echarts-box">
            <div id="myChart" class="chart"></div>
        </div>
-         </div>
    </div>
 </template>
@@ -161,7 +145,6 @@ export default {
 @import "~@/styles/public.scss";
 .jktjDetail {
-    // background-color: #fff;
    height: 100%;
    display: flex;
    flex-direction: column;
@@ -169,7 +152,7 @@ export default {
    .echarts-box {
        display: flex;
        justify-content: center;
-        height: 100%;
+        height: 500px;
        .chart {
            width: 100%;
--- a/src/views/jsbwcx/index.vue
View file @c93d1d0
+++ b/src/views/jsbwcx/index.vue
View file @c93d1d0
@@ -32,7 +32,7 @@
          </el-col>
        </el-row>
        <el-row class="mt-10">
-           <el-col :span="6">
+          <el-col :span="6">
            <el-form-item label="业务号" prop="ywh">
              <el-input v-model="form.ywh" class="width100" placeholder="业务号"></el-input>
            </el-form-item>
@@ -87,6 +87,8 @@
        :data="tableData.data">
      </lb-table>
    </div>
+    <!-- 编辑 -->
+    <dataDetails ref="editLog" />
  </div>
 </template>
@@ -97,10 +99,16 @@ import data from "./data";
 // 引入table混入方法
 import tableMixin from "@/mixins/tableMixin.js";
 import { getReceiveDataReportPage } from "@/api/sbbwcx.js";
+// 引入详情弹框
+import dataDetails from "@/components/dataDetails/edit-dialog";
 export default {
  name: "jsbwcx",
  mixins: [tableMixin],
-  data() {
+  // 注册组件
+  components: {
+    dataDetails,
+  },
+  data () {
    return {
      // 开始结束日期限制
      pickerOptionsStart: {
@@ -194,7 +202,7 @@ export default {
  },
  methods: {
    // 初始化数据
-    queryClick() {
+    queryClick () {
      getReceiveDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
        if (res.code === 200) {
          let { total, records } = res.result;
@@ -204,23 +212,17 @@ export default {
      });
    },
    // 重置
-    resetForm() {
+    resetForm () {
      this.$refs.ruleForm.resetFields();
    },
-    featchData() {
+    featchData () {
      this.queryClick();
    },
    // 详情
-    handleEdit() {
+    handleEdit (row) {
-      this.$popupDialog(
+      this.$refs.editLog.isShow(row);
-        "业务报文",
+    }
-        "components/JsonEditor/index",
+  }
-        {},
-        "50%",
-        "320px"
-      );
-    },
-  },
 };
 </script>
 <style scoped lang="scss">