From 0de47fd5ea71ea663af3a614478aed806aa9c085 Mon Sep 17 00:00:00 2001
From: "DESKTOP-H2PAFLR\\Administrator" <xuqianhao@88.com>
Date: Mon, 7 Aug 2023 18:54:37 +0800
Subject: [PATCH] =?UTF-8?q?dict=E5=A4=84=E7=90=86=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Vue/src/components/DictTag/index.vue   |  30 +-
 ZR.Vue/src/views/basisManagement/unit.vue |   2 +-
 ZR.Vue/src/views/index.vue                | 421 +---------------------
 3 files changed, 28 insertions(+), 425 deletions(-)

diff --git a/ZR.Vue/src/components/DictTag/index.vue b/ZR.Vue/src/components/DictTag/index.vue
index d52dd364..4c196c48 100644
--- a/ZR.Vue/src/components/DictTag/index.vue
+++ b/ZR.Vue/src/components/DictTag/index.vue
@@ -1,12 +1,23 @@
 <template>
   <div>
     <template v-for="(item, index) in options">
-      <template v-if="values.includes(item.dictValue)">
-        <span v-if="item.listClass == 'default' || item.listClass == ''" :key="item.dictValue" :index="index" :class="item.cssClass">
-          {{ item.dictLabel }} <i v-if="showValue">#{{item.dictValue}}</i></span>
-        <el-tag size="mini" v-else :disable-transitions="true" :key="item.dictValue" :index="index"
-          :type="item.listClass == 'primary' ? '' : item.listClass" :class="item.cssClass">
-          {{ item.dictLabel }}<i v-if="showValue">#{{item.dictValue}}</i>
+      <template v-if="values.includes(item.value)">
+        <span
+          v-if="item.raw.listClass == 'default' || item.raw.listClass == ''"
+          :key="item.value"
+          :index="index"
+          :class="item.raw.cssClass"
+          >{{ item.label }}</span
+        >
+        <el-tag
+          v-else
+          :disable-transitions="true"
+          :key="item.value"
+          :index="index"
+          :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
+          :class="item.raw.cssClass"
+        >
+          {{ item.label }}
         </el-tag>
       </template>
     </template>
@@ -21,12 +32,11 @@ export default {
       type: Array,
       default: null,
     },
-    value: [Number, String, Array, Boolean],
-    showValue: false,
+    value: [Number, String, Array],
   },
   computed: {
     values() {
-      if (this.value !== null && typeof this.value !== "undefined") {
+      if (this.value !== null && typeof this.value !== 'undefined') {
         return Array.isArray(this.value) ? this.value : [String(this.value)];
       } else {
         return [];
@@ -39,4 +49,4 @@ export default {
 .el-tag + .el-tag {
   margin-left: 10px;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/ZR.Vue/src/views/basisManagement/unit.vue b/ZR.Vue/src/views/basisManagement/unit.vue
index e508133a..1a41d274 100644
--- a/ZR.Vue/src/views/basisManagement/unit.vue
+++ b/ZR.Vue/src/views/basisManagement/unit.vue
@@ -35,7 +35,7 @@
       <el-table-column label="单位名称" align="center" prop="measureName" />
        <el-table-column label="是否启用" align="center" prop="enableFlag" >
         <template slot-scope="scope">
-          <dict-tag1 :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
diff --git a/ZR.Vue/src/views/index.vue b/ZR.Vue/src/views/index.vue
index b7f4f155..203cb815 100644
--- a/ZR.Vue/src/views/index.vue
+++ b/ZR.Vue/src/views/index.vue
@@ -1,424 +1,17 @@
 <template>
-  <div class="dashboard-editor-container home">
-    <!-- 用户信息 -->
-    <el-row :gutter="15">
-      <el-col :md="24" :lg="16" :xl="16" class="mb10">
-        <el-card shadow="hover">
-          <div slot="header">
-            <span>我的工作台</span>
-          </div>
-          <div class="user-item">
-            <div class="user-item-left">
-              <img :src="userInfo.avatar" />
-            </div>
-
-          【腾讯云限时秒杀活动】
-          <el-link href="https://curl.qcloud.com/4yEoRquq" type="primary" target="_blank">☛☛点我进入☚☚ </el-link>
-          <br />
-
-          【华为特惠专区，多款产品限时特价】
-          <el-link
-            href="https://activity.huaweicloud.com/discount_area_v5/index.html?fromacct=a53709d1-149d-49f4-9b89-bf62bd96ef65&utm_source=aGlkX3N0dnZkMWNxejBnOTJ5OA===&utm_medium=cps&utm_campaign=201905"
-            type="primary"
-            target="_blank"
-          >
-            ☛☛点我进入☚☚
-          </el-link>
-          <br />
-          【领取七牛云通用云产品优惠券】
-          <el-link href="https://s.qiniu.com/FzEfay" type="primary" target="_blank"> ☛☛点我进入☚☚ </el-link>
-          <br />
-          【Gitee 企业版优惠专区】
-          <el-link href="https://gitee.com/enterprises?invite_code=Z2l0ZWUtMTI1NzM1OQ%3D%3D" type="primary" target="_blank"> ☛☛点我进入☚☚ </el-link>
-          <br />
-          <h4 class="text-danger">云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)</h4>
-        </blockquote>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :lg="16" :sm="24">
-        <h2>ZRAdmin.NET后台管理框架</h2>
-        <p>
-          ZRAdmin.NET借鉴了很多开源项目的优点，让你开发Web管理系统更简单，所以我也把它给开源了（前端
-          <code>vue页面</code>主要参考若依，在此表示感谢.)
-        </p>
-        <p>代码完全免费开源，易读易懂、界面简洁美观，给你的项目多一种选择与参考。</p>
-        <p>
-          <b>当前版本:</b> <span>v{{ version }}</span>
-          <el-link
-            class="ml10"
-            type="primary"
-            size="mini"
-            icon="el-icon-document"
-            plain
-            @click="goTarget('http://www.izhaorui.cn/doc/changelog.html#' + version)"
-            >更新日志
-          </el-link>
-        </p>
-        <p>
-          <el-button type="primary" size="mini" icon="el-icon-cloudy" plain @click="goTarget('https://gitee.com/izory/ZrAdminNetCore')"
-            >访问码云
-          </el-button>
-          <el-button type="primary" size="mini" icon="el-icon-cloudy" plain @click="goTarget('https://github.com/izhaorui/ZrAdmin.NET')"
-            >Github
-          </el-button>
-        </p>
-        <p></p>
-        <h3>如果觉得不错欢迎给个⭐Star⭐收藏一下 ，这样作者才有继续免费下去的动力，谢谢！</h3>
-      </el-col>
-      <el-col :sm="24" :lg="8">
-        <el-row>
-          <h2>技术选型</h2>
-          <el-col :span="10">
-            <h4>后端技术</h4>
-            <ul>
-              <li>NET5</li>
-              <li>JWT</li>
-              <li>SqlSugar</li>
-              <li>Quartz.Net</li>
-              <li>MySql</li>
-              <li>Mapster</li>
-              <li>Epplus</li>
-              <li>Signalr</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-          <el-col :span="10">
-            <h4>前端技术</h4>
-            <ul>
-              <li>Vue</li>
-              <li>Vuex</li>
-              <li>Element-ui</li>
-              <li>Axios</li>
-              <li>Sass</li>
-              <li>Quill</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-    <el-divider />
-    <el-row :gutter="20" class="mt10">
-      <el-col :sm="24" :lg="8">
-        <el-card>
-          <div slot="header" class="clearfix">
-            <span>联系信息</span>
-          </div>
-          <div class="body">
-            <p>
-              <i class="el-icon-s-promotion"></i>官网：
-              <el-link href="http://www.izhaorui.cn/doc" target="_blank">http://www.izhaorui.cn/doc</el-link>
-            </p>
-          </div>
-          <div class="body">
-            <p>
-              <i class="el-icon-user-solid"></i>QQ群：<a
-                href="https://qm.qq.com/cgi-bin/qm/qr?k=Y__-fTGo_K2UIo3nWz7QnvS8LoRfPWKm&authKey=/ldXxiuolv80PF4yC8VtLk/TvAYbIhm2LKP8YVHCxAk+x2I+iqPAM1H/IsxQ+0gC&noverify=0"
-                target="_black"
-                >191349103</a
-              >
-            </p>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :md="24" :lg="8" :xl="8" class="mb10">
-        <el-card shadow="hover">
-          <div slot="header">
-            <span>最新文章</span>
-            <el-button class="home-card-more" type="text" @click="onOpenGitee">更多</el-button>
-          </div>
-          <div class="info">
-            <Scroll :data="newArticleList" class="info-scroll" :class-option="optionSingleHeight">
-              <ul class="info-ul">
-                <li v-for="(v, k) in newArticleList" :key="k" class="info-item">
-                  <div class="info-item-left" v-text="v.title"></div>
-                  <div class="info-item-right" v-text="parseTime(v.updateTime, '{m}/{d}')"></div>
-                </li>
-              </ul>
-            </Scroll>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :span="10">
-        <!-- <el-card>
-          <div slot="header" class="clearfix">
-            <span></span>
-          </div>
-        </el-card> -->
-      </el-col>
-    </el-row>
+  <div>
+    hello
   </div>
 </template>
 
-<script>
-import PanelGroup from './dashboard/PanelGroup'
-import LineChart from './dashboard/LineChart'
-import RaddarChart from './dashboard/RaddarChart'
-import PieChart from './dashboard/PieChart'
-import BarChart from './dashboard/BarChart'
-import Scroll from 'vue-seamless-scroll'
-import { listNewArticle } from '@/api/system/article.js'
 
-const lineChartData = {
-  newVisitis: {
-    expectedData: [100, 120, 161, 134, 105, 160, 165],
-    actualData: [120, 82, 91, 154, 162, 140, 145]
-  },
-  messages: {
-    expectedData: [200, 192, 120, 144, 160, 130, 140],
-    actualData: [180, 160, 151, 106, 145, 150, 130]
-  },
-  purchases: {
-    expectedData: [80, 100, 121, 104, 105, 90, 100],
-    actualData: [120, 90, 100, 138, 142, 130, 130]
-  },
-  shoppings: {
-    expectedData: [130, 140, 141, 142, 145, 150, 160],
-    actualData: [120, 82, 91, 154, 162, 140, 130]
-  }
-}
+<script>
 export default {
-  name: 'Index',
-  components: {
-    PanelGroup,
-    LineChart,
-    RaddarChart,
-    PieChart,
-    BarChart,
-    Scroll
-  },
-  computed: {
-    photo() {
-      return this.$store.getters.photo
-    },
-    userInfo() {
-      return this.$store.getters.userinfo
-    },
-    currentTime() {
-      return this.parseTime(new Date())
-    },
-    optionSingleHeight() {
-      return {
-        step: 0.2, // 数值越大速度滚动越快
-        limitMoveNum: 2, // 开始无缝滚动的数据量 this.dataList.length
-        hoverStop: true, // 是否开启鼠标悬停stop
-        direction: 1, // 0向下 1向上 2向左 3向右
-        openWatch: true, // 开启数据实时监控刷新dom
-        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
-        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
-        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
-      }
-    }
-  },
-  data() {
-    return {
-      lineChartData: lineChartData.newVisitis,
-      newArticleList: []
-    }
-  },
-  created() {
-    listNewArticle().then((res) => {
-      this.newArticleList = res.data
-    })
-  },
-  methods: {
-    handleSetLineChartData(type) {
-      this.lineChartData = lineChartData[type]
-    },
-    onOpenGitee() {}
-  }
+  name:"index"
+
 }
 </script>
 
-<style lang="scss" scoped>
-.home {
-  width: 100%;
-  overflow: hidden;
-  .home-card-more {
-    float: right;
-    padding: 3px 0;
-    font-size: 13px;
-  }
-  .home-card-time {
-    float: right;
-    font-size: 13px;
-    width: 130px;
-    margin-top: -4px;
-  }
-  .user-item {
-    height: 198px;
-    display: flex;
-    align-items: center;
-    .user-item-left {
-      width: 100px;
-      height: 130px;
-      border-radius: 4px;
-      overflow: hidden;
-      img {
-        width: 100%;
-        height: 100%;
-      }
-    }
-    .user-item-right {
-      flex: 1;
-      padding: 15px;
-      .right-title {
-        font-size: 20px;
-      }
-      .right-l-v {
-        font-size: 13px;
-        display: flex;
-        .right-label {
-          color: gray;
-          width: 40px;
-        }
-        .right-value {
-          flex: 1;
-        }
-      }
-    }
-  }
-  .info {
-    height: 198px;
-    .info-scroll {
-      height: 100%;
-      overflow: hidden;
-      .info-ul {
-        list-style: none;
-        padding: 0;
-        .info-item {
-          display: flex;
-          font-size: 13px;
-          color: gray;
-          height: 28px;
-          line-height: 28px;
-          &:hover {
-            color: var(--color-primary);
-            cursor: pointer;
-          }
-          .info-item-left {
-            flex: 1;
-            flex-shrink: 0;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            overflow: hidden;
-          }
-          .info-item-right {
-            width: 60px;
-            text-align: right;
-          }
-        }
-      }
-    }
-  }
-  .home-recommend-row {
-    .home-recommend {
-      position: relative;
-      height: 100px;
-      color: #ffffff;
-      border-radius: 4px;
-      overflow: hidden;
-      cursor: pointer;
-      &:hover {
-        i {
-          right: 0px !important;
-          bottom: 0px !important;
-          transition: all ease 0.3s;
-        }
-      }
-      i {
-        position: absolute;
-        right: -10px;
-        bottom: -10px;
-        font-size: 70px;
-        transform: rotate(-30deg);
-        transition: all ease 0.3s;
-      }
-      .home-recommend-auto {
-        padding: 15px;
-        position: absolute;
-        left: 0;
-        top: 5%;
-        .home-recommend-msg {
-          font-size: 12px;
-          margin-top: 10px;
-        }
-      }
-    }
-  }
-  .charts {
-    width: 100%;
-    height: 282.6px;
-    display: flex;
-    padding: 12px 15px;
-    .charts-left {
-      flex: 1;
-      height: 100%;
-    }
-    .charts-right {
-      flex: 1;
-      height: 100%;
-    }
-  }
-  .home-charts {
-    height: 282.6px;
-    .home-charts-item {
-      background-color: #f5f5f5;
-      padding: 19px 15px;
-      border-radius: 2px;
-      display: flex;
-      align-items: center;
-      margin-bottom: 12px;
-      cursor: pointer;
-      &:last-of-type {
-        margin-bottom: 0;
-      }
-      &:hover {
-        .home-charts-item-right {
-          i {
-            transform: rotate(45deg);
-            transition: all ease 0.3s;
-          }
-        }
-      }
-      .home-charts-item-left {
-        flex: 1;
-        .home-charts-item-title {
-          font-size: 13px;
-        }
-        .home-charts-item-num {
-          font-size: 20px;
-          margin-top: 5px;
-        }
-      }
-      .home-charts-item-right {
-        i {
-          font-size: 20px;
-          padding: 8px;
-          border-radius: 100%;
-          transition: all ease 0.3s;
-        }
-      }
-    }
-  }
-}
+<style>
 
-.dashboard-editor-container {
-  padding: 18px;
-  background-color: rgb(240, 242, 245);
-  position: relative;
-
-  .chart-wrapper {
-    background: #fff;
-    padding: 16px 16px 0;
-    margin-bottom: 32px;
-  }
-}
-
-@media (max-width: 1024px) {
-  .chart-wrapper {
-    padding: 8px;
-  }
-}
-</style>
+</style>
\ No newline at end of file