Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

# Conflicts:
#	src/router/HDrpManagement.js

src/HDrpManagement/unit/components/delete.vue

@@ -0,0 +1,30 @@
+<template>
+  <div style="display:inline;margin:0 16px">
+    <el-popconfirm title="确定删除当前数据吗？" @confirm="deleteRow()">
+      <el-button slot="reference" size="small" type="text">删 除</el-button>
+    </el-popconfirm>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ['type','id'],
+  methods: {
+    async deleteRow() {
+      let res = await this.$api.requested({
+          "id": this.type == 'unit' ? '20220922084903' : '20220922084603',
+          "version":1,
+          "content": {
+            [this.type == 'unit' ? 'unitid' : 'unitgroupid']:this.id
+          }
+      })
+
+      console.log(res);
+      this.tool.showMessage(res,() => {
+        this.$emit('deleteSuccess')
+      })
+    },
+  }
+}
+
+</script>

src/HDrpManagement/unit/components/list.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="unit container normal-panel">
+    <el-row>
+      <el-col :span="11">
+        <p class="normal-title normal-margin">计量单位</p>
+        <slot name="unitAdd"/>
+        <tableLayout v-if="unitList" :layout="tablecols1" :data="unitList" :custom="false" height="70vh">
+          <template v-slot:opreation="scope">
+              <div style="display:flex">
+                  <slot name="unitEdit" :data="scope.data" />
+                  <slot name="unitDel" :data="scope" />
+              </div>
+          </template>
+        </tableLayout>
+      </el-col>
+      <el-col :span="11" style="margin-left:16px">
+        <p class="normal-title normal-margin">计量单位组</p>
+        <slot name="unitGroupAdd"/>
+        <tableLayout v-if="unitGroupList" :layout="tablecols2" :data="unitGroupList" :custom="false" height="70vh">
+          <template v-slot:opreation="scope">
+              <div style="display:flex">
+                  <slot name="unitGroupEdit" :data="{row:scope.data,unitList:unitList}" />
+                  <slot name="unitGroupDel" :data="scope.data" />
+              </div>
+          </template>
+        </tableLayout>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data() {
+    return {
+      unitList:'',
+      unitGroupList:'',
+      tablecols1:'',
+      tabelCol2:''
+    };
+  },
+  computed:{
+  },
+  watch:{
+  },
+  created() {
+    this.getUnit()
+    this.getUnitGroup()
+    this.tablecols1 = this.tool.tabelCol(this.$route.name).unitTable.tablecols
+    this.tablecols2 = this.tool.tabelCol(this.$route.name).unitGroupTable.tablecols
+  },
+  methods: {
+    /* 获取单位列表 */
+    async getUnit() {
+      let res = await this.$api.requested({
+        "id": "20220922084803",
+        "version":1,
+        "content": {
+          "nocache":true,
+          "where":{
+              "condition":""
+          }
+        }
+      })
+      this.unitList = res.data
+      console.log(res)
+    },
+    /* 计量单位组数据 */
+    async getUnitGroup() {
+      let res = await this.$api.requested({
+        "id": "20220922084503",
+        "version":1,
+        "content": {
+          "nocache":true,
+          "where":{
+              "condition":""
+          }
+        }
+      })
+      this.unitGroupList = res.data
+      console.log(res);
+      
+    }
+  },
+};
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/unit/components/unitAdd.vue

@@ -0,0 +1,99 @@
+<template>
+  <div class="add">
+    <el-button type="primary" size="small" style="margin-bottom:16px" @click="dialogVisible=true" v-if="type=='add'">新增</el-button>
+    <el-button type="text" size="small" @click="editBtn" v-else>编辑</el-button>
+    <el-dialog
+      :title="type == 'add' ? '新增计量单位' : '编辑计量单位'"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+        <el-form-item label="计量单位" prop="unitname">
+          <el-input v-model="ruleForm.unitname" size="small"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <div>
+          <el-button @click="dialogVisible = false" size="small">取 消</el-button>
+          <el-button type="primary" @click="submit" size="small">确 定</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
+  
+</template>
+
+<script>
+import { log } from '@antv/g2plot/lib/utils';
+export default {
+  name: '',
+  data() {
+    return {
+      currentData:'',
+      dialogVisible:false,
+      ruleForm: {
+        unitname:''
+      },
+      rules:{
+        unitname: [
+          { required: true, message: '请输入计量单位', trigger: 'blur' },
+        ]
+      }
+    };
+  },
+  props:['type','unitData'],
+  computed:{
+  },
+  watch:{
+    currentData: {
+      handler(val) {
+        this.ruleForm.unitname = val.unitname
+      }
+    }
+  },
+  methods: {
+    editBtn() {
+      this.dialogVisible=true
+      this.currentData = this.unitData
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+    submit() {
+      this.$refs.ruleForm.validate(async val => {
+        if(val) {
+          let res = await this.$api.requested({
+            "accesstoken": "bed2f4500c0e799a29ddbbe47a2a04b6",
+            "id": "20220922084703",
+            "version":1,
+            "content": {
+                "unitid":this.type == 'add' ? 0 : this.currentData.unitid,
+                "unitname":this.ruleForm.unitname
+            }
+          })
+          console.log(res);
+          this.tool.showMessage(res,() => {
+            this.$emit('unitAddSuccess')
+            this.dialogVisible = false
+            this.$refs.ruleForm.resetFields()
+          })
+        }
+      })
+    }
+  },
+};
+</script>
+
+<style scoped>
+  .dialog-footer {
+    display: flex;
+    justify-content: space-evenly;
+  }
+  /deep/.el-dialog__body {
+    padding-top: 10px !important;
+    padding-bottom: 0 !important;
+  }
+  /deep/.dialog-footer {
+    margin-top: 10px !important;
+  }
+</style>

src/HDrpManagement/unit/components/unitGroupAdd.vue

@@ -0,0 +1,147 @@
+<template>
+  <div class="add">
+    <el-button type="primary" size="small" style="margin-bottom:16px" @click="dialogVisible=true" v-if="type=='add'">新增</el-button>
+    <el-button type="text" size="small" @click="editBtn" v-else>编辑</el-button>
+    <el-dialog
+      :title="type == 'add' ? '新增计量单位组' : '编辑计量单位组'"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="demo-ruleForm">
+        <el-form-item label="计量单位组名称" prop="unitgroupname">
+          <el-input v-model="ruleForm.unitgroupname" size="small"></el-input>
+        </el-form-item>
+        <el-form-item label="主计量单位" prop="unitid">
+          <el-select v-model="ruleForm.unitid" placeholder="请选择">
+            <el-option
+              v-for="item in allUnit"
+              :key="item.value"
+              :label="item.unitname"
+              :value="item.unitid"
+              size="small">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="辅助计量单位" prop="auxunitid">
+          <el-select v-model="ruleForm.auxunitid" placeholder="请选择">
+            <el-option
+              v-for="item in allUnit"
+              :key="item.value"
+              :label="item.unitname"
+              :value="item.unitid"
+              size="small">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="换算率" prop="conversionrate">
+          <el-input v-model.number="ruleForm.conversionrate" size="small" placeholder="换算率=辅助单位数量/主单位数量"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <div>
+          <el-button @click="dialogVisible = false" size="small">取 消</el-button>
+          <el-button type="primary" @click="submit" size="small">确 定</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
+  
+</template>
+
+<script>
+import { log } from '@antv/g2plot/lib/utils';
+export default {
+  name: '',
+  data() {
+    return {
+      currentData:'',
+      dialogVisible:false,
+      ruleForm: {
+        unitgroupname:'',
+        unitid:'',
+        auxunitid:'',
+        conversionrate:''
+      },
+      rules:{
+        unitgroupname: [
+          { required: true, message: '请输入计量单位组名称', trigger: 'blur' },
+        ],
+        unitid: [
+          { required: true, message: '请输入主计量单位', trigger: 'blur' },
+        ],
+        auxunitid: [
+          { required: true, message: '请输入辅助计量单位', trigger: 'blur' },
+        ],
+        conversionrate: [
+          { required: true, message: '请输入换算率,换算率=辅助单位数量/主单位数量', trigger: 'blur' },
+          { message: '换算率必须为数字', trigger: 'blur' , type:'number' },
+        ],
+      }
+    };
+  },
+  props:['type','unitData','allUnit'],
+  computed:{
+  },
+  watch:{
+    currentData: {
+      handler(val) {
+        this.ruleForm = {
+          unitgroupname:val.unitgroupname,
+          unitid:val.unitid,
+          auxunitid:val.auxunitid,
+          conversionrate:val.conversionrate
+        }
+      }
+    }
+  },
+  methods: {
+    editBtn() {
+      this.dialogVisible=true
+      this.currentData = this.unitData
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+    submit() {
+      this.$refs.ruleForm.validate(async val => {
+        if(val) {
+          let res = await this.$api.requested({
+            "id": "20220922084403",
+            "version":1,
+            "content": {
+              "unitgroupid":this.type == 'add' ? 0 : this.unitData.unitgroupid,     
+              "unitgroupname":this.ruleForm.unitgroupname,
+              "unitid":this.ruleForm.unitid,
+              "auxunitid":this.ruleForm.auxunitid,
+              "conversionrate":this.ruleForm.conversionrate
+            }
+          })
+          console.log(res);
+          this.tool.showMessage(res,() => {
+            this.$emit('unitAddSuccess')
+            this.dialogVisible = false
+            this.$refs.ruleForm.resetFields()
+          })
+        }
+      })
+    }
+  },
+};
+</script>
+
+<style scoped>
+  .dialog-footer {
+    display: flex;
+    justify-content: space-evenly;
+  }
+  /deep/.el-dialog__body {
+    padding-top: 10px !important;
+    padding-bottom: 0 !important;
+  }
+  /deep/.dialog-footer {
+    margin-top: 10px !important;
+  }
+  /deep/.el-select {
+    width: 100% !important;
+  }
+</style>

src/HDrpManagement/unit/index.vue

@@ -0,0 +1,112 @@
+<template>
+  <div>
+    <list ref="list">
+      <!--单位计量-->
+      <unitAdd 
+        type="add" 
+        slot="unitAdd" 
+        @unitAddSuccess="unitAddSuccess" 
+        v-if="tool.checkAuth($route.name,'insert')" 
+      />
+      <template v-slot:unitEdit="scope">
+        <unitAdd 
+          type="edit"  
+          @unitAddSuccess="unitAddSuccess" 
+          :unitData="scope.data" 
+          v-if="tool.checkAuth($route.name,'update')" 
+        />
+      </template>
+      <template v-slot:unitDel="scope">
+        <Del type="unit" 
+          @deleteSuccess="UnitDeleteSuccess" 
+          :id="scope.data.data.unitid"  
+          v-if="tool.checkAuth($route.name,'delete')"
+        />
+      </template>
+      <!--单位计量组-->
+      <unit-group-add 
+        type="add" 
+        slot="unitGroupAdd" 
+        @unitAddSuccess="unitGroupAddSuccess" 
+        :allUnit="unitList" 
+        v-if="tool.checkAuth($route.name,'insert')" 
+      />
+      <template v-slot:unitGroupEdit="scope">
+        <unit-group-add 
+          type="edit" 
+          :unitData="scope.data.row" 
+          @unitAddSuccess="unitGroupAddSuccess" 
+          :allUnit="scope.data.unitList" 
+          v-if="tool.checkAuth($route.name,'update')"
+        />
+      </template>
+      <template v-slot:unitGroupDel="scope">
+        <Del type="unitGroup" 
+          @deleteSuccess="unitGroupDelSuccess" 
+          :id="scope.data.unitgroupid" 
+          v-if="tool.checkAuth($route.name,'delete')"
+        />
+      </template>
+    </list>
+  </div>
+</template>
+
+<script>
+import list from './components/list'
+import Del from './components/delete'
+import unitAdd from './components/unitAdd'
+import unitGroupAdd from './components/unitGroupAdd'
+export default {
+  name: '',
+  data() {
+    return {
+      unitList:''
+    };
+  },
+  components:{list,Del,unitAdd,unitGroupAdd},
+  computed:{
+  },
+  watch:{
+  },
+  created() {
+    this.getUnit()
+  },
+  methods: {
+    /* 计量单位增加成功 */
+    unitAddSuccess() {
+      this.$refs.list.getUnit()
+    },
+    /* 计量单位删除成功 */
+    UnitDeleteSuccess() {
+      this.$refs.list.getUnit()
+    },
+    /* 计量组添加成功 */
+    unitGroupAddSuccess() {
+      this.$refs.list.getUnitGroup()
+    },
+    /* 计量组删除成功 */
+    unitGroupDelSuccess() {
+      this.$refs.list.getUnitGroup()
+    },
+    /* 获取单位列表 */
+    async getUnit() {
+      let res = await this.$api.requested({
+        "id": "20220922084803",
+        "version":1,
+        "content": {
+          "nocache":true,
+          "where":{
+              "condition":""
+          }
+        }
+      })
+      this.unitList = res.data
+      console.log(res)
+    },
+  },
+};
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/salesForecastTemplate/index.vue

@@ -3,7 +3,7 @@
     <add v-if="tool.checkAuth($route.name,'insert')" @onSuccess="onSuccess"></add>
     <tepList ref="teplist" @tableRowClick="tableRowClick">
       <template v-slot:edit="scope">
-        <edit v-if="tool.checkAuth($route.name,'update')" :data="scope.data"></edit>
+        <edit v-if="tool.checkAuth($route.name,'update')" :data="scope.data" @onSuccess="onSuccess"></edit>
       </template>
       <template v-slot:del="scope">
         <ondel v-if="tool.checkAuth($route.name,'delete')" :data="scope.data" @onSuccess="onSuccess"></ondel>

src/HManagement/salesForecastTemplate/modules/add.vue

@@ -68,7 +68,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="提报要求">
-              <el-checkbox v-model="form.baseonproject" :true-label="1" :false-label="0">按项目预测</el-checkbox>
+              <el-checkbox v-model="form.baseonproject" :true-label="1" :false-label="0">按项目及产品类别预测</el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -152,6 +152,20 @@ export default {
         callback();
       }
     },
+    validateEndDate(rule, value, callback){
+      let start = (new Date(this.form.begdate)).getTime()
+      let end = (new Date(this.form.enddate)).getTime()
+      if (value === '') {
+        callback(new Error('请选择结束日期'));
+      } else if (end < start) {
+        callback(new Error('结束日期不能小于开始日期'));
+      } else {
+        // if (this.form.enddate !== '') {
+        //   this.$refs['form'].validateField('enddate');
+        // }
+        callback();
+      }
+    },
     onSubmit () {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
@@ -205,20 +219,6 @@ export default {
         }
       })
       this.rolelist = res.data
-    },
-    validateEndDate(rule, value, callback){
-      let start = (new Date(this.form.begdate)).getTime()
-      let end = (new Date(this.form.enddate)).getTime()
-      if (value === '') {
-        callback(new Error('请选择结束日期'));
-      } else if (end < start) {
-        callback(new Error('结束日期不能小于开始日期'));
-      } else {
-        // if (this.form.enddate !== '') {
-        //   this.$refs['form'].validateField('enddate');
-        // }
-        callback();
-      }
     }
   },
   mounted () {

src/HManagement/salesForecastTemplate/modules/edit.vue

@@ -68,7 +68,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="提报要求">
-              <el-checkbox v-model="form.baseonproject" :true-label="1" :false-label="0">按项目预测</el-checkbox>
+              <el-checkbox v-model="form.baseonproject" :true-label="1" :false-label="0">按项目及产品类别预测</el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -130,7 +130,7 @@ export default {
           { required: true, message: '请选择开始日期', trigger: 'change' }
         ],
         enddate: [
-          { required: true, message: '请选择结束日期', trigger: 'change' }
+          { validator:this.validateEndDate, required: true, trigger: 'change' }
         ],
         taskdays:[
           { required: true, message: '请输提醒天数', trigger: 'blur' },
@@ -154,6 +154,20 @@ export default {
         callback();
       }
     },
+    validateEndDate(rule, value, callback){
+      let start = (new Date(this.form.begdate)).getTime()
+      let end = (new Date(this.form.enddate)).getTime()
+      if (value === '') {
+        callback(new Error('请选择结束日期'));
+      } else if (end < start) {
+        callback(new Error('结束日期不能小于开始日期'));
+      } else {
+        // if (this.form.enddate !== '') {
+        //   this.$refs['form'].validateField('enddate');
+        // }
+        callback();
+      }
+    },
     async queryMainData (fn) {
       const res = await this.$api.requested({
         "id": 20220906150303,

src/HManagement/salesForecastTemplate/modules/templateList.vue

@@ -13,7 +13,7 @@
           <span :style="scope.column.data.status === '发布'?'color:#52C41A':''">{{scope.column.data.status}}</span>
         </div>
         <div v-else-if="scope.column.columnname === 'baseonproject'">
-          <span>{{scope.column.data.baseonproject === 1?'按项目预测':'无'}}</span>
+          <span>{{scope.column.data.baseonproject === 1?'按产品类别及项目预测':'按产品类别预测'}}</span>
         </div>
         <div v-else-if="scope.column.columnname === 'taskdays'">
           <span>提前{{scope.column.data.taskdays}}天</span>

src/SManagement/personal_target/components/table.vue

@@ -454,7 +454,7 @@
         label="操作"
         width="120"
         :fixed="Object.keys(tableData).length != 0 ? 'right' : ''">
-        <template slot-scope="scope">
+        <template slot-scope="scope" v-if="scope.row.hrid">
             <slot :data="{data:scope.row,year:year}" name="edit"/>
             <slot :data="{data:scope.row,year:year}" name="detail"/>
         </template>

src/SManagement/project_target/components/table.vue

@@ -473,7 +473,7 @@
         label="操作"
         width="120"
         :fixed="Object.keys(tableData).length != 0 ? 'right' : ''">
-        <template slot-scope="scope">
+        <template slot-scope="scope" v-if="scope.row.hrid">
             <slot :data="{data:scope.row,year:year}" name="edit"/>
             <slot :data="{data:scope.row,year:year}" name="detail"/>
         </template>
@@ -515,6 +515,8 @@ export default {
       this.params.content.year = this.year
       let res = await this.$api.requested(this.params)
       this.tableData = res.data
+      console.log(this.tableData);
+      
     },
     /* 清空指标 */
     clearTarget() {

src/SManagement/project_target/modules/editInfo.vue

@@ -32,7 +32,7 @@
     </div>
     <div class="container normal-panel" style="margin-top:16px">
       <div class="header" style="margin-bottom:16px">
-        <Search />
+        <Search @searchActive="searchActive" @clearData="clearData" />
         <add-project @addSuccess="getprojectTargetList" />
       </div>
       <tableLayout v-if="list" :layout="tablecols" :data="list" :custom="false" height="300">
@@ -91,8 +91,8 @@ export default {
       let res = await this.$api.requested({
           "id": 20220906094602,
           "content": {
-              "year": 2023,
-              "hrid": this.hrid,
+              "year": this.$route.query.year,
+              "hrid": this.$route.query.id,
               // "sa_salestargetbillid": 2//可不传
           }
       })

src/components/dynamic-table/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table :row-class-name="tableClassName" v-loading="loading" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%"  border>
+    <el-table :row-class-name="tableClassName" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%"  border>
       <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width" :fixed="col.columnname === fixedName?'right':false">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->

src/router/HDrpManagement.js

@@ -8,5 +8,15 @@ const HDrpManagement = [
         },
         component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/BrandManage/index')
     },
+  {
+    path: '/sm_unit',
+    name: 'unit',
+    meta: {
+      title: '计量单位',
+      ast_nav: true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/unit/index')
+  }
 ]
 export default HDrpManagement

yos/img/message.99a6561b.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.a{fill:none;}.b{fill:#fff;}</style></defs><g transform="translate(-32 -103)"><rect class="a" width="30" height="30" transform="translate(32 103)"/><path class="b" d="M269.787,379.677a14.041,14.041,0,0,0-14,14v13.25a.769.769,0,0,0,.75.75h13.25a14,14,0,0,0,0-28Zm3.3,21.6h-6.6a1,1,0,0,1,0-2h6.65a1,1,0,0,1,1,1A1.047,1.047,0,0,1,273.087,401.277Zm2.65-5.25h-11.9a1,1,0,1,1,0-2h11.9a1,1,0,1,1,0,2Zm0-5.35h-11.9a1,1,0,1,1,0-2h11.9a1,1,0,1,1,0,2Z" transform="translate(-222.787 -275.677)"/></g></svg>

yos/img/work_station.550df9c4.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.a{fill:none;}.b{fill:#fff;}</style></defs><g transform="translate(80 -466)"><rect class="a" width="30" height="30" transform="translate(-80 466)"/><path class="b" d="M86.087,724.24l-4.151,4.15a2.607,2.607,0,0,1-3.688,0L74.1,724.24a2.608,2.608,0,0,1,0-3.689l4.151-4.151a2.607,2.607,0,0,1,3.688,0l4.151,4.151a2.608,2.608,0,0,1,0,3.689Zm-16.757,17.4H63.46a2.608,2.608,0,0,1-2.609-2.609v-5.87a2.609,2.609,0,0,1,2.609-2.609h5.87a2.609,2.609,0,0,1,2.609,2.609v5.87a2.608,2.608,0,0,1-2.609,2.609Zm0-13.7H63.46a2.609,2.609,0,0,1-2.609-2.609v-5.87a2.608,2.608,0,0,1,2.609-2.609h5.87a2.609,2.609,0,0,1,2.609,2.609v5.87a2.609,2.609,0,0,1-2.609,2.609Zm7.827,2.609h5.87a2.609,2.609,0,0,1,2.609,2.609v5.87a2.608,2.608,0,0,1-2.609,2.609h-5.87a2.608,2.608,0,0,1-2.609-2.609v-5.87a2.609,2.609,0,0,1,2.609-2.609Zm0,0" transform="translate(-138.851 -247.636)"/></g></svg>

yos/index copy.html

@@ -1,259 +0,0 @@
-
-    <!DOCTYPE html>
-    <html>
-    
-    <head>
-      <meta charset="utf-8">
-      <meta name="viewport" content="width=device-width,initial-scale=1.0">
-      <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-      <title>nx-admin</title>
-      <style>
-        html,
-        body,
-        #app {
-          height: 100%;
-          margin: 0px;
-          padding: 0px;
-        }
-        .chromeframe {
-          margin: 0.2em 0;
-          background: #ccc;
-          color: #000;
-          padding: 0.2em 0;
-        }
-    
-        #loader-wrapper {
-          position: fixed;
-          top: 0;
-          left: 0;
-          width: 100%;
-          height: 100%;
-          z-index: 999999;
-        }
-    
-        #loader {
-          display: block;
-          position: relative;
-          left: 50%;
-          top: 50%;
-          width: 150px;
-          height: 150px;
-          margin: -75px 0 0 -75px;
-          border-radius: 50%;
-          border: 3px solid transparent;
-          /* COLOR 1 */
-          border-top-color: #FFF;
-          -webkit-animation: spin 2s linear infinite;
-          /* Chrome, Opera 15+, Safari 5+ */
-          -ms-animation: spin 2s linear infinite;
-          /* Chrome, Opera 15+, Safari 5+ */
-          -moz-animation: spin 2s linear infinite;
-          /* Chrome, Opera 15+, Safari 5+ */
-          -o-animation: spin 2s linear infinite;
-          /* Chrome, Opera 15+, Safari 5+ */
-          animation: spin 2s linear infinite;
-          /* Chrome, Firefox 16+, IE 10+, Opera */
-          z-index: 1001;
-        }
-    
-        #loader:before {
-          content: "";
-          position: absolute;
-          top: 5px;
-          left: 5px;
-          right: 5px;
-          bottom: 5px;
-          border-radius: 50%;
-          border: 3px solid transparent;
-          /* COLOR 2 */
-          border-top-color: #FFF;
-          -webkit-animation: spin 3s linear infinite;
-          /* Chrome, Opera 15+, Safari 5+ */
-          -moz-animation: spin 3s linear infinite;
-          /* Chrome, Opera 15+, Safari 5+ */
-          -o-animation: spin 3s linear infinite;
-          /* Chrome, Opera 15+, Safari 5+ */
-          -ms-animation: spin 3s linear infinite;
-          /* Chrome, Opera 15+, Safari 5+ */
-          animation: spin 3s linear infinite;
-          /* Chrome, Firefox 16+, IE 10+, Opera */
-        }
-    
-        #loader:after {
-          content: "";
-          position: absolute;
-          top: 15px;
-          left: 15px;
-          right: 15px;
-          bottom: 15px;
-          border-radius: 50%;
-          border: 3px solid transparent;
-          border-top-color: #FFF;
-          /* COLOR 3 */
-          -moz-animation: spin 1.5s linear infinite;
-          /* Chrome, Opera 15+, Safari 5+ */
-          -o-animation: spin 1.5s linear infinite;
-          /* Chrome, Opera 15+, Safari 5+ */
-          -ms-animation: spin 1.5s linear infinite;
-          /* Chrome, Opera 15+, Safari 5+ */
-          -webkit-animation: spin 1.5s linear infinite;
-          /* Chrome, Opera 15+, Safari 5+ */
-          animation: spin 1.5s linear infinite;
-          /* Chrome, Firefox 16+, IE 10+, Opera */
-        }
-    
-    
-        @-webkit-keyframes spin {
-          0% {
-            -webkit-transform: rotate(0deg);
-            /* Chrome, Opera 15+, Safari 3.1+ */
-            -ms-transform: rotate(0deg);
-            /* IE 9 */
-            transform: rotate(0deg);
-            /* Firefox 16+, IE 10+, Opera */
-          }
-          100% {
-            -webkit-transform: rotate(360deg);
-            /* Chrome, Opera 15+, Safari 3.1+ */
-            -ms-transform: rotate(360deg);
-            /* IE 9 */
-            transform: rotate(360deg);
-            /* Firefox 16+, IE 10+, Opera */
-          }
-        }
-    
-        @keyframes spin {
-          0% {
-            -webkit-transform: rotate(0deg);
-            /* Chrome, Opera 15+, Safari 3.1+ */
-            -ms-transform: rotate(0deg);
-            /* IE 9 */
-            transform: rotate(0deg);
-            /* Firefox 16+, IE 10+, Opera */
-          }
-          100% {
-            -webkit-transform: rotate(360deg);
-            /* Chrome, Opera 15+, Safari 3.1+ */
-            -ms-transform: rotate(360deg);
-            /* IE 9 */
-            transform: rotate(360deg);
-            /* Firefox 16+, IE 10+, Opera */
-          }
-        }
-    
-    
-        #loader-wrapper .loader-section {
-          position: fixed;
-          top: 0;
-          width: 51%;
-          height: 100%;
-          background: #7171C6;
-          /* Old browsers */
-          z-index: 1000;
-          -webkit-transform: translateX(0);
-          /* Chrome, Opera 15+, Safari 3.1+ */
-          -ms-transform: translateX(0);
-          /* IE 9 */
-          transform: translateX(0);
-          /* Firefox 16+, IE 10+, Opera */
-        }
-    
-        #loader-wrapper .loader-section.section-left {
-          left: 0;
-        }
-    
-        #loader-wrapper .loader-section.section-right {
-          right: 0;
-        }
-    
-        /* Loaded */
-    
-        .loaded #loader-wrapper .loader-section.section-left {
-          -webkit-transform: translateX(-100%);
-          /* Chrome, Opera 15+, Safari 3.1+ */
-          -ms-transform: translateX(-100%);
-          /* IE 9 */
-          transform: translateX(-100%);
-          /* Firefox 16+, IE 10+, Opera */
-          -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-          transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-        }
-    
-        .loaded #loader-wrapper .loader-section.section-right {
-          -webkit-transform: translateX(100%);
-          /* Chrome, Opera 15+, Safari 3.1+ */
-          -ms-transform: translateX(100%);
-          /* IE 9 */
-          transform: translateX(100%);
-          /* Firefox 16+, IE 10+, Opera */
-          -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-          transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-        }
-    
-        .loaded #loader {
-          opacity: 0;
-          -webkit-transition: all 0.3s ease-out;
-          transition: all 0.3s ease-out;
-        }
-    
-        .loaded #loader-wrapper {
-          visibility: hidden;
-          -webkit-transform: translateY(-100%);
-          /* Chrome, Opera 15+, Safari 3.1+ */
-          -ms-transform: translateY(-100%);
-          /* IE 9 */
-          transform: translateY(-100%);
-          /* Firefox 16+, IE 10+, Opera */
-          -webkit-transition: all 0.3s 1s ease-out;
-          transition: all 0.3s 1s ease-out;
-        }
-    
-        /* JavaScript Turned Off */
-    
-        .no-js #loader-wrapper {
-          display: none;
-        }
-    
-        .no-js h1 {
-          color: #222222;
-        }
-    
-        #loader-wrapper .load_title {
-          font-family: 'Open Sans';
-          color: #FFF;
-          font-size: 19px;
-          width: 100%;
-          text-align: center;
-          z-index: 9999999999999;
-          position: absolute;
-          top: 60%;
-          opacity: 1;
-          line-height: 30px;
-        }
-    
-        #loader-wrapper .load_title span {
-          font-weight: normal;
-          font-style: italic;
-          font-size: 13px;
-          color: #FFF;
-          opacity: 0.5;
-        }
-      </style>
-    </head>
-    
-    <body>
-      <!-- built files will be auto injected -->
-      <div id="app">
-        <div id="loader-wrapper">
-          <div id="loader"></div>
-          <div class="loader-section section-left"></div>
-          <div class="loader-section section-right"></div>
-          <div class="load_title">正在加载 nx-admin,请耐心等待
-            <br>
-            <span>V1.3</span>
-          </div>
-        </div>
-      </div>
-    </body>
-    
-    </html>

yos/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.a591369e.js"></script><link href="css/app.09f1a246.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.888247d1.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.a721bc7e.js"></script><link href="css/app.1831ed6a.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.9a0c4174.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>