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

@@ -45,6 +45,18 @@ export default {
   color: #FFFFFF !important;
 }
 
+.ace_content {
+  background-color: #05275B !important;
+}
+
+.ace_marker-layer .ace_active-line {
+  background-color: #4e8ae2 !important;
+}
+
+.ace-jsoneditor .ace_variable {
+  color: #FFFFFF !important;
+}
+
 .jsoneditor-menu {
   background-color: #074487 !important;
 }

 <template>
   <transition name="msgbox-fade" v-if="myShow">
     <div class="ls-mask" v-loading="loading">
-      <div class="ls-mask-window" :style="{ 'width': width }">
+      <div class="ls-mask-window dialogBox" :style="{ 'width': width }">
         <div class="ls-head">
           <div class="ls-title" :style="{ 'text-align': titleStyle }">
             <svg-icon v-if="iconClass != ''" :icon-class='iconClass' />
@@ -105,6 +105,9 @@ export default {
 }
 </script>
 <style scoped lang="scss" >
+@import "~@/styles/mixin.scss";
+@import "~@/styles/dialogBox.scss";
+
 .ls-mask {
   width: 100%;
   height: 100%;
@@ -138,7 +141,7 @@ export default {
 .ls-title {
   padding: 10px;
   color: #ffffff;
-  background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%);
+  // background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%);
   font-size: 16px;
 }
 

@@ -47,9 +47,12 @@ export default {
   }
 }
 
-.app-main {
-  height: calc(100% -94px) !important;
-  // padding: 10px;
+.appMain {
+  height: calc(100vh - 94px) !important;
   box-sizing: border-box;
+
+  .app-main {
+    height: 100%;
+  }
 }
 </style>

 .dialogBox {
   overflow: hidden;
-  background: url("~@/image/dialogBg.png") no-repeat;
-  background-size: 100% 100%;
+  background: url("~@/image/dialogBg.png") no-repeat !important;
+  background-size: 100% 100% !important;
 
   .dialog_title {
     display: flex;

@@ -9,19 +9,6 @@
                         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>
@@ -155,6 +142,8 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+@import "~@/styles/public.scss";
+
 .jktjDetail {
     background-color: #fff;
     height: 100%;
@@ -164,7 +153,7 @@ export default {
     .echarts-box {
         display: flex;
         justify-content: center;
-        height: 100%;
+        height: 500px;
 
         .chart {
             width: 100%;

 <template>
     <!-- 监控日志 -->
-    <div class="jktjDetail form-clues">
+    <div class="jktjDetail from-clues">
         <!-- 头部搜索 -->
         <div class="from-clues-header">
          <el-form ref="form" :model="form" label-width="80px">
@@ -158,6 +158,8 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+@import "~@/styles/public.scss";
+
 .jktjDetail {
     // background-color: #fff;
     height: 100%;

@@ -14,13 +14,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="开始日期" prop="startTime">
+            <el-form-item label="接收开始日期" prop="startTime">
               <el-date-picker type="date" class="width100" placeholder="开始日期" :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="结束日期" prop="endTime">
+            <el-form-item label="接收结束日期" prop="endTime">
               <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
                 clearable v-model="form.endTime" value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
@@ -33,14 +33,27 @@
         </el-row>
         <el-row class="mt-10">
            <el-col :span="6">
-            <el-form-item label="业务名称" prop="ywmc">
-              <el-select v-model="form.ywmc" class="width100" clearable placeholder="业务名称">
-                <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value">
+            <el-form-item label="业务号" prop="ywh">
+              <el-input v-model="form.ywh" class="width100" placeholder="业务号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item label="权利类型" prop="qllx">
+              <el-select v-model="form.ywmc" class="width100" clearable placeholder="权利类型">
+                <el-option v-for="item in dicData['A8']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="3">
+            <el-form-item label="登记类型" prop="djlx">
+              <el-select v-model="form.ywmc" class="width100" clearable placeholder="登记类型">
+                <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
             <el-form-item label="检查结果" prop="jcjg">
               <el-select v-model="form.jcjg" class="width100" clearable placeholder="检查结果">
                 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
@@ -48,7 +61,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="3">
             <el-form-item label="入库结果" prop="rkjg">
               <el-select v-model="form.rkjg" class="width100" clearable placeholder="入库结果">
                 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
@@ -87,7 +100,7 @@ import { getDataReportPage } from "@/api/sbbwcx.js";
 export default {
   name: "jsbwcx",
   mixins: [tableMixin],
-  data () {
+  data() {
     return {
       // 开始结束日期限制
       pickerOptionsStart: {
@@ -177,30 +190,11 @@ export default {
       },
       // 业务名称
       statusOptions: [],
-      // 行政区
-      xzqOptions: [
-        {
-          value: "632321",
-          label: "同仁县",
-        },
-        {
-          value: "632322",
-          label: "尖扎县",
-        },
-        {
-          value: "632323",
-          label: "泽库县",
-        },
-        {
-          value: "632324",
-          label: "河南县",
-        },
-      ],
     };
   },
   methods: {
     // 初始化数据
-    queryClick () {
+    queryClick() {
       getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
         if (res.code === 200) {
           let { total, records } = res.result;
@@ -210,14 +204,14 @@ export default {
       });
     },
     // 重置
-    resetForm () {
+    resetForm() {
       this.$refs.ruleForm.resetFields();
     },
-    featchData () {
+    featchData() {
       this.queryClick();
     },
     // 详情
-    handleEdit () {
+    handleEdit() {
       this.$popupDialog(
         "业务报文",
         "components/JsonEditor/index",

@@ -8,7 +8,7 @@
           <el-col :span="6">
             <el-form-item label="行政区" prop="pcode">
               <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
-                <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
+                  <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
             </el-form-item>