style:区县接入样式修改

任超
Showing 7 changed files with 87 additions and 101 deletions
src/styles/index.scss
src/views/bwcxrkrz/index.vue
src/views/dataView/leftcard.vue
src/views/jsbwcx/data/index.js
src/views/jsbwcx/index.vue
src/views/jsbwcxrk/index.vue
src/views/sbbwcx/index.vue
--- a/src/styles/index.scss
View file @e5afeaf
+++ b/src/styles/index.scss
View file @e5afeaf
@@ -106,11 +106,8 @@ html {
  padding: 0px !important;
 }
-.padding-content {
-  padding: 4px 0;
-}
 a:focus,
+div:focus,
 a:active {
  outline: none;
 }
@@ -127,20 +124,20 @@ ul li {
  list-style: none;
 }
-div:focus {
-  outline: none;
-}
 .fr {
  float: right;
 }
-.mt15 {
+.fl {
+  float: left;
+}
+.mt-15 {
  margin-top: 15px;
 }
-.fl {
+.mb-5 {
-  float: left;
+  margin-bottom: 5px;
 }
 .pr-5 {
@@ -155,7 +152,7 @@ div:focus {
  margin-top: 10px;
 }
-//flex
+//flex 公共样式
 .d-flex {
  display: flex;
 }
@@ -171,9 +168,6 @@ div:focus {
  justify-content: center;
 }
-.bg-color-blue {
-  background-color: #1a5cd7;
-}
 .jc-between {
  justify-content: space-between;
@@ -192,13 +186,6 @@ div:focus {
  font-size: 24px;
 }
-.inlineBlock {
-  display: block;
-}
-.marginbtm5 {
-  margin-bottom: 5px !important;
-}
 .clearfix {
  &:after {
@@ -235,23 +222,6 @@ aside {
 }
 //main-container全局样式
-.app-container {
-  padding: 20px;
-}
-.components-container {
-  margin: 30px 50px;
-  position: relative;
-}
-.pagination-container {
-  margin-top: 30px;
-}
-.text-center {
-  text-align: center
-}
 .width100 {
  width: 100% !important;
 }
@@ -366,14 +336,15 @@ aside {
  color: $yellow;
 }
-// 通过 入库
+// 通过 入库 样式
-.adopt {
+.adopt,
+.success {
  color: #00FAA8;
  position: relative;
 }
 .warehousing {
-  color: #FF9933;
+  color: #FFCA57;
  position: relative;
 }
@@ -382,39 +353,54 @@ aside {
  position: absolute;
  content: '';
  display: block;
-  width: 10px;
+  width: 8px;
-  height: 10px;
+  height: 8px;
  left: -15px;
-  top: 3px;
+  top: 5px;
  background: #00FAA8;
  border-radius: 50%;
-  border: 2px solid rgba(0, 0, 0, 0.6);
+  border: 2px solid rgba(0, 0, 0, 0.2);
 }
 .warehousing::before {
  position: absolute;
  content: '';
  display: block;
-  width: 10px;
+  width: 8px;
-  height: 10px;
+  height: 8px;
  left: -15px;
-  top: 3px;
+  top: 4px;
  background: #FF9933;
  border-radius: 50%;
-  border: 2px solid rgba(0, 0, 0, 0.6);
+  border: 2px solid rgba(0, 0, 0, 0.2);
 }
-//错误日志样式 后期超优化
+// 成功 失败
-.item-cwnr {
+.success::before {
-  white-space: pre-wrap;
+  position: absolute;
-  display: -webkit-box;
+  content: '√';
-  overflow: hidden;
+  display: block;
-  text-overflow: ellipsis;
+  width: 0;
-  overflow-wrap: break-word;
+  height: 8px;
-  -webkit-line-clamp: 3;
+  left: -10px;
-  -webkit-box-orient: vertical;
+  top: 1px;
+  background: #00FAA8;
+  color: #00FAA8;
+}
+.fail {
+  color: #FF7962;
+  position: relative;
 }
-.item-cwnr img {
+.fail::before {
-  height: 30px;
+  position: absolute;
+  content: '!';
+  display: block;
+  width: 0;
+  height: 8px;
+  left: -10px;
+  top: 1px;
+  background: #FF7962;
+  color: #FF7962;
 }
\ No newline at end of file
--- a/src/views/bwcxrkrz/index.vue
View file @e5afeaf
+++ b/src/views/bwcxrkrz/index.vue
View file @e5afeaf
@@ -4,7 +4,7 @@
    <!-- 头部搜索 -->
    <div class="from-clues-header">
      <el-form ref="ruleForm" :model="form" label-width="100px">
-        <el-row class="marginbtm5">
+        <el-row class="mb-5">
          <el-col :span="6">
            <el-form-item label="行政区" prop="pcode">
              <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
--- a/src/views/dataView/leftcard.vue
View file @e5afeaf
+++ b/src/views/dataView/leftcard.vue
View file @e5afeaf
@@ -21,7 +21,7 @@
        </div>
      </div>
    </div>
-    <div class="card mt15">
+    <div class="card mt-15">
      <div class="cardhead">省厅汇交</div>
      <div class="cardcontent">
        <ul class="cardcontent-left d-center">
@@ -42,7 +42,7 @@
        </div>
      </div>
    </div>
-    <div class="card1 mt15">
+    <div class="card1 mt-15">
      <div class="cardhead">各区县数据上报统计</div>
      <columnar />
    </div>
--- a/src/views/jsbwcx/data/index.js
View file @e5afeaf
+++ b/src/views/jsbwcx/data/index.js
View file @e5afeaf
@@ -3,9 +3,41 @@ class data extends filter {
  constructor() {
    super()
  }
-  columns() {
+  columns () {
    return [
      {
+        prop: 'jcjg',
+        label: '检查结果',
+        width: 100,
+        render: (h, scope) => {
+          return (
+            <div>
+              {
+                scope.row.receiveState
+                  ? <span class='adopt'>通过</span>
+                  : <span class='warehousing'>不通过</span>
+              }
+            </div>
+          )
+        }
+      },
+      {
+        prop: 'rkjg',
+        label: '入库结果',
+        width: 100,
+        render: (h, scope) => {
+          return (
+            <div>
+              {
+                scope.row.storageState
+                  ? <span class='success'>成功</span>
+                  : <span class='fail'>失败</span>
+              }
+            </div>
+          )
+        }
+      },
+      {
        prop: "areacode",
        label: "行政区代码",
        width: 100,
@@ -43,39 +75,7 @@ class data extends filter {
      {
        prop: "createdate",
        label: "接收时间",
-      },
+      }
-      {
-        prop: 'jcjg',
-        label: '检查结果',
-        width: 100,
-        render: (h, scope) => {
-          return (
-            <div>
-              {
-                scope.row.receiveState
-                  ? <span class='adopt'>通过</span>
-                  : <span>通过1</span>
-              }
-            </div>
-          )
-        }
-      },
-      {
-        prop: 'rkjg',
-        label: '入库结果',
-        width: 100,
-        render: (h, scope) => {
-          return (
-            <div>
-              {
-                scope.row.storageState
-                  ? <span class='warehousing'>入库</span>
-                  : <span>入库1</span>
-              }
-            </div>
-          )
-        }
-      },
    ]
  }
 }
--- a/src/views/jsbwcx/index.vue
View file @e5afeaf
+++ b/src/views/jsbwcx/index.vue
View file @e5afeaf
@@ -4,7 +4,7 @@
    <!-- 头部搜索 -->
    <div class="from-clues-header">
      <el-form ref="ruleForm" :model="form" label-width="100px">
-        <el-row class="marginbtm5">
+        <el-row class="mb-5">
          <el-col :span="6">
            <el-form-item label="行政区" prop="pcode">
              <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
--- a/src/views/jsbwcxrk/index.vue
View file @e5afeaf
+++ b/src/views/jsbwcxrk/index.vue
View file @e5afeaf
@@ -4,7 +4,7 @@
    <!-- 头部搜索 -->
    <div class="from-clues-header">
      <el-form ref="ruleForm" :model="form" label-width="55px">
-        <el-row class="marginbtm5">
+        <el-row class="mb-5">
          <el-col :span="6">
            <el-form-item label="行政区" prop="pcode">
              <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
--- a/src/views/sbbwcx/index.vue
View file @e5afeaf
+++ b/src/views/sbbwcx/index.vue
View file @e5afeaf
@@ -4,7 +4,7 @@
    <!-- 头部搜索 -->
    <div class="from-clues-header">
      <el-form ref="ruleForm" :model="form" label-width="100px">
-        <el-row class="marginbtm5">
+        <el-row class="mb-5">
          <el-col :span="6">
            <el-form-item label="行政区" prop="pcode">
              <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">