From 61e05c2e75bd0f5d277ab14cfd2c1954f22baed4 Mon Sep 17 00:00:00 2001
From: 阿宝 <liangbaoman210@sina.com>
Date: Sun, 18 Dec 2022 13:00:55 +0800
Subject: [PATCH] 软件下载

---
 E/system-commandline-sentinel-files/dotnet-suggest-registration-git-credential-manager-core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null |   6 ++++++
 src/views/down/client.vue                                                                                                                          | 397 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------
 2 files changed, 364 insertions(+), 39 deletions(-)
 create mode 100644 E/system-commandline-sentinel-files/dotnet-suggest-registration-git-credential-manager-core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null

diff --git a/E/system-commandline-sentinel-files/dotnet-suggest-registration-git-credential-manager-core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null b/E/system-commandline-sentinel-files/dotnet-suggest-registration-git-credential-manager-core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null
new file mode 100644
index 0000000..821db7c
--- /dev/null
+++ b/E/system-commandline-sentinel-files/dotnet-suggest-registration-git-credential-manager-core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null
@@ -0,0 +1,6 @@
+Exception during registration:
+System.ComponentModel.Win32Exception (0x80004005): 系统找不到指定的文件。
+   在 System.Diagnostics.Process.StartWithCreateProcess(ProcessStartInfo startInfo)
+   在 System.Diagnostics.Process.Start()
+   在 System.CommandLine.Invocation.Process.StartProcess(String command, String args, String workingDir, Action`1 stdOut, Action`1 stdErr, ValueTuple`2[] environmentVariables)
+   在 System.CommandLine.Builder.CommandLineBuilderExtensions.<>c.<<RegisterWithDotnetSuggest>b__10_1>d.MoveNext()
\ No newline at end of file
diff --git a/src/views/down/client.vue b/src/views/down/client.vue
index 434e6b8..e14b996 100644
--- a/src/views/down/client.vue
+++ b/src/views/down/client.vue
@@ -8,9 +8,9 @@
     <div class="page-content">
       <div class="content-top">
         <div class="cont-info">
-          <img class="logo" :src="info.appImage" alt="" />
+          <img v-if="info.appImage" class="logo" :src="info.appImage" alt="" />
           <div>
-            <p class="name">{{ `${info.appName} ${info.versionName}` }}</p>
+            <p class="name">{{ `${info.appName||""} ${info.versionName||""}` }}</p>
             <p class="txt">文件大小：{{ `${info.fileSize}` }}M</p>
             <p class="txt">最近更新：{{ info.modifiedTime }}</p>
           </div>
@@ -27,14 +27,20 @@
       </div>
       <ul class="down-ul">
         <li class="down-li" v-for="item in tableData" :key="item.id">
-          <span @click="edit(item)">{{ item.configName }}</span>
+          <span @click="setConfigForm(item)">{{ item.configName }}</span>
           <el-button plan round @click="getAppDownloadUrl(item.id)"
             >下载</el-button
           >
         </li>
         <li class="down-li">
           <span>自定义软件功能</span>
-          <el-button plan round icon="el-icon-plus">参数设置</el-button>
+          <el-button
+            plan
+            round
+            icon="el-icon-plus"
+            @click="setDefaultForm(), (dialogVis = true), (type = 1)"
+            >参数设置</el-button
+          >
         </li>
       </ul>
     </div>
@@ -46,7 +52,15 @@
         </div>
       </div>
       <div class="form-box">
-        <el-form :model="formData" :rules="ruleForm" label-width="160px">
+        <el-form :model="formData" :rules="ruleForm" label-width="180px">
+          <el-form-item label="主菜单设置：" prop="configName" v-if="type==1">
+            <el-col :span="12">
+              <el-input
+                v-model.trim="formData.configName"
+                placeholder="请填写配置名称"
+              ></el-input>
+            </el-col>
+          </el-form-item>
           <el-form-item label="主菜单设置：" prop="mainMenu">
             <el-checkbox-group v-model="formData.mainMenu" :max="4">
               <el-checkbox v-for="item in menuList" :label="item" :key="item">{{
@@ -72,26 +86,64 @@
           </el-form-item>
           <el-form-item label="成绩等级设置：">
             <el-col :span="12">
-              <p class="silde-p">
-                <el-slider v-model="formData.failedSet"></el-slider
-                ><span>不及格</span>
-              </p>
-              <p class="silde-p">
-                <el-slider v-model="formData.passSet"></el-slider
-                ><span>及格</span>
-              </p>
-              <p class="silde-p">
-                <el-slider v-model="formData.goodSet"></el-slider
-                ><span>良好</span>
-              </p>
-              <p class="silde-p">
-                <el-slider v-model="formData.excellenSet"></el-slider
-                ><span>优秀</span>
-              </p>
+              <div class="silde-box">
+                <p class="silde-p">
+                  <span class="num" :style="{ left: formData.failedSet + '%' }"
+                    >{{ formData.failedSet }}%</span
+                  >
+                  <el-slider
+                    v-model="formData.failedSet"
+                    :show-tooltip="false"
+                  ></el-slider
+                  ><span class="txt" :style="{ left: formData.failedSet + '%' }"
+                    >不及格</span
+                  >
+                </p>
+                <p class="silde-p">
+                  <span class="num" :style="{ left: formData.passSet + '%' }"
+                    >{{ formData.passSet }}%</span
+                  >
+                  <el-slider
+                    v-model="formData.passSet"
+                    :show-tooltip="false"
+                  ></el-slider
+                  ><span class="txt" :style="{ left: formData.passSet + '%' }"
+                    >及格</span
+                  >
+                </p>
+                <p class="silde-p">
+                  <span class="num" :style="{ left: formData.goodSet + '%' }"
+                    >{{ formData.goodSet }}%</span
+                  >
+                  <el-slider
+                    v-model="formData.goodSet"
+                    :show-tooltip="false"
+                  ></el-slider
+                  ><span class="txt" :style="{ left: formData.goodSet + '%' }"
+                    >良好</span
+                  >
+                </p>
+                <p class="silde-p">
+                  <span
+                    class="num"
+                    :style="{ left: formData.excellenSet + '%' }"
+                    >{{ formData.excellenSet }}%</span
+                  >
+                  <el-slider
+                    v-model="formData.excellenSet"
+                    :show-tooltip="false"
+                  ></el-slider
+                  ><span
+                    class="txt"
+                    :style="{ left: formData.excellenSet + '%' }"
+                    >优秀</span
+                  >
+                </p>
+              </div>
             </el-col>
           </el-form-item>
           <el-form-item label="抢答设置：" prop="viesAnswerSet">
-            <el-radio-group v-model="formData.popupMenu">
+            <el-radio-group v-model="formData.viesAnswerSet">
               <el-radio :label="0">倒计时抢答</el-radio>
               <el-radio :label="1">即时抢答</el-radio>
               <el-radio :label="2">老师选择</el-radio>
@@ -105,12 +157,100 @@
             ></el-input-number
             >秒
           </el-form-item>
-          <el-form-item label="抽答设置：" prop="viesAnswerSet">
+          <el-form-item label="抽答设置：" prop="ballotAnswerSet">
             <el-radio-group v-model="formData.ballotAnswerSet">
               <el-radio :label="0">点名抽答</el-radio>
               <el-radio :label="1">随机抽答</el-radio>
             </el-radio-group>
           </el-form-item>
+          <el-form-item label="单选题选项默认个数：" prop="singleChoiceNum">
+            <el-input-number
+              size="small"
+              class="count-down count-down2"
+              v-model="formData.singleChoiceNum"
+              :min="2"
+              :max="7"
+              :step="1"
+              :step-strictly="true"
+            ></el-input-number
+            >个
+          </el-form-item>
+          <el-form-item label="多选题选项默认个数：" prop="countdown">
+            <el-input-number
+              size="small"
+              class="count-down count-down2"
+              v-model="formData.countdown"
+              :min="2"
+              :max="7"
+              :step="1"
+              :step-strictly="true"
+            ></el-input-number
+            >个
+          </el-form-item>
+          <el-form-item label="测—单题型默认题数：" prop="singleTypeNum">
+            <el-input-number
+              size="small"
+              class="count-down count-down2"
+              v-model="formData.singleTypeNum"
+              :min="1"
+              :max="100"
+              :step="1"
+              :step-strictly="true"
+            ></el-input-number
+            >个
+          </el-form-item>
+          <el-form-item label="问—倒计时：" prop="askCountdown">
+            <el-switch v-model="askCount" @change="askCountChange"> </el-switch>
+            <el-input-number
+              v-show="askCount"
+              size="small"
+              class="count-down"
+              v-model="formData.askCountdown"
+              :min="0"
+              :step="1"
+              :step-strictly="true"
+            ></el-input-number>
+            {{ askCount ? "秒" : "" }}
+          </el-form-item>
+          <el-form-item label="测—倒计时：" prop="viesAnswerSet">
+            <el-switch v-model="examsDuration" @change="examsDurationChange">
+            </el-switch>
+            <el-input-number
+              v-show="examsDuration"
+              size="small"
+              class="count-down"
+              v-model="formData.examsDuration"
+              :min="0"
+              :step="1"
+              :step-strictly="true"
+            ></el-input-number>
+            {{ examsDuration ? "秒" : "" }}
+          </el-form-item>
+          <el-form-item label="答题结构展示：" prop="displayModel">
+            <el-radio-group v-model="formData.displayModel">
+              <el-radio :label="0">极简模式</el-radio>
+              <el-radio :label="1">全屏模式</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="语言设置：" prop="languageSet">
+            <el-radio-group v-model="formData.languageSet">
+              <el-radio :label="0">中文</el-radio>
+              <el-radio :label="1">英文</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="其他设置：">
+            <el-checkbox-group v-model="formData.otherSet">
+              <p>
+                <el-checkbox :label="0">答题结束自动显示答题统计</el-checkbox>
+              </p>
+              <p><el-checkbox :label="1">答题结束自动保存截屏</el-checkbox></p>
+            </el-checkbox-group>
+          </el-form-item>
+          <el-form-item label=" ">
+            <el-button type="primary" round @click="saveForm">保存</el-button>
+            <el-button round @click="setDefaultForm">恢复默认设置</el-button>
+            <el-button round @click="dialogVis = false">取消</el-button>
+          </el-form-item>
         </el-form>
       </div>
     </div>
@@ -118,11 +258,44 @@
 </template>
 
 <script>
+const defaultForm = {
+  configName: "",
+  mainMenu: ["问"],
+  popupMenu: 1,
+  failedSet: 60,
+  passSet: 80,
+  goodSet: 90,
+  excellenSet: 98,
+  viesAnswerSet: 0,
+  countdown: 5,
+  ballotAnswerSet: 0,
+  singleChoiceNum: 4,
+  multipleChoiceNum: 4,
+  singleTypeNum: 20,
+  askCountdown: 30,
+  examsDuration: 5400,
+  displayModel: 0,
+  languageSet: 0,
+  otherSet: [],
+};
 export default {
+  watch: {
+    "formData.askCountdown": function (val) {
+      if (val == 0) {
+        this.askCount = false;
+      }
+    },
+    "formData.examsDuration": function (val) {
+      if (val == 0) {
+        this.examsDuration = false;
+      }
+    },
+  },
   data() {
     return {
       page: 1,
       size: 20,
+      type: 1, //1-添加；2-修改
       info: {
         appName: "",
         appImage: "",
@@ -131,8 +304,12 @@ export default {
         modifiedTime: "",
       },
       tableData: [],
-      dialogVis: true,
+      dialogVis: false,
+      askCount: true,
+      examsDuration: true,
+      configId:'',
       formData: {
+        configName: "",
         mainMenu: ["问"],
         popupMenu: 1,
         failedSet: 60,
@@ -142,8 +319,19 @@ export default {
         viesAnswerSet: 0,
         countdown: 5,
         ballotAnswerSet: 0,
+        singleChoiceNum: 4,
+        multipleChoiceNum: 4,
+        singleTypeNum: 20,
+        askCountdown: 30,
+        examsDuration: 5400,
+        displayModel: 0,
+        languageSet: 0,
+        otherSet: [],
       },
       ruleForm: {
+        configName: [
+          { required: true, message: "请填写配置名称", trigger: "blur" },
+        ],
         mainMenu: [
           { required: true, message: "请选择主菜单", trigger: "blur" },
         ],
@@ -159,6 +347,41 @@ export default {
         ballotAnswerSet: [
           { required: true, message: "请选择抽答类型", trigger: "blur" },
         ],
+        singleChoiceNum: [
+          {
+            required: true,
+            message: "请输入单选题选项默认个数",
+            trigger: "blur",
+          },
+        ],
+        multipleChoiceNum: [
+          {
+            required: true,
+            message: "请输入多选题选项默认个数",
+            trigger: "blur",
+          },
+        ],
+        singleTypeNum: [
+          {
+            required: true,
+            message: "请输入测—单题型默认题数",
+            trigger: "blur",
+          },
+        ],
+        displayModel: [
+          {
+            required: true,
+            message: "请选择答题结构",
+            trigger: "blur",
+          },
+        ],
+        languageSet: [
+          {
+            required: true,
+            message: "请选择语言",
+            trigger: "blur",
+          },
+        ],
       },
       menuList: ["问", "测", "析"],
     };
@@ -168,6 +391,81 @@ export default {
     this.appConfigList();
   },
   methods: {
+    setConfigForm(obj) {
+      let content = JSON.parse(obj.content)
+      console.log(content)
+      for (let key in this.formData) {
+        content[key] ? (this.formData[key] = content[key]) : "";
+      }
+      this.type = 2;
+      this.configId = obj.id,
+      this.dialogVis=true
+    },
+    setDefaultForm() {
+      for (let key in this.formData) {
+        this.formData[key] = defaultForm[key];
+      }
+    },
+    askCountChange(val) {
+      if (val) {
+        this.formData.askCountdown = 30;
+      } else {
+        this.formData.askCountdown = 0;
+      }
+    },
+    examsDurationChange(val) {
+      if (val) {
+        this.formData.examsDuration = 5400;
+      } else {
+        this.formData.examsDuration = 0;
+      }
+    },
+    async saveForm() {
+      let content = {};
+      for (let key in this.formData) {
+        if (key != "configName") {
+          content[key] = this.formData[key];
+        }
+      }
+
+      if (this.type == 1) {
+        this.addAppConfig({
+          configName: this.formData.configName,
+          content: { ...content },
+        });
+      } else {
+        this.updateAppConfig({
+          configId: this.configId,
+          content: { ...content },
+        });
+      }
+    },
+
+    async addAppConfig(params) {
+      const { data, status, info } = await this.$request.addAppConfig({
+        ...params,
+      });
+      if (status == 0) {
+        this.$message.success("配置成功");
+        this.dialogVis = false;
+        this.appConfigList();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async updateAppConfig(params) {
+      const { data, status, info } = await this.$request.updateAppConfig({
+        ...params,
+      });
+      if (status == 0) {
+        this.$message.success("配置成功");
+        this.dialogVis = false;
+        this.appConfigList();
+      } else {
+        this.$message.error(info);
+      }
+    },
+
     async latestVersion() {
       const { data, status, info } = await this.$request.latestVersion();
       if (status == 0) {
@@ -337,21 +635,42 @@ export default {
         display: none;
       }
     }
-    .silde-p {
-      display: flex;
-      align-items: center;
-      height:36px;
-      line-height:36px;
-      & > span {
-        width: 48px;
-        margin-left: 10px;
-        flex-shrink: 0;
-      }
-      :deep(.el-slider) {
-        flex: 1;
-      }
-      :deep(.el-slider__runway) {
-        margin:5px 0;
+    .count-down2 {
+      margin-left: 0;
+    }
+    .silde-box {
+      position: relative;
+      width: 100%;
+      height: 60px;
+      .silde-p {
+        width: 100%;
+        position: absolute;
+        padding-top: 20px;
+        & > span {
+          position: absolute;
+          width: 48px;
+          text-align: center;
+          line-height: 18px;
+          flex-shrink: 0;
+          font-size: 12px;
+        }
+        :deep(.el-slider) {
+          flex: 1;
+        }
+        :deep(.el-slider__runway) {
+          margin: 5px 0;
+        }
+        :deep(.el-slider__runway) {
+          background-color: #409eff;
+        }
+        .num {
+          top: 0;
+          transform: translateX(-24px);
+        }
+        .txt {
+          bottom: -20px;
+          transform: translateX(-24px);
+        }
       }
     }
   }
--
libgit2 0.21.4