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

@@ -36,6 +36,10 @@ export default {
             axisLabel: {
               show: true,
               color: "#ffff",
+                textStyle: {
+                  fontWeight: "normal",
+                  fontSize: "8",
+                },
             },
             axisTick: {
               show: false,
@@ -45,7 +49,7 @@ export default {
               lineStyle: {
                 color: "rgba(95, 180, 237, 0.32)",
               },
-            },
+            }
           },
           yAxis: {
             splitLine: {

@@ -3,48 +3,84 @@
 </template>
 
 <script>
-import Chart from './chart.vue'
+import Chart from "./chart.vue";
 export default {
-  data () {
+  data() {
     return {
       cdata: {
-        category: [
-          "首次",
-          "转移",
-          "变更",
-          "注销",
-          "更正",
-          "异议",
-          "预告",
-          "查封",
-          "其他",
-
-        ],
-        lineData: [
-          14715,
-          8444,
-          10415,
-          6061,
-          18092,
-          12728,
-          9045,
-          8348,
-          20008,
-        ],
-      }
+        category: [],
+        lineData: [],
+      },
     };
   },
   components: {
     Chart,
   },
-  mounted () {
+  created() {
+    this.queryClick();
   },
+  mounted() {},
   methods: {
-
-  }
+    queryClick() {
+      console.log("来了kkksxdx");
+      // getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
+      let data = {
+        success: true,
+        message: "操作成功！",
+        code: 200,
+        result: [
+          {
+            AREACODE: "转移登记",
+            ywtotal: "2",
+          },
+          {
+            AREACODE: "变更登记",
+            ywtotal: "4",
+          },
+          {
+            AREACODE: "注销登记",
+            ywtotal: "6",
+          },
+          {
+            AREACODE: "更正登记",
+            ywtotal: "2",
+          },
+          {
+            AREACODE: "首次登记",
+            ywtotal: "11",
+          },
+          {
+            AREACODE: "预告登记",
+            ywtotal: "5",
+          },
+          {
+            AREACODE: "补证",
+            ywtotal: "1",
+          },
+          {
+            AREACODE: "换证",
+            ywtotal: "2",
+          },
+          {
+            AREACODE: "查封登记",
+            ywtotal: "2",
+          },
+        ],
+        timestamp: 1673856701381,
+      };
+      if (data.code === 200) {
+        data.result.filter((item) => {
+          return (
+            this.cdata.category.push(item.AREACODE),
+            this.cdata.lineData.push(item.ywtotal)
+          );
+        });
+        console.log("this.cdata", this.cdata);
+      }
+      //   });
+    },
+  },
 };
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

@@ -48,7 +48,7 @@ export default {
 }
 
 .appMain {
-  height: calc(100vh - 94px) !important;
+  height: calc(100vh - 101px) !important;
   box-sizing: border-box;
 
   .app-main {

@@ -24,4 +24,4 @@ export default {
   width: 100%;
   margin-right: 15px;
 }
-</style>
\ No newline at end of file
+</style>

@@ -44,4 +44,4 @@ $borderColor: #EBEEF5;
   sideBarFontSize: $sideBarFontSize;
   borderColor: $borderColor;
   headerHeight: $headerHeight;
-}
\ No newline at end of file
+}

@@ -27,8 +27,8 @@
               <el-input v-model="form.CFWH" placeholder="查封文号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="from-clues-search-button">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+         <el-col :span="4" class="btnColRight">
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -151,4 +151,4 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
-</style>
\ No newline at end of file
+</style>

@@ -22,8 +22,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="from-clues-search-button">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+        <el-col :span="4" class="btnColRight">
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -36,8 +36,8 @@
               <el-input v-model="form.xzq" placeholder="权利人"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="from-clues-search-button">
-            <el-button type="primary" @click="handleSubmit">查询</el-button>
+          <el-col :span="4" class="btnColRight">
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
 
@@ -162,4 +162,4 @@ export default {
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "./index.scss";
-</style>
\ No newline at end of file
+</style>

@@ -31,8 +31,8 @@
               <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="btnColRight">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+         <el-col :span="4" class="btnColRight">
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -191,4 +191,4 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
-</style>
\ No newline at end of file
+</style>

@@ -22,8 +22,8 @@
               <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="9" class="btnColRight">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+         <el-col :span="4" class="btnColRight">
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -147,4 +147,4 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
-</style>
\ No newline at end of file
+</style>

@@ -32,7 +32,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" class="btnColRight">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -191,4 +191,4 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
-</style>
\ No newline at end of file
+</style>

@@ -31,8 +31,8 @@
               <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="from-clues-search-button">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+          <el-col :span="4" class="btnColRight">
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -161,4 +161,4 @@ export default {
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "./index.scss";
-</style>
\ No newline at end of file
+</style>

@@ -31,8 +31,8 @@
               <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="from-clues-search-button">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+          <el-col :span="4" class="btnColRight">
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -32,7 +32,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" class="btnColRight">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -192,4 +192,4 @@ export default {
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "./index.scss";
-</style>
\ No newline at end of file
+</style>

@@ -13,8 +13,8 @@
               <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="14" class="btnColRight">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+          <el-col :span="4" class="btnColRight">
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -135,4 +135,4 @@ export default {
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "./index.scss";
-</style>
\ No newline at end of file
+</style>

@@ -31,8 +31,8 @@
               <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="from-clues-search-button">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+          <el-col :span="4" class="btnColRight">
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -161,4 +161,4 @@ export default {
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "./index.scss";
-</style>
\ No newline at end of file
+</style>

@@ -31,8 +31,8 @@
               <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="3" class="from-clues-search-button">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+         <el-col :span="4" class="btnColRight">
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -31,8 +31,8 @@
               <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="from-clues-search-button">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+          <el-col :span="4" class="btnColRight">
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -159,4 +159,4 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
-</style>
\ No newline at end of file
+</style>

@@ -13,8 +13,8 @@
               <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="14" class="btnColRight">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+         <el-col :span="4" class="btnColRight">
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -133,4 +133,4 @@ export default {
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "./index.scss";
-</style>
\ No newline at end of file
+</style>

@@ -20,11 +20,11 @@
           >
           </el-date-picker>
         </el-col>
-        <!-- 按钮操作 -->
-        <el-col :span="12" class="btnColRight">
-          <el-button type="default" @click="resetForm"> 重置 </el-button>
-          <el-button type="primary"> 查询 </el-button>
-        </el-col>
+          <!-- 操作按钮 -->
+          <el-col :span="3" class="btnColRight">
+            <btn nativeType="cz" @click="resetForm">重置</btn>
+            <btn nativeType="cx">查询</btn>
+          </el-col>
       </el-row>
     </el-form>
     <!-- 表格 -->
@@ -86,10 +86,10 @@ export default {
           text: "汉中市接入数量与上报数量统计(单位:个)\n(2022年02月05日~2022年03月07日)",
           left: "center",
           textStyle: {
-            fontSize: 30,
+            fontSize: 20,
             lineHeight: 30,
             height: 60,
-            color: "#fff",
+            color: "#b6b5b5",
           },
         },
         legend: {
@@ -101,7 +101,7 @@ export default {
           ],
           top: 80,
           textStyle: {
-            fontSize: 24,
+            fontSize: 20,
             lineHeight: 30,
             height: 60,
             color: "#777",
@@ -111,7 +111,7 @@ export default {
           show: true,
           trigger: "axis",
            textStyle: {
-      fontSize: 22 // 字体大小
+      fontSize: 20 // 字体大小
     },
     extraCssText: 'width:260px;height:200px;' // 背景色
         },
@@ -126,7 +126,7 @@ export default {
               textStyle: {
                 show: true,
                 color: "#fff",
-                fontSize: "24",
+                fontSize: "20",
               },
             },
           },
@@ -138,7 +138,7 @@ export default {
               textStyle: {
                 show: true,
                 color: "#fff",
-                fontSize: "24",
+                fontSize: "20",
               },
             },
           },
@@ -194,6 +194,7 @@ export default {
   .form-clues-content {
     flex: 1;
     height: 100%;
+    color: #b6b5b5
   }
 }
 </style>

@@ -20,11 +20,11 @@
           >
           </el-date-picker>
         </el-col>
-        <!-- 按钮操作 -->
-        <el-col :span="12" class="btnColRight">
-          <el-button type="default" @click="resetForm"> 重置 </el-button>
-          <el-button type="primary"> 查询 </el-button>
-        </el-col>
+        <!-- 操作按钮 -->
+          <el-col :span="3" class="btnColRight">
+            <btn nativeType="cz" @click="resetForm">重置</btn>
+            <btn nativeType="cx">查询</btn>
+          </el-col>
       </el-row>
     </el-form>
     <!-- 表格 -->
@@ -86,10 +86,10 @@ export default {
           text: "汉中市接入数量与上报数量统计(单位:个)\n(2022年02月05日~2022年03月07日)",
           left: "center",
           textStyle: {
-            fontSize: 30,
+            fontSize: 20,
             lineHeight: 30,
             height: 60,
-            color: "#fff",
+            color: "#b6b5b5",
           },
         },
         legend: {
@@ -101,7 +101,7 @@ export default {
           ],
           top: 80,
           textStyle: {
-            fontSize: 24,
+            fontSize: 20,
             lineHeight: 30,
             height: 60,
             color: "#777",
@@ -111,7 +111,7 @@ export default {
           show: true,
           trigger: "axis",
            textStyle: {
-      fontSize: 22 // 字体大小
+      fontSize: 20 // 字体大小
     },
     extraCssText: 'width:260px;height:200px;' // 背景色
         },
@@ -126,7 +126,7 @@ export default {
               textStyle: {
                 show: true,
                 color: "#fff",
-                fontSize: "24",
+                fontSize: "20",
               },
             },
           },
@@ -138,7 +138,7 @@ export default {
               textStyle: {
                 show: true,
                 color: "#fff",
-                fontSize: "24",
+                fontSize: "20",
               },
             },
           },

@@ -14,11 +14,11 @@
               <el-input v-model="ruleForm.dname" @clear="queryClick" clearable placeholder="字典类型名称"></el-input>
             </el-form-item>
           </el-col>
+           <!-- 操作按钮 -->
           <el-col :span="12" class="btnColRight">
-            <el-form-item>
-              <el-button type="primary" native-type="submit" icon="el-icon-search" @click="queryClick">查询</el-button>
-              <el-button icon="el-icon-refresh" @click="handleRefresh">刷新缓存</el-button>
-            </el-form-item>
+
+            <btn nativeType="cx" @click="queryClick">查询</btn>
+            <btn nativeType="sb" @click="handleRefresh">刷新缓存</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -5,31 +5,47 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="数据表名">
-              <el-input v-model="form.DATATABLE" placeholder="数据表名"></el-input>
+              <el-input
+                v-model="form.DATATABLE"
+                placeholder="数据表名"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="中文名称">
-              <el-input v-model="form.CHINESETABLE" placeholder="中文名称"></el-input>
+              <el-input
+                v-model="form.CHINESETABLE"
+                placeholder="中文名称"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="tab表头链接标识">
-              <el-input v-model="form.SOLEURL" placeholder="tab表头链接标识"></el-input>
+              <el-input
+                v-model="form.SOLEURL"
+                placeholder="tab表头链接标识"
+              ></el-input>
             </el-form-item>
           </el-col>
 
+          <!-- 操作按钮 -->
           <el-col :span="6" class="btnColRight">
-            <el-button @click="handleUpdateDic">刷新规则缓存</el-button>
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+            <btn nativeType="sb" @click="handleUpdateDic">刷新缓存</btn>
+            <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
-        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
-        :data="tableData.data">
+      <lb-table
+        :page-size="pageData.size"
+        :current-page.sync="pageData.current"
+        :total="pageData.total"
+        @size-change="handleSizeChange"
+        @p-current-change="handleCurrentChange"
+        :column="tableData.columns"
+        :data="tableData.data"
+      >
       </lb-table>
       <message-tips ref="msg" :message="message" />
     </div>
@@ -39,145 +55,157 @@
 
 <script>
 // 字典
-import data from "./data"
-import tableMixin from '@/mixins/tableMixin.js'
-import ruleConfig from '@/api/ruleConfig'
-import editValidRule from '../components/editValidRule.vue'
+import data from "./data";
+import tableMixin from "@/mixins/tableMixin.js";
+import ruleConfig from "@/api/ruleConfig";
+import editValidRule from "../components/editValidRule.vue";
 export default {
   name: "dictionary-config",
   mixins: [tableMixin],
   components: {
-    editValidRule
+    editValidRule,
   },
-  data () {
+  data() {
     return {
-      message: '',
+      message: "",
       form: {
-        DATATABLE: '',
-        CHINESETABLE: '',
-        SOLEURL: '',
-        currentPage: 1
+        DATATABLE: "",
+        CHINESETABLE: "",
+        SOLEURL: "",
+        currentPage: 1,
       },
-      preContent: '',
+      preContent: "",
       tableData: {
-        columns: [{
-          label: '序号',
-          type: 'index',
-          width: '50',
-          index: this.indexMethod,
-        }].concat(data.columns()).concat([
+        columns: [
           {
-            label: "操作",
-            render: (h, scope) => {
-              return (
-                <div>
-                  <el-button
-                    type="text"
-                    size="mini"
-                    icon="el-icon-edit"
-                    onClick={() => { this.handleEdit(scope.$index, scope.row) }}
-                  >
-                    编辑
-                  </el-button>
+            label: "序号",
+            type: "index",
+            width: "50",
+            index: this.indexMethod,
+          },
+        ]
+          .concat(data.columns())
+          .concat([
+            {
+              label: "操作",
+              render: (h, scope) => {
+                return (
+                  <div>
+                    <el-button
+                      type="text"
+                      size="mini"
+                      icon="el-icon-edit"
+                      onClick={() => {
+                        this.handleEdit(scope.$index, scope.row);
+                      }}
+                    >
+                      编辑
+                    </el-button>
 
-                  <el-button
-                    type="text"
-                    size="mini"
-                    icon="el-icon-delete"
-                    style="color:#F56C6C"
-                    onClick={() => { this.handleDel(scope.$index, scope.row) }}
-                  >
-                    删除
-                  </el-button>
-                </div>
-              );
+                    <el-button
+                      type="text"
+                      size="mini"
+                      icon="el-icon-delete"
+                      style="color:#F56C6C"
+                      onClick={() => {
+                        this.handleDel(scope.$index, scope.row);
+                      }}
+                    >
+                      删除
+                    </el-button>
+                  </div>
+                );
+              },
             },
-          }
-        ]),
-        data: []
+          ]),
+        data: [],
       },
       pageData: {
         total: 0,
         pageSize: 15,
         current: 1,
       },
-      ruleData: null
-    }
+      ruleData: null,
+    };
   },
   methods: {
-    async featchData () {
+    async featchData() {
       try {
-        this.form = Object.assign(this.form, this.formData)
-        let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await ruleConfig.getSysYwsjbList(this.form)
-        this.tableData.data = list
+        this.form = Object.assign(this.form, this.formData);
+        let {
+          result: { list, total, pages: pageSize, pageNum: current },
+        } = await ruleConfig.getSysYwsjbList(this.form);
+        this.tableData.data = list;
         this.pageData = {
           pageSize,
           current,
-          total
-        }
+          total,
+        };
       } catch (error) {
-        this.message = error
-        this.$refs.msg.messageShow()
+        this.message = error;
+        this.$refs.msg.messageShow();
       }
     },
-    async handleEdit (index, row) {
+    async handleEdit(index, row) {
       try {
-        let { result: res } = await ruleConfig.eidtConfigRule(row.BSM_YWSJB)
-        this.ruleData = res
-        this.$refs.validRule.isShow()
+        let { result: res } = await ruleConfig.eidtConfigRule(row.BSM_YWSJB);
+        this.ruleData = res;
+        this.$refs.validRule.isShow();
       } catch (error) {
-        this.$alert(error, '提示', {
-          confirmButtonText: '确定',
-          type: 'error'
-        })
+        this.$alert(error, "提示", {
+          confirmButtonText: "确定",
+          type: "error",
+        });
       }
     },
-    handleDel (index, row) {
-      let _this = this
-      this.$confirm('此操作将进行删除校验规则, 是否继续?', '提示', {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning'
-      }).then(async () => {
-        try {
-          let res = await ruleConfig.deleteSysYwsjbWithSysYwsjbFieldByBsmYwsjb(row.BSM_YWSJB)
-          if (res.code == 200) {
-            _this.$message({
-              type: 'success',
-              message: '删除成功!'
+    handleDel(index, row) {
+      let _this = this;
+      this.$confirm("此操作将进行删除校验规则, 是否继续?", "提示", {
+        cancelButtonText: "取消",
+        confirmButtonText: "确定",
+        type: "warning",
+      })
+        .then(async () => {
+          try {
+            let res =
+              await ruleConfig.deleteSysYwsjbWithSysYwsjbFieldByBsmYwsjb(
+                row.BSM_YWSJB
+              );
+            if (res.code == 200) {
+              _this.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+              _this.featchData();
+            }
+          } catch (error) {
+            _this.$alert(error, "提示", {
+              confirmButtonText: "确定",
+              type: "error",
             });
-            _this.featchData()
           }
-        } catch (error) {
-          _this.$alert(error, '提示', {
-            confirmButtonText: '确定',
-            type: 'error'
-          })
-        }
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
         });
-      });
     },
-    handleUpdateDic () {
-      this.$store.dispatch('dictionaries/generateDic').then((res) => {
+    handleUpdateDic() {
+      this.$store.dispatch("dictionaries/generateDic").then((res) => {
         if (res) {
           this.$message({
-            message: '刷新成功！',
-            type: 'success'
-          })
+            message: "刷新成功！",
+            type: "success",
+          });
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "./index.scss";
 </style>
-
-