style;样式

任超
Showing 10 changed files with 72 additions and 58 deletions
src/views/home/index.scss
src/views/home/index.vue
src/views/system/flfg/components/addDialog.vue
src/views/system/flfg/flfg.vue
src/views/system/xttz/components/addDialog.vue
src/views/system/xttz/components/viewDialog.vue
src/views/system/xttz/xttz.vue
src/views/ywbl/components/mixin/index.js
src/views/ywbl/components/search.vue
src/views/ywbl/dbx/dbx.vue
--- a/src/views/home/index.scss
View file @37b859d
+++ b/src/views/home/index.scss
View file @37b859d
@@ -70,7 +70,7 @@
  .box-mountNode {
    flex: 1;
-    height: calc(100% - 500px);
+    height: calc(100% - 485px);
  }
  .home-right {
--- a/src/views/home/index.vue
View file @37b859d
+++ b/src/views/home/index.vue
View file @37b859d
@@ -14,7 +14,7 @@
          </el-card>
        </el-col>
        <el-col :span="12">
-          <el-card shadow="hover"  style="height:245px">
+          <el-card shadow="hover" style="height:243px">
            <div slot="header" class="flexst">
              <h5 class="title">系统通知</h5>
              <i class="el-icon-s-unfold pointer"></i>
@@ -22,7 +22,7 @@
            <ul>
              <li v-for="(item, index) in noticeList" :key="index" @click="handleNotice" class="flexst pointer">
                <p class="list-title">{{ item.noticeTitle }}</p>
-                <p class="marginZL15">{{ item.createtime }}</p>
+                <p class="marginZL15">{{ item.createtime.substring(0, 10) }}</p>
                <p v-if="item.userBrowse == '1'" style="color:red">未读</p>
                <p v-else>已读</p>
              </li>
@@ -32,29 +32,30 @@
      </el-row>
      <el-row :gutter="8" class="marginTop10">
        <el-col :span="12">
-          <el-card shadow="hover" style="height:280px">
+          <el-card shadow="hover">
            <div slot="header" class="flexst">
              <h5 class="title">待办事项</h5>
              <i class="el-icon-s-unfold pointer"></i>
            </div>
            <ul>
              <li v-for="(item, index) in todoList" :key="index" class="flexst">
-                <p class="right15">{{ item.dealTime }}</p>
+                <p class="right15">{{ item.dealTime.substring(0, 10) }}</p>
-                <p class="list-title">{{ item.dealBusiness }} ({{item.dealStep+ '环节'}})</p>
+                <p class="list-title">{{ item.dealBusiness }} ({{ item.dealStep + '环节' }})</p>
              </li>
            </ul>
          </el-card>
        </el-col>
        <el-col :span="12">
-          <el-card shadow="hover" style="height:280px">
+          <el-card shadow="hover" style="height:225px">
            <div slot="header" class="flexst">
              <h5 class="title">法律法规</h5>
              <i class="el-icon-s-unfold pointer"></i>
            </div>
            <ul>
-              <li v-for="(item, index) in policyList" @click="handleView(item.noticeFileUrl)" :key="index" class="flexst pointer">
+              <li v-for="(item, index) in policyList" @click="handleView(item.noticeFileUrl)" :key="index"
+                class="flexst pointer">
                <p class="right15">{{ item.noticeTitle }}</p>
-                <p class="list-title">{{ item.createtime }}</p>
+                <p class="list-title">{{ item.createtime.substring(0, 10) }}</p>
              </li>
            </ul>
          </el-card>
@@ -74,8 +75,8 @@
        </div>
        <ul>
          <li v-for="(item, index) in doneList" :key="index" class="flexst">
-            <p class="right15">{{ item.dealTime }}</p>
+            <p class="right15">{{ item.dealTime.substring(0, 10) }}</p>
-            <p class="list-title">{{ item.dealBusiness }} ({{item.dealStep+ '环节'}})</p>
+            <p class="list-title">{{ item.dealBusiness }} ({{ item.dealStep + '环节' }})</p>
          </li>
        </ul>
      </el-card>
@@ -143,9 +144,6 @@ export default {
        year: '1996',
        value: 31056
      }, {
-        year: '1995',
-        value: 17000
-      }, {
        year: '1996',
        value: 31056
      }],
@@ -167,30 +165,42 @@ export default {
      window.open(href, '_blank');
    },
    //获取待办事项列表
-    queryTodoList(){
+    queryTodoList () {
      getHomeTodoList().then(res => {
-        if(res.result){
+        if (res.result) {
-          this.todoList = res.result
+          this.todoList = res.result.slice(0, 4)
        }
      })
    },
    //获取已办事项列表
-    queryDoneList(){
+    queryDoneList () {
      getHomeDoneList().then(res => {
-        if(res.result){
+        if (res.result) {
          this.doneList = res.result
        }
      })
    },
    //获取通知列表
-    queryNoticeList(){
+    queryNoticeList () {
      getHomeNoticeList().then(res => {
-        if(res.result){
+        if (res.result) {
          this.noticeList = res.result.noticeList
+          this.noticeList.forEach(item => {
+          })
          this.policyList = res.result.policyList
        }
      })
    },
+    _timedate (date) {
+      let time_str = "";
+      if (new Date(date).getDate() === new Date().getDate()) {
+        time_str = "今天";
+      } else if (new Date(date).getDate() === (new Date().getDate() - 1)) {
+        time_str = "昨天";
+      }
+      return time_str;
+    },
    buildChart () {
      let height = document.getElementById("mountNodeCon").offsetHeight - 20
      var chart = new G2.Chart({
@@ -231,4 +241,8 @@ export default {
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
 @import "./index.scss";
+/deep/.el-card__body {
+  padding: 10px;
+}
 </style>
\ No newline at end of file
--- a/src/views/system/flfg/components/addDialog.vue
View file @37b859d
+++ b/src/views/system/flfg/components/addDialog.vue
View file @37b859d
@@ -26,8 +26,8 @@
 <script>
 import '@/styles/package/theme/index.scss'
-import { addSysNotice} from "@/api/notice.js"
+import { addSysNotice } from "@/api/notice.js"
-import { upload} from "@/api/system.js"
+import { upload } from "@/api/system.js"
 export default {
  props: {
    value: { type: Boolean, default: false },
@@ -60,7 +60,8 @@ export default {
              this.$parent.queryClick();
            } else {
              this.$message.error(res.message)
-                }})
+            }
+          })
        } else {
          // console.log('error submit!!');
          return false;
@@ -73,7 +74,7 @@ export default {
      this.resetRuleForm();
    },
    //
-    resetRuleForm(){
+    resetRuleForm () {
      this.$refs['ruleForm'].resetFields();
      this.ruleForm.noticeType = '2'
    },
@@ -91,5 +92,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
 </style>
\ No newline at end of file
--- a/src/views/system/flfg/flfg.vue
View file @37b859d
+++ b/src/views/system/flfg/flfg.vue
View file @37b859d
@@ -31,11 +31,11 @@
 <script>
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./flfgdata";
-import { getSysPolicyList,deleteSysNotice } from "@/api/notice.js"
+import { getSysPolicyList, deleteSysNotice } from "@/api/notice.js"
 import addDialog from "./components/addDialog.vue";
 export default {
-  name: "xttz",
+  name: "flfg",
-  components: { addDialog},
+  components: { addDialog },
  mixins: [table],
  mounted () {
    sendThis(this);
@@ -70,15 +70,15 @@ export default {
      })
    },
    //打开新增弹窗
-    openDialog() {
+    openDialog () {
      this.isDialog = true;
    },
-    downloadFile(item){
+    downloadFile (item) {
      const href = item.noticeFileUrl
      window.open(href, '_blank');
    },
    //删除
-    delNotice(item){      
+    delNotice (item) {
      this.$confirm('是否确定删除', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
--- a/src/views/system/xttz/components/addDialog.vue
View file @37b859d
+++ b/src/views/system/xttz/components/addDialog.vue
View file @37b859d
@@ -32,9 +32,8 @@
 </template>
 <script>
-import '@/styles/package/theme/index.scss'
+import { addSysNotice } from "@/api/notice.js"
-import { addSysNotice} from "@/api/notice.js"
+import { upload } from "@/api/system.js"
-import { upload} from "@/api/system.js"
 export default {
  props: {
    value: { type: Boolean, default: false },
@@ -70,7 +69,8 @@ export default {
              this.$parent.queryClick();
            } else {
              this.$message.error(res.message)
-                }})
+            }
+          })
        } else {
          // console.log('error submit!!');
          return false;
@@ -83,7 +83,7 @@ export default {
      this.resetRuleForm();
    },
    //
-    resetRuleForm(){
+    resetRuleForm () {
      this.$refs['ruleForm'].resetFields();
      this.ruleForm.noticeType = '1'
    },
@@ -101,5 +101,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
 </style>
\ No newline at end of file
--- a/src/views/system/xttz/components/viewDialog.vue
View file @37b859d
+++ b/src/views/system/xttz/components/viewDialog.vue
View file @37b859d
@@ -15,7 +15,7 @@
    <el-row :gutter="8">
      <el-col :span="24" class="margin-top-middle">
        附件：
-            <div @click="handleView(formData.item.noticeFileUrl)" class="pointer">{{formData.item.noticeFileName}}</div>
+        <div @click="handleView(formData.item.noticeFileUrl)" class="pointer">{{ formData.item.noticeFileName }}</div>
      </el-col>
    </el-row>
  </div>
@@ -26,14 +26,14 @@ export default {
    return {
    };
  },
-  components: {  },
+  components: {},
  props: {
    formData: {
      type: Object,
-      default: () => {}
+      default: () => { }
    },
  },
-  created(){
+  created () {
    console.log(this.formData);
  },
  computed: {
@@ -46,8 +46,7 @@ export default {
 };
 </script>
 <style scoped lang='scss'>
-@import "~@/styles/public.scss";
 .margin-top-middle {
-    margin-top:10px
+  margin-top: 10px
 }
 </style>
\ No newline at end of file
--- a/src/views/system/xttz/xttz.vue
View file @37b859d
+++ b/src/views/system/xttz/xttz.vue
View file @37b859d
@@ -39,11 +39,11 @@
 <script>
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./xttzdata";
-import { getSysNoticeList,deleteSysNotice,publishNotice,unPublishNotice } from "@/api/notice.js"
+import { getSysNoticeList, deleteSysNotice, publishNotice, unPublishNotice } from "@/api/notice.js"
 import addDialog from "./components/addDialog.vue";
 export default {
  name: "xttz",
-  components: { addDialog},
+  components: { addDialog },
  mixins: [table],
  mounted () {
    sendThis(this);
@@ -58,8 +58,8 @@ export default {
        noticeStatus: ''
      },
      noticeStatusList: [
-          {"label": '未发布','value':'1'},
+        { "label": '未发布', 'value': '1' },
-          {'label': '已发布','value':'2'}
+        { 'label': '已发布', 'value': '2' }
      ],
      tableData: {
        total: 0,
@@ -83,11 +83,11 @@ export default {
      })
    },
    //打开新增弹窗
-    openDialog() {
+    openDialog () {
      this.isDialog = true;
    },
    //删除
-    delNotice(item){      
+    delNotice (item) {
      this.$confirm('是否确定删除', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -109,7 +109,7 @@ export default {
      });
    },
    //发布
-    toPublish(item){
+    toPublish (item) {
      this.$confirm('是否确定发布', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -131,7 +131,7 @@ export default {
      });
    },
    //取消发布
-    toUnPublish(item){
+    toUnPublish (item) {
      this.$confirm('是否确定取消发布', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -152,11 +152,11 @@ export default {
        });
      });
    },
-    downloadFile(item){
+    downloadFile (item) {
      const href = item.noticeFileUrl
      window.open(href, '_blank');
    },
-    viewDetail(e){
+    viewDetail (e) {
      this.$popup("错误日志", "system/xttz/components/viewDialog", {
        formData: {
          item: e
--- a/src/views/ywbl/components/mixin/index.js
View file @37b859d
+++ b/src/views/ywbl/components/mixin/index.js
View file @37b859d
@@ -11,8 +11,9 @@ export default {
      this.isSearch = true
    },
    getSearch (val) {
-      console.log(val, 222222222222);
+      if (!val) return
      this.otherForm = val
+      this.queryClick()
      let obj = { ywlymc: '业务来源', qllxmc: '权利类型', djlxmc: '登记类型', ywh: '业务号', sqywmc: '申请业务名称', qlrmc: '权利人', ywrmc: '义务人', slsj: '受理时间' }
      this.searchList = Object.entries({ ...this.searchForm, ...val }).map((item) => {
        const [name, value] = item
--- a/src/views/ywbl/components/search.vue
View file @37b859d
+++ b/src/views/ywbl/components/search.vue
View file @37b859d
@@ -70,8 +70,7 @@ export default {
      this.$refs['ruleForm'].resetFields()
    },
    submitForm () {
-      this.$emit('getSearch', this.ruleForm)
+      this.$emit('getSearch', _.cloneDeep(this.ruleForm))
-      console.log(this.ruleForm);
      this.$emit('input', false)
      this.$refs['ruleForm'].resetFields()
    }
--- a/src/views/ywbl/dbx/dbx.vue
View file @37b859d
+++ b/src/views/ywbl/dbx/dbx.vue
View file @37b859d
@@ -126,7 +126,7 @@ export default {
    queryClick () {
      this.$startLoading()
      this.searchForm.ywh = this.queryForm.ywh
-      this.getSearch()
+      console.log(this.otherForm);
      searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => {
        this.$endLoading()
        if (res.code === 200) {