Merge branch 'cmy/develop-bi' into develop

TEAMModelBI/ClientApp/package.json

@@ -29,7 +29,7 @@
         "splitpanes": "^3.1.1",
         "vue": "^3.2.0",
         "vue-clipboard3": "^2.0.0",
-        "vue-i18n": "^9.2.0-beta.35",
+        "vue-i18n": "^9.2.2",
         "vue-loader-v16": "npm:vue-loader@^16.0.0-alpha.3",
         "vue-router": "^4.0.0-rc.5",
         "vue3-count-to": "^1.1.2",

TEAMModelBI/ClientApp/src/view/created/created.vue

@@ -16,16 +16,8 @@
           <el-form :label-position="labelPosition" label-width="125px" :model="formArea" ref="formRef" :rules="areaRules">
             <el-form-item label="学区名称" class="special" prop="areaname.value">
               <div class="areanames">
-                <!-- <el-input v-model="formArea.areaname.value" disabled
-                            :placeholder="$t(`areaManages.createdArea.namehint`)"  
-                            v-show="formArea.areaname.state == false" size="medium" /> -->
                 <el-input v-model="formArea.areaname.value" placeholder="创建学区名称" />
               </div>
-              <!-- <div class="areanames-btn">
-                        <el-button type="primary" icon="el-icon-edit"
-                            v-if="formArea.areaname.state == false && formArea.areaname.value"
-                            @click="formArea.areaname.state = true"></el-button>
-                    </div> -->
             </el-form-item>
             <el-form-item :label="$t(`areaManages.createdArea.affiliation`)" class="belong" prop="institution">
               <div class="institutionbox">
@@ -579,8 +571,7 @@ import * as excel from '../../until/excel.js'
 import option from '@/static/region.json'
 import router from '@/router/index.js'
 import { useRoute } from 'vue-router'
-import { useI18n } from 'vue-i18n'
-import { FLIPPED_ALIAS_KEYS } from '@babel/types'
+ import { useI18n } from 'vue-i18n'
 import option_cn from '@/static/regions/region_cn.json'
 import option_gl from '@/static/regions/region_gl.json'
 const chinaData = new EluiChinaAreaDht.ChinaArea().chinaAreaflat
@@ -656,7 +647,7 @@ export default {
   components: { EluiChinaAreaDht, Search, StarFilled },
   setup () {
     const siteValue = window.location.host === 'localhost:5001' ? 'cn' : window.location.host === 'bi.teammodel.cn' ? 'cn' : window.location.host === 'bitest.teammodel.cn' ? 'cn' : 'international'
-    const { t } = useI18n()
+     const { t } = useI18n()
     const labelPosition = 'right'
     let { proxy } = getCurrentInstance()
     const store = useStore()

TEAMModelBI/ClientApp/src/view/login.vue

@@ -2,60 +2,18 @@
   <div class="backgorundbox">
     <div class="loginbox">
       <div class="logintitle">{{ $t(`login.title`) }}</div>
-      <!-- <div class="usrpwd" v-if="loginModel">
-                <div class='userbox' style="margin-bottom:10%">
-                    <el-input v-model="user" placeholder="醍摩豆ID/手机号码" prefix-icon="el-icon-user" />
-                </div>
-                <div class='userbox'>
-                    <el-input v-model="pwd" placeholder="密码" type="password" prefix-icon="el-icon-key" />
-                    <div class="loginbtn" v-show="user !='' && pwd !='' " @click="userlogin(proxy)"><img src="@/assets/img/login.png"></div>
-                </div>
-                <div class="not_has_more">
-                    或下列方式登录
-                    <div class="ddlogin" @click="loginModel=false"><img src="../assets/img/ddlogin.png"></div>
-                </div>
-            </div> -->
       <div class="usrpwd">
-        <ddlogin></ddlogin>
+        <DDlogin></DDlogin>
       </div>
-      <!-- <div class="accessbox">
-        <div class="access" title="IES5应用接入说明文档" @click="openSkip('movement')">
-          <el-icon>
-            <Share color="#fff" style="width:20px;height:20px" />
-          </el-icon>
-        </div>
-      </div> -->
-      <!-- <div class="cut" @click="loginModel = !loginModel">
-                <svg width="52" height="52" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" style="border-top-right-radius:10px">
-                    <mask id="id-3757926926-a" width="52" height="52" x="0" y="0" maskUnits="userSpaceOnUse">
-                        <path fill="#fff" d="M0 0l52 52V0H0z"></path>
-                    </mask>
-                    <g mask="url(#id-3757926926-a)">
-                        <path fill="#ccF" d="M0 0h48a4 4 0 014 4v48L0 0z"></path>
-                        <path fill="url(#pattern0)" d="M0 0h52v52H0z"></path>
-                    </g>
-                    <defs>
-                        <pattern id="pattern0" width="1" height="1" patternContentUnits="objectBoundingBox">
-                            <use transform="scale(.00216)" xlink:href="#image0"></use>
-                        </pattern>
-                        <image id="image0" width="463" height="463" :xlink:href="loginImg"></image>
-                    </defs>
-                </svg>
-            </div> -->
     </div>
     <div class="footerbox">
       <Footer></Footer>
     </div>
-    <!-- <div id="login_container" style="transform: scale(.8);">123456</div> -->
-    <!--绑定弹窗-->
-    <!-- <bind :callbackStatus=callbackStatus v-if="callbackStatus.state ===201" ref="comRef"></bind> -->
-    <!--绑定弹窗end-->
   </div>
 </template>
 <script>
 import { ref, watch, onMounted, getCurrentInstance, toRef, reactive } from 'vue'
-import ddlogin from './ddlogin.vue'
-import bind from './bindPhone.vue'
+import DDlogin from './ddlogin.vue'
 import Footer from '@/view/common/footer.vue'
 import { ElMessage, ElLoading } from 'element-plus'
 import { useRouter } from 'vue-router'
@@ -64,8 +22,7 @@ import jwt_decode from 'jwt-decode'
 import { Share } from '@element-plus/icons-vue'
 export default {
   components: {
-    ddlogin,
-    bind,
+    DDlogin,
     Share,
     Footer
   },