`fix`

src/views/detection/detail/index.vue

@@ -465,16 +465,42 @@
       <div>
         <el-form :model="pdobj" label-width="120px">
           <el-form-item label="负责班组"
-            ><el-select
+            >
+
+                <el-select-v2
+        v-model="pdobj.fzbz"
+        :options="treedept.map(i=>{ return {label:i.label,value:i.id}})"
+        placeholder="请选择"
+        style="width: 100%"
+        allow-create
+        filterable
+        multiple
+        clearable
+      />
+
+            <!-- <el-select
               style="width: 100%"
               v-model="pdobj.fzbz"
               multiple
           >
           <el-option v-for="item in treedept" :label="item.label" :value="item.id" />
-          </el-select>
+          </el-select> -->
           </el-form-item>
           <el-form-item label="负责人">
-            <el-select v-model="pdobj.fzr" placeholder="请选择" style="width: 100%">
+
+              <el-select-v2
+        v-model="pdobj.fzr"
+        :options="allusers.filter(
+                  (i) => (pdobj.fzbz ?? []).indexOf(i.deptId) !== -1
+                ).map(i=>{ return {label:i.nickName,value:i.userId}})"
+        placeholder="请选择"
+        style="width: 100%"
+        allow-create
+        filterable
+        multiple
+        clearable
+      />
+            <!-- <el-select v-model="pdobj.fzr" placeholder="请选择" style="width: 100%">
               <el-option
                 v-for="item in allusers.filter(
                   (i) => (pdobj.fzbz ?? []).indexOf(i.deptId) !== -1
@@ -482,7 +508,7 @@
                 :label="item.nickName"
                 :value="item.userId"
               />
-            </el-select>
+            </el-select> -->
           </el-form-item>
         </el-form>
       </div>

src/views/task/detail/index.vue

@@ -750,13 +750,24 @@
       <div>
         <el-form :model="pdobj" label-width="120px">
           <el-form-item label="负责班组">
-            <el-select v-model="pdobj.fzbz" multiple placeholder="">
+
+          <el-select-v2
+        v-model="pdobj.fzbz"
+        :options="ywdept.map(i=>{ return {label:i.deptName,value:i.deptId}})"
+        placeholder="请选择"
+        style="width: 100%"
+        allow-create
+        filterable
+        multiple
+        clearable
+      />
+            <!-- <el-select v-model="pdobj.fzbz" multiple placeholder="">
               <el-option
                 v-for="dept in ywdept"
                 :label="dept.deptName"
                 :value="dept.deptId"
               ></el-option>
-            </el-select>
+            </el-select> -->
 
             <!-- <el-tree-select
               style="width: 100%"
@@ -766,7 +777,18 @@
           /> -->
           </el-form-item>
           <el-form-item label="负责人">
-            <el-select
+
+            <el-select-v2
+        v-model="pdobj.fzr"
+        :options="fzrusers.map(i=>{ return {label:i.nickName,value:i.userId}})"
+        placeholder="请选择"
+        style="width: 100%"
+        allow-create
+        filterable
+        multiple
+        clearable
+      />
+            <!-- <el-select
               v-model="pdobj.fzr"
               placeholder="请选择"
               style="width: 100%"
@@ -778,7 +800,7 @@
                 :label="item.nickName"
                 :value="item.userId"
               />
-            </el-select>
+            </el-select> -->
           </el-form-item>
         </el-form>
       </div>
@@ -1215,6 +1237,16 @@ const gzobj = ref({ isfinsh: "是", hfdes: "", czcompletetime: "", jlr: "" });
 const shobj = ref({ hcry: "", hcdes: "", hctime: "" });
 const cztblaname = ref("gzl");
 
+
+
+const deptoption = computed(() => {
+  return dept
+})
+
+
+
+
+
 if (!route.params.id || route.params.id == "undefined") {
   router.back();
 }

vite.config.js

@@ -7,58 +7,59 @@ export default defineConfig(({ mode, command }) => {
     const env = loadEnv(mode, process.cwd())
     const { VITE_APP_ENV } = env
     return {
-
-        // 部署生产环境和开发环境下的URL。
-        // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
-        // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-        base: VITE_APP_ENV === "production" ? "/" : "/",
-        plugins: createVitePlugins(env, command === "build"),
-        resolve: {
-            // https://cn.vitejs.dev/config/#resolve-alias
-            alias: {
-                // 设置路径
-                "~": path.resolve(__dirname, "./"),
-                // 设置别名
-                "@": path.resolve(__dirname, "./src"),
-            },
-            // https://cn.vitejs.dev/config/#resolve-extensions
-            extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue"],
+      // 部署生产环境和开发环境下的URL。
+      // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
+      // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+      base: VITE_APP_ENV === "production" ? "/" : "/",
+      plugins: createVitePlugins(env, command === "build"),
+      resolve: {
+        // https://cn.vitejs.dev/config/#resolve-alias
+        alias: {
+          // 设置路径
+          "~": path.resolve(__dirname, "./"),
+          // 设置别名
+          "@": path.resolve(__dirname, "./src"),
         },
-        esbuild: {
-            jsxFactory: 'h',
-            jsxFragment: 'Fragment',
-            jsxInject: "import { h } from 'vue';"
+        // https://cn.vitejs.dev/config/#resolve-extensions
+        extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue"],
+      },
+      esbuild: {
+        jsxFactory: "h",
+        jsxFragment: "Fragment",
+        jsxInject: "import { h } from 'vue';",
+      },
+      // vite 相关配置
+      server: {
+        port: 9005,
+        host: true,
+        open: true,
+        cors: true,
+        proxy: {
+          // 'http://nnbpbg.xt.wenhq.top:8083'
+          "/dev-api": {
+            target: "http://39.104.26.229/api",
+            // target:"http://nnbpbg.xt.wenhq.top:8083/api",
+            changeOrigin: true,
+            rewrite: (p) => p.replace(/^\/dev-api/, ""),
+          },
         },
-        // vite 相关配置
-        server: {
-            port: 9005,
-            host: true,
-            open: true,
-            cors:true,
-            proxy: {
-                // 'http://nnbpbg.xt.wenhq.top:8083'
-                "/dev-api": {
-                    target: "http://localhost:8080/api",
-                    // target:"http://nnbpbg.xt.wenhq.top:8083/api",
-                    changeOrigin: true,
-                    rewrite: (p) => p.replace(/^\/dev-api/, ""),
+      },
+      //fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
+      css: {
+        postcss: {
+          plugins: [
+            {
+              postcssPlugin: "internal:charset-removal",
+              AtRule: {
+                charset: (atRule) => {
+                  if (atRule.name === "charset") {
+                    atRule.remove();
+                  }
                 },
+              },
             },
+          ],
         },
-        //fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
-        css: {
-            postcss: {
-                plugins: [{
-                    postcssPlugin: "internal:charset-removal",
-                    AtRule: {
-                        charset: (atRule) => {
-                            if (atRule.name === "charset") {
-                                atRule.remove();
-                            }
-                        },
-                    },
-                }, ],
-            },
-        },
+      },
     };
 })